Refactor job information for --show and --history

diff --git a/src/main/cli.lisp b/src/main/cli.lisp
index e451c8041659b44720cc71148321eb54f91bb81a..b57a3d6f63137dadd23503ea8462c2c1288f85db 100644 (file)
--- a/src/main/cli.lisp
+++ b/src/main/cli.lisp
@@ -62,36 +62,34 @@
  (communication:query `(candle:delete-project ,name))
  (format t "Removed project ~A~%" name))
 
+(defun job-info->line (job-info)
+ (format nil "~A (~A) ~A"
+  (subseq (first job-info) 0 8)
+  (format nil "~{~A/~A/~A ~A:~A~}"
+   (utils:time-as-list (third job-info) :month :date :year :hr :min))
+  (case (second job-info)
+   (:succeeded (format nil "~c[1;32mPassed~c[0m" #\Esc #\Esc))
+   (:failed (format nil "~c[1;31mFailed~c[0m" #\Esc #\Esc))
+   (:queued "In queue")
+   (:no-candle-file "No candle file present")
+   (:in-progress "In progress"))))
+
 (defun show-project (name)
- (mapcar
-  (lambda (branch-info)
-   (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))
-     (:queued "In queue")
-     (:no-candle-file "No candle file present")
-     (:in-progress "In progress"))
-    (format nil "~{~A/~A/~A ~A:~A~}"
-     (utils:time-as-list (third branch-info) :month :date :year :hr :min))))
-  (sort (communication:query `(candle:project-branch-information ,name)) #'< :key #'third)))
+ (let*
+  ((branch-infos (communication:query `(candle:project-branch-information ,name)))
+   (width (apply #'max (mapcar #'length (mapcar #'car branch-infos)))))
+  (mapcar
+   (lambda (branch-info)
+    (format t (format nil "~~~A@A: ~~A~~%" width)
+     (first branch-info)
+     (job-info->line (second branch-info))))
+   (sort branch-infos #'< :key (lambda (branch-info) (third (second branch-info)))))))
 
 (defun project-history (name)
- (mapcar
-  (lambda (job-info)
-   (format t "~A: ~A at ~A~%"
-    (first job-info)
-    (case (second job-info)
-     (:succeeded (format nil "~c[1;32mPassed~c[0m" #\Esc #\Esc))
-     (:failed (format nil "~c[1;31mFailed~c[0m" #\Esc #\Esc))
-     (:queued "In queue")
-     (:no-candle-file "No candle file present")
-     (:in-progress "In progress"))
-    (format nil "~{~A/~A/~A ~A:~A~}"
-     (utils:time-as-list (third job-info) :month :date :year :hr :min))))
-  (sort (communication:query `(candle:project-job-information ,name)) #'< :key #'third)))
+ (format t "~{~A~%~}"
+  (mapcar
+   #'job-info->line
+   (sort (communication:query `(candle:project-job-information ,name)) #'< :key #'third))))
 
 (defun refresh-project (name)
  (communication:query `(candle:refresh-project ,name))

diff --git a/src/main/server.lisp b/src/main/server.lisp
index 07f587b0753e356e1528a152adbbd678e43b664d..41ec48232f9b3b40703a0b35f9728d3540a099fe 100644 (file)
--- a/src/main/server.lisp
+++ b/src/main/server.lisp
@@ -70,6 +70,9 @@
   (mapcar #'nremove-branch (find-branch-by-project project))
   (nremove-project project)))
 
+(defun job->job-information (job)
+ (list (job-sha job) (job-status job) (job-create-date job)))
+
 (defun project-branch-information (name)
  (let
   ((project (find name *all-project* :test #'string= :key #'project-name)))
@@ -78,19 +81,11 @@
    (lambda (branch)
     (list
      (branch-name branch)
-     (job-status (branch-job branch))
-     (job-create-date (branch-job branch))
-     (job-sha (branch-job branch))))
+     (job->job-information (branch-job branch))))
    (remove-if-not #'branch-in-git (find-branch-by-project project)))))
 
 (defun project-job-information (name)
  (let
   ((project (find name *all-project* :test #'string= :key #'project-name)))
   (when (not project) (error "Project does not exists"))
-  (mapcar
-   (lambda (job)
-    (list
-     (job-sha job)
-     (job-status job)
-     (job-create-date job)))
-   (find-job-by-project project))))
+  (mapcar #'job->job-information (find-job-by-project project))))