Fixed problem with inability to resolve kt files.

Author: aartiPl

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

@@ -8,7 +8,6 @@ import java.io.File
 import java.io.FileInputStream
 import java.io.InputStreamReader
 import java.lang.IllegalArgumentException
-import java.net.URI
 import java.net.URL
 import java.net.UnknownHostException
 import java.util.*
@@ -85,7 +84,7 @@ fun main(args: Array<String>) {
         quit(0)
     }
 
-    // note: with current impt we still don't support `kscript -1` where "-1" is a valid kotlin expression
+    // note: with current implementation we still don't support `kscript -1` where "-1" is a valid kotlin expression
     val userArgs = args.dropWhile { it.startsWith("-") && it != "-" }.drop(1)
     val kscriptArgs = args.take(args.size - userArgs.size)
 
@@ -102,7 +101,6 @@ fun main(args: Array<String>) {
     if (docopt.getBoolean("clear-cache")) {
         info("Cleaning up cache...")
         KSCRIPT_CACHE_DIR.listFiles().forEach { it.delete() }
-        //        evalBash("rm -f ${KSCRIPT_CACHE_DIR}/*")
         quit(0)
     }
 
@@ -281,6 +279,7 @@ fun main(args: Array<String>) {
     }
 
     var extClassPath = "${jarFile}${CP_SEPARATOR_CHAR}${KOTLIN_HOME}${File.separatorChar}lib${File.separatorChar}kotlin-script-runtime.jar"
+
     if (classpath.isNotEmpty())
         extClassPath += CP_SEPARATOR_CHAR + classpath
 
@@ -404,5 +403,6 @@ private fun resolvePreambles(rawScript: File, enableSupportApi: Boolean): File {
 
         scriptFile = Script(scriptFile).prependWith("//INCLUDE ${preambleFile.absolutePath}").createTmpScript()
     }
+
     return scriptFile
 }

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

@@ -18,8 +18,10 @@ data class IncludeResult(val scriptFile: File, val includes: List<URL> = emptyLi
 /** Resolve include declarations in a script file. Resolved script will be put into another temporary script */
 fun resolveIncludes(file: File): IncludeResult {
     val includes = mutableListOf<URI>()
+    //TODO: in case initial file is a remote file, we shouldn't allow local references, so initial 'true' here is a wrong assumption
+    //TODO: first resolve redirects: https://stackoverflow.com/questions/2659000/java-how-to-find-the-redirected-url-of-a-url
     val lines = resolve(true, file.toURI(), includes)
-    val script = Script(lines)
+    val script = Script(lines, file.extension)
 
     return IncludeResult(script.consolidateStructure().createTmpScript(), includes.map { it.toURL() })
 }

test/test_suite.sh

@@ -54,6 +54,10 @@ echo "Configuring KScript for further testing..."
 export PATH=${PROJECT_DIR}/build/libs:$PATH
 echo  "KScript path for testing: $(which kscript)"
 
+# Fake idea binary... Maybe good idea to use it instead of real idea binary?
+#echo "#!/usr/bin/env bash" > "${PROJECT_DIR}/build/libs/idea"
+#echo "echo $*" >> "${PROJECT_DIR}/build/libs/idea"
+
 ########################################################################################################################
 SUITE="script input modes"
 echo
@@ -132,7 +136,7 @@ assert_end "$SUITE"
 #assert_end "$SUITE"
 
 ########################################################################################################################
-SUITE="Environment"
+SUITE="environment"
 echo
 echo "Starting $SUITE tests:"
 
@@ -220,7 +224,7 @@ assert_statement 'echo "foo${NL}bar" | kscript --text "lines.split().select(1, 2
 assert_end "$SUITE"
 
 ########################################################################################################################
-SUITE=".kt support"
+SUITE="kt support"
 echo
 echo "Starting $SUITE tests:"