fixed #59: Kscript just reports usage info if user arguments start with - or --

Author: holgerbrandl

src/main/kotlin/kscript/app/Kscript.kt

@@ -57,7 +57,11 @@ fun main(args: Array<String>) {
         quit(0)
     }
 
-    val docopt = DocOptWrapper(args, USAGE)
+    // note: with current impt we still don't support `kscript -1` where "-1" is a valid kotlin expression
+    val userArgs = args.dropWhile { it.startsWith("-") }.drop(1)
+    val kscriptArgs = args.take(args.size - userArgs.size)
+
+    val docopt = DocOptWrapper(kscriptArgs, USAGE)
     val loggingEnabled = !docopt.getBoolean("silent")
 
 
@@ -239,9 +243,10 @@ fun main(args: Array<String>) {
 
 
     // print the final command to be run by exec
-    val shiftedArgs = args.drop(1 + args.indexOfFirst { it == scriptResource }).joinToString(" ")
+    //    val joinedUserArgs = args.drop(1 + args.indexOfFirst { it == scriptResource }).joinToString(" ")
+    val joinedUserArgs = userArgs.joinToString(" ")
 
-    println("kotlin ${kotlinOpts} -classpath ${jarFile}${CP_SEPARATOR_CHAR}${KOTLIN_HOME}${File.separatorChar}lib${File.separatorChar}kotlin-script-runtime.jar${CP_SEPARATOR_CHAR}${classpath} ${execClassName} ${shiftedArgs} ")
+    println("kotlin ${kotlinOpts} -classpath ${jarFile}${CP_SEPARATOR_CHAR}${KOTLIN_HOME}${File.separatorChar}lib${File.separatorChar}kotlin-script-runtime.jar${CP_SEPARATOR_CHAR}${classpath} ${execClassName} ${joinedUserArgs} ")
 }
 
 fun collectDependencies(scriptText: List<String>): List<String> {

src/main/kotlin/org/docopt/DocoptHelper.kt

@@ -8,7 +8,7 @@ import java.io.File
  */
 
 /** Simple Kotlin facade for org.org.docopt.Docopt.Docopt(java.lang.String) .*/
-class DocOptWrapper(args: Array<String>, val usage: String) {
+class DocOptWrapper(args: Iterable<String>, val usage: String) {
 
     val parsedArgs = try {
         Docopt(usage).withExit(false).parse(args.toList())

test/test_suite.sh

@@ -39,6 +39,11 @@ assert "kscript ''" ""
 assert 'kscript "println(1+1)"' '2'
 
 
+##  use dashed arguments (to prevent regression from https://github.com/holgerbrandl/kscript/issues/59)
+assert 'kscript "println(args.joinToString(\"\"))" --arg u ments' '--arguments'
+assert 'kscript -s "println(args.joinToString(\"\"))" --arg u ments' '--arguments'
+
+
 ## provide script via stidin
 assert "echo 'println(1+1)' | kscript -" "2"
 
@@ -90,7 +95,7 @@ assert_end script_input_modes
 #assert "kscript -i '//DEPS log4j:log4j:1.2.14'" "To create a shell with script dependencies run:\nkotlinc  -classpath '${HOME}/.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar'"
 #assert "kscript -i <(echo '//DEPS log4j:log4j:1.2.14')" "To create a shell with script dependencies run:\nkotlinc  -classpath '${HOME}/.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar'"
 
-assert_end cli_helper_tests
+#assert_end cli_helper_tests
 
 ########################################################################################################################
 ## environment_tests