Fix #73

Kotlin · May 18, 2021 · 2e98ee5 · 2e98ee5
1 parent e29513d
commit 2e98ee5
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 5 deletions.
diff --git a/ki-shell/pom.xml b/ki-shell/pom.xml
@@ -91,6 +91,7 @@
     <resources>
       <resource>
         <directory>${project.basedir}/src/main/resources</directory>
+        <filtering>true</filtering>
       </resource>
     </resources>
     <plugins>

diff --git a/ki-shell/src/main/kotlin/org/jetbrains/kotlinx/ki/shell/ApplicationProperties.kt b/ki-shell/src/main/kotlin/org/jetbrains/kotlinx/ki/shell/ApplicationProperties.kt
@@ -0,0 +1,21 @@
+package org.jetbrains.kotlinx.ki.shell
+
+import java.util.*
+import kotlin.NoSuchElementException
+
+object ApplicationProperties {
+    private val props: Properties = Properties()
+
+    val version: String
+        get() = get("project.version")
+
+    fun get(key: String): String {
+        if (props.isEmpty) {
+            val inputStream = javaClass.getResourceAsStream("/application.properties")
+            inputStream.use {
+                props.load(inputStream)
+            }
+        }
+        return props.getProperty(key) ?: throw NoSuchElementException(key)
+    }
+}
diff --git a/ki-shell/src/main/kotlin/org/jetbrains/kotlinx/ki/shell/KotlinShell.kt b/ki-shell/src/main/kotlin/org/jetbrains/kotlinx/ki/shell/KotlinShell.kt
@@ -1,5 +1,8 @@
 package org.jetbrains.kotlinx.ki.shell
 
+import kotlinx.cli.CommandLineInterface
+import kotlinx.cli.flagArgument
+import kotlinx.cli.parse
 import org.jetbrains.kotlinx.ki.shell.configuration.CachedInstance
 import org.jetbrains.kotlinx.ki.shell.configuration.ReplConfiguration
 import org.jetbrains.kotlinx.ki.shell.configuration.ReplConfigurationBase
@@ -11,8 +14,18 @@ import kotlin.script.experimental.jvm.dependenciesFromClassloader
 import kotlin.script.experimental.jvm.jvm
 
 object KotlinShell {
+    private val cli = CommandLineInterface("ki", printHelpByDefault = false)
+    private val version by cli.flagArgument("--version", "Print version")
+
     @JvmStatic
     fun main(args: Array<String>) {
+        cli.parse(args)
+
+        if (version) {
+            printVersion()
+            return
+        }
+
         val repl = Shell(
             configuration(),
             defaultJvmScriptingHostConfiguration,

diff --git a/ki-shell/src/main/kotlin/org/jetbrains/kotlinx/ki/shell/Shell.kt b/ki-shell/src/main/kotlin/org/jetbrains/kotlinx/ki/shell/Shell.kt
@@ -321,13 +321,9 @@ open class Shell(val replConfiguration: ReplConfiguration,
     }
 
     private fun sayHello() {
-        println("ki-shell $VERSION/${KotlinVersion.CURRENT}")
+        printVersion()
         replConfiguration.plugins().forEach { it.sayHello() }
     }
-
-    companion object {
-        const val VERSION: String = "0.3"
-    }
 }
 
 class OnCompile(private val data: LinkedSnippet<KJvmCompiledScript>) : Event<LinkedSnippet<KJvmCompiledScript>> {

diff --git a/ki-shell/src/main/kotlin/org/jetbrains/kotlinx/ki/shell/Util.kt b/ki-shell/src/main/kotlin/org/jetbrains/kotlinx/ki/shell/Util.kt
@@ -4,6 +4,10 @@ import java.io.File
 import java.util.*
 import java.util.regex.Pattern
 
+fun printVersion() {
+    val version = ApplicationProperties.version
+    println("ki-shell $version/${KotlinVersion.CURRENT}")
+}
 
 fun calcHumanReadableSize(bytes: Long, si: Boolean = false): String {
     val unit = if (si) 1000 else 1024

diff --git a/ki-shell/src/main/resources/application.properties b/ki-shell/src/main/resources/application.properties
@@ -0,0 +1 @@
+project.version=${project.version}