feature/marge-mcsm

.github/workflows/deploy_maven_central.yml

@@ -16,17 +16,26 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
+      - name: Make gradlew executable
+        run: chmod +x ./gradlew
       - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@ccb4328a959376b642e027874838f60f8e596de3
+        uses: gradle/wrapper-validation-action@v1
+      - name: Restore gradle.properties
+        env:
+          GPG_PRIVATE_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
+          GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
+        run: |
+          echo "$GPG_PRIVATE_KEY" | base64 -d > kutil/sec.pem
+          echo "signing.keyId=ED76201E" >> ./gradle.properties
+          echo "signing.password=${GPG_PASSPHRASE}" >> ./gradle.properties
+          echo "signing.secretKeyRingFile=sec.pem" >> ./gradle.properties
       - name: Publish package
-        uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629
+        uses: gradle/gradle-build-action@v2
         with:
           arguments: publish
         env:
           MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-#          gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
-#          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
 ####

.github/workflows/test_on_push.yml

@@ -0,0 +1,29 @@
+name: run test
+
+on:
+  push:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Java
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+      - name: Make gradlew executable
+        run: chmod +x ./gradlew
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@v1
+      - name: run test
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: allTests
+        env:
+          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+####

.gitignore

@@ -18,7 +18,6 @@ out/
 *.ctxt
 
 # Package Files #
-*.jar
 *.war
 *.nar
 *.ear
@@ -127,4 +126,4 @@ run/
 /.idea/
 /log1/
 /log/
-/api/build/
+/*/build/

README.md

@@ -2,7 +2,7 @@
 
 ## About
 
-* javaのutility
+* kotlinのutility
 
 ## Use
 
@@ -11,20 +11,20 @@
         <dependency>
             <groupId>net.kigawa.kutil</groupId>
             <artifactId>kutil</artifactId>
-            <version>2.2.1</version>
+            <version>3.0.0</version>
         </dependency>
         ......
     </dependencies>
 ```
 
 ## Requirement
 
-* java
+* kotlin
 
 ## Author
 
 * kigawa
-    * kigawa.[email protected]
+    * contact@kigawa.net
 
 # Making
 

api/build.gradle.kts

@@ -3,4 +3,5 @@ plugins {
 }
 
 dependencies {
-}
+  commonMainImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
+}

api/src/commonMain/kotlin/net/kigawa/kutil/kutil/api/Func.kt

@@ -0,0 +1,10 @@
+package net.kigawa.kutil.kutil.api
+
+import kotlinx.coroutines.channels.Channel
+
+
+suspend inline fun <T> Channel<T>.forEach(func: (T) -> Unit) {
+  for (item in this) {
+    func(item)
+  }
+}

api/src/commonMain/kotlin/net/kigawa/kutil/kutil/api/Kutil.kt

@@ -0,0 +1,56 @@
+@file:Suppress("unused")
+
+package net.kigawa.kutil.kutil.api
+
+import net.kigawa.kutil.kutil.api.io.KuCloseable
+import net.kigawa.kutil.kutil.api.io.SuspendCloseable
+import kotlin.contracts.ExperimentalContracts
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
+
+@Suppress("unused")
+object Kutil {
+  fun fillStr(src: String, size: Int, fillChar: Char = ' '): String {
+    val sb = StringBuilder(size)
+    for (i in 0 until size) {
+      sb.append(src.getOrNull(i) ?: fillChar)
+    }
+    return sb.toString()
+  }
+
+}
+
+@OptIn(ExperimentalContracts::class)
+inline fun <T : KuCloseable, R> T.tryCatch(
+  block: (self: T) -> R,
+): R {
+  contract {
+    callsInPlace(block, InvocationKind.EXACTLY_ONCE)
+  }
+  try {
+    return block(this)
+  } catch (e: Throwable) {
+    throw e
+  } finally {
+    close()
+  }
+}
+
+@OptIn(ExperimentalContracts::class)
+suspend inline fun <T : KuCloseable, R> T.tryCatchSuspend(
+  block: (self: T) -> R,
+): R {
+  contract {
+    callsInPlace(block, InvocationKind.EXACTLY_ONCE)
+  }
+  try {
+    return block(this)
+  } catch (e: Throwable) {
+    throw e
+  } finally {
+    when (this) {
+      is SuspendCloseable -> suspendClose()
+      else -> close()
+    }
+  }
+}

api/src/commonMain/kotlin/net/kigawa/kutil/kutil/api/KutilArray.kt

@@ -0,0 +1,7 @@
+package net.kigawa.kutil.kutil.api
+
+/**
+ * utilities about array
+ */
+@Suppress("unused", "EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
+expect object KutilArray

api/src/commonMain/kotlin/net/kigawa/kutil/kutil/api/KutilFile.kt

@@ -0,0 +1,9 @@
+package net.kigawa.kutil.kutil.api
+
+/**
+ * utilities about file
+ */
+@Suppress("unused", "EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
+expect object KutilFile {
+
+}

api/src/commonMain/kotlin/net/kigawa/kutil/kutil/api/KutilPlatform.kt

@@ -0,0 +1,7 @@
+package net.kigawa.kutil.kutil.api
+
+@Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
+expect object KutilPlatform {
+  fun getSystemProperty(name: String): String
+  fun getEnv(name: String): String?
+}

api/src/commonMain/kotlin/net/kigawa/kutil/kutil/api/Option.kt

@@ -0,0 +1,10 @@
+package net.kigawa.kutil.kutil.api
+
+  @Suppress("unused")
+interface Option {
+  val name: String
+  val optName: String
+  val shortName: String?
+  val description: String
+  val defaultValue: String
+}

api/src/commonMain/kotlin/net/kigawa/kutil/kutil/api/OptionStore.kt

@@ -0,0 +1,16 @@
+package net.kigawa.kutil.kutil.api
+
+@Suppress("unused")
+class OptionStore {
+  private val options = mutableMapOf<Option, String>()
+
+  fun add(option: Option, value: String) {
+    options[option] = value
+  }
+
+
+  fun get(option: Option): String = options[option]
+    ?: KutilPlatform.getEnv(option.name)
+    ?: option.defaultValue
+
+}

api/src/commonMain/kotlin/net/kigawa/kutil/kutil/api/Paths.kt

@@ -0,0 +1,11 @@
+package net.kigawa.kutil.kutil.api
+
+import net.kigawa.kutil.kutil.api.io.fs.KuPath
+
+@Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
+expect enum class Paths {
+  JAVA
+  ;
+
+  val path: KuPath
+}

api/src/commonMain/kotlin/net/kigawa/kutil/kutil/api/PlatFormInstance.kt

@@ -0,0 +1,6 @@
+package net.kigawa.kutil.kutil.api
+
+@Suppress("unused")
+data class PlatFormInstance(
+  val exitProcess: (Int) -> Nothing,
+)

api/src/commonMain/kotlin/net/kigawa/kutil/kutil/api/SignalHandler.kt

@@ -0,0 +1,6 @@
+package net.kigawa.kutil.kutil.api
+
+@Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
+expect object SignalHandler {
+  fun shutdownHook(hook: () -> Unit)
+}