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

[#173] <input> becomes *input*

Browse source
This commit is contained in:
Michiel Borkent 2019-12-20 23:51:24 +01:00
parent 7c45baf008
commit 479a08d73e
7 changed files with 83 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CHANGES.md
View file

@ -2,10 +2,9 @@
## Breaking changes
## v0.0.44
- #173: Rename `*in*` to `<input>` (in the `user` namespace). The name
was a poor choice for two reasons. It shadowed `clojure.core/*in*`. Also, the
value was not a dynamic var, but the earmuffs suggested otherwise.
## v0.0.44 - 0.0.45
- #173: Rename `*in*` to `*input*` (in the `user` namespace). The reason for
this is that itt shadowed `clojure.core/*in*` when used unqualified.
## v0.0.43
- #160: Add support for `java.lang.ProcessBuilder`. See docs. This replaces the

50
README.md
View file

@ -18,7 +18,7 @@ A Clojure [babushka](https://en.wikipedia.org/wiki/Headscarf) for the grey areas
``` shellsession
$ bash <(curl -s https://raw.githubusercontent.com/borkdude/babashka/master/install)
$ ls | bb --time -i '(filter #(-> % io/file .isDirectory) <input>)'
$ ls | bb --time -i '(filter #(-> % io/file .isDirectory) *input*)'
("doc" "resources" "sci" "script" "src" "target" "test")
bb took 4ms.
```
@ -64,29 +64,29 @@ on [CHANGES.md](CHANGES.md) for a list of breaking changes.
## Examples
``` shellsession
$ ls | bb -i '<input>'
$ ls | bb -i '*input*'
["LICENSE" "README.md" "bb" "doc" "pom.xml" "project.clj" "reflection.json" "resources" "script" "src" "target" "test"]
$ ls | bb -i '(count <input>)'
$ ls | bb -i '(count *input*)'
12
$ bb '(vec (dedupe <input>))' <<< '[1 1 1 1 2]'
$ bb '(vec (dedupe *input*))' <<< '[1 1 1 1 2]'
[1 2]
$ bb '(filterv :foo <input>)' <<< '[{:foo 1} {:bar 2}]'
$ bb '(filterv :foo *input*)' <<< '[{:foo 1} {:bar 2}]'
[{:foo 1}]
$ bb '(#(+ %1 %2 %3) 1 2 <input>)' <<< 3
$ bb '(#(+ %1 %2 %3) 1 2 *input*)' <<< 3
6
$ ls | bb -i '(filterv #(re-find #"reflection" %) <input>)'
$ ls | bb -i '(filterv #(re-find #"reflection" %) *input*)'
["reflection.json"]
$ bb '(run! #(shell/sh "touch" (str "/tmp/test/" %)) (range 100))'
$ ls /tmp/test | bb -i '<input>'
$ ls /tmp/test | bb -i '*input*'
["0" "1" "10" "11" "12" "13" "14" "15" "16" "17" "18" "19" "2" "20" "21" ...]
$ bb -O '(repeat "dude")' | bb --stream '(str <input> "rino")' | bb -I '(take 3 <input>)'
$ bb -O '(repeat "dude")' | bb --stream '(str *input* "rino")' | bb -I '(take 3 *input*)'
("duderino" "duderino" "duderino")
```
@ -143,12 +143,12 @@ Options:
--help, -h or -? Print this help text.
--version Print the current version of babashka.
-i Bind <input> to a lazy seq of lines from stdin.
-I Bind <input> to a lazy seq of EDN values from stdin.
-i Bind *input* to a lazy seq of lines from stdin.
-I Bind *input* to a lazy seq of EDN values from stdin.
-o Write lines to stdout.
-O Write EDN values to stdout.
--verbose Print entire stacktrace in case of exception.
--stream Stream over lines or EDN values from stdin. Combined with -i or -I <input> becomes a single value per iteration.
--stream Stream over lines or EDN values from stdin. Combined with -i or -I *input* becomes a single value per iteration.
-e, --eval <expr> Evaluate an expression.
-f, --file <path> Evaluate a file.
-cp, --classpath Classpath to use.
@ -221,13 +221,13 @@ conditionals](#reader-conditionals) to maintain compatibility with JVM Clojure.
### Input and output flags
In one-liners the `<input>` value may come in handy. It contains the input read from stdin as EDN by default. If you want to read in text, use the `-i` flag, which binds `<input>` to a lazy seq of lines of text. If you want to read multiple EDN values, use the `-I` flag. The `-o` option prints the result as lines of text. The `-O` option prints the result as lines of EDN values.
In one-liners the `*input*` value may come in handy. It contains the input read from stdin as EDN by default. If you want to read in text, use the `-i` flag, which binds `*input*` to a lazy seq of lines of text. If you want to read multiple EDN values, use the `-I` flag. The `-o` option prints the result as lines of text. The `-O` option prints the result as lines of EDN values.
The following table illustrates the combination of options for commands of the form
echo "{{Input}}" | bb {{Input flags}} {{Output flags}} "<input>"
echo "{{Input}}" | bb {{Input flags}} {{Output flags}} "*input*"
| Input | Input flags | Output flag | `<input>` | Output |
| Input | Input flags | Output flag | `*input*` | Output |
|----------------|-------------|-------------|---------------|----------|
| `{:a 1}` <br> `{:a 2}` | | | `{:a 1}` | `{:a 1}` |
| hello <br> bye | `-i` | | `("hello" "bye")` | `("hello" "bye")` |
@ -238,7 +238,7 @@ The following table illustrates the combination of options for commands of the f
When combined with the `--stream` option, the script is executed for each value in the input:
``` clojure
$ echo '{:a 1} {:a 2}' | bb --stream '<input>'
$ echo '{:a 1} {:a 2}' | bb --stream '*input*'
{:a 1}
{:a 2}
```
@ -361,7 +361,7 @@ export BABASHKA_PRELOADS
Note that you can concatenate multiple expressions. Now you can use these functions in babashka:
``` shellsession
$ bb '(-> (foo <input>) bar)' <<< 1
$ bb '(-> (foo *input*) bar)' <<< 1
6
```
@ -371,7 +371,7 @@ You can also preload an entire file using `load-file`:
export BABASHKA_PRELOADS='(load-file "my_awesome_prelude.clj")'
```
Note that `<input>` is not available in preloads.
Note that `*input*` is not available in preloads.
## Classpath
@ -601,7 +601,7 @@ welcome!
### Delete a list of files returned by a Unix command
```
find . | grep conflict | bb -i '(doseq [f <input>] (.delete (io/file f)))'
find . | grep conflict | bb -i '(doseq [f *input*] (.delete (io/file f)))'
```
### Calculate aggregate size of directory
@ -635,7 +635,7 @@ $ cat /tmp/test.txt
3 Babashka
4 Goodbye
$ < /tmp/test.txt bb -io '(shuffle <input>)'
$ < /tmp/test.txt bb -io '(shuffle *input*)'
3 Babashka
2 Clojure
4 Goodbye
@ -649,7 +649,7 @@ For converting JSON to EDN, see [jet](https://github.com/borkdude/jet).
``` shellsession
$ curl -s https://api.github.com/repos/borkdude/babashka/tags |
jet --from json --keywordize --to edn |
bb '(-> <input> first :name (subs 1))'
bb '(-> *input* first :name (subs 1))'
"0.0.4"
```
@ -658,8 +658,8 @@ bb '(-> <input> first :name (subs 1))'
``` shellsession
$ curl -s https://api.github.com/repos/borkdude/babashka/releases |
jet --from json --keywordize |
bb '(-> <input> first :assets)' |
bb '(some #(re-find #".*linux.*" (:browser_download_url %)) <input>)'
bb '(-> *input* first :assets)' |
bb '(some #(re-find #".*linux.*" (:browser_download_url %)) *input*)'
"https://github.com/borkdude/babashka/releases/download/v0.0.4/babashka-0.0.4-linux-amd64.zip"
```
@ -669,7 +669,7 @@ Contributed by [@plexus](https://github.com/plexus).
``` shellsession
$ curl https://clojars.org/stats/all.edn |
bb -o '(for [[[group art] counts] <input>] (str (reduce + (vals counts)) " " group "/" art))' |
bb -o '(for [[[group art] counts] *input*] (str (reduce + (vals counts)) " " group "/" art))' |
sort -rn |
less
14113842 clojure-complete/clojure-complete
@ -722,7 +722,7 @@ Contributed by [@plexus](https://github.com/plexus).
``` shellsession
$ cat project.clj |
sed -e 's/#=//g' -e 's/~@//g' -e 's/~//g' |
bb '(let [{:keys [dependencies source-paths resource-paths]} (apply hash-map (drop 3 <input>))]
bb '(let [{:keys [dependencies source-paths resource-paths]} (apply hash-map (drop 3 *input*))]
{:paths (into source-paths resource-paths)
:deps (into {} (for [[d v] dependencies] [d {:mvn/version v}]))}) ' |
jet --pretty > deps.edn

2
sci

@ -1 +1 @@
Subproject commit 76502d1116701264e85b702e8c501c1631feba4b
Subproject commit 278932006626278a29b2ce4307d332531ff8af9d

23
src/babashka/main.clj
View file

@ -138,12 +138,12 @@
(println "
--help, -h or -? Print this help text.
--version Print the current version of babashka.
-i Bind <input> to a lazy seq of lines from stdin.
-I Bind <input> to a lazy seq of EDN values from stdin.
-i Bind *input* to a lazy seq of lines from stdin.
-I Bind *input* to a lazy seq of EDN values from stdin.
-o Write lines to stdout.
-O Write EDN values to stdout.
--verbose Print entire stacktrace in case of exception.
--stream Stream over lines or EDN values from stdin. Combined with -i or -I <input> becomes a single value per iteration.
--stream Stream over lines or EDN values from stdin. Combined with -i or -I *input* becomes a single value per iteration.
-e, --eval <expr> Evaluate an expression.
-f, --file <path> Evaluate a file.
-cp, --classpath Classpath to use.
@ -176,16 +176,16 @@ Everything after that is bound to *command-line-args*."))
(defn start-repl! [ctx read-next]
(let [ctx (update ctx :bindings assoc
(with-meta '<input>
{:sci/deref! true})
(read-next))]
(with-meta '*input*
{:sci.impl/deref! true})
(sci/new-dynamic-var '*input* (read-next)))]
(repl/start-repl! ctx)))
(defn start-socket-repl! [address ctx read-next]
(let [ctx (update ctx :bindings assoc
(with-meta '<input>
{:sci/deref! true})
(read-next))]
(with-meta '*input*
{:sci.impl/deref! true})
(sci/new-dynamic-var '*input* (read-next)))]
(socket-repl/start-repl! address ctx)
;; hang until SIGINT
@(promise)))
@ -296,9 +296,10 @@ Everything after that is bound to *command-line-args*."))
(let [expr (if file (read-file file) expression)]
(if expr
(loop [in (read-next *in*)]
(let [ctx (update-in ctx [:namespaces 'user] assoc (with-meta '<input>
(let [ctx (update-in ctx [:namespaces 'user] assoc (with-meta '*input*
(when-not stream?
{:sci/deref! true})) in)]
{:sci.impl/deref! true}))
(sci/new-dynamic-var '*input* in))]
(if (identical? ::EOF in)
[nil 0] ;; done streaming
(let [res [(let [res (eval-string expr ctx)]

6
test/babashka/impl/repl_test.clj
View file

@ -7,8 +7,8 @@
(set! *warn-on-reflection* true)
(defn repl! []
(start-repl! {:bindings {(with-meta '<input>
{:sci/deref! true})
(start-repl! {:bindings {(with-meta '*input*
{:sci.impl/deref! true})
(delay [1 2 3])
'*command-line-args*
["a" "b" "c"]}
@ -27,7 +27,7 @@
(assert-repl "1\n(dec *1)(+ *2 *2)" "2")
(assert-repl "1\n(dec *1)(+ *2 *2)" "2")
(assert-repl "*command-line-args*" "[\"a\" \"b\" \"c\"]")
(assert-repl "<input>" "[1 2 3]"))
(assert-repl "*input*" "[1 2 3]"))
;;;; Scratch

10
test/babashka/impl/socket_repl_test.clj
View file

@ -31,8 +31,8 @@
(deftest socket-repl-test
(try
(if tu/jvm?
(start-repl! "0.0.0.0:1666" {:bindings {(with-meta '<input>
{:sci/deref! true})
(start-repl! "0.0.0.0:1666" {:bindings {(with-meta '*input*
{:sci.impl/deref! true})
(delay [1 2 3])
'*command-line-args*
["a" "b" "c"]}
@ -47,8 +47,8 @@
(sh "bash" "-c"
"lsof -t -i:1666"))))))
(is (socket-command "(+ 1 2 3)" "user=> 6"))
(testing "<input>"
(is (socket-command "<input>" "[1 2 3]")))
(testing "*input*"
(is (socket-command "*input*" "[1 2 3]")))
(testing "*command-line-args*"
(is (socket-command '*command-line-args* "\"a\" \"b\" \"c\"")))
(testing "&env"
@ -72,7 +72,7 @@
(dotimes [_ 1000]
(t/run-tests))
(stop-repl!)
(start-repl! "0.0.0.0:1666" {:bindings {(with-meta '<input>
(start-repl! "0.0.0.0:1666" {:bindings {(with-meta '*input*
{:sci/deref! true})
(delay [1 2 3])
'*command-line-args*

64
test/babashka/main_test.clj
View file

@ -34,45 +34,45 @@
(deftest main-test
(testing "-io behaves as identity"
(= "foo\nbar\n" (test-utils/bb "foo\nbar\n" "-io" "<input>")))
(= "foo\nbar\n" (test-utils/bb "foo\nbar\n" "-io" "*input*")))
(testing "if and when"
(is (= 1 (bb 0 '(if (zero? <input>) 1 2))))
(is (= 2 (bb 1 '(if (zero? <input>) 1 2))))
(is (= 1 (bb 0 '(when (zero? <input>) 1))))
(is (nil? (bb 1 '(when (zero? <input>) 1)))))
(is (= 1 (bb 0 '(if (zero? *input*) 1 2))))
(is (= 2 (bb 1 '(if (zero? *input*) 1 2))))
(is (= 1 (bb 0 '(when (zero? *input*) 1))))
(is (nil? (bb 1 '(when (zero? *input*) 1)))))
(testing "and and or"
(is (= false (bb 0 '(and false true <input>))))
(is (= 0 (bb 0 '(and true true <input>))))
(is (= 1 (bb 1 '(or false false <input>))))
(is (= false (bb false '(or false false <input>))))
(is (= 3 (bb false '(or false false <input> 3)))))
(is (= false (bb 0 '(and false true *input*))))
(is (= 0 (bb 0 '(and true true *input*))))
(is (= 1 (bb 1 '(or false false *input*))))
(is (= false (bb false '(or false false *input*))))
(is (= 3 (bb false '(or false false *input* 3)))))
(testing "fn"
(is (= 2 (bb 1 "(#(+ 1 %) <input>)")))
(is (= 2 (bb 1 "(#(+ 1 %) *input*)")))
(is (= [1 2 3] (bb 1 "(map #(+ 1 %) [0 1 2])")))
(is (= 1 (bb 1 "(#(when (odd? <input>) <input>))"))))
(is (= 1 (bb 1 "(#(when (odd? *input*) *input*))"))))
(testing "map"
(is (= [1 2 3] (bb 1 '(map inc [0 1 2])))))
(testing "keep"
(is (= [false true false] (bb 1 '(keep odd? [0 1 2])))))
(testing "->"
(is (= 4 (bb 1 '(-> <input> inc inc (inc))))))
(is (= 4 (bb 1 '(-> *input* inc inc (inc))))))
(testing "->>"
(is (= 10 (edn/read-string (test-utils/bb "foo\n\baar\baaaaz" "-i" "(->> <input> (map count) (apply max))")))))
(is (= 10 (edn/read-string (test-utils/bb "foo\n\baar\baaaaz" "-i" "(->> *input* (map count) (apply max))")))))
(testing "literals"
(is (= {:a 4
:b {:a 2}
:c [1 1]
:d #{1 2}}
(bb 1 '{:a (+ 1 2 <input>)
:b {:a (inc <input>)}
:c [<input> <input>]
:d #{<input> (inc <input>)}}))))
(bb 1 '{:a (+ 1 2 *input*)
:b {:a (inc *input*)}
:c [*input* *input*]
:d #{*input* (inc *input*)}}))))
(testing "shuffle the contents of a file"
(let [in "foo\n Clojure is nice. \nbar\n If you're nice to clojure. "
in-lines (set (str/split in #"\n"))
out (test-utils/bb in
"-io"
(str '(shuffle <input>)))
(str '(shuffle *input*)))
out-lines (set (str/split out #"\n"))]
(is (= in-lines out-lines))))
(testing "find occurrences in file by line number"
@ -80,14 +80,14 @@
(->
(bb "foo\n Clojure is nice. \nbar\n If you're nice to clojure. "
"-i"
"(map-indexed #(-> [%1 %2]) <input>)")
(bb "(keep #(when (re-find #\"(?i)clojure\" (second %)) (first %)) <input>)"))))))
"(map-indexed #(-> [%1 %2]) *input*)")
(bb "(keep #(when (re-find #\"(?i)clojure\" (second %)) (first %)) *input*)"))))))
(deftest println-test
(is (= "hello\n" (test-utils/bb nil "(println \"hello\")"))))
(deftest input-test
(testing "bb doesn't wait for input if <input> isn't used"
(testing "bb doesn't wait for input if *input* isn't used"
(is (= "2\n" (with-out-str (main/main "(inc 1)"))))))
(deftest System-test
@ -114,12 +114,12 @@
(is (re-find #"doctype html" resp))))
(deftest stream-test
(is (= "2\n3\n4\n" (test-utils/bb "1 2 3" "--stream" "(inc <input>)")))
(is (= "2\n3\n4\n" (test-utils/bb "{:x 2} {:x 3} {:x 4}" "--stream" "(:x <input>)")))
(is (= "2\n3\n4\n" (test-utils/bb "1 2 3" "--stream" "(inc *input*)")))
(is (= "2\n3\n4\n" (test-utils/bb "{:x 2} {:x 3} {:x 4}" "--stream" "(:x *input*)")))
(let [x "foo\n\bar\n"]
(is (= x (test-utils/bb x "--stream" "-io" "<input>"))))
(is (= x (test-utils/bb x "--stream" "-io" "*input*"))))
(let [x "f\n\b\n"]
(is (= x (test-utils/bb x "--stream" "-io" "(subs <input> 0 1)")))))
(is (= x (test-utils/bb x "--stream" "-io" "(subs *input* 0 1)")))))
(deftest load-file-test
(let [tmp (java.io.File/createTempFile "script" ".clj")]
@ -145,21 +145,21 @@
(deftest pipe-test
(when test-utils/native?
(let [out (:out (sh "bash" "-c" "./bb -o '(range)' |
./bb --stream '(* <input> <input>)' |
./bb --stream '(* *input* *input*)' |
head -n10"))
out (str/split-lines out)
out (map edn/read-string out)]
(is (= (take 10 (map #(* % %) (range))) out))))
(when test-utils/native?
(let [out (:out (sh "bash" "-c" "./bb -O '(repeat \"dude\")' |
./bb --stream '(str <input> \"rino\")' |
./bb -I '(take 3 <input>)'"))
./bb --stream '(str *input* \"rino\")' |
./bb -I '(take 3 *input*)'"))
out (edn/read-string out)]
(is (= '("duderino" "duderino" "duderino") out)))))
(deftest lazy-text-in-test
(when test-utils/native?
(let [out (:out (sh "bash" "-c" "yes | ./bb -i '(take 2 <input>)'"))
(let [out (:out (sh "bash" "-c" "yes | ./bb -i '(take 2 *input*)'"))
out (edn/read-string out)]
(is (= '("y" "y") out)))))
@ -311,6 +311,10 @@
(deftest Thread-test
(is (= "hello" (bb nil "(doto (java.lang.Thread. (fn [] (prn \"hello\"))) (.start) (.join)) nil"))))
(deftest dynvar-test
(is (= 1 (bb nil "(binding [*command-line-args* 1] *command-line-args*)")))
(is (= 1 (bb nil "(binding [*input* 1] *input*)"))))
;;;; Scratch
(comment