Remove cli based add-job

diff --git a/src/main/cli.lisp b/src/main/cli.lisp
index 44ae31770b3daca12c3502945f8703734b2bd370..92fc311ba239203cd040080199e1e4439ced547e 100644 (file)
--- a/src/main/cli.lisp
+++ b/src/main/cli.lisp
@@ -17,10 +17,7 @@
 
 (defun job-options ()
  '((:name :help :short "h" :long "help" :description "Print this usage.")
 
 (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 :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>")))
+   (:name :project-name :long "project" :takes-argument t :description "The project name for the jobs under consideration.")))

 
 (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.")))


@@ -65,21 +62,12 @@
    ((opera:option-present :delete options) (delete-project (opera:option-argument :delete options)))
    ((opera:option-present :add options) (add-project (opera:option-argument :add 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)
- (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)
   (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)))
 (defmethod execute-command ((command (eql :job)) args)
  (multiple-value-bind (options remaining-args error) (opera:process-arguments (job-options) 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))))
-   ((and (opera:option-present :add options) (not (opera:option-present :project-name options)))
-    (format *error-output* "Cannot --add without --project.  See 'candle job --help'.~%"))
-   ((opera:option-present :add options)
-    (add-job
-     (opera:option-argument :project-name options)
-     (opera:option-argument :add options))))))
+   ((opera:option-present :help options) (format t "~A" (opera:usage "candle job" (job-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)

diff --git a/src/main/package.lisp b/src/main/package.lisp
index a7b55f8348cf4bffce811321c587922353a081a9..88c812d53e6d53bebbeb4c95d1f1aeb109b0242d 100644 (file)
--- a/src/main/package.lisp
+++ b/src/main/package.lisp
@@ -1,4 +1,4 @@
 (defpackage #:candle (:use :cl)
 (defpackage #:candle (:use :cl)

- (:export #:server #:add-project #:delete-project #:add-job #:run #:*candle-dir*))
+ (:export #:server #:add-project #:delete-project #:run #:*candle-dir*))

 
 (defpackage #:candle-cli (:use :cl) (:export :run))
 
 (defpackage #:candle-cli (:use :cl) (:export :run))

diff --git a/src/main/server.lisp b/src/main/server.lisp
index f8e97e35629c2ccfcccabb3c43da97f753ce65df..8d34aa2328c719f2c23df506cff789387057028b 100644 (file)
--- a/src/main/server.lisp
+++ b/src/main/server.lisp
@@ -39,7 +39,3 @@
    (error "Project does not exists"))
   (sb-ext:delete-directory (project-dir project) :recursive t)
   (nremove-project project)))
    (error "Project does not exists"))
   (sb-ext:delete-directory (project-dir project) :recursive t)
   (nremove-project project)))

-
-(defun add-job (project-name sha)
- (make-job :project (find project-name *all-project* :key #'project-name :test #'string=) :sha sha)
- t)