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

Tasks: add explicit run function

Browse source
This commit is contained in:
Michiel Borkent 2021-04-30 11:55:24 +02:00
parent f0adfb450e
commit 3bcc392760
2 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
(ns babashka.impl.tasks (ns babashka.impl.tasks
(:require [babashka.impl.classpath :as cp] (:require [babashka.impl.classpath :as cp]
[babashka.impl.common :refer [bb-edn]] [babashka.impl.common :refer [ctx bb-edn]]
[babashka.impl.deps :as deps] [babashka.impl.deps :as deps]
[babashka.process :as p] [babashka.process :as p]
[clojure.java.io :as io] [clojure.java.io :as io]
@ -110,14 +110,6 @@
@res @res
res))) res)))
(def tasks-namespace
{'shell (sci/copy-var shell sci-ns)
'clojure (sci/copy-var clojure sci-ns)
'-wait (sci/copy-var -wait sci-ns)
'*task* task
'current-task current-task
'current-state state})
(defn depends-map [tasks target-name] (defn depends-map [tasks target-name]
(let [deps (seq (:depends (get tasks target-name))) (let [deps (seq (:depends (get tasks target-name)))
m [target-name deps]] m [target-name deps]]
@ -212,6 +204,9 @@
(when-not (resolve 'current-task) (when-not (resolve 'current-task)
(intern *ns* 'current-task babashka.tasks/current-task)) (intern *ns* 'current-task babashka.tasks/current-task))
(when-not (resolve 'run)
(intern *ns* 'run babashka.tasks/run))
%s %s
%s %s
@ -379,3 +374,18 @@
(when-let [d (doc-from-task sci-ctx tasks task)] (when-let [d (doc-from-task sci-ctx tasks task)]
(str " " d)))))) (str " " d))))))
(println "No tasks found.")))) (println "No tasks found."))))
(defn run
([task] (run task nil))
([task {:keys [:parallel]}]
(let [[[expr]] (assemble-task task parallel)]
(sci/eval-string* @ctx expr))))
(def tasks-namespace
{'shell (sci/copy-var shell sci-ns)
'clojure (sci/copy-var clojure sci-ns)
'-wait (sci/copy-var -wait sci-ns)
'*task* task
'current-task current-task
'current-state state
'run (sci/copy-var run sci-ns)})

6
test/babashka/bb_edn_test.clj
View file

@ -154,7 +154,11 @@
bar {:depends [baz]} bar {:depends [baz]}
baz {:enter nil baz {:enter nil
:leave nil}}} :leave nil}}}
(is (= '[[bar foo] [bar]] (bb "run" "--prn" "foo")))))) (is (= '[[bar foo] [bar]] (bb "run" "--prn" "foo")))))
(testing "run"
(test-utils/with-config '{:tasks {a (+ 1 2 3)
b (prn (run 'a))}}
(is (= 6 (bb "run" "b"))))))
(deftest list-tasks-test (deftest list-tasks-test
(test-utils/with-config {} (test-utils/with-config {}