Small fixes

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

Author: aartiPl

TODO.md

@@ -1,7 +1,6 @@
 # kscript 4.2 features:
 
 * Release kscript to Maven Central
-* Test local artifacts directory
 
 * Change a way of executing .kts files (investigate if we can get rid of reflections)
 * Onboard on brew

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

@@ -1,6 +1,6 @@
 package io.github.kscripting.kscript.integration
 
-import io.github.kscripting.kscript.integration.tools.TestAssertion
+import io.github.kscripting.kscript.integration.tools.TestAssertion.startsWith
 import io.github.kscripting.kscript.integration.tools.TestAssertion.verify
 import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
@@ -10,7 +10,7 @@ class CliReplTest : TestBase {
     @Tag("posix")
     @Tag("windows")
     fun `Do not run interactive mode prep without script argument`() {
-        verify("kscript -i", 1, "", TestAssertion.startsWith("kscript - Enhanced scripting support for Kotlin"))
+        verify("kscript -i", 1, "", startsWith("kscript - Enhanced scripting support for Kotlin"))
     }
 
 //    fun `CLI REPL tests`() {

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

@@ -72,7 +72,7 @@ class KscriptHandler(
 
         val resolvedDependencies = cache.getOrCreateDependencies(script.digest) {
             val localArtifacts = if (config.scriptingConfig.artifactsDir != null) {
-                getArtifactsRecursively(config.scriptingConfig.artifactsDir)
+                getArtifactsRecursively(config.scriptingConfig.artifactsDir, DependencyResolver.supportedExtensions)
             } else emptyList()
 
             DependencyResolver(script.repositories).resolve(script.dependencies) + localArtifacts

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

@@ -60,13 +60,15 @@ class DependencyResolver(private val customRepos: Set<Repository>) {
         }.flatten().map {
             it.toOsPath()
         }.filter {
-            it.extension == "jar" || it.extension == "aar"
+            supportedExtensions.contains(it.extension)
         }.toSet()
 
         return resolvedDependencies
     }
 
     companion object {
+        val supportedExtensions = listOf("jar", "aar")
+
         private val exceptionMessage =
             """|Artifact resolution failure. Check the connection (http/https, port, proxy, credentials, etc.) of your
                |maven dependency locators. If you suspect this is a bug, you can create an issue on:

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

@@ -56,11 +56,11 @@ object FileUtils {
         return path
     }
 
-    fun getArtifactsRecursively(osPath: OsPath): List<OsPath> {
+    fun getArtifactsRecursively(osPath: OsPath, supportedExtensions: List<String>): List<OsPath> {
         val artifacts = mutableListOf<OsPath>()
 
         osPath.toNativeFile().absoluteFile.walk().forEach {
-            if (it.isFile && (it.extension == "jar" || it.extension == "aar")) {
+            if (it.isFile && supportedExtensions.contains(it.extension)) {
                 artifacts.add(it.toOsPath())
             }
         }

src/test/kotlin/io/github/kscripting/kscript/util/FileUtilsTest.kt

@@ -7,12 +7,11 @@ import io.github.kscripting.shell.model.OsType
 import io.github.kscripting.shell.model.readText
 import io.github.kscripting.shell.model.toNativeFile
 import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.apache.commons.io.FileUtils as ApacheFileUtils
 
 class FileUtilsTest {
-    private val path = OsPath.createOrThrow(OsType.native, "build/tmp/file_utils_test")
+    private val path = OsPath.createOrThrow(OsType.native, "./build/tmp/file_utils_test")
     private val newFile1 = path.resolve("test1.txt")
     private val newFile2 = path.resolve("test2.txt")
     private val newFile3 = path.resolve("firstDir", "secondDir", "test3.txt")
@@ -31,8 +30,6 @@ class FileUtilsTest {
     }
 
     @Test
-    //TODO: re-enable it
-    @Disabled
     fun `Test symlink file`() {
         FileUtils.createFile(newFile1, content1)
         FileUtils.symLinkOrCopy(newFile2, newFile1)
@@ -41,8 +38,6 @@ class FileUtilsTest {
     }
 
     @Test
-    //TODO: re-enable it
-    @Disabled
     fun `Create dirs if needed`() {
         FileUtils.createFile(newFile3, content1)
         FileUtils.symLinkOrCopy(newFile4, newFile3)
@@ -53,8 +48,9 @@ class FileUtilsTest {
     @Test
     fun `Assert that getArtifactsRecursively finds all the artifacts in the path`() {
         val artifactsPath = OsPath.createOrThrow(OsType.native, "test/resources/config/jars/")
+        val supportedExtensions = listOf("jar", "aar")
 
-        assertThat(FileUtils.getArtifactsRecursively(artifactsPath)).transform {
+        assertThat(FileUtils.getArtifactsRecursively(artifactsPath, supportedExtensions)).transform {
             it.map { it.stringPath().substringAfterLast("jars").replace("\\", "/") }
         }.isEqualTo(listOf("/jar_file_1.jar", "/subdir/jar_file_2.jar"))
     }