Change candle project --history to candle job

diff --git a/src/main/cli.lisp b/src/main/cli.lisp
index b57a3d6f63137dadd23503ea8462c2c1288f85db..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 :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 :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.")))
 
 (defun run-options ()
  '((:name :help :short "h" :long "help" :description "Print this usage.")))


@@ -104,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 :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)
    ((opera:option-present :add options) (add-project (opera:option-argument :add options))))))
 
 (defmethod execute-command ((command (eql :job)) args)


@@ -112,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)))
   (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)
 
 (defmethod execute-command ((command (eql :run)) args)
  (multiple-value-bind (options remaining-args error) (opera:process-arguments (run-options) args)