Better model to auto-enable kscript.text.* mode (fixes #28)

Author: holgerbrandl

kscript

@@ -1,10 +1,13 @@
 #!/bin/bash
 
-KSCRIPT_VERSION=1.4
+KSCRIPT_VERSION=1.4.1
 
 ## make sure that all requirements (java, kotlinc, maven) to run kscript are met
 assertInPath(){ if [ -z "$(which $1)" ]; then echo "[ERROR] Could not locate '$1'" 1>&2; exit 1; fi }
 
+## trim whitespace from a string
+trim() { while read -r line; do echo "$line"; done; }
+
 assertInPath kotlinc
 assertInPath mvn
 assertInPath curl
@@ -144,8 +147,11 @@ fi
 ## note: -e also supports non-regular files in contrast to -f
 if [[ "$scriptFile" != *kts ]] && [[ ! -e ${scriptFile} ]]; then
     ## auto-prefix one-liners with kscript-support api
-    if [[ $(echo "${scriptFile}" | wc -l) -eq 1 ]]; then
-        scriptFile=$'//DEPS com.github.holgerbrandl:kscript:1.2\nimport kscript.text.*\nval lines = resolveArgFile(args)\n\n'${scriptFile}
+#    if [[ $(echo "${scriptFile}" | wc -l) -eq 1 ]]; then ## old approach
+#    http://stackoverflow.com/questions/2172352/in-bash-how-can-i-check-if-a-string-begins-with-some-value
+    trimmedScript=$(echo "${scriptFile}" | tr -d '\n' )
+    if [[ $trimmedScript == lines.* ]] || [[ $trimmedScript == stdin.* ]] ; then
+        scriptFile=$'//DEPS com.github.holgerbrandl:kscript:1.2.1\nimport kscript.text.*\nval lines = resolveArgFile(args)\n\n'${scriptFile}
     fi
 
     scriptHash=$(kscript_md5 <(echo "$scriptFile"))
@@ -173,7 +179,6 @@ fi
 if [ $(grep "^// DEPS" ${scriptFile} | wc -l) -gt 0 ]; then
     echo "[ERROR] Dependencies must be declared by using the line prefix //DEPS" 1>&2; exit 1;
 fi
-trim() { while read -r line; do echo "$line"; done; }
 dependencies=$(grep "^//DEPS" ${scriptFile} | cut -f2- -d' ' | trim | tr ',;\n' ' ')
 
 

test/test_suite.sh

@@ -102,14 +102,10 @@ assert 'echo "foo${NL}bar" | kscript "stdin.print()"' $'foo\nbar'
 #echo "$'foo\nbar' | kscript 'stdin.print()'
 
 assert 'echo "foo${NL}bar" | kscript "stdin.print()"' $'foo\nbar'
+assert 'kscript "println(1+1)"' '2'
 
-## todo renable once support v1.3 is live on jcenter
-#assert_statement 'echo "foo${NL}bar" | kscript "stdin.split().select(1, 2, -3)"' "" "[ERROR] Can not mix positive and negative selections" 1
 
-
-
-## requirement checkig using support api
-assert_statement 'kscript "kscript.stopIfNot(1==23){\"condition not met\"}"' "" "[ERROR] condition not met" 1
+assert_statement 'echo "foo${NL}bar" | kscript "stdin.split().select(1, 2, -3)"' "" "[ERROR] Can not mix positive and negative selections" 1
 
 assert_end support_api