Fixes for test.

Signed-off-by: Marcin Kuszczak <1508798+aartiPl@users.noreply.github.com>

Author: aartiPl

TODO.md

@@ -18,4 +18,4 @@
 * Compatibility with Kotlin Scripting
 * Consider changing a way of executing last command, so that it is not executed by shell, but is executed directly in kscript (main concern: kotlin interactive shell, but maybe this use case is not that important)
 * Onboard on docker etc. and other release channels
-* 
+* Abstraction for shell command (Command class containing e.g. environment variables)

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

@@ -3,6 +3,7 @@ package io.github.kscripting.kscript.integration
 import io.github.kscripting.kscript.integration.tools.TestAssertion.any
 import io.github.kscripting.kscript.integration.tools.TestAssertion.contains
 import io.github.kscripting.kscript.integration.tools.TestAssertion.verify
+import io.github.kscripting.kscript.integration.tools.TestContext.osType
 import io.github.kscripting.kscript.integration.tools.TestContext.projectDir
 import io.github.kscripting.kscript.integration.tools.TestContext.resolvePath
 import io.github.kscripting.kscript.integration.tools.TestContext.testDir
@@ -88,8 +89,16 @@ class MiscTest : TestBase {
     @Tag("windows")
     fun `Test local jar dir referenced in ENV variable`() {
         val shellPath = resolvePath("$projectDir/test/resources/config/")
+
+
+        val envSetter = if (osType.isWindowsLike()) {
+            "set KSCRIPT_DIRECTORY_ARTIFACTS=${shellPath.resolve("jarFiles")} &&"
+        } else {
+            "KSCRIPT_DIRECTORY_ARTIFACTS=${shellPath.resolve("jarFiles")}"
+        }
+
         verify(
-            "KSCRIPT_DIRECTORY_ARTIFACTS=${shellPath.resolve("jarFiles")} kscript ${shellPath.resolve("script_with_local_jars.kts")}",
+            "$envSetter kscript -d ${shellPath.resolve("script_with_local_jars.kts")}",
             0,
             "I am living in Test1 class...\nAnd I come from Test2 class...\n",
             ""

src/integration/kotlin/io/github/kscripting/kscript/integration/tools/TestContext.kt

@@ -6,7 +6,7 @@ import io.github.kscripting.shell.ShellExecutor
 import io.github.kscripting.shell.model.*
 
 object TestContext {
-    private val osType: OsType = OsType.findOrThrow(System.getProperty("osType"))
+    val osType: OsType = OsType.findOrThrow(System.getProperty("osType"))
     private val nativeType = if (osType.isPosixHostedOnWindows()) OsType.WINDOWS else osType
 
     private val projectPath: OsPath = OsPath.createOrThrow(nativeType, System.getProperty("projectPath"))

src/main/kotlin/io/github/kscripting/kscript/KscriptHandler.kt

@@ -11,11 +11,14 @@ import io.github.kscripting.kscript.resolver.ScriptResolver
 import io.github.kscripting.kscript.resolver.SectionResolver
 import io.github.kscripting.kscript.util.Executor
 import io.github.kscripting.kscript.util.FileUtils.getArtifactsRecursively
+import io.github.kscripting.kscript.util.Logger.devMsg
 import io.github.kscripting.kscript.util.Logger.info
 import io.github.kscripting.kscript.util.Logger.infoMsg
 import io.github.kscripting.kscript.util.Logger.warnMsg
 import io.github.kscripting.shell.model.ScriptType
+import io.github.kscripting.shell.model.parent
 import java.net.URI
+import kotlin.io.path.listDirectoryEntries
 
 class KscriptHandler(
     private val executor: Executor, private val config: Config, private val options: Map<String, String>
@@ -71,6 +74,10 @@ class KscriptHandler(
         }
 
         val resolvedDependencies = cache.getOrCreateDependencies(script.digest) {
+            devMsg("Local artifacts dir: ${config.scriptingConfig.artifactsDir}")
+            devMsg("Content of dir:\n ${config.scriptingConfig.artifactsDir?.parent?.listDirectoryEntries()}")
+
+
             val localArtifacts = if (config.scriptingConfig.artifactsDir != null) {
                 getArtifactsRecursively(config.scriptingConfig.artifactsDir)
             } else emptyList()