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

[#865] Use print-meta when emitting tasks

Browse source
This commit is contained in:
Michiel Borkent 2021-05-30 11:27:11 +02:00
parent 9347bfd3d3
commit 94fc8298e6
2 changed files with 75 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,15 +31,6 @@
(binding [*out* *err*]
(println (format "[bb %s]" (:name @task)) (str/join " " strs))))))
#_(defn log-error [& strs]
(let [log-level @log-level]
(when (or
;; log error also in case of info level
(identical? :info log-level)
(identical? :error log-level))
(binding [*out* *err*]
(println (format "[bb %s]" (:name @task)) (str/join " " strs))))))
(defn- handle-non-zero [proc opts]
(when proc
(when-let [proc (deref proc)]
@ -268,7 +259,7 @@
(if (seq requires)
(format "(:require %s)" (str/join " " requires))
"")
(str init)
(pr-str init)
prog))
(defn target-order
@ -303,75 +294,70 @@
enter (:enter tasks)
leave (:leave tasks)
task (get tasks task-name)]
(if task
(let [m? (map? task)
requires (get tasks :requires)
init (get tasks :init)
prog (if-let [depends (when m? (:depends task))]
(let [[targets error]
(try [(target-order tasks task-name)]
(catch clojure.lang.ExceptionInfo e
[nil (ex-message e)]))
#_#_dependees (tasks->dependees targets tasks)
task-map (cond-> {}
enter (assoc :enter enter)
leave (assoc :leave leave)
parallel? (assoc :parallel parallel?))]
(if error
[(binding [*out* *err*]
(println error)) 1]
(loop [prog ""
targets (seq targets)
done []
extra-paths []
extra-deps nil
requires requires]
(let [t (first targets)
targets (next targets)
#_#_ depends-on-t (get dependees t)
task-map (cond->
(assoc task-map
:name t
#_#_:started done)
#_#_targets (assoc :pending (vec targets))
#_#_depends-on-t (assoc :dependents depends-on-t))]
(if targets
(if-let [task (get tasks t)]
(recur (str prog "\n" (assemble-task-1 task-map task parallel?))
targets
(conj done t)
(concat extra-paths (:extra-paths task))
(merge extra-deps (:extra-deps task))
(concat requires (:requires task)))
[(binding [*out* *err*]
(println "No such task:" t)) 1])
(if-let [task (get tasks t)]
(let [prog (str prog "\n"
#_(wait-tasks depends) #_(apply str (map deref-task depends))
"\n"
(assemble-task-1 task-map task parallel? true))
extra-paths (concat extra-paths (:extra-paths task))
extra-deps (merge extra-deps (:extra-deps task))
requires (concat requires (:requires task))]
[[(format-task init extra-paths extra-deps requires prog)] nil])
[(binding [*out* *err*]
(println "No such task:" t)) 1]))))))
[[(format-task
init
(:extra-paths task)
(:extra-deps task)
(concat requires (:requires task))
(assemble-task-1 (cond-> {:name task-name}
enter (assoc :enter enter)
leave (assoc :leave leave)
parallel? (assoc :parallel parallel?))
task parallel? true))] nil])]
(when @debug
(binding [*out* *err*]
(println (ffirst prog))))
prog)
[(binding [*out* *err*]
(println "No such task:" task-name)) 1])))
(binding [*print-meta* true]
(if task
(let [m? (map? task)
requires (get tasks :requires)
init (get tasks :init)
prog (if (when m? (:depends task))
(let [[targets error]
(try [(target-order tasks task-name)]
(catch clojure.lang.ExceptionInfo e
[nil (ex-message e)]))
task-map (cond-> {}
enter (assoc :enter enter)
leave (assoc :leave leave)
parallel? (assoc :parallel parallel?))]
(if error
[(binding [*out* *err*]
(println error)) 1]
(loop [prog ""
targets (seq targets)
done []
extra-paths []
extra-deps nil
requires requires]
(let [t (first targets)
targets (next targets)
task-map (assoc task-map
:name t)]
(if targets
(if-let [task (get tasks t)]
(recur (str prog "\n" (assemble-task-1 task-map task parallel?))
targets
(conj done t)
(concat extra-paths (:extra-paths task))
(merge extra-deps (:extra-deps task))
(concat requires (:requires task)))
[(binding [*out* *err*]
(println "No such task:" t)) 1])
(if-let [task (get tasks t)]
(let [prog (str prog "\n"
#_(wait-tasks depends) #_(apply str (map deref-task depends))
"\n"
(assemble-task-1 task-map task parallel? true))
extra-paths (concat extra-paths (:extra-paths task))
extra-deps (merge extra-deps (:extra-deps task))
requires (concat requires (:requires task))]
[[(format-task init extra-paths extra-deps requires prog)] nil])
[(binding [*out* *err*]
(println "No such task:" t)) 1]))))))
[[(format-task
init
(:extra-paths task)
(:extra-deps task)
(concat requires (:requires task))
(assemble-task-1 (cond-> {:name task-name}
enter (assoc :enter enter)
leave (assoc :leave leave)
parallel? (assoc :parallel parallel?))
task parallel? true))] nil])]
(when @debug
(binding [*out* *err*]
(println (ffirst prog))))
prog)
[(binding [*out* *err*]
(println "No such task:" task-name)) 1]))))
(defn doc-from-task [sci-ctx tasks task]
(or (:doc task)

11
test/babashka/bb_edn_test.clj
View file

@ -236,7 +236,16 @@
:task (do (Thread/sleep 10)
(+ 1 2 3))}
c (do (Thread/sleep 10) :c)}}
(is (= [6 6 :c] (bb "run" "--prn" "a")))))))
(is (= [6 6 :c] (bb "run" "--prn" "a"))))))
(testing "dynamic vars"
(test-utils/with-config '{:tasks
{:init (def ^:dynamic *foo* true)
a (do
(def ^:dynamic *bar* false)
(binding [*foo* false
*bar* true]
[*foo* *bar*]))}}
(is (= [false true] (bb "run" "--prn" "a"))))))
(deftest list-tasks-test
(test-utils/with-config {}