1.1.0 release #2

Merged
Infendro merged 6 commits from develop into main 2026-02-15 13:13:31 +00:00
10 changed files with 122 additions and 141 deletions

View File

@@ -1,36 +0,0 @@
on:
push:
branches:
- main
env:
GIT__TOKEN: ${{ secrets.TOKEN }}
jobs:
publish:
runs-on: linux
steps:
- uses: actions/checkout@v4
- uses: actions/cache/restore@v4
with:
key: gradle
path: |
~/.gradle/caches/
~/.gradle/wrapper/
~/.konan/
- uses: actions/setup-java@v4
with:
java-version: '24'
distribution: 'temurin'
- run: ./gradlew publish
- uses: actions/cache/save@v4
with:
key: gradle
path: |
~/.gradle/caches/
~/.gradle/wrapper/
~/.konan/

View File

@@ -0,0 +1,47 @@
on:
push:
branches: [ main ]
jobs:
publish:
runs-on: linux
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Java
uses: actions/setup-java@v4
with:
java-version: '24'
distribution: 'temurin'
- name: Cache Gradle
uses: actions/cache@v4
with:
key: gradle-${{ hashFiles('**/libs.versions.toml') }}
restore-keys: gradle
path: |
~/.gradle/caches/
~/.gradle/wrapper/
- name: Cache Konan
uses: actions/cache@v4
with:
key: konan-${{ hashFiles('**/libs.versions.toml') }}
restore-keys: konan
path: |
~/.konan/
- name: Cache Node
uses: actions/cache@v4
with:
key: node-${{ hashFiles('**/libs.versions.toml') }}
restore-keys: node
path: |
~/.gradle/nodejs
~/.gradle/yarn
- name: Publish
run: ./gradlew publish
env:
INFENDRO__TOKEN: ${{ secrets.TOKEN }}

View File

