bugfix: issue #347 - improved interoperability with Windows, but not yet fixed

feature: improved test suite

Author: aartiPl

src/main/kotlin/kscript/app/model/ConfigBuilder.kt

@@ -4,14 +4,15 @@ import kscript.app.util.ShellUtils.guessKotlinHome
 import java.io.File
 import java.nio.file.Path
 import java.nio.file.Paths
+import kotlin.io.path.absolute
 
 class ConfigBuilder internal constructor() {
     var selfName: String = System.getenv("CUSTOM_KSCRIPT_NAME") ?: "kscript"
     var kscriptDir: Path = Paths.get(System.getenv("KSCRIPT_DIR") ?: (System.getProperty("user.home")!! + "/.kscript"))
     var customPreamble: String = System.getenv("CUSTOM_KSCRIPT_PREAMBLE") ?: ""
     var intellijCommand: String = System.getenv("KSCRIPT_IDEA_COMMAND") ?: "idea"
     var gradleCommand: String = System.getenv("KSCRIPT_GRADLE_COMMAND") ?: "gradle"
-    var kotlinHome: Path? = (System.getenv("KOTLIN_HOME") ?: guessKotlinHome())?.let { Paths.get(it) }
+    var kotlinHome: Path? = (System.getenv("KOTLIN_HOME") ?: guessKotlinHome())?.let { Paths.get(it).absolute() }
     var classPathSeparator: String = if (System.getProperty("os.name").lowercase().contains("windows")) ";" else ":"
     var separatorChar: Char = File.separatorChar
     var homeDir: Path = Paths.get(System.getProperty("user.home")!!)

src/main/kotlin/kscript/app/resolver/CommandResolver.kt

@@ -7,19 +7,19 @@ import kscript.app.model.KotlinOpt
 import kscript.app.model.Script
 import java.nio.file.Path
 import java.nio.file.Paths
-import kotlin.io.path.absolute
 import kotlin.io.path.absolutePathString
 import kotlin.io.path.div
 
 class CommandResolver(private val config: Config, private val script: Script) {
     fun compileKotlin(jar: Path, dependencies: Set<Path>, filePaths: Set<Path>): String {
         val compilerOptsStr = resolveCompilerOpts(script.compilerOpts)
         val classpath = resolveClasspath(dependencies)
-        val files = filePaths.joinToString(" ") { it.absolute().toString() }
+        val files = filePaths.joinToString(" ") { "'${it.absolutePathString()}'" }
 
-        val kotlinc = if (config.kotlinHome != null) (config.kotlinHome / "bin" / "kotlinc").toString() else "kotlinc"
+        val kotlinc =
+            if (config.kotlinHome != null) (config.kotlinHome / "bin" / "kotlinc").absolutePathString() else "kotlinc"
 
-        return "$kotlinc $compilerOptsStr $classpath -d '${jar.absolute()}' $files"
+        return "'$kotlinc' $compilerOptsStr $classpath -d '${jar.absolutePathString()}' $files"
     }
 
     fun executeKotlin(jarArtifact: JarArtifact, dependencies: Set<Path>, userArgs: List<String>): String {
@@ -64,6 +64,6 @@ class CommandResolver(private val config: Config, private val script: Script) {
     private fun resolveUserArgs(userArgs: List<String>) =
         userArgs.joinToString(" ") { "\"${it.replace("\"", "\\\"")}\"" }
 
-    private fun resolveClasspath(dependencies: Set<Path>) =
-        if (dependencies.isEmpty()) "" else "-classpath " + dependencies.joinToString(config.classPathSeparator) { it.absolutePathString() }
+    private fun resolveClasspath(dependencies: Set<Path>) = if (dependencies.isEmpty()) ""
+    else "-classpath " + dependencies.joinToString(config.classPathSeparator) { "'${it.absolutePathString()}'" }
 }

test/setup_environment.sh

@@ -51,6 +51,18 @@ assert_stderr(){
     assert "( $1 ) 2>&1 >/dev/null" "$2"
 }
 
+# $1 - suite name; $2 - requested suites
+start_suite() {
+  if [[ "${2}" =~ "${1}" ]] || [[ "${2}" == "ALL" ]]; then
+    echo
+    echo "Starting '$1' tests:"
+    return 0
+  fi
+
+  echo "Skipping '$1' tests..."
+  return 1
+}
+
 #http://stackoverflow.com/questions/3005963/how-can-i-have-a-newline-in-a-string-in-sh
 export NL=$'\n'
 

test/test_suite.sh

@@ -1,50 +1,52 @@
 #!/usr/bin/env bash
 
-# Provide suite names which you want to execute as a parameter or nothing if you want to execute all
+# Provide suite names which you want to execute as a parameter
+# Example:
+# no parameters or 'ALL' - execute all test suites
+# '-' (dash) - just compile - no suites executed
+# 'junit' - execute just unit tests
 
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 PROJECT_DIR=$(realpath "$SCRIPT_DIR/../")
 
-echo "Starting KScript test suite..."
-
-REQUESTED_SUITES=${1:-ALL}
-echo "Requested test suites: $REQUESTED_SUITES"
-
-# $1 - suite name; $2 - requested suites
-start_suite() {
-  if [[ "${2}" =~ "${1}" ]] || [[ "${2}" == "ALL" ]]; then
-    echo
-    echo "Starting $1 tests:"
-    return 0
-  fi
-
-  echo "Skipping $1 tests..."
-  return 1
-}
+REQUESTED_SUITES="${@:-ALL}"
+echo "Starting KScript test suites: $REQUESTED_SUITES"
+echo
 
 kscript --clear-cache
+echo
 
 ########################################################################################################################
-SUITE="JUnit"
-echo
-echo "Starting $SUITE test suite... Compiling... Please wait..."
+echo "Compiling KScript... Please wait..."
 
 cd $PROJECT_DIR
-./gradlew clean build
-status=$?
+./gradlew clean assemble
+EXIT_CODE="$?"
 cd -
 
-if [[ "$status" -ne "0" ]]; then
+if [[ "$EXIT_CODE" -ne "0" ]]; then
   echo
-  echo "KScript build terminated with invalid exit code $status..."
+  echo "KScript build terminated with invalid exit code $EXIT_CODE..."
   exit 1
 fi
 
-echo "$SUITE test suite successfully accomplished."
-
 ########################################################################################################################
 
 source "$SCRIPT_DIR/setup_environment.sh"
+echo
+
+########################################################################################################################
+SUITE="junit"
+if start_suite $SUITE $REQUESTED_SUITES; then
+  cd $PROJECT_DIR
+  ./gradlew test
+  EXIT_CODE="$?"
+  cd -
+
+  assert "echo $EXIT_CODE" "0"
+
+  assert_end "$SUITE"
+fi
 
 ########################################################################################################################
 SUITE="script_input_modes"