Fixed last broken case (I can not confirm idea and packaging tests)

Author: aartiPl

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

@@ -108,7 +108,7 @@ fun main(args: Array<String>) {
     // Resolve the script resource argument into an actual file
     val scriptResource = docopt.getString("script")
 
-    val rawUri = prepareScript(scriptResource)
+    val (rawUri, includeContext) = prepareScript(scriptResource)
 
     if (docopt.getBoolean("add-bootstrap-header")) {
         errorIf(!isFile(rawUri)) {
@@ -150,7 +150,7 @@ fun main(args: Array<String>) {
 
     // post process script (text-processing mode, custom dsl preamble, resolve includes)
     // and finally resolve all includes (see https://github.com/holgerbrandl/kscript/issues/34)
-    val (scriptFile, includeURLs) = resolveIncludes(resolvePreambles(rawUri, enableSupportApi))
+    val (scriptFile, includeURLs) = resolveIncludes(resolvePreambles(rawUri, enableSupportApi), includeContext)
 
     val script = Script(scriptFile)
 
@@ -328,58 +328,69 @@ private fun versionCheck() {
     }
 }
 
+fun prepareScript(scriptResource: String): Pair<URI, URI> {
+    var scriptFile: File?
 
-fun prepareScript(scriptResource: String): URI {
-    if (isUrl(scriptResource)) {
-        return URI(scriptResource)
-    }
-
-    var scriptUri: URI?
+    // we need to keep track of the scripts dir or the working dir in case of stdin script to correctly resolve includes
+    var includeContext: URI = File(".").toURI()
 
     // map script argument to script file
-    scriptUri = with(File(scriptResource)) {
+    scriptFile = with(File(scriptResource)) {
         if (!canRead()) {
             // not a file so let's keep the script-file undefined here
             null
         } else if (listOf("kts", "kt").contains(extension)) {
-            this.toURI()
+            // update include context
+            includeContext = this.absoluteFile.parentFile.toURI()
+
+            // script input is a regular script or clas file
+            this
         } else {
             // if we can "just" read from script resource create tmp file
             // i.e. script input is process substitution file handle
             // not FileInputStream(this).bufferedReader().use{ readText()} does not work nor does this.readText
-            createTmpScript(FileInputStream(this).bufferedReader().readText()).toURI()
+            includeContext = this.absoluteFile.parentFile.toURI()
+            createTmpScript(FileInputStream(this).bufferedReader().readText())
         }
     }
 
     // support stdin
     if (scriptResource == "-" || scriptResource == "/dev/stdin") {
         val scriptText = generateSequence() { readLine() }.joinToString("\n").trim()
-        scriptUri = createTmpScript(scriptText).toURI()
+        scriptFile = createTmpScript(scriptText)
     }
 
+
+    // Support URLs as script files
+    if (scriptResource.startsWith("http://") || scriptResource.startsWith("https://")) {
+        scriptFile = fetchFromURL(scriptResource)
+
+        includeContext = URI(scriptResource.run { substring(lastIndexOf('/') + 1) })
+    }
+
+
     // Support for support process substitution and direct script arguments
-    if (scriptUri == null && !scriptResource.endsWith(".kts") && !scriptResource.endsWith(".kt")) {
+    if (scriptFile == null && !scriptResource.endsWith(".kts") && !scriptResource.endsWith(".kt")) {
         val scriptText = if (File(scriptResource).canRead()) {
             File(scriptResource).readText().trim()
         } else {
             // the last resort is to assume the input to be a kotlin program
             scriptResource.trim()
         }
 
-        scriptUri = createTmpScript(scriptText).toURI()
+        scriptFile = createTmpScript(scriptText)
     }
 
     // just proceed if the script file is a regular file at this point
-    errorIf(scriptUri == null) {
+    errorIf(scriptFile == null || !scriptFile.canRead()) {
         "Could not read script argument '$scriptResource'"
     }
 
     // note script file must be not null at this point
 
-    return scriptUri!!
+    return Pair(scriptFile!!.toURI(), includeContext)
 }
 
-
 private fun resolvePreambles(rawUri: URI, enableSupportApi: Boolean): URI {
     if (!isFile(rawUri)) {
         return rawUri

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

@@ -16,7 +16,7 @@ const val IMPORT_STATEMENT_PREFIX = "import " // todo make more solid by using o
 data class IncludeResult(val scriptFile: File, val includes: List<URL> = emptyList())
 
 /** Resolve include declarations in a script file. Resolved script will be put into another temporary script */
-fun resolveIncludes(uri: URI): IncludeResult {
+fun resolveIncludes(uri: URI, includeContext: URI = uri.resolve(".")): IncludeResult {
     val scriptText = uri.toURL().readText()
 
     val urlExtension = when {
@@ -30,21 +30,20 @@ fun resolveIncludes(uri: URI): IncludeResult {
     }
 
     val includes = mutableListOf<URI>()
-    val lines = resolve(isFile(uri), uri, includes)
+    val lines = resolve(isFile(uri), uri, includeContext, includes)
     val script = Script(lines, urlExtension)
 
     return IncludeResult(script.consolidateStructure().createTmpScript(), includes.map { it.toURL() })
 }
 
-private fun resolve(allowFileReferences: Boolean, scriptUri: URI, includes: MutableList<URI>): List<String> {
+private fun resolve(allowFileReferences: Boolean, scriptUri: URI, includeContext: URI, includes: MutableList<URI>): List<String> {
     val lines = readLines(scriptUri)
-    val scriptPath = scriptUri.resolve(".")
     val result = mutableListOf<String>()
 
     for (line in lines) {
         if (isIncludeDirective(line)) {
             val include = extractTarget(line)
-            val includeUri = resolveUri(scriptPath, include)
+            val includeUri = resolveUri(includeContext, include)
 
             if (!allowFileReferences && isFile(includeUri)) {
                 errorMsg("References to local filesystem from remote scripts are not allowed.\nIn script: $scriptUri; Reference: $includeUri")
@@ -59,7 +58,7 @@ private fun resolve(allowFileReferences: Boolean, scriptUri: URI, includes: Muta
 
             includes.add(includeUri)
 
-            val resolvedLines = resolve(allowFileReferences && isFile(includeUri), includeUri, includes)
+            val resolvedLines = resolve(allowFileReferences && isFile(includeUri), includeUri, includeUri.resolve("."), includes)
             result.addAll(resolvedLines)
             continue
         }