X-Git-Url: https://code.consxy.com/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Fmain%2Fcli.lisp;h=44ae31770b3daca12c3502945f8703734b2bd370;hb=bf450bcba73aca7398aa7574627746d3e30b4022;hp=0dd036ad5ffe7afa9c8f458cf821baba55d9efd7;hpb=43528d90eeeee498d0a94c22bc38de9554e15d9a;p=candle

diff --git a/src/main/cli.lisp b/src/main/cli.lisp
index 0dd036a..44ae317 100644
--- a/src/main/cli.lisp
+++ b/src/main/cli.lisp
@@ -6,19 +6,25 @@
     :description "Port on which to listen for commands.  Defaults to 25004")
    (:positional "<command>" :required t :description "Command to send to candle server")))
 
-(defun project-options()
+(defun project-options ()
  '((:name :help :short "h" :long "help" :description "Print this usage.")
    (:name :add :long "add" :takes-argument t :description
-    "Add a project.  <name> is the name of the project, which must not include colons, while <src> is the location of the repository for cloning.  This location must be accessible by the machine running candle."
-    :variable-name "<name>:<src>")))
+    "Add a project.  NAME is the name of the project, which must not include colons, while SRC is the location of the repository for cloning.  This location must be accessible by the machine running candle."
+    :variable-name "NAME:SRC")
+   (:name :delete :long "delete" :takes-argument t :description
+    "Delete a project named by NAME."
+    :variable-name "NAME")))
 
-(defun job-options()
+(defun job-options ()
  '((:name :help :short "h" :long "help" :description "Print this usage.")
-   (:name :project-name :short "p" :long "project" :takes-argument t :description "The project name for the jobs under consideration.")
+   (:name :project-name :long "project" :takes-argument t :description "The project name for the jobs under consideration.")
    (:name :add :long "add" :takes-argument t :description
     "Add a job to a project.  <sha> is the commit for that project to run the job.  Requires --project to be specified."
     :variable-name "<sha>")))
 
+(defun run-options ()
+ '((:name :help :short "h" :long "help" :description "Print this usage.")))
+
 (defun main-usage ()
  (format t "~A"
   (opera:usage
@@ -26,7 +32,8 @@
    (main-options)
    "Interacts with candle server.  The available commands are:
   project   List, show or add projects
-  job       List or show jobs")))
+  job       List or show jobs
+  run       Local command.  Run candle in the current working directory")))
 
 (defgeneric execute-command (command args))
 
@@ -41,22 +48,25 @@
    (t
     (let*
      ((name (subseq project-definition 0 pos))
-      (src (subseq project-definition (1+ pos)))
-      (response (communication:query `(candle:add-project ,name ,src))))
+      (src (subseq project-definition (1+ pos))))
+     (communication:query `(candle:add-project ,name ,src))
      (format t "Added project ~A at src definition ~A~%" name src))))))
 
+(defun delete-project (name)
+ (communication:query `(candle:delete-project ,name))
+ (format t "Removed project ~A~%" name))
+
 (defmethod execute-command ((command (eql :project)) args)
  (multiple-value-bind (options remaining-args error) (opera:process-arguments (project-options) args)
   (cond
    ((eql error :unknown-option) (format *error-output* "Unknown option: ~A.  See 'candle project --help'.~%" (car remaining-args)))
    ((eql error :required-argument-missing) (format *error-output* "Missing argument for ~A.  See 'candle project --help'.~%" (car remaining-args)))
    ((opera:option-present :help options) (format t "~A" (opera:usage "candle project" (project-options))))
+   ((opera:option-present :delete options) (delete-project (opera:option-argument :delete options)))
    ((opera:option-present :add options) (add-project (opera:option-argument :add options))))))
 
 (defun add-job (project-name sha)
- (let
-  ((response (communication:query `(candle:add-job ,project-name ,sha))))
-  (format t "Added job with sha ~A to project ~A~%" sha project-name)))
+ (format t "Added job with sha ~A to project ~A~%" sha project-name))
 
 (defmethod execute-command ((command (eql :job)) args)
  (multiple-value-bind (options remaining-args error) (opera:process-arguments (job-options) args)
@@ -71,6 +81,15 @@
      (opera:option-argument :project-name options)
      (opera:option-argument :add options))))))
 
+(defmethod execute-command ((command (eql :run)) args)
+ (multiple-value-bind (options remaining-args error) (opera:process-arguments (run-options) args)
+  (cond
+   ((eql error :unknown-option) (format *error-output* "Unknown option: ~A.  See 'candle run --help'.~%" (car remaining-args)))
+   ((eql error :required-argument-missing) (format *error-output* "Missing argument for ~A.  See 'candle run --help'.~%" (car remaining-args)))
+   (remaining-args (format *error-output* "Unknown option: ~A. See 'candle run --help'.~%" (car remaining-args)))
+   ((opera:option-present :help options) (format t "~A" (opera:usage "candle run" (run-options))))
+   ((not (candle:run)) (sb-ext:exit :code 1)))))
+
 (defun run ()
  (multiple-value-bind (options remaining-args error) (opera:process-arguments (main-options) (cdr sb-ext:*posix-argv*))
   (cond
@@ -88,5 +107,3 @@
          (parse-integer (opera:option-argument :port options) :junk-allowed t))
         25004)))
      (execute-command (intern (string-upcase (car remaining-args)) :keyword) (cdr remaining-args)))))))
-
-; vim:ft=lisp