X-Git-Url: https://git.jsancho.org/?p=guile-click.git;a=blobdiff_plain;f=click.scm;fp=click.scm;h=e8f8c09833acf6bb8abc67a22beb6d7141bd1731;hp=d2da6ac577e9154be5ad7a278f704ae4258030d7;hb=84da61950d4a4038f76fdb9f66e0bbbb71f75385;hpb=ebf74b7c3fda8ead57a398bb6a1555067150d06f

diff --git a/click.scm b/click.scm
index d2da6ac..e8f8c09 100644
--- a/click.scm
+++ b/click.scm
@@ -19,6 +19,9 @@
 
 (define-module (click)
   #:use-module (ice-9 getopt-long)
+  #:use-module (srfi srfi-9)
+  #:use-module (srfi srfi-9 gnu)
+  #:use-module (click command)
   #:use-module (click constant)
   #:use-module (click help)
   #:use-module (click util)
@@ -27,26 +30,25 @@
             group))
 
 
-(define (command option-spec procedure)
+(define* (command #:key (name #f) (option-spec '()) (help "") (procedure #f))
   "Define a new command for the procedure"
-  (lambda (args)
-    (let* ((click-option-spec (append option-spec (list HELP_OPTION)))
-           (values (getopt-long args
-                                (getopt-long-option-spec click-option-spec))))
-      (if (option-ref values 'help #f)
-          (let ((program-name (car args)))
-            (display-help program-name procedure click-option-spec))
-          (apply procedure (map cdr (get-values option-spec values)))))))
+  (group #:name name
+         #:option-spec option-spec
+         #:help help
+         #:procedure procedure))
 
 
-(define (group option-spec target . commands)
+(define* (group #:key (name #f) (option-spec '()) (help "") (procedure #f) (commands '()))
   "Define a new group with a list of commands associated"
-  (lambda (args)
-    (let* ((click-option-spec (append option-spec (list HELP_OPTION)))
-           (values (getopt-long args
-                                (getopt-long-option-spec click-option-spec))))
-      (if (or (null? (cdr args))
-              (option-ref values 'help #f))
-          (let ((program-name (car args)))
-            (display-help program-name target click-option-spec commands))
-          (apply target (map cdr (get-values option-spec values)))))))
+  (let* ((click-option-spec (append option-spec (list HELP_OPTION)))
+         (new-command (make-command name click-option-spec help procedure commands)))
+    (let ((click-manager
+           (lambda (args)
+             (let ((values
+                    (getopt-long args (getopt-long-option-spec click-option-spec))))
+               (if (option-ref values 'help #f)
+                   (let ((program-name (car args)))
+                     (display-help program-name new-command))
+                   (apply procedure (map cdr (get-values option-spec values))))))))
+      (set-command-click-manager! new-command click-manager)
+      new-command)))