From: Frank Duncan Date: Sat, 11 Dec 2021 02:59:55 +0000 (-0600) Subject: Remove cli based add-job X-Git-Url: https://code.consxy.com/gitweb/gitweb.cgi?a=commitdiff_plain;h=b2b606982b84a98e1f4b07e55cf5dc3ca1aa454e;p=candle Remove cli based add-job --- diff --git a/src/main/cli.lisp b/src/main/cli.lisp index 44ae317..92fc311 100644 --- 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.") - (: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. is the commit for that project to run the job. Requires --project to be specified." - :variable-name ""))) + (: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."))) @@ -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)))))) -(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))) - ((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) diff --git a/src/main/package.lisp b/src/main/package.lisp index a7b55f8..88c812d 100644 --- a/src/main/package.lisp +++ b/src/main/package.lisp @@ -1,4 +1,4 @@ (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)) diff --git a/src/main/server.lisp b/src/main/server.lisp index f8e97e3..8d34aa2 100644 --- 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))) - -(defun add-job (project-name sha) - (make-job :project (find project-name *all-project* :key #'project-name :test #'string=) :sha sha) - t)