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

Tasks: detect cycles

Browse source
This commit is contained in:
Michiel Borkent 2021-05-02 14:51:51 +02:00
parent fb3d24b23c
commit 12c29eb308
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -225,13 +225,15 @@
prog)) prog))
(defn target-order (defn target-order
([tasks task-name] (target-order tasks task-name (volatile! #{}))) ([tasks task-name] (target-order tasks task-name (volatile! #{}) #{}))
([tasks task-name processed] ([tasks task-name processed processing]
(let [task (tasks task-name) (let [task (tasks task-name)
depends (:depends task)] depends (:depends task)]
(when (contains? processing task-name)
(throw (Exception. (str "Cyclic task: " task-name))))
(loop [deps (seq depends)] (loop [deps (seq depends)]
(let [deps (remove #(contains? @processed %) deps) (let [deps (remove #(contains? @processed %) deps)
order (vec (mapcat #(target-order tasks % processed) deps))] order (vec (mapcat #(target-order tasks % processed (conj processing task-name)) deps))]
(if-not (contains? @processed task-name) (if-not (contains? @processed task-name)
(do (vswap! processed conj task-name) (do (vswap! processed conj task-name)
(conj order task-name)) (conj order task-name))

12
test/babashka/bb_edn_test.clj
View file

@ -170,6 +170,18 @@
:task (+ a 4 5 6)}}} :task (+ a 4 5 6)}}}
(is (thrown-with-msg? (is (thrown-with-msg?
Exception #"No such task: x" Exception #"No such task: x"
(bb "run" "b")))))
(testing "cyclic task"
(test-utils/with-config '{:tasks {b {:depends [b]
:task (+ a 4 5 6)}}}
(is (thrown-with-msg?
Exception #"Cyclic task: b"
(bb "run" "b"))))
(test-utils/with-config '{:tasks {c {:depends [b]}
b {:depends [c]
:task (+ a 4 5 6)}}}
(is (thrown-with-msg?
Exception #"Cyclic task: b"
(bb "run" "b")))))) (bb "run" "b"))))))
(deftest list-tasks-test (deftest list-tasks-test