adjusted tests and dependency resolution to new execution model

Author: holgerbrandl

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

@@ -3,7 +3,6 @@ package kscript.app
 import java.io.BufferedReader
 import java.io.File
 import java.io.InputStreamReader
-import kotlin.system.exitProcess
 
 /**
  * @author Holger Brandl
@@ -42,9 +41,8 @@ fun resolveDependencies(depIds: List<String>): String? {
         val splitDepId = it.split(":")
 
         if (!listOf(3, 4).contains(splitDepId.size)) {
-            System.err.println("invalid dependency locator: ${it}")
-            System.err.println("Expected format is groupId:artifactId:version[:classifier]")
-            exitProcess(1)
+            System.err.println("[ERROR] Invalid dependency locator: '${it}'.  Expected format is groupId:artifactId:version[:classifier]")
+            quit(1)
         }
 
         """
@@ -107,7 +105,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
         //    val failedDep = matchResult !!.groupValues[1]
         //    System.err.println("Failed to resolve: ${failedDep}")
 
-        exitProcess(1)
+        quit(1)
     }
 
 
@@ -119,7 +117,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 
     if (classPath == null) {
         System.err.println("Failed to lookup dependencies. Check dependency locators or file a bug on https://github.com/holgerbrandl/kscript")
-        exitProcess(1)
+        quit(1)
     }
 
 
@@ -132,5 +130,5 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 
 
 fun main(args: Array<String>) {
-    println(resolveDependencies(args.toList()))
+    System.err.println(resolveDependencies(args.toList()))
 }

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

@@ -4,6 +4,7 @@ import kscript.app.ShellUtils.requireInPath
 import org.docopt.DocOptWrapper
 import java.io.BufferedReader
 import java.io.File
+import java.io.FileInputStream
 import java.io.InputStreamReader
 import java.net.URL
 import java.nio.file.Files
@@ -246,17 +247,26 @@ private fun guessKotlinHome(): String? {
 fun prepareScript(scriptResource: String): File {
     var scriptFile: File? = null
 
-    // if script input was file just use it as it is
-    if (File(scriptResource).run { isFile() && canRead() }) {
-        scriptFile = File(scriptResource)
+    // map script argument to script file
+    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)) {
+            // 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())
+        }
     }
 
     // support stdin
     if (scriptResource == "-" || scriptResource == "/dev/stdin") {
         val scriptText = generateSequence() { readLine() }.joinToString("\n").trim()
-
-        scriptFile = File(createTempDir(), "scriptlet.${md5(scriptText)}.kts")
-        scriptFile.writeText(scriptText)
+        scriptFile = createTmpScript(scriptText)
     }
 
 
@@ -290,9 +300,7 @@ fun prepareScript(scriptResource: String): File {
             script.trim()
         }
 
-
-        scriptFile = File(createTempDir(), "scriptlet.${md5(scriptText)}.kts")
-        scriptFile.writeText(scriptText)
+        scriptFile = createTmpScript(scriptText)
     }
 
 
@@ -304,6 +312,12 @@ fun prepareScript(scriptResource: String): File {
     return scriptFile!!
 }
 
+private fun createTmpScript(scriptText: String): File {
+    return File(createTempDir(), "scriptlet.${md5(scriptText)}.kts").apply {
+        writeText(scriptText)
+    }
+}
+
 fun fetchFromURL(scriptURL: String): File? {
     val urlHash = md5(scriptURL)
     val urlCache = File(KSCRIPT_CACHE_DIR, "/url_cache_${urlHash}.kts")

test/test_suite.sh

@@ -15,6 +15,11 @@ assert_statement(){
 #assert_statment "echo foo; echo bar  >&2; exit 1" "foo" "bar" 1
 
 
+assert_stderr(){
+    assert "( $1 ) 2>&1 >/dev/null" "$2"
+}
+#assert_stderr "echo foo" "bar"
+
 #http://stackoverflow.com/questions/3005963/how-can-i-have-a-newline-in-a-string-in-sh
 #http://stackoverflow.com/questions/3005963/how-can-i-have-a-newline-in-a-string-in-sh
 export NL=$'\n'
@@ -99,24 +104,25 @@ assert_end environment_tests
 ## dependency_lookup
 
 # export KSCRIPT_HOME="/Users/brandl/projects/kotlin/kscript"; export PATH=${KSCRIPT_HOME}:${PATH}
-alias resdeps.kts='kotlin -classpath kscript.jar kscript.app.DepedencyUtilKt'
+resolve_deps() { kotlin -classpath kscript.jar kscript.app.DepedencyUtilKt "$@";}
+export -f resolve_deps
+
 
-assert "resdeps.kts log4j:log4j:1.2.14" "${HOME}/.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar"
+assert_stderr "resolve_deps log4j:log4j:1.2.14" "${HOME}/.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar"
 
 ## impossible version
-assert_raises "resdeps.kts log4j:log4j:9.8.76" 1
+assert "resolve_deps log4j:log4j:9.8.76" "false"
 
 ## wrong format should exit with 1
-assert_raises "resdeps.kts log4j:1.0" 1
+assert "resolve_deps log4j:1.0" "false"
 
-## wrong format should give meaningful error message
-assert "resdeps.kts log4j:1.0 2>&1" "invalid dependency locator: log4j:1.0\nExpected format is groupId:artifactId:version[:classifier]"
+assert_stderr "resolve_deps log4j:1.0" "[ERROR] Invalid dependency locator: 'log4j:1.0'.  Expected format is groupId:artifactId:version[:classifier]"
 
 ## other version of wrong format should die with useful error.
-assert "resdeps.kts log4j:::1.0 2>&1" "Failed to lookup dependencies. Check dependency locators or file a bug on https://github.com/holgerbrandl/kscript"
+assert_stderr "resolve_deps log4j:::1.0" "Failed to lookup dependencies. Check dependency locators or file a bug on https://github.com/holgerbrandl/kscript"
 
 ## one good dependency,  one wrong
-assert_raises "resdeps.kts org.org.docopt:org.docopt:0.9.0-SNAPSHOT log4j:log4j:1.2.14" 1
+assert_raises "resolve_deps org.org.docopt:org.docopt:0.9.0-SNAPSHOT log4j:log4j:1.2.14" 1
 
 assert_end dependency_lookup