Change candle project --history to candle job

[candle] / src / main / cli.lisp

diff --git a/src/main/cli.lisp b/src/main/cli.lisp
index e451c8041659b44720cc71148321eb54f91bb81a..bee2885a6dab94847183ecb04077aa9d60982a20 100644 (file)
--- a/src/main/cli.lisp
+++ b/src/main/cli.lisp
@@ -17,16 +17,15 @@
    (:name :refresh :long "refresh" :takes-argument t :description
     "Refresh project named by NAME."
     :variable-name "NAME")
-   (:name :history :long "history" :takes-argument t :description
-    "Show history of project named by NAME."
-    :variable-name "NAME")
    (:name :delete :long "delete" :takes-argument t :description
     "Delete a project named by NAME."
     :variable-name "NAME")))
 
 (defun job-options ()
  '((:name :help :short "h" :long "help" :description "Print this usage.")
-   (:name :project-name :long "project" :takes-argument t :description "The project name for the jobs under consideration.")))
+   (:name :project-name :long "project" :takes-argument t
+    :variable-name "PROJECT"
+    :description "The project name for the jobs under consideration.  Required argumnet.")))
 
 (defun run-options ()
  '((:name :help :short "h" :long "help" :description "Print this usage.")))
@@ -62,36 +61,34 @@
  (communication:query `(candle:delete-project ,name))
  (format t "Removed project ~A~%" name))
 
+(defun job-info->line (job-info)
+ (format nil "~A (~A) ~A"
+  (subseq (first job-info) 0 8)
+  (format nil "~{~A/~A/~A ~A:~A~}"
+   (utils:time-as-list (third job-info) :month :date :year :hr :min))
+  (case (second job-info)
+   (:succeeded (format nil "~c[1;32mPassed~c[0m" #\Esc #\Esc))
+   (:failed (format nil "~c[1;31mFailed~c[0m" #\Esc #\Esc))
+   (:queued "In queue")
+   (:no-candle-file "No candle file present")
+   (:in-progress "In progress"))))
+
 (defun show-project (name)
- (mapcar
-  (lambda (branch-info)
-   (format t "~A: ~A ~A at ~A~%"
-    (first branch-info)
-    (fourth branch-info)
-    (case (second branch-info)
-     (:succeeded (format nil "~c[1;32mPassed~c[0m" #\Esc #\Esc))
-     (:failed (format nil "~c[1;31mFailed~c[0m" #\Esc #\Esc))
-     (:queued "In queue")
-     (:no-candle-file "No candle file present")
-     (:in-progress "In progress"))
-    (format nil "~{~A/~A/~A ~A:~A~}"
-     (utils:time-as-list (third branch-info) :month :date :year :hr :min))))
-  (sort (communication:query `(candle:project-branch-information ,name)) #'< :key #'third)))
+ (let*
+  ((branch-infos (communication:query `(candle:project-branch-information ,name)))
+   (width (apply #'max (mapcar #'length (mapcar #'car branch-infos)))))
+  (mapcar
+   (lambda (branch-info)
+    (format t (format nil "~~~A@A: ~~A~~%" width)
+     (first branch-info)
+     (job-info->line (second branch-info))))
+   (sort branch-infos #'< :key (lambda (branch-info) (third (second branch-info)))))))
 
 (defun project-history (name)
- (mapcar
-  (lambda (job-info)
-   (format t "~A: ~A at ~A~%"
-    (first job-info)
-    (case (second job-info)
-     (:succeeded (format nil "~c[1;32mPassed~c[0m" #\Esc #\Esc))
-     (:failed (format nil "~c[1;31mFailed~c[0m" #\Esc #\Esc))
-     (:queued "In queue")
-     (:no-candle-file "No candle file present")
-     (:in-progress "In progress"))
-    (format nil "~{~A/~A/~A ~A:~A~}"
-     (utils:time-as-list (third job-info) :month :date :year :hr :min))))
-  (sort (communication:query `(candle:project-job-information ,name)) #'< :key #'third)))
+ (format t "~{~A~%~}"
+  (mapcar
+   #'job-info->line
+   (sort (communication:query `(candle:project-job-information ,name)) #'< :key #'third))))
 
 (defun refresh-project (name)
  (communication:query `(candle:refresh-project ,name))
@@ -106,7 +103,6 @@
    ((opera:option-present :delete options) (delete-project (opera:option-argument :delete options)))
    ((opera:option-present :show options) (show-project (opera:option-argument :show options)))
    ((opera:option-present :refresh options) (refresh-project (opera:option-argument :refresh options)))
-   ((opera:option-present :history options) (project-history (opera:option-argument :history options)))
    ((opera:option-present :add options) (add-project (opera:option-argument :add options))))))
 
 (defmethod execute-command ((command (eql :job)) args)
@@ -114,7 +110,9 @@
   (cond
    ((eql error :unknown-option) (format *error-output* "Unknown option: ~A.  See 'candle job --help'.~%" (car remaining-args)))
    ((eql error :required-argument-missing) (format *error-output* "Missing argument for ~A.  See 'candle job --help'.~%" (car remaining-args)))
-   ((opera:option-present :help options) (format t "~A" (opera:usage "candle job" (job-options)))))))
+   ((opera:option-present :help options) (format t "~A" (opera:usage "candle job" (job-options))))
+   ((not (opera:option-present :project-name options)) (format *error-output* "Requires --project argument.  See 'candle job --help'.~%" ))
+   (t (project-history (opera:option-argument :project-name options))))))
 
 (defmethod execute-command ((command (eql :run)) args)
  (multiple-value-bind (options remaining-args error) (opera:process-arguments (run-options) args)