Merge branch 'test'

Author: BppleMan

.idea/kommand.iml

@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "com.kgit2"
-version = "2.0.2"
+version = "2.1.0"
 
 repositories {
     mavenCentral()

.idea/material_theme_project_new.xml

@@ -6,7 +6,7 @@ prepare:
     brew install x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu
 
 leaks:
-    cargo build
+    cargo build --package kommand-core --package kommand-echo
     leaks -atExit -- target/debug/leaks_test
 
 bench:

.idea/modules.xml

@@ -5,6 +5,7 @@ use kommand_core::io::{drop_stdout, read_line_stdout};
 use kommand_core::process::{buffered_stdout_child, Stdio};
 use kommand_core::process::{drop_child, wait_child};
 use kommand_core::process::{drop_command, new_command, spawn_command, stdout_command};
+use kommand_core::result::ErrorType;
 
 fn main() {
     unsafe {
@@ -31,7 +32,10 @@ fn main() {
                 let line = if !result.ok.is_null() {
                     into_string(result.ok as *mut c_char)
                 } else {
-                    panic!("{}", into_string(result.err))
+                    match result.error_type {
+                        ErrorType::None => String::new(),
+                        _ => panic!("{}", into_string(result.err)),
+                    }
                 };
                 println!("[{i}] line {}", line);
                 if line.is_empty() {

build.gradle.kts

@@ -12,10 +12,14 @@ expect class Command(command: String) {
 
     fun args(args: List<String>): Command
 
+    fun args(vararg args: String): Command
+
     fun env(key: String, value: String): Command
 
     fun envs(envs: Map<String, String>): Command
 
+    fun envs(vararg envs: Pair<String, String>): Command
+
     fun removeEnv(key: String): Command
 
     fun envClear(): Command

kommand-core/.idea/material_theme_project_new.xml

@@ -30,6 +30,11 @@ actual class Command(
         return this
     }
 
+    actual fun args(vararg args: String): Command {
+        builder.command().addAll(args)
+        return this
+    }
+
     actual fun env(key: String, value: String): Command {
         builder.environment()[key] = value
         return this
@@ -40,6 +45,11 @@ actual class Command(
         return this
     }
 
+    actual fun envs(vararg envs: Pair<String, String>): Command {
+        builder.environment().putAll(envs)
+        return this
+    }
+
     actual fun removeEnv(key: String): Command {
         builder.environment().remove(key)
         return this

kommand-core/justfile

@@ -1,5 +1,5 @@
 headers = kommand_core.h
 staticLibraries = libkommand_core.a
 compilerOpts = -Ikommand-core
-linkerOpts = -static -lws2_32 -lbcrypt -luserenv -lntdll -v
+linkerOpts = -static -lws2_32 -lbcrypt -luserenv -lntdll -lstdc++ -v
 libraryPaths = kommand-core/target/x86_64-pc-windows-gnu/release

kommand-core/src/bin/leaks_test.rs

@@ -52,6 +52,13 @@ actual class Command(
         return this
     }
 
+    actual fun args(vararg args: String): Command {
+        for (arg in args) {
+            arg_command(inner, arg)
+        }
+        return this
+    }
+
     actual fun env(key: String, value: String): Command {
         env_command(inner, key, value)
         return this
@@ -64,6 +71,13 @@ actual class Command(
         return this
     }
 
+    actual fun envs(vararg envs: Pair<String, String>): Command {
+        for ((key, value) in envs) {
+            env_command(inner, key, value)
+        }
+        return this
+    }
+
     actual fun removeEnv(key: String): Command {
         remove_env_command(inner, key)
         return this