diff --git a/NEWS.adoc b/NEWS.adoc index 42d49b7..113e187 100644 --- a/NEWS.adoc +++ b/NEWS.adoc @@ -7,10 +7,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 == [Unreleased] +== [0.5.2] - 2023-04-29 + +=== Added +* Updated Gradle to version 8.0.2 + +=== Fixed +* Correctly handle Unicode when reading from the console + +== [0.5.1] - 2023-04-06 + +=== Fixed +* Handling of paths with spaces on Windows (thanks to https://github.com/ckaag[ckaag]) + == [0.5.0] - 2022-11-25 === Added -- ShellExecutor - executor for commands in Posix and Windows shells -- OsType - enum defining different types of OSes -- OsPath - generic implementation of system path +* ShellExecutor - executor for commands in Posix and Windows shells +* OsType - enum defining different types of OSes +* OsPath - generic implementation of system path diff --git a/README.md b/README.adoc similarity index 98% rename from README.md rename to README.adoc index cbc8dc0..756d6dd 100644 --- a/README.md +++ b/README.adoc @@ -1,4 +1,4 @@ -# shell += shell This repository is for shell interoperability diff --git a/TODO.adoc b/TODO.adoc new file mode 100644 index 0000000..070f554 --- /dev/null +++ b/TODO.adoc @@ -0,0 +1,3 @@ += shell 0.6 features: + +* Use https://github.com/JetBrains/pty4j[PTY4j] instead of ProcessBuilder to read color codes from input and append them to output diff --git a/TODO.md b/TODO.md deleted file mode 100644 index c6fdd83..0000000 --- a/TODO.md +++ /dev/null @@ -1,2 +0,0 @@ -# shell 0.5 features: - diff --git a/build.gradle.kts b/build.gradle.kts index d2414f5..d91c53c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ repositories { } group = "io.github.kscripting" -version = "0.5.1" +version = "0.5.2" sourceSets { create("integration") { @@ -92,30 +92,6 @@ tasks.test { useJUnitPlatform() } -dependencies { - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion") - implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") - - implementation("org.jetbrains.kotlin:kotlin-scripting-common:$kotlinVersion") - implementation("org.jetbrains.kotlin:kotlin-scripting-jvm:$kotlinVersion") - implementation("org.jetbrains.kotlin:kotlin-scripting-dependencies-maven-all:$kotlinVersion") - implementation("io.arrow-kt:arrow-core:1.1.2") - implementation("org.apache.commons:commons-lang3:3.12.0") - - implementation("org.slf4j:slf4j-nop:2.0.4") - - testImplementation("org.junit.platform:junit-platform-suite-engine:1.9.0") - testImplementation("org.junit.platform:junit-platform-suite-api:1.9.0") - testImplementation("org.junit.platform:junit-platform-suite-commons:1.9.0") - testImplementation("org.junit.jupiter:junit-jupiter-engine:5.9.0") - testImplementation("org.junit.jupiter:junit-jupiter-params:5.9.0") - testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.25") - testImplementation("io.mockk:mockk:1.13.2") - - testImplementation(kotlin("script-runtime")) -} - publishing { publications { create("mavenJava") { @@ -166,3 +142,27 @@ publishing { signing { sign(publishing.publications["mavenJava"]) } + +dependencies { + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion") + implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") + + implementation("org.jetbrains.kotlin:kotlin-scripting-common:$kotlinVersion") + implementation("org.jetbrains.kotlin:kotlin-scripting-jvm:$kotlinVersion") + implementation("org.jetbrains.kotlin:kotlin-scripting-dependencies-maven-all:$kotlinVersion") + implementation("io.arrow-kt:arrow-core:1.1.2") + implementation("org.apache.commons:commons-lang3:3.12.0") + + implementation("org.slf4j:slf4j-nop:2.0.4") + + testImplementation("org.junit.platform:junit-platform-suite-engine:1.9.0") + testImplementation("org.junit.platform:junit-platform-suite-api:1.9.0") + testImplementation("org.junit.platform:junit-platform-suite-commons:1.9.0") + testImplementation("org.junit.jupiter:junit-jupiter-engine:5.9.0") + testImplementation("org.junit.jupiter:junit-jupiter-params:5.9.0") + testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.25") + testImplementation("io.mockk:mockk:1.13.2") + + testImplementation(kotlin("script-runtime")) +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927..ccebba7 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661..bdc9a83 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..79a61d4 100644 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -143,12 +143,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -205,6 +209,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..93e3f59 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/src/main/kotlin/io/github/kscripting/shell/process/StreamGobbler.kt b/src/main/kotlin/io/github/kscripting/shell/process/StreamGobbler.kt index 2cf1724..a3137f5 100644 --- a/src/main/kotlin/io/github/kscripting/shell/process/StreamGobbler.kt +++ b/src/main/kotlin/io/github/kscripting/shell/process/StreamGobbler.kt @@ -1,12 +1,16 @@ package io.github.kscripting.shell.process +import java.io.BufferedReader import java.io.InputStream +import java.io.InputStreamReader import java.io.PrintStream + class StreamGobbler( - private val inputStream: InputStream, + inputStream: InputStream, private val printStream: List, ) { + private val reader: BufferedReader = BufferedReader(InputStreamReader(inputStream, "UTF8")) private var thread: Thread? = null fun start(): StreamGobbler { @@ -23,14 +27,14 @@ class StreamGobbler( } private fun readInputStreamSequentially() { - val buffer = ByteArray(1024) + val charArray = CharArray(1024) var length: Int - while (inputStream.read(buffer).also { length = it } != -1) { - val readContent = String(buffer, 0, length) + while (reader.read(charArray).also { length = it } != -1) { + val content = String(charArray, 0, length) printStream.forEach { - it.print(readContent) + it.print(content) } } }