@@ -1,14 +1,6 @@
# Kotlin Shell # shell-kt
This library enables the execution of shell commands in Kotlin Multiplatform. `shell-kt` is a Kotlin Multiplatform library that enables the execution of shell commands.
## Features
* Execute commands on the shell.
* Multiplatform support
* JVM
* JavaScript
* Native (Linux)
## Installation ## Installation
@@ -20,21 +12,15 @@ repositories {
} }
dependencies { dependencies {
implementation("com.infendro:shell:1.0.0") implementation("com.infendro:shell:1.1.0")
} }
``` ```
## Usage ## Usage
```kotlin ```kotlin
import com.infendro.shell.Shell suspend fun main() {
val result = execute("echo", "Hello World!")
fun main() {
// the command to execute
val command = arrayOf("echo", "Hello World!")
// execute the command
val result = Shell.run(command)
println(result.code) // 0 println(result.code) // 0
println(result.value) // Hello World! println(result.value) // Hello World!

View File

@@ -1,54 +1,39 @@
group = "com.infendro" import com.infendro.plugin.infendro
version = "1.0.0" import com.infendro.plugin.token
repositories { group = "com.infendro"
mavenCentral() version = "1.1.0"
}
plugins { plugins {
alias(libs.plugins.infendro)
alias(libs.plugins.multiplatform) alias(libs.plugins.multiplatform)
id("maven-publish") id("maven-publish")
} }
kotlin { kotlin {
jvm() jvm()
js {
nodejs()
}
linuxX64() linuxX64()
linuxArm64()
mingwX64()
macosX64()
macosArm64()
js { nodejs() }
repositories {
mavenCentral()
}
sourceSets { sourceSets {
jsMain.dependencies { jsMain.dependencies {
implementation(libs.node) implementation(libs.node)
} }
} }
}
publishing { compilerOptions {
repositories { freeCompilerArgs.add("-opt-in=kotlinx.cinterop.ExperimentalForeignApi")
maven {
url = uri("https://git.infendro.com/api/packages/Infendro/maven")
authentication.create("header", HttpHeaderAuthentication::class)
credentials(HttpHeaderCredentials::class) {
val token = secret("git.token") ?: throw GradleException()
name = "Authorization"
value = "token $token"
}
}
} }
} }
fun secret( publishing.repositories {
key: String, infendro(token)
): String? {
val property = key
val environment = key
.uppercase()
.replace(".", "__")
val prop = properties[property] as String?
val env = System.getenv(environment)
return prop ?: env
} }

View File

@@ -1,8 +1,10 @@
[versions] [versions]
kotlin = "2.1.20" infendro = "1.1.0"
node = "2025.6.9-22.13.10" kotlin = "2.3.0"
node = "2026.2.11-24.10.4"
[plugins] [plugins]
infendro = { id = "com.infendro.plugin", version.ref = "infendro" }
multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
[libraries] [libraries]

View File

@@ -1 +1,6 @@
rootProject.name = "shell" rootProject.name = "shell"
pluginManagement.repositories {
maven("https://git.infendro.com/api/packages/Infendro/maven")
mavenCentral()
}

View File

@@ -1,20 +1,20 @@
package com.infendro.shell package com.infendro.shell
object Shell { data class Result(
suspend fun run(
command: Array<String>,
directory: String? = null,
): Result {
return execute(command, directory)
}
class Result(
val code: Int, val code: Int,
val value: String, val value: String,
) ) {
val success: Boolean
get() = code == 0
internal companion object {
fun from(code: Int, value: String) = Result(code, value)
fun from(code: Int, success: () -> String, error: () -> String) = when (code) {
0 -> Result(code, success())
else -> Result(code, error())
}
}
} }
internal expect suspend fun execute( expect suspend fun execute(vararg command: String, directory: String? = null): Result
command: Array<String>,
directory: String?,
): Shell.Result

View File

@@ -1,19 +1,17 @@
package com.infendro.shell package com.infendro.shell
import kotlin.coroutines.resume
import kotlin.coroutines.suspendCoroutine
import node.childProcess.ExecOptions import node.childProcess.ExecOptions
import node.childProcess.exec import node.childProcess.exec
import kotlin.coroutines.resume
import kotlin.coroutines.suspendCoroutine
internal actual suspend fun execute( actual suspend fun execute(vararg command: String, directory: String?): Result = suspendCoroutine { continuation ->
command: Array<String>, val command = command.joinToString(" ") { """"$it"""" }
directory: String?, val options = ExecOptions(cwd = directory)
): Shell.Result = suspendCoroutine { continuation ->
val command = command.joinToString(" ") { "\"$it\"" }
val options = ExecOptions.invoke(cwd = directory)
exec(command, options) { error, stdout, stderr -> exec(command, options) { error, stdout, stderr ->
val code = if (error == null) 0 else error.code!!.toInt() val code = error?.code?.toInt() ?: 0
val value = if (error == null) stdout else stderr
continuation.resume(Shell.Result(code, value)) val result = Result.from(code, { stdout as String }, { stderr as String })
continuation.resume(result)
} }
} }

View File

@@ -1,21 +1,18 @@
package com.infendro.shell package com.infendro.shell
import java.io.File import java.io.File
import kotlin.coroutines.resume
import kotlin.coroutines.suspendCoroutine
internal actual suspend fun execute( actual suspend fun execute(vararg command: String, directory: String?): Result = suspendCoroutine { continuation ->
command: Array<String>, val process = ProcessBuilder(*command).also {
directory: String?,
): Shell.Result {
val process = ProcessBuilder(*command)
.also {
if (directory != null) { if (directory != null) {
it.directory(File(directory)) val dir = File(directory)
it.directory(dir)
} }
} }.start()
.start()
val code = process.waitFor() val code = process.waitFor()
val value = process
.let { if (code == 0) it.inputReader() else it.errorReader() } val result = Result.from(code, { process.inputReader().readText() }, { process.errorReader().readText() })
.readText() continuation.resume(result)
return Shell.Result(code, value)
} }

View File

@@ -1,33 +1,30 @@
package com.infendro.shell package com.infendro.shell
import kotlinx.cinterop.CPointer import kotlinx.cinterop.CPointer
import kotlinx.cinterop.ExperimentalForeignApi
import kotlinx.cinterop.refTo import kotlinx.cinterop.refTo
import kotlinx.cinterop.toKString import kotlinx.cinterop.toKString
import platform.posix.* import platform.posix.*
import kotlin.coroutines.resume
import kotlin.coroutines.suspendCoroutine
@ExperimentalForeignApi actual suspend fun execute(vararg command: String, directory: String?): Result = suspendCoroutine { continuation ->
internal actual suspend fun execute( val command = command.joinToString(" ") { """"$it"""" }
command: Array<String>,
directory: String?,
): Shell.Result {
val command = command.joinToString(" ") { "\"$it\"" }
if (directory != null) { if (directory != null) {
chdir(directory) chdir(directory)
} }
val stream = popen(command, "r")!! val stream = popen(command, "r")!!
val value = stream.readLines().joinToString("") val value = stream.readLines().joinToString("")
val code = pclose(stream) val code = pclose(stream)
return Shell.Result(code, value)
val result = Result.from(code, value)
continuation.resume(result)
} }
@ExperimentalForeignApi
private fun CPointer<FILE>.readLines(): List<String> { private fun CPointer<FILE>.readLines(): List<String> {
val lines = mutableListOf<String>() val lines = mutableListOf<String>()
val buffer = ByteArray(4096) val buffer = ByteArray(4096)
while (true) { while (true) {
val line = fgets(buffer.refTo(0), buffer.size, this) val line = fgets(buffer.refTo(0), buffer.size, this) ?: break
if (line == null) break
lines.add(line.toKString()) lines.add(line.toKString())
} }
return lines return lines