impl support for @file:DependsOn (towards #42)

Author: holgerbrandl

misc/docker_tests.sh

@@ -8,6 +8,11 @@ cd ${KSCRIPT_HOME}/misc
 docker build -t kscript_tester .
 docker run -it kscript_tester
 
+
+#docker rm  `docker ps -q -l` # restart it in the background
+docker start  `docker ps -q -l` # restart it in the background
+docker attach `docker ps -q -l` # reattach the terminal & stdin
+
 #curl -Lso /bin/kscript https://raw.githubusercontent.com/holgerbrandl/kscript/abb5f4c6ee72ec90d22c0fe913284e92363cad0e/kscript && chmod u+x /bin/kscript
 #curl -Lso /bin/kscript https://www.dropbox.com/s/l5g8vr0wz78y3zy/kscript?dl=1 && chmod u+x /bin/kscript
 

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

@@ -117,7 +117,7 @@ fun main(args: Array<String>) {
     //  Optionally enter interactive mode
     if (docopt.getBoolean("interactive")) {
         System.err.println("Creating REPL from ${scriptFile}")
-        System.err.println("kotlinc ${kotlinOpts} -classpath '${classpath}'")
+        //        System.err.println("kotlinc ${kotlinOpts} -classpath '${classpath}'")
 
         println("kotlinc ${kotlinOpts} -classpath ${classpath}")
         exitProcess(0)
@@ -221,13 +221,31 @@ fun main(args: Array<String>) {
 }
 
 fun collectDependencies(scriptText: List<String>): List<String> {
-    return scriptText
+    val deps = scriptText
             .filter { it.startsWith("//DEPS ") }
             .flatMap { it.split("[ ;,]+".toRegex()).drop(1) }
             .map(String::trim)
+
+    val annotatonPrefix = "@file:DependsOn("
+    var annotDeps = scriptText
+            .filter { it.startsWith(annotatonPrefix) }
+            .map { it.replaceFirst(annotatonPrefix, "").split(")")[0] }
+            .flatMap { it.split(",") }
+            .map { it.trim(' ', '"') }
+
+    // if annotations are used add dependency
+    if (scriptText.any { containsKscriptAnnotation(it) }) {
+        annotDeps += "com.github.holgerbrandl:kscript-annotations:1.0"
+    }
+
+    return (deps + annotDeps).distinct()
 }
 
 
+fun containsKscriptAnnotation(line: String) =
+        listOf("DependsOn", "KotlinOpts", "Include", "EntryPoint").any { line.startsWith("@file:${it}(") }
+
+
 fun collectRuntimeOptions(scriptText: List<String>): String {
     val koptsPrefix = "//KOTLIN_OPTS "
 
@@ -305,7 +323,7 @@ fun prepareScript(scriptResource: String, enableSupportApi: Boolean): File {
             var script = scriptResource.trim()
 
             //auto-prefix one-liners with kscript-support api
-//            if (numLines(script) == 1 && (script.startsWith("lines") || script.startsWith("stdin"))) {
+            //            if (numLines(script) == 1 && (script.startsWith("lines") || script.startsWith("stdin"))) {
             if (enableSupportApi) {
                 val prefix = """
                 //DEPS com.github.holgerbrandl:kscript:1.2.2

src/test/kotlin/Tests.kt

@@ -11,7 +11,7 @@ class Tests {
 
     // "comma separated dependencies should be parsed correctly"
     @Test
-    fun dependencyCollect() {
+    fun directiveDependencyCollect() {
         val lines = listOf(
                 "//DEPS de.mpicbg.scicomp.joblist:joblist-kotlin:1.1, de.mpicbg.scicomp:kutils:0.7",
                 "//DEPS  log4j:log4j:1.2.14"
@@ -26,6 +26,25 @@ class Tests {
         collectDependencies(lines) shouldBe expected
     }
 
+    @Test
+    fun mixedDependencyCollect() {
+        val lines = listOf(
+                "//DEPS de.mpicbg.scicomp.joblist:joblist-kotlin:1.1, de.mpicbg.scicomp:kutils:0.7",
+                """@file:DependsOn("log4j:log4j:1.2.14")"""
+        )
+
+        val expected = listOf(
+                "de.mpicbg.scicomp.joblist:joblist-kotlin:1.1",
+                "de.mpicbg.scicomp:kutils:0.7",
+                "log4j:log4j:1.2.14",
+                "com.github.holgerbrandl:kscript-annotations:1.0"
+        )
+
+        collectDependencies(lines) shouldBe expected
+    }
+
+
+
     // combine kotlin opts spread over multiple lines
     @Test
     fun optsCollect() {

test/resources/annotation_deps.kts

@@ -0,0 +1,15 @@
+#!/usr/bin/env kscript
+
+@file:DependsOn("log4j:log4j:1.2.14", "com.offbytwo:docopt:0.6.0.20150202")
+
+// some pointless comment
+
+import org.docopt.Docopt
+
+// test the docopt dependency
+val docopt = Docopt("Usage: jl <command> [options] [<joblist_file>]")
+
+// instantiate a logger to test the log4j dependency
+org.apache.log4j.Logger.getRootLogger()
+
+println("kscript with annotations rocks!")

test/test_suite.sh

@@ -132,6 +132,14 @@ assert_raises "resolve_deps org.org.docopt:org.docopt:0.9.0-SNAPSHOT log4j:log4j
 
 assert_end dependency_lookup
 
+########################################################################################################################
+## annotation-drive configuration
+
+# make sure that @file:DependsOn is parsed correctly
+assert "kscript ${KSCRIPT_HOME}/test/resources/annotation_deps.kts" "kscript with annotations rocks!"
+
+
+
 ########################################################################################################################
 ## support_api