fixed #81: Allow package declarations for scripts

Author: holgerbrandl

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

@@ -204,12 +204,15 @@ fun main(args: Array<String>) {
 
         val wrapperSrcArg = if (scriptFileExt == "kts") {
             val mainKotlin = File(createTempDir("kscript"), execClassName + ".kt")
+
+            val classReference = (script.pckg ?: "") + className
+
             mainKotlin.writeText("""
             class Main_${className}{
                 companion object {
                     @JvmStatic
                     fun main(args: Array<String>) {
-                        val script = Main_${className}::class.java.classLoader.loadClass("${className}")
+                        val script = Main_${className}::class.java.classLoader.loadClass("${classReference}")
                         script.getDeclaredConstructor(Array<String>::class.java).newInstance(args);
                     }
                 }
@@ -235,7 +238,6 @@ fun main(args: Array<String>) {
 }
 
 
-
 /** Determine the latest version by checking github repo and print info if newer version is available. */
 private fun versionCheck() {
 

test/resources/script_in_pckg.kts

@@ -0,0 +1,12 @@
+#!/usr/bin/env kscript
+
+@file:KotlinOpts("-J-Xmx5g")
+
+package foo
+
+import KotlinOpts
+
+//import kscript.annotations.*
+
+
+println("I live in a package!")

test/test_suite.sh

@@ -187,10 +187,17 @@ assert "kscript ${KSCRIPT_HOME}/test/resources/kt_tests/default_entry_nopckg.kt"
 
 assert "kscript ${KSCRIPT_HOME}/test/resources/kt_tests/default_entry_withpckg.kt" "main was called"
 
+
+## also make sure that kts in package can be run via kscript
+assert "${KSCRIPT_HOME}/test/resources/script_in_pckg.kts" "I live in a package!"
+
+
 assert_end kt_support
 
 
 
+
+
 ########################################################################################################################
 ##  custom interpreters