collects imports, removes bang line, and prepends at top of script

.travis.yml

@@ -26,6 +26,7 @@ install:
   - sudo add-apt-repository -y ppa:openjdk-r/ppa
   - sudo apt-get update
   - sudo apt-get install openjdk-8-jdk
+  - sudo apt-get install maven2
   # workaround for missing cacerts in openjdk
   - sudo dpkg --purge --force-depends ca-certificates-java
   - sudo apt-get install ca-certificates-java
@@ -41,7 +42,7 @@ install:
 #  - bash -c 'source "/home/travis/.sdkman/bin/sdkman-init.sh"; yes | sdk install java 8u144-oracle'
 #  - bash -c 'source "/home/travis/.sdkman/bin/sdkman-init.sh"; yes | sdk install java 8u144-zulu'
 #  - sudo apt-get install -y openjdk-8-jdk
-  - sdk install maven
+#  - sdk install maven
   - sdk install kotlin
   - sdk install gradle
 

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

@@ -418,7 +418,7 @@ fun prepareScript(scriptResource: String, enableSupportApi: Boolean): File {
 
 
     // support //INCLUDE directive (see https://github.com/holgerbrandl/kscript/issues/34)
-    scriptFile = resolveIncludes(scriptFile)
+    if (scriptFile != null) scriptFile = resolveIncludes(scriptFile)
 
     // just proceed if the script file is a regular file at this point
     errorIf(scriptFile == null || !scriptFile.canRead()) {

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

@@ -9,21 +9,20 @@ import java.net.URL
  */
 
 /** Resolve include declarations in a script file. Resolved script will be put into another temporary script */
-fun resolveIncludes(template: File?): File? {
-    if (template == null) return null
+fun resolveIncludes(template: File): File = resolveIncludesInternal(template)
 
-    // recursively replace //INCLUDES
-    return resolveIncludesInternal(template)?.run { resolveIncludes(this) } ?: template
-}
-
-private fun resolveIncludesInternal(template: File): File? {
+private fun resolveIncludesInternal(template: File): File {
     val scriptLines = template.readText().lines()
 
-    // don't do a thing if there's not INCLUDE in the script
-    if (scriptLines.find { it.startsWith("//INCLUDE ") } == null) return null
+    if (scriptLines.find { it.startsWith("//INCLUDE ") } == null) {
+        return template
+    }
 
     val sb = StringBuilder()
 
+    // collect up the set of imports in this
+    val imports : MutableSet<String> = emptySet<String>().toMutableSet()
+
     scriptLines.map {
         if (it.startsWith("//INCLUDE")) {
             val include = it.split("[ ]+".toRegex()).last()
@@ -37,20 +36,32 @@ private fun resolveIncludesInternal(template: File): File? {
             }
 
             try {
-                sb.appendln(includeURL.readText())
+                // collect the import or emit
+                includeURL.readText().lines().forEach {
+                    if (it.startsWith("import")) {
+                        imports.add(it)
+                    } else {
+                        sb.appendln(it)
+                    }
+                }
             } catch (e: FileNotFoundException) {
                 errorMsg("Failed to resolve //INCLUDE '${include}'")
                 System.err.println(e.message?.lines()!!.map { it.prependIndent("[ERROR] ") })
-
                 quit(1)
             }
+        } else if (it.startsWith("import")) {
+            imports.add(it)
         } else {
-            // if it's not a directive we simply skip emit the line as it is
-            sb.appendln(it)
+            // if its not an include directive or an import or a bang line, emit as is
+            if (it.startsWith("#")) {  } else { sb.appendln(it) }
         }
     }
 
-    return createTmpScript(sb.toString())
+    val impsb = StringBuilder()
+    imports.map { impsb.appendln(it) }
+
+    val final = impsb.appendln(sb.toString())
+    return createTmpScript(final.toString())
 }