Fixes for tests

Signed-off-by: Marcin Kuszczak <[email protected]>

Author: aartiPl

src/integration/kotlin/io/github/kscripting/kscript/integration/PackagingTest.kt

@@ -15,8 +15,8 @@ class PackagingTest : TestBase {
     //TODO: doesn't work on msys, cygwin, windows
     fun `Packaged script is cached`() {
         //@formatter:off
-        verify("kscript --package \"println(1+1)\"", 0, "", startsWith("[kscript] Packaging script 'scriplet' into standalone executable..."))
-        verify("kscript --package \"println(1+1)\"", 0, "", startsWith("[kscript] Packaged script 'scriplet' available at path:"))
+        verify("kscript --package \"println(1+1)\"", 0, "", startsWith("[kscript] Packaging script 'Scriplet' into standalone executable..."))
+        verify("kscript --package \"println(1+1)\"", 0, "", startsWith("[kscript] Packaged script 'Scriplet' available at path:"))
         //@formatter:on
     }
 

src/main/kotlin/io/github/kscripting/kscript/creator/JarArtifactCreator.kt

@@ -11,7 +11,9 @@ data class JarArtifact(val path: OsPath, val execClassName: String)
 class JarArtifactCreator(private val executor: Executor) {
 
     fun create(basePath: OsPath, script: Script, resolvedDependencies: Set<OsPath>): JarArtifact {
-        val execClassName = "${script.entryPoint.value}Kt"
+        val entryPoint = script.entryPoint?.value ?: "ScripletKt"
+        val execClassName = script.packageName.value + "." + entryPoint
+
         val jarFile = basePath.resolve("scriplet.jar")
         val scriptFile = basePath.resolve("Scriplet.kt")
         val execClassNameFile = basePath.resolve("scripletExecClassName.txt")

src/main/kotlin/io/github/kscripting/kscript/model/Script.kt

@@ -8,7 +8,7 @@ data class Script(
     val resolvedCode: String,
 
     val packageName: PackageName,
-    val entryPoint: Entry,
+    val entryPoint: Entry?,
     val importNames: Set<ImportName>,
 
     val includes: Set<Include>,

src/main/kotlin/io/github/kscripting/kscript/resolver/ScriptResolver.kt

@@ -2,6 +2,7 @@ package io.github.kscripting.kscript.resolver
 
 import io.github.kscripting.kscript.model.*
 import io.github.kscripting.kscript.parser.LineParser.extractValues
+import io.github.kscripting.kscript.util.Logger
 import io.github.kscripting.kscript.util.ScriptUtils
 import io.github.kscripting.kscript.util.UriUtils
 import io.github.kscripting.shell.model.*
@@ -12,7 +13,7 @@ class ScriptResolver(
     private val sectionResolver: SectionResolver,
     private val scriptingConfig: ScriptingConfig
 ) {
-    private val scripletName = "Scriplet"
+    private val defaultScripletFileName = "Scriplet"
 
     //level parameter - for how many levels should include be resolved
     //level 0       -   do not resolve includes in base file and any other embedded
@@ -34,7 +35,7 @@ class ScriptResolver(
                     scriptType,
                     null,
                     inputOutputResolver.resolveCurrentDir(),
-                    scripletName
+                    defaultScripletFileName
                 )
 
             return createScript(
@@ -100,7 +101,7 @@ class ScriptResolver(
                         content.scriptType,
                         content.uri,
                         content.contextUri,
-                        scripletName
+                        defaultScripletFileName
                     )
 
                 return createScript(
@@ -124,7 +125,7 @@ class ScriptResolver(
                 scriptType,
                 null,
                 inputOutputResolver.resolveCurrentDir(),
-                scripletName
+                defaultScripletFileName
             )
 
         return createScript(
@@ -158,7 +159,9 @@ class ScriptResolver(
         resolutionContext.scriptNodes.add(scriptNode)
 
         resolutionContext.packageName = resolutionContext.packageName ?: PackageName("kscript.scriplet")
-        resolutionContext.entryPoint = resolutionContext.entryPoint ?: Entry("${resolutionContext.packageName!!.value}.Scriplet")
+
+        Logger.devMsg("packageName: ${resolutionContext.packageName}")
+        Logger.devMsg("entryPoint: ${resolutionContext.entryPoint}")
 
         val code = ScriptUtils.resolveCode(resolutionContext.packageName, resolutionContext.importNames, scriptNode)
 
@@ -174,7 +177,7 @@ class ScriptResolver(
             scriptLocation,
             code,
             resolutionContext.packageName!!,
-            resolutionContext.entryPoint!!,
+            resolutionContext.entryPoint,
             resolutionContext.importNames,
             resolutionContext.includes,
             resolutionContext.dependencies,

src/main/kotlin/io/github/kscripting/kscript/util/ScriptUtils.kt

@@ -54,6 +54,7 @@ object ScriptUtils {
 
         var indent = ""
         var shouldPrependEmptyLine = false
+
         if (scriptNode.scriptLocation.scriptType == ScriptType.KTS) {
             sb.appendLine("fun main(args: Array<String>) {")
             indent = "    "