prepared runtime opts parsing for annotation support (closes #48)

Author: holgerbrandl

.travis.yml

@@ -64,6 +64,7 @@ install:
   - java  -version
   - mvn --version
   - kscript 'println("kotlin rocks")'
+  - kscript ${KSCRIPT_HOME}/test/resources/multi_line_deps.kts
 #  - resdeps.kts org.org.docopt:org.docopt:0.6.0-SNAPSHOT log4j:log4j:1.2.14
 #  - kscript ${KSCRIPT_HOME}/test/resources/multi_line_deps.kts
 

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

@@ -230,16 +230,18 @@ fun collectDependencies(scriptText: List<String>): List<String> {
 fun collectRuntimeOptions(scriptText: List<String>): String {
     val koptsPrefix = "//KOTLIN_OPTS "
 
-    // Append $KSCRIPT_KOTLIN_OPTS.
-    // Overriding //KOTLIN_OPTS lines in the script relies on the JVM processing
-    // arguments in order, which seems to be the case for Oracle, OpenJDK, and J9.
-    val kscriptOpts = System.getenv()["KSCRIPT_KOTLIN_OPTS"]
-
-    return scriptText.
+    var kotlinOpts = scriptText.
             filter { it.startsWith(koptsPrefix) }.
-            map { it.replaceFirst(koptsPrefix, "").trim() }.
-            joinToString(" ").
-            plus(kscriptOpts ?: "")
+            map { it.replaceFirst(koptsPrefix, "").trim() }
+
+    //todo add support for @file:KotlinOpts here
+
+    // Append $KSCRIPT_KOTLIN_OPTS if defined in the parent environment
+    System.getenv()["KSCRIPT_KOTLIN_OPTS"]?.run {
+        kotlinOpts = kotlinOpts + this
+    }
+
+    return kotlinOpts.joinToString(" ")
 }
 
 

test/test_suite.sh

@@ -46,7 +46,7 @@ assert "source ${KSCRIPT_HOME}/test/resources/cmd_subst_test.sh" "command substi
 
 ## make sure that it runs with local script files
 assert "source ${KSCRIPT_HOME}/test/resources/local_script_file.sh" "kscript rocks!"
-assert "echo foo" "bar" # known to fail
+#assert "echo foo" "bar" # known to fail
 
 ## make sure that it runs with local script files
 assert "kscript ${KSCRIPT_HOME}/test/resources/multi_line_deps.kts" "kscript is  cool!"