Return errors from run-commands

Author: strika

src/commands.janet

@@ -43,16 +43,16 @@
           (map (fn [build-command] (build-command arguments file-path))
                commands)))
 
+# TODO: Replace reduce with something else.
 (defn run-commands [plan file-path arguments]
   (def commands (build-commands arguments file-path))
   (def errors (filter identity (flatten (map (fn [c] (c :errors)) commands))))
-  (if (any? errors)
-    (do
-      (errors/print-errors-without-status-code errors)
-      plan)
-    (reduce (fn [new-plan command-and-arguments]
-              (def command (first (command-and-arguments :command)))
-              (def arguments (drop 1 (command-and-arguments :command)))
-              (apply command new-plan arguments))
-            plan
-            commands)))
+  (var new-plan plan)
+  (if (empty? errors)
+    (set new-plan (reduce (fn [new-plan command-and-arguments]
+                            (def command (first (command-and-arguments :command)))
+                            (def arguments (drop 1 (command-and-arguments :command)))
+                            (apply command new-plan arguments))
+                         plan
+                         commands)))
+  {:plan new-plan :errors errors})

test/commands_test.janet

@@ -54,8 +54,9 @@
                       (day/build-day (d/date 2020 8 2) @[]
                                      @[(task/build-task "Buy milk" true)])]))
   (def arguments {"skip-backup" true "remove-empty-days" true "insert-days" "3"})
-  (def new-plan (run-commands plan file-path arguments))
+  (def {:plan new-plan :errors errors} (run-commands plan file-path arguments))
   (def days (new-plan :days))
+  (test (empty? errors) true)
   (test (length days) 4)
   (test (= (d/+days today 2) ((days 0) :date)) true)
   (test (= (d/+days today 1) ((days 1) :date)) true)
@@ -70,9 +71,10 @@
                       (day/build-day (d/date 2020 8 2) @[]
                                      @[(task/build-task "Buy milk" true)])]))
   (def arguments {"skip-backup" true "remove-empty-days" true "insert-days" "three"})
-  (def new-plan (run-commands plan file-path arguments))
+  (def {:plan new-plan :errors errors} (run-commands plan file-path arguments))
   (def days (new-plan :days))
   (test (length days) 3)
   (test (= today ((days 0) :date)) true)
   (test (= (d/date 2020 8 4) ((days 1) :date)) true)
-  (test (= (d/date 2020 8 2) ((days 2) :date)) true))
+  (test (= (d/date 2020 8 2) ((days 2) :date)) true)
+  (test (= (first errors) "--insert-days argument is not a number.") true))