Compare commits
10 Commits
4ed863c561
...
develop
| Author | SHA1 | Date | |
|---|---|---|---|
|
db7a05f88b
|
|||
|
13b8597810
|
|||
|
a80bb11652
|
|||
|
dc92be5367
|
|||
|
2679f688d5
|
|||
|
c961342462
|
|||
|
fd54489747
|
|||
|
c1cbd96558
|
|||
|
9336409590
|
|||
|
a64703cf2f
|
@@ -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/
|
|
||||||
47
.gitea/workflows/publish.yaml
Normal file
47
.gitea/workflows/publish.yaml
Normal 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 }}
|
||||||
24
README.md
24
README.md
@@ -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!
|
||||||
|
|||||||
@@ -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
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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]
|
||||||
|
|||||||
@@ -1 +1,6 @@
|
|||||||
rootProject.name = "shell"
|
rootProject.name = "shell"
|
||||||
|
|
||||||
|
pluginManagement.repositories {
|
||||||
|
maven("https://git.infendro.com/api/packages/Infendro/maven")
|
||||||
|
mavenCentral()
|
||||||
|
}
|
||||||
|
|||||||
@@ -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
|
|
||||||
|
|||||||
@@ -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)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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)
|
|
||||||
}
|
}
|
||||||
|
|||||||
20
src/linuxMain/kotlin/com/infendro/shell/Shell.linux.kt
Normal file
20
src/linuxMain/kotlin/com/infendro/shell/Shell.linux.kt
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
package com.infendro.shell
|
||||||
|
|
||||||
|
import platform.posix.chdir
|
||||||
|
import platform.posix.pclose
|
||||||
|
import platform.posix.popen
|
||||||
|
import kotlin.coroutines.resume
|
||||||
|
import kotlin.coroutines.suspendCoroutine
|
||||||
|
|
||||||
|
actual suspend fun execute(vararg command: String, directory: String?): Result = suspendCoroutine { continuation ->
|
||||||
|
val command = command.joinToString(" ") { """"$it"""" }
|
||||||
|
if (directory != null) {
|
||||||
|
chdir(directory)
|
||||||
|
}
|
||||||
|
val stream = popen(command, "r")!!
|
||||||
|
val value = stream.readLines().joinToString("")
|
||||||
|
val code = pclose(stream)
|
||||||
|
|
||||||
|
val result = Result.from(code, value)
|
||||||
|
continuation.resume(result)
|
||||||
|
}
|
||||||
20
src/macosMain/kotlin/com/infendro/shell/Shell.macos.kt
Normal file
20
src/macosMain/kotlin/com/infendro/shell/Shell.macos.kt
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
package com.infendro.shell
|
||||||
|
|
||||||
|
import platform.posix.chdir
|
||||||
|
import platform.posix.pclose
|
||||||
|
import platform.posix.popen
|
||||||
|
import kotlin.coroutines.resume
|
||||||
|
import kotlin.coroutines.suspendCoroutine
|
||||||
|
|
||||||
|
actual suspend fun execute(vararg command: String, directory: String?): Result = suspendCoroutine { continuation ->
|
||||||
|
val command = command.joinToString(" ") { """"$it"""" }
|
||||||
|
if (directory != null) {
|
||||||
|
chdir(directory)
|
||||||
|
}
|
||||||
|
val stream = popen(command, "r")!!
|
||||||
|
val value = stream.readLines().joinToString("")
|
||||||
|
val code = pclose(stream)
|
||||||
|
|
||||||
|
val result = Result.from(code, value)
|
||||||
|
continuation.resume(result)
|
||||||
|
}
|
||||||
20
src/mingwMain/kotlin/shell/Shell.mingw.kt
Normal file
20
src/mingwMain/kotlin/shell/Shell.mingw.kt
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
package com.infendro.shell
|
||||||
|
|
||||||
|
import platform.posix._pclose
|
||||||
|
import platform.posix._popen
|
||||||
|
import platform.posix.chdir
|
||||||
|
import kotlin.coroutines.resume
|
||||||
|
import kotlin.coroutines.suspendCoroutine
|
||||||
|
|
||||||
|
actual suspend fun execute(vararg command: String, directory: String?): Result = suspendCoroutine { continuation ->
|
||||||
|
val command = command.joinToString(" ") { """"$it"""" }
|
||||||
|
if (directory != null) {
|
||||||
|
chdir(directory)
|
||||||
|
}
|
||||||
|
val stream = _popen(command, "r")!!
|
||||||
|
val value = stream.readLines().joinToString("")
|
||||||
|
val code = _pclose(stream)
|
||||||
|
|
||||||
|
val result = Result.from(code, value)
|
||||||
|
continuation.resume(result)
|
||||||
|
}
|
||||||
17
src/nativeMain/kotlin/com.infendro.shell/C.kt
Normal file
17
src/nativeMain/kotlin/com.infendro.shell/C.kt
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
package com.infendro.shell
|
||||||
|
|
||||||
|
import kotlinx.cinterop.CPointer
|
||||||
|
import kotlinx.cinterop.refTo
|
||||||
|
import kotlinx.cinterop.toKString
|
||||||
|
import platform.posix.FILE
|
||||||
|
import platform.posix.fgets
|
||||||
|
|
||||||
|
internal fun CPointer<FILE>.readLines(): List<String> {
|
||||||
|
val lines = mutableListOf<String>()
|
||||||
|
val buffer = ByteArray(4096)
|
||||||
|
while (true) {
|
||||||
|
val line = fgets(buffer.refTo(0), buffer.size, this) ?: break
|
||||||
|
lines.add(line.toKString())
|
||||||
|
}
|
||||||
|
return lines
|
||||||
|
}
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
package com.infendro.shell
|
|
||||||
|
|
||||||
import kotlinx.cinterop.CPointer
|
|
||||||
import kotlinx.cinterop.ExperimentalForeignApi
|
|
||||||
import kotlinx.cinterop.refTo
|
|
||||||
import kotlinx.cinterop.toKString
|
|
||||||
import platform.posix.*
|
|
||||||
|
|
||||||
@ExperimentalForeignApi
|
|
||||||
internal actual suspend fun execute(
|
|
||||||
command: Array<String>,
|
|
||||||
directory: String?,
|
|
||||||
): Shell.Result {
|
|
||||||
val command = command.joinToString(" ") { "\"$it\"" }
|
|
||||||
if (directory != null) {
|
|
||||||
chdir(directory)
|
|
||||||
}
|
|
||||||
val stream = popen(command, "r")!!
|
|
||||||
val value = stream.readLines().joinToString("")
|
|
||||||
val code = pclose(stream)
|
|
||||||
return Shell.Result(code, value)
|
|
||||||
}
|
|
||||||
|
|
||||||
@ExperimentalForeignApi
|
|
||||||
private fun CPointer<FILE>.readLines(): List<String> {
|
|
||||||
val lines = mutableListOf<String>()
|
|
||||||
val buffer = ByteArray(4096)
|
|
||||||
while (true) {
|
|
||||||
val line = fgets(buffer.refTo(0), buffer.size, this)
|
|
||||||
if (line == null) break
|
|
||||||
lines.add(line.toKString())
|
|
||||||
}
|
|
||||||
return lines
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user