added mordant + renamed Terminal.kt to CLI.kt

BLUEAMETHYST-Studios · May 21, 2024 · a2cd4ef · a2cd4ef
1 parent e466f54
commit a2cd4ef
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -14,6 +14,8 @@ dependencies {
     implementation(libs.bundles.ktorClient)
     implementation(libs.guice)
     implementation(libs.clikt)
+    implementation(libs.mordant)
+    implementation(libs.mordantCoroutines)
     implementation(kotlin("reflect"))
 }
 

diff --git a/.../bluecloud/common/console/cli/Terminal.kt → ...thyst/bluecloud/common/console/cli/CLI.kt b/.../bluecloud/common/console/cli/Terminal.kt → ...thyst/bluecloud/common/console/cli/CLI.kt
@@ -6,11 +6,11 @@ import me.blueamethyst.bluecloud.common.console.Logger
 import me.blueamethyst.bluecloud.common.console.cli.command.RootCommand
 import java.io.Closeable
 
-class Terminal(
+class CLI(
     private val logger: Logger,
     private val prompt: String,
     val subCommands: List<CliktCommand>
-): Thread(), Closeable {
+): Thread("cli-thread"), Closeable {
 
     var running = false; private set
 

diff --git a/common/src/test/kotlin/ConsoleTest.kt b/common/src/test/kotlin/ConsoleTest.kt
@@ -1,19 +1,18 @@
 import com.github.ajalt.clikt.core.CliktCommand
 import me.blueamethyst.bluecloud.common.console.ConsoleColors
 import me.blueamethyst.bluecloud.common.console.Logger
-import me.blueamethyst.bluecloud.common.console.cli.Terminal
-import java.net.InetAddress
+import me.blueamethyst.bluecloud.common.console.cli.CLI
 
 fun main() {
-    val terminal = Terminal(
+    val cli = CLI(
         Logger("Terminal", true),
         "${ConsoleColors.YELLOW_BRIGHT}CLI${ConsoleColors.BLACK_BRIGHT}@${ConsoleColors.BLUE_BRIGHT}BlueCloud ${ConsoleColors.BLACK_BRIGHT}» ${ConsoleColors.RESET}",
         listOf(
             MySubcommand()
         )
     )
 
-    terminal.start()
+    cli.start()
 
     while (true) {
         Thread.sleep(1000)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,6 +4,7 @@ guice = "7.0.0"
 ktor = "2.3.11"
 kotlinx-serialization = "1.6.3"
 clikt = "4.4.0"
+mordant = "2.6.0"
 
 [libraries]
 kotlinxCoroutinesCore = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesCore" }
@@ -15,6 +16,8 @@ ktor-client-cio = { group = "io.ktor", name = "ktor-client-cio", version.ref = "
 ktor-client-content-negotiation = { group = "io.ktor", name = "ktor-client-content-negotiation", version.ref = "ktor" }
 ktor-serialization-kotlinx-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor" }
 clikt = { group = "com.github.ajalt.clikt", name = "clikt", version.ref = "clikt" }
+mordant = { group = "com.github.ajalt.mordant", name = "mordant", version.ref = "mordant" }
+mordantCoroutines = { group = "com.github.ajalt.mordant", name = "mordant-coroutines", version.ref = "mordant" }
 
 [bundles]
 ktorClient = ["ktor-client-core", "ktor-client-cio", "ktor-client-content-negotiation", "ktor-serialization-kotlinx-json"]
diff --git a/runner/src/test/kotlin/Test.kt b/runner/src/test/kotlin/Test.kt
@@ -1,7 +1,3 @@
-import me.blueamethyst.bluecloud.api.service.ICloudService
-import me.blueamethyst.bluecloud.runner.ProcessRegistry
-import java.util.*
-
 /*
 fun main() {
     val call = ProcessRegistry().getServiceProcess("jvm")!!.constructors.firstOrNull()!!.call()

diff --git a/wrapper/src/main/kotlin/me/blueamethyst/bluecloud/wrapper/logic/WrapperWatcher.kt b/wrapper/src/main/kotlin/me/blueamethyst/bluecloud/wrapper/logic/WrapperWatcher.kt
@@ -1,10 +1,10 @@
 package me.blueamethyst.bluecloud.wrapper.logic
 
 import me.blueamethyst.bluecloud.api.annontations.InternalBlueCloudApi
-import me.blueamethyst.bluecloud.wrapper.logic.WrapperQueue as Queue
-import me.blueamethyst.bluecloud.wrapper.logic.WrapperServiceProcessor as ServiceProcessor
 import me.blueamethyst.bluecloud.wrapper.Wrapper.Companion.logger
 import java.io.Closeable
+import me.blueamethyst.bluecloud.wrapper.logic.WrapperQueue as Queue
+import me.blueamethyst.bluecloud.wrapper.logic.WrapperServiceProcessor as ServiceProcessor
 
 @InternalBlueCloudApi
 class WrapperWatcher: Thread("wrapper-watcher"), Closeable {