Formalize errors and error handling

[candle] / src / main / cli.lisp

diff --git a/src/main/cli.lisp b/src/main/cli.lisp
index fe36dfbc1c775d83220fea82694430fa6a1c2804..fb38f58570b0e4e47790a83ee76c4b214239bb63 100644 (file)
--- a/src/main/cli.lisp
+++ b/src/main/cli.lisp
@@ -2,8 +2,12 @@
 
 (defgeneric execute-command (command args))
 
+(defun error-and-exit (str &rest args)
+ (apply #'format *error-output* str args)
+ (sb-ext:exit :code 1))
+
 (defmethod execute-command (command args)
- (format *error-output* "Unknown command '~(~A~)'.  See 'candle --help'.~%" command))
+ (error-and-exit "Unknown command '~(~A~)'.  See 'candle --help'.~%" command))
 
 (defun job-info->line (job-info)
  (format nil "~A (~A) ~A"
@@ -23,10 +27,11 @@
    ((opera:option-present :help parsed-options)
     (format t "~A" ,(if (eql usage :default) `(opera:usage ,cmd ,options-in) usage)))
    ((eql error :unknown-option)
-    (format *error-output* "Unknown option: ~A.  See '~A --help'.~%" (car remaining-args) ,cmd))
+    (error-and-exit "Unknown option: ~A.  See '~A --help'.~%" (car remaining-args) ,cmd))
    ((eql error :required-argument-missing)
-    (format *error-output* "Missing argument for ~A.  See '~A --help'.~%" (car remaining-args) ,cmd))
-   ((and ,remaining-args-required (not remaining-args)) (format *error-output* "~A required.  See 'candle --help'.~%" ,remaining-args-required))
+    (error-and-exit "Missing argument for ~A.  See '~A --help'.~%" (car remaining-args) ,cmd))
+   ((and ,remaining-args-required (not remaining-args))
+    (error-and-exit "~A required.  See 'candle --help'.~%" ,remaining-args-required))
    (t
     ,@success))))
 
@@ -34,17 +39,27 @@
 
 (defun run ()
  (standard-cli "candle" (main-options) (cdr sb-ext:*posix-argv*) (main-usage) "Command"
-  (if
-   (and (opera:option-present :port parsed-options) (not (parse-integer (opera:option-argument :port parsed-options) :junk-allowed t)))
-   (format *error-output* "--port requires a number.  See 'candle -h'~%")
-   (let
-    ((communication:*query-port*
-      (or
-       (and
-        (opera:option-present :port parsed-options)
-        (parse-integer (opera:option-argument :port parsed-options) :junk-allowed t))
-       25004)))
-    (execute-command (intern (string-upcase (car remaining-args)) :keyword) (cdr remaining-args))))))
+  (handler-case
+   (if
+    (and (opera:option-present :port parsed-options) (not (parse-integer (opera:option-argument :port parsed-options) :junk-allowed t)))
+    (error-and-exit "--port requires a number.  See 'candle -h'~%")
+    (let
+     ((communication:*query-port*
+       (or
+        (and
+         (opera:option-present :port parsed-options)
+         (parse-integer (opera:option-argument :port parsed-options) :junk-allowed t))
+        25004)))
+     (execute-command (intern (string-upcase (car remaining-args)) :keyword) (cdr remaining-args))))
+   (candle:candle-error (e)
+    (case (candle:candle-error-reason e)
+     (:project-does-not-exist (error-and-exit "Project does not exist~%"))
+     (:job-does-not-exist (error-and-exit "Job does not exist~%"))
+     (:invalid-project-name (error-and-exit "Project name invalid~%"))
+     (:invalid-project-uri (error-and-exit "Project uri invalid~%"))
+     (:project-name-taken (error-and-exit "Project name already taken~%"))
+     (:project-failed-to-get-branches (error-and-exit "Unable to retrieve branches from server~%"))
+     (t (error-and-exit "Unknown error occurred: ~(~S~)~%" (candle:candle-error-reason e))))))))
 
 (defun main-options ()
  '((:name :help :short "h" :long "help" :description "Print this usage.")
@@ -101,7 +116,7 @@
     ((project-definition (car remaining-args))
      (pos (position #\: project-definition)))
     (cond
-     ((not pos) (format *error-output* "Project definition ~A is not valid.  See 'candle project add --help'.~%" project-definition))
+     ((not pos) (error-and-exit "Project definition ~A is not valid.  See 'candle project add --help'.~%" project-definition))
      (t
       (let*
        ((name (subseq project-definition 0 pos))
@@ -210,7 +225,7 @@
    (multiple-value-bind (project-name sha) (decompose-job-definition (car remaining-args))
     (if project-name
      (format t "~A" (communication:query `(candle:get-job-log ,project-name ,sha)))
-     (format *error-output* "Job definition ~A is not valid.  See 'candle job log --help'.~%" (car remaining-args)))))))
+     (error-and-exit "Job definition ~A is not valid.  See 'candle job log --help'.~%" (car remaining-args)))))))
 
 (defun retry-job (args)
  (let
@@ -223,7 +238,7 @@
      (progn
       (communication:query `(candle:retry-job ,project-name ,sha))
       (format t "Retrying job ~A~%" (car remaining-args)))
-     (format *error-output* "Job definition ~A is not valid.  See 'candle job log --help'.~%" (car remaining-args)))))))
+     (error-and-exit "Job definition ~A is not valid.  See 'candle job log --help'.~%" (car remaining-args)))))))
 
 ;;; Section for ./candle run