From: Frank Duncan Date: Sat, 11 Dec 2021 17:34:21 +0000 (-0600) Subject: Add project --refresh X-Git-Url: https://code.consxy.com/gitweb/?a=commitdiff_plain;h=045fd57002ac344e635f76cc18120d7d63106a00;p=candle Add project --refresh --- diff --git a/src/main/cli.lisp b/src/main/cli.lisp index 3b4243e..0ab33e8 100644 --- a/src/main/cli.lisp +++ b/src/main/cli.lisp @@ -14,6 +14,9 @@ (:name :show :long "show" :takes-argument t :description "Show branch information for a project named by NAME." :variable-name "NAME") + (:name :refresh :long "refresh" :takes-argument t :description + "Refresh project named by NAME." + :variable-name "NAME") (:name :delete :long "delete" :takes-argument t :description "Delete a project named by NAME." :variable-name "NAME"))) @@ -59,8 +62,9 @@ (defun show-project (name) (mapcar (lambda (branch-info) - (format t "~A: ~A at ~A~%" + (format t "~A: ~A ~A at ~A~%" (first branch-info) + (fourth branch-info) (case (second branch-info) (:succeeded (format nil "~c[1;32mPassed~c[0m" #\Esc #\Esc)) (:failed (format nil "~c[1;31mFailed~c[0m" #\Esc #\Esc)) @@ -71,6 +75,10 @@ (utils:time-as-list (third branch-info) :month :date :year :hr :min)))) (sort (communication:query `(candle:project-branch-information ,name)) #'< :key #'third))) +(defun refresh-project (name) + (communication:query `(candle:refresh-project ,name)) + (format t "Refreshed project ~A~%" name)) + (defmethod execute-command ((command (eql :project)) args) (multiple-value-bind (options remaining-args error) (opera:process-arguments (project-options) args) (cond @@ -79,6 +87,7 @@ ((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 :show options) (show-project (opera:option-argument :show options))) + ((opera:option-present :refresh options) (refresh-project (opera:option-argument :refresh options))) ((opera:option-present :add options) (add-project (opera:option-argument :add options)))))) (defmethod execute-command ((command (eql :job)) args) diff --git a/src/main/package.lisp b/src/main/package.lisp index 2c8aca7..1078e78 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 #:project-branch-information #:run #:*candle-dir*)) + (:export #:server #:add-project #:delete-project #:refresh-project #:project-branch-information #:run #:*candle-dir*)) (defpackage #:candle-cli (:use :cl) (:export :run)) diff --git a/src/main/server.lisp b/src/main/server.lisp index edae4a6..07d6213 100644 --- a/src/main/server.lisp +++ b/src/main/server.lisp @@ -30,15 +30,17 @@ ((project (make-project :name name :src src))) (ensure-directories-exist (project-dir project)) (git project "clone" src ".") - (refresh-project project)) + (refresh-project name)) t) -(defun refresh-project (project) - (multiple-value-bind (success code out err) (git project "branch" "-r" "--format" "%(refname) %(objectname)" "--list" "origin/*") - (declare (ignore code err)) - (when (not success) (error "Failed to get branches")) - (let - ((branches (find-branch-by-project project))) +(defun refresh-project (name) + (let* + ((project (find name *all-project* :test #'string= :key #'project-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/*") + (declare (ignore code err)) + (when (not success) (error "Failed to get branches")) (mapcar (lambda (branch) (set-branch-in-git branch nil)) branches) (mapcar (lambda (line) @@ -74,5 +76,6 @@ (list (branch-name branch) (job-status (branch-job branch)) - (job-create-date (branch-job branch)))) - (find-branch-by-project project)))) + (job-create-date (branch-job branch)) + (job-sha (branch-job branch)))) + (remove-if-not #'branch-in-git (find-branch-by-project project)))))