@@ -14,6 +14,20 @@ a record do not begin with either a single tab or three spaces) and it detects i

 Additionally, if run in interactive mode `-i`, when it discovers invalid input, it will prompt for a replacement

 and attempt to correct the error.  Also, with `-W`, it should be able to recover from whitespace errors on its own.

+## Install:

+

+Just do this:

+

+```

+CC=`which gcc` \

+sbcl --no-userinit \

+     --load ~/quicklisp/setup.lisp \

+     --eval '(push (truename ".") asdf:*central-registry*)' \

+     --eval '(ql:quickload :timesheet)'  \

+     --load timesheet-client.lisp \

+     --eval '(timesheet.cli::make-executable)'

+```

+

 ## Todo:

 - Expand error handling

@@ -24,15 +38,18 @@ and attempt to correct the error.  Also, with `-W`, it should be able to recover

 ## Examples:

 ```

-% ./timesheet -h

-timesheet file parser, version 0:4

--c --client                     boolean  Sort by client

--r --reverse                    boolean  Reverse sort

--W --ignore-whitespace          boolean  Ignore whitespace errors in input

--i --interactive                boolean  Run Interactively

--v --version                    boolean  Version

--s --status                     boolean  Print a summary of the hours worked and the prices

--h --help                       boolean  show help

+Usage: timesheet [-crWisvh] [OPTIONS] TIMESHEETS ...

+

+A program for managing logs of hours worked

+Main actions

+  -c, --client                Sort records by client

+  -r, --reverse               Reverse the sort direction

+  -W, --ignore-whitespace     Ignore whitespace errors in input

+  -i, --interactive           Run interactively

+  -s, --status                Print a short summary of work status

+Other options

+  -v, --version               Show the program version

+  -h, --help                  Show this help

 ```

 By default, it orders the log by dates.  With the `-r` option, it displays the dates in descending order:

@@ -29,3 +29,9 @@

   (:use #:cl #:anaphora #:alexandria #:serapeum #:fwoar.lisputils

         #:timesheet.parser)

   (:import-from #:format-string-builder #:define-message))

+

+(defpackage #:timesheet.cli

+  (:use #:cl #:anaphora #:alexandria #:serapeum #:fwoar.lisputils

+        #:timesheet.parser #:timesheet #:net.didierverna.clon)

+  (:import-from #:format-string-builder #:define-message))

+

new file mode 100644

@@ -0,0 +1,41 @@

+

+(in-package #:timesheet.cli)

+

+(defsynopsis (:postfix "TIMESHEETS ...")

+  (text :contents "A program for managing logs of hours worked")

+  (group (:header "Main actions")

+         (flag :short-name "c"

+               :long-name "client"

+               :description "Sort records by client")

+         (flag :short-name "r"

+               :long-name "reverse"

+               :description "Reverse the sort direction")

+         (flag :short-name "W"

+               :long-name "ignore-whitespace"

+               :description "Ignore whitespace errors in input")

+         (flag :short-name "i" :long-name "interactive"

+               :description "Run interactively") 

+         (flag :short-name "s" :long-name "status"

+               :description "Print a short summary of work status"))

+  (group (:header "Other options")

+         (flag :short-name "v" :long-name "version"

+               :description "Show the program version")  

+         (flag :short-name "h" :long-name "help"

+               :description "Show this help")))

+

+(defun pprint-log-main ()

+  (make-context)

+  (cond 

+    ((getopt :long-name "help") (help))

+    (t (timesheet::with-timesheet-configuration ()

+         (timesheet::pprint-log

+           (remainder)

+           :client (getopt :long-name "client")

+           :interactive (getopt :long-name "interactive")  

+           :ignore-whitespace (getopt :long-name "ignore-whitespace")  

+           :version (getopt :long-name "version")  

+           :status (getopt :long-name "status")  

+           :reverse (getopt :long-name "reverse"))))))

+

+(defun make-executable ()

+  (dump "timesheet" pprint-log-main))

@@ -8,13 +8,13 @@

   :depends-on (#:alexandria

                #:anaphora

                #:cells

+               #:net.didierverna.clon

                #:command-line-arguments

                #:drakma

                #:format-string-builder

                #:fwoar.lisputils

                #:local-time-duration

                #:lquery

-               #:manardb

                #:ningle

                #:serapeum

                #:should-test

@@ -139,28 +139,6 @@

   (let* ((entries (parse-file file ignore-whitespace)))

     (mapcan #'get-entry-ranges entries)))

-(defparameter +pprint-log-option-spec+

-  '((("client" #\c) :type boolean :optional t :documentation "Sort by client")

-    (("reverse" #\r) :type boolean :optional t :documentation "Reverse sort")

-    (("ignore-whitespace" #\W) :type boolean :optional t :documentation "Ignore whitespace errors in input")

-    (("interactive" #\i) :type boolean :optional t :documentation "Run Interactively")

-    (("version" #\v) :type boolean :optional t :documentation "Version")

-    (("status" #\s) :type boolean :optional t

-                    :documentation "Print a summary of the hours worked and the prices")

-    (("help" #\h) :type boolean :optional t :documentation "show help")))

-

-(defparameter *version* "0:4")

-

-(define-message version-message (version)

-  (:own-line () "timesheet file parser, version " :str))

-

-(defun show-version ()

-  (version-message t *version*))

-

-(defun show-help ()

-  (show-version)

-  (command-line-arguments:show-option-help +pprint-log-option-spec+ :sort-names t))

-

 (defun sort-by-date (results)

   (stable-sort results #'local-time:timestamp<

                :key (alambda (apply #'local-time:encode-timestamp

@@ -272,12 +250,3 @@

              (ubiquitous:defaulted-value #p"~/time.md" :timesheet :file)))

        ,@body)))

-(defun pprint-log-main (argv)

-  (with-timesheet-configuration ()

-    (command-line-arguments:handle-command-line

-      +pprint-log-option-spec+

-      'pprint-log

-      :command-line (cdr argv)

-      :name "timesheet"

-      :rest-arity t)))

-