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

- correct --init to be a global option (#1036)

Browse source 
- test --init before subcommands and task names
This commit is contained in:
Bob 2021-10-18 09:39:08 -04:00 committed by GitHub
parent 8dad1fa473
commit 5a80e1603e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/babashka/main.clj
View file

@ -587,10 +587,6 @@ Use bb run --help to show this help output.
(let [options (next options)]
(recur (next options)
(assoc opts-map :main (first options))))
("--init")
(let [options (next options)]
(recur (next options)
(assoc opts-map :init (first options))))
("--run")
(parse-run-opts opts-map (next options))
("--tasks")
@ -626,6 +622,8 @@ Use bb run --help to show this help output.
("--debug"
"--verbose" ;; renamed to --debug
) (recur (next options) (assoc opts-map :debug true))
("--init")
(recur (nnext options) (assoc opts-map :init (second options)))
[options opts-map])
[options opts-map])))

12
test/babashka/main_test.clj
View file

@ -206,7 +206,17 @@
(testing "init with a qualified function passed to --main"
(test-utils/with-config '{:paths ["test-resources/babashka/src_for_classpath_test"]}
(is (= "foobar" (bb nil "--init" "test-resources/babashka/init_test.clj"
"-m" "call-init-main/foobar"))))))
"-m" "call-init-main/foobar")))))
(testing "init with a subcommand after it"
(let [actual-output (test-utils/bb "(println (init-test/do-a-thing))"
"--init" "test-resources/babashka/init_test.clj" "repl")]
(is (str/includes? actual-output "foo\n")))
(test-utils/with-config '{:tasks {thing (println (init-test/do-a-thing))}} ; make a task available
(let [actual-output (test-utils/bb nil "--init" "test-resources/babashka/init_test.clj" "tasks")]
(is (every? #(str/includes? actual-output %) ["following tasks are available" "thing"])))))
(testing "init with a task name after it"
(test-utils/with-config '{:tasks {thing (println (init-test/do-a-thing))}} ; make a task available
(is (= "foo\n" (test-utils/bb nil "--init" "test-resources/babashka/init_test.clj" "thing"))))))
(deftest preloads-test