From 4aa3c53883d919803cac77f47ad16ce33047f6ce Mon Sep 17 00:00:00 2001 From: Frank Duncan Date: Sat, 18 Dec 2021 15:00:55 -0600 Subject: [PATCH] Satisfy style checker --- src/main/aws/aws.lisp | 52 ++++++++++++------------ src/main/cli.lisp | 85 ++++++++++++++++++++++++---------------- src/main/server-cli.lisp | 32 ++++++++------- src/main/server.lisp | 8 ++-- 4 files changed, 99 insertions(+), 78 deletions(-) diff --git a/src/main/aws/aws.lisp b/src/main/aws/aws.lisp index 4182c67..ad224af 100644 --- a/src/main/aws/aws.lisp +++ b/src/main/aws/aws.lisp @@ -49,13 +49,13 @@ (defun aws-command (cmd &rest args) (with-output-to-string (out) - (sb-ext:run-program - *aws-exec* - (append - (list "ec2" cmd) - args) - :output out - :error *error-output*))) + (sb-ext:run-program + *aws-exec* + (append + (list "ec2" cmd) + args) + :output out + :error *error-output*))) (defun describe-property (property) (read-from-string @@ -102,22 +102,22 @@ (let* ((out nil) (code nil)) - (setf out - (with-output-to-string (out-str) - (setf code - (sb-ext:process-exit-code - (sb-ext:run-program - *ssh-exec* - (list - "-o" - "StrictHostKeyChecking=no" - "-o" - "UserKnownHostsFile=/dev/null" - "-i" - *aws-keyfile* - (describe-property "PublicIpAddress") - (format nil "cd ~A ; ~A run" *remote-work-dir* *remote-candle-location*)) - :output out-str - :error out-str - :wait t))))) - (values (zerop code) out))) + (setf out + (with-output-to-string (out-str) + (setf code + (sb-ext:process-exit-code + (sb-ext:run-program + *ssh-exec* + (list + "-o" + "StrictHostKeyChecking=no" + "-o" + "UserKnownHostsFile=/dev/null" + "-i" + *aws-keyfile* + (describe-property "PublicIpAddress") + (format nil "cd ~A ; ~A run" *remote-work-dir* *remote-candle-location*)) + :output out-str + :error out-str + :wait t))))) + (values (zerop code) out))) diff --git a/src/main/cli.lisp b/src/main/cli.lisp index bacd1e3..1fff398 100644 --- a/src/main/cli.lisp +++ b/src/main/cli.lisp @@ -23,18 +23,18 @@ (:in-progress "In progress")))) (defmacro standard-cli (cmd options-in args usage remaining-args-required &rest success) -`(multiple-value-bind (parsed-options remaining-args error) (opera:process-arguments ,options-in ,args) - (cond - ((opera:option-present :help parsed-options) - (format t "~A" ,(if (eql usage :default) `(opera:usage ,cmd ,options-in) usage))) - ((eql error :unknown-option) - (error-and-exit "Unknown option: ~A. See '~A --help'.~%" (car remaining-args) ,cmd)) - ((eql error :required-argument-missing) - (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)))) + `(multiple-value-bind (parsed-options remaining-args error) (opera:process-arguments ,options-in ,args) + (cond + ((opera:option-present :help parsed-options) + (format t "~A" ,(if (eql usage :default) `(opera:usage ,cmd ,options-in) usage))) + ((eql error :unknown-option) + (error-and-exit "Unknown option: ~A. See '~A --help'.~%" (car remaining-args) ,cmd)) + ((eql error :required-argument-missing) + (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)))) ;;; Section for ./candle @@ -42,7 +42,9 @@ (standard-cli "candle" (main-options) (cdr sb-ext:*posix-argv*) (main-usage) "Command" (handler-case (if - (and (opera:option-present :port parsed-options) (not (parse-integer (opera:option-argument :port parsed-options) :junk-allowed t))) + (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* @@ -110,14 +112,21 @@ (defun add-project (args) (let ((options - '((:name :help :short "h" :long "help" :description "Print this usage.") - (:positional ":" :description " is the name of the project, which must be alphanumeric (hyphens are allowed), while is the location of the repository for cloning. This location must be accessible by the machine running candle.")))) + `((:name :help :short "h" :long "help" :description "Print this usage.") + (:positional ":" + :description + ,(format nil "~{~A~}" + (list + " is the name of the project, which must be alphanumeric (hyphens are allowed), while is the " + "location of the repository for cloning. This location must be accessible by the machine running candle." + "")))))) (standard-cli "candle project add" options args :default ":" (let* ((project-definition (car remaining-args)) (pos (position #\: project-definition))) (cond - ((not pos) (error-and-exit "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)) @@ -128,17 +137,17 @@ (defun delete-project (args) (let ((options - '((:name :help :short "h" :long "help" :description "Print this usage.") - (:positional "" :description " is the name of the project to delete")))) + '((:name :help :short "h" :long "help" :description "Print this usage.") + (:positional "" :description " is the name of the project to delete")))) (standard-cli "candle project delete" options args :default "" - (communication:query `(candle:delete-project ,(car remaining-args))) - (format t "Removed project ~A~%" (car remaining-args))))) + (communication:query `(candle:delete-project ,(car remaining-args))) + (format t "Removed project ~A~%" (car remaining-args))))) (defun show-project (args) (let ((options - '((:name :help :short "h" :long "help" :description "Print this usage.") - (:positional "" :description " is the name of the project to show")))) + '((:name :help :short "h" :long "help" :description "Print this usage.") + (:positional "" :description " is the name of the project to show")))) (standard-cli "candle project show" options args :default "" (let* ((branch-infos (communication:query `(candle:project-branch-information ,(car remaining-args)))) @@ -153,8 +162,8 @@ (defun refresh-project (args) (let ((options - '((:name :help :short "h" :long "help" :description "Print this usage.") - (:positional "" :description " is the name of the project to refresh")))) + '((:name :help :short "h" :long "help" :description "Print this usage.") + (:positional "" :description " is the name of the project to refresh")))) (standard-cli "candle project refresh" options args :default "" (communication:query `(candle:refresh-project ,(car remaining-args))) (format t "Refreshed project ~A~%" (car remaining-args))))) @@ -172,12 +181,15 @@ (defun project-failures (args) (let ((options - '((:name :help :short "h" :long "help" :description "Print this usage.") - (:name :project :long "project" :variable-name "PROJECT" :takes-argument t :description "Restrict failures to project named by PROJECT")))) + '((:name :help :short "h" :long "help" :description "Print this usage.") + (:name :project :long "project" :variable-name "PROJECT" :takes-argument t + :description "Restrict failures to project named by PROJECT")))) (standard-cli "candle project failures" options args :default nil (format t "~A" (communication:query - `(candle:failures ,(when (opera:option-present :project parsed-options) (opera:option-argument :project parsed-options)))))))) + `(candle:failures + ,(when (opera:option-present :project parsed-options) + (opera:option-argument :project parsed-options)))))))) ;;; Section for ./candle job @@ -207,13 +219,16 @@ (defun job-list (args) (let ((options - '((:name :help :short "h" :long "help" :description "Print this usage.") - (:name :project :long "project" :variable-name "PROJECT" :takes-argument t :description "Restrict jobs to project named by PROJECT")))) + '((:name :help :short "h" :long "help" :description "Print this usage.") + (:name :project :long "project" :variable-name "PROJECT" :takes-argument t + :description "Restrict jobs to project named by PROJECT")))) (standard-cli "candle job list" options args :default nil (format t "~{~A~%~}" (mapcar #'job-info->line - (sort (communication:query `(candle:project-job-information ,(opera:option-argument :project parsed-options))) #'< :key #'fourth)))))) + (sort + (communication:query `(candle:project-job-information ,(opera:option-argument :project parsed-options))) + #'< :key #'fourth)))))) (defun decompose-job-definition (job-definition) (let @@ -227,8 +242,9 @@ (defun job-log (args) (let ((options - '((:name :help :short "h" :long "help" :description "Print this usage.") - (:positional ":" :description " is the name of the project, while is the sha of the job in question.")))) + '((:name :help :short "h" :long "help" :description "Print this usage.") + (:positional ":" + :description " is the name of the project, while is the sha of the job in question.")))) (standard-cli "candle job log" options args :default ":" (multiple-value-bind (project-name sha) (decompose-job-definition (car remaining-args)) (if project-name @@ -238,8 +254,9 @@ (defun retry-job (args) (let ((options - '((:name :help :short "h" :long "help" :description "Print this usage.") - (:positional ":" :description " is the name of the project, while is the sha of the job in question.")))) + '((:name :help :short "h" :long "help" :description "Print this usage.") + (:positional ":" + :description " is the name of the project, while is the sha of the job in question.")))) (standard-cli "candle job retry" options args :default ":" (multiple-value-bind (project-name sha) (decompose-job-definition (car remaining-args)) (if project-name diff --git a/src/main/server-cli.lisp b/src/main/server-cli.lisp index b0c378b..6a6fd06 100644 --- a/src/main/server-cli.lisp +++ b/src/main/server-cli.lisp @@ -23,7 +23,9 @@ (remaining-args (format *error-output* "Don't understand ~A. See 'candle-server -h'~%" (car remaining-args)) (sb-ext:exit :code 1)) - ((and (opera:option-present :port options) (not (parse-integer (opera:option-argument :port options) :junk-allowed t))) + ((and + (opera:option-present :port options) + (not (parse-integer (opera:option-argument :port options) :junk-allowed t))) (format *error-output* "--port requires a number. See 'candle-server -h'~%")) (t (let @@ -31,17 +33,17 @@ (opera:option-present :port options) (parse-integer (opera:option-argument :port options) :junk-allowed t)) 25004))) - (setf candle:*job-system* - (if (opera:option-present :system options) - (intern (string-upcase (opera:option-argument :system options)) :keyword) - :local)) - (let - ((*error-output* (make-broadcast-stream))) - (case candle:*job-system* - (:aws (asdf:load-system :candle-aws)) - (:local (asdf:load-system :candle-local)))) - (setf candle:*candle-dir* - (if (opera:option-present :dir options) - (opera:option-argument :dir options) - "/opt/candle/")) - (candle:server port nil)))))) + (setf candle:*job-system* + (if (opera:option-present :system options) + (intern (string-upcase (opera:option-argument :system options)) :keyword) + :local)) + (let + ((*error-output* (make-broadcast-stream))) + (case candle:*job-system* + (:aws (asdf:load-system :candle-aws)) + (:local (asdf:load-system :candle-local)))) + (setf candle:*candle-dir* + (if (opera:option-present :dir options) + (opera:option-argument :dir options) + "/opt/candle/")) + (candle:server port nil)))))) diff --git a/src/main/server.lisp b/src/main/server.lisp index 338516b..3f022f3 100644 --- a/src/main/server.lisp +++ b/src/main/server.lisp @@ -77,7 +77,9 @@ ((project (find-project-by-name-or-die name)) (branches (find-branch-by-project project))) (git project "fetch" "origin" "--prune") - (multiple-value-bind (success code out err) (git project "branch" "-r" "--format" "%(refname) %(objectname)" "--list" "origin/*") + (multiple-value-bind + (success code out err) + (git project "branch" "-r" "--format" "%(refname) %(objectname)" "--list" "origin/*") (declare (ignore code err)) (when (not success) (raise-candle-error :project-failed-to-get-branches)) (mapcar (lambda (branch) (set-branch-in-git branch nil)) branches) @@ -135,8 +137,8 @@ (find-if (lambda (job-sha) (and (<= (length sha) (length job-sha)) (string= sha (subseq job-sha 0 (length sha))))) - (find-job-by-project project) - :key #'job-sha)))) + (find-job-by-project project) + :key #'job-sha)))) (when (not job) (raise-candle-error :job-does-not-exist)) job)) -- 2.25.1