luciano/babashka
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tasks: add :log option

Browse source
This commit is contained in:
Michiel Borkent 2021-04-24 14:47:03 +02:00
parent b7ebf9c915
commit cb07196de9
1 changed files with 55 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
src/babashka/impl/tasks.clj
View file

@ -8,9 +8,14 @@
(def sci-ns (sci/create-ns 'babashka.tasks nil)) (def sci-ns (sci/create-ns 'babashka.tasks nil))
(defn- exit-non-zero [proc] (def ^:dynamic *task-name* nil)
(defn- exit-non-zero [log-level proc]
(when-let [exit-code (some-> proc deref :exit)] (when-let [exit-code (some-> proc deref :exit)]
(when (not (zero? exit-code)) (when (not (zero? exit-code))
(when (contains? #{:info :error} log-level)
(binding [*out* *err*]
(println (str "> Terminating with non-zero exit code: " exit-code))))
(System/exit exit-code)))) (System/exit exit-code))))
(def default-opts (def default-opts
@ -29,11 +34,19 @@
(update opts :out io/file) (update opts :out io/file)
opts) opts)
opts) opts)
log-level (or (:log opts)
(-> @bb-edn
:tasks
:log)
:info)
cmd (if (.exists (io/file cmd)) cmd (if (.exists (io/file cmd))
[cmd] [cmd]
(p/tokenize cmd)) (p/tokenize cmd))
cmd (into cmd args)] cmd (into cmd args)]
(exit-non-zero (when (identical? :info log-level)
(binding [*out* *err*]
(println ">" (str/join " " cmd))))
(exit-non-zero log-level
(p/process cmd (merge default-opts opts))))) (p/process cmd (merge default-opts opts)))))
(defn clojure [cmd & args] (defn clojure [cmd & args]
@ -46,11 +59,19 @@
(update opts :out io/file) (update opts :out io/file)
opts) opts)
opts) opts)
log-level (or (:log opts)
(-> @bb-edn
:tasks
:log)
:info)
cmd (if (.exists (io/file cmd)) cmd (if (.exists (io/file cmd))
[cmd] [cmd]
(p/tokenize cmd)) (p/tokenize cmd))
cmd (into cmd args)] cmd (into cmd args)]
(exit-non-zero (when (identical? :info log-level)
(binding [*out* *err*]
(println ">" (str/join " " (cons "clojure" cmd)))))
(exit-non-zero log-level
(deps/clojure cmd (merge default-opts opts))))) (deps/clojure cmd (merge default-opts opts)))))
(defn -wait [res] (defn -wait [res]
@ -94,15 +115,29 @@
(format "(do %s)" (str (str/join "\n" (map deref-task depends)) "\n" prog)) (format "(do %s)" (str (str/join "\n" (map deref-task depends)) "\n" prog))
prog)) prog))
(defn wrap-print [task-name prog]
(str (format
"(binding [*out* *err*]
(println \"> %s\"))
"
task-name)
prog))
(defn assemble-task-1 (defn assemble-task-1
"Assembles task, does not process :depends." "Assembles task, does not process :depends."
([task-name task parallel?] ([task-name task log-level parallel?]
(assemble-task-1 task-name task parallel? nil nil)) (assemble-task-1 task-name task log-level parallel? nil nil))
([task-name task parallel? last?] (assemble-task-1 task-name task parallel? last? nil)) ([task-name task log-level parallel? last?] (assemble-task-1 task-name task log-level parallel? last? nil))
([task-name task parallel? last? depends] ([task-name task log-level parallel? last? depends]
(let [[task depends] (if (map? task) (let [[task depends] (if (map? task)
[(:task task) (:depends task)] [(:task task) (:depends task)]
[task depends])] [task depends])
private? (or (:private task)
(str/starts-with? task-name "-"))
log-level (or log-level
(:log task)
(when private?
:error))]
(if (qualified-symbol? task) (if (qualified-symbol? task)
(let [prog (format "(apply %s *command-line-args*)" task) (let [prog (format "(apply %s *command-line-args*)" task)
prog (wrap-depends prog depends parallel?) prog (wrap-depends prog depends parallel?)
@ -114,8 +149,12 @@
prog)] prog)]
prog) prog)
(let [task (pr-str task) (let [task (pr-str task)
prog (wrap-depends task depends parallel?)] prog (wrap-depends task depends parallel?)
(wrap-def task-name prog parallel? last?)))))) prog (wrap-def task-name prog parallel? last?)
prog (if (identical? :error log-level)
prog
(wrap-print task-name prog))]
prog)))))
(defn format-task [init requires prog] (defn format-task [init requires prog]
(format " (format "
@ -152,7 +191,9 @@
(defn assemble-task [task-name parallel?] (defn assemble-task [task-name parallel?]
(let [task-name (symbol task-name) (let [task-name (symbol task-name)
tasks (get @bb-edn :tasks) bb-edn @bb-edn
tasks (get bb-edn :tasks)
log-level (or (:log tasks) :info)
task (get tasks task-name)] task (get tasks task-name)]
(if task (if task
(let [m? (map? task) (let [m? (map? task)
@ -167,7 +208,7 @@
targets (next targets)] targets (next targets)]
(if targets (if targets
(if-let [task (get tasks t)] (if-let [task (get tasks t)]
(recur (str prog "\n" (assemble-task-1 t task parallel?)) (recur (str prog "\n" (assemble-task-1 t task log-level parallel?))
targets targets
(concat requires (:requires task))) (concat requires (:requires task)))
[(binding [*out* *err*] [(binding [*out* *err*]
@ -176,7 +217,7 @@
(let [prog (str prog "\n" (let [prog (str prog "\n"
(apply str (map deref-task depends)) (apply str (map deref-task depends))
"\n" "\n"
(assemble-task-1 t task parallel? true)) (assemble-task-1 t task log-level parallel? true))
requires (concat requires (:requires task))] requires (concat requires (:requires task))]
[[(format-task init requires prog)] nil]) [[(format-task init requires prog)] nil])
[(binding [*out* *err*] [(binding [*out* *err*]
@ -184,7 +225,7 @@
[[(format-task [[(format-task
init init
(concat requires (:requires task)) (concat requires (:requires task))
(assemble-task-1 task-name task parallel? true))] nil])] (assemble-task-1 task-name task log-level parallel? true))] nil])]
(when (= "true" (System/getenv "BABASHKA_DEV")) (when (= "true" (System/getenv "BABASHKA_DEV"))
(println (ffirst prog))) (println (ffirst prog)))
prog) prog)