Small changes. git main function is now a real function, not syntax

info.rkt

@@ -1,23 +1,23 @@
-#lang info
+#lang info
-
+
-(define collection "git-cli")
+(define collection "git-cli")
-(define pkg-desc "Command-line-like Git operations for Racket, interface to the git cli command")
+(define pkg-desc "Command-line-like Git operations for Racket, interface to the git cli command")
-(define version "0.3.10")
+(define version "0.3.11")
-(define pkg-authors '("Hans Dijkema"))
+(define pkg-authors '("Hans Dijkema"))
-(define license 'MIT)
+(define license 'MIT)
-
+
-(define deps
+(define deps
-  '("base"
+  '("base"
-    "simple-ini"
+    "simple-ini"
-    "simple-log"
+    "simple-log"
-    "racket-index"
+    "racket-index"
-    "scribble-lib"
+    "scribble-lib"
-    "racket-makefile"
+    "racket-makefile"
-    "package-zipper"))
+    "package-zipper"))
-
+
-(define build-deps
+(define build-deps
-  '("rackunit-lib"
+  '("rackunit-lib"
-    "racket-doc"))
+    "racket-doc"))
-
+
-(define scribblings
+(define scribblings
-  '(("scribblings/git.scrbl" () ("Git"))))
+  '(("scribblings/git.scrbl" () ("Git"))))

main.rkt

@@ -22,25 +22,29 @@
          )
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Provided commands
+;; Internal variables
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define git-commands (make-hash))
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Command invocation using 'git'
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;; goal: Invoke a supported Git command through the command table.
 ;; pre: command is a registered Git command symbol.
 ;; post: The selected command has processed all supplied arguments.
 ;; result: The command-specific result.
-(define-syntax git
+
-  (syntax-rules ()
+(define (git command . args)
-    ((_ command b1 ...)
+  ((hash-ref git-commands command
-     ((hash-ref git-commands command
+             (λ ()
-                (λ ()
+               (error "Not a supported or recognized git command: " command)))
-                  (error "Not a supported or recognized git command: " command)))
+   args))
-      (list b1 ...)))
+
-    )
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  )
+;; Supporting functions
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define (git-prompt p)
   (display p)
@@ -76,6 +80,9 @@
                  (string-contains? line* "no changes added to commit"))))
          out))
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Command definition macro
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-syntax def-cmd
   (syntax-rules ()
@@ -93,6 +100,10 @@
     )
   )
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Typical git commands
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
 ;; goal: Return the complete Git index and worktree status for every reported file.
 ;; pre: The current directory is inside a Git working tree.
 ;; post: Git status has been invoked with --porcelain.
@@ -154,7 +165,9 @@
 ;; post: Git pull has completed successfully or an exception has been raised.
 ;; result: #t after a successful pull.
 (def-cmd git-pull cmd-git-pull 'pull)
+
 (def-cmd git-branch cmd-git-branch 'branch)
+
 (def-cmd git-clone cmd-git-clone 'clone)
 
 ;; goal: Display the Git commit log.
@@ -162,32 +175,9 @@
 ;; post: Git log has completed successfully or an exception has been raised.
 ;; result: #t after successfully displaying the log.
 (def-cmd git-log cmd-git-log 'log)
+
 (def-cmd git-rev-list cmd-git-rev-list 'rev-list)
 
-(define (git-version . args)
-  (cmd-git-version args))
-
-(define (cmd-git-version args)
-  (info-version "."))
-
-(hash-set! git-commands 'version cmd-git-version)
-
-;; goal: Increment the package version in info.rkt.
-;; pre: kind is 'maj, 'major, 'min, 'minor or 'patch.
-;; post: The version definition in info.rkt has been updated.
-;; result: The new version as a list containing major, minor and patch.
-(define (git-new-version . args)
-  (cmd-git-new-version args))
-
-(define (cmd-git-new-version args)
-  (when(null? args)
-      (error "git-new-version expects 'maj, 'major, 'min, 'minor or 'patch"))
-  (let ((kind (car args)))
-    (git-next-version kind ".")
-    (git-version)))
-
-(hash-set! git-commands 'new-version cmd-git-new-version)
-
 (def-cmd git-diff cmd-git-diff 'diff
   (λ (args info) args)
   (λ (cmd exit-code result output out info)
@@ -257,3 +247,36 @@
 (def-cmd git-help cmd-git-help 'help)
 
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Racket module versioning
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(define (git-version . args)
+  (cmd-git-version args))
+
+(define (cmd-git-version args)
+  (info-version "."))
+
+(hash-set! git-commands 'version cmd-git-version)
+
+;; goal: Increment the package version in info.rkt.
+;; pre: kind is 'maj, 'major, 'min, 'minor or 'patch.
+;; post: The version definition in info.rkt has been updated.
+;; result: The new version as a list containing major, minor and patch.
+(define (git-new-version . args)
+  (cmd-git-new-version args))
+
+(define (cmd-git-new-version args)
+  (when(null? args)
+      (error "git-new-version expects 'maj, 'major, 'min, 'minor or 'patch"))
+  (let ((kind (car args)))
+    (git-next-version kind ".")
+    (git-version)))
+
+(hash-set! git-commands 'new-version cmd-git-new-version)
+
+
+
+
+
+

scribblings/git.scrbl

@@ -1,7 +1,8 @@
 #lang scribble/manual
 
 @(require (for-label racket/base
-                     git-cli))
+                     "../main.rkt"))
+@;git-cli))
 
 @title[#:tag "top"]{git-cli}
 @author{Hans Dijkema}