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

diff --git a/click.scm b/click.scm
index afeb2f9..e8f8c09 100644
--- a/click.scm
+++ b/click.scm
@@ -19,27 +19,36 @@
 
 (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 display)
+  #:use-module (click help)
   #:use-module (click util)
-  #:export (command))
+  #:use-module (click value)
+  #:export (command
+            group))
 
-(define (get-options-value options option-spec)
-  (cond ((null? option-spec)
-         '())
-        (else
-         (let* ((option (car option-spec))
-                (option-name (car option))
-                (default (option-default-value option)))
-           (cons (cons option-name (option-ref options option-name default))
-                 (get-options-value options (cdr option-spec)))))))
 
-(define (command option-spec procedure)
-  (lambda (args)
-    (with-fluids ((%program-name (car args)))
-      (let* ((click-option-spec (append option-spec (list HELP_OPTION)))
-             (options (getopt-long args
-                                   (getopt-long-option-spec click-option-spec))))
-        (if (option-ref options 'help #f)
-            (display-help procedure click-option-spec)
-            (apply procedure (map cdr (get-options-value options option-spec))))))))
+(define* (command #:key (name #f) (option-spec '()) (help "") (procedure #f))
+  "Define a new command for the procedure"
+  (group #:name name
+         #:option-spec option-spec
+         #:help help
+         #:procedure procedure))
+
+
+(define* (group #:key (name #f) (option-spec '()) (help "") (procedure #f) (commands '()))
+  "Define a new group with a list of commands associated"
+  (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)))