Add short commit hash

Author: alancai98

build.gradle

@@ -97,19 +97,32 @@ subprojects {
             test.kotlin.srcDirs = ["test"]
 
             main {
-                output.dir(generatedVersionDir, builtBy: 'generateVersionProperties')
+                output.dir(generatedVersionDir, builtBy: 'generateVersionAndHashProperties')
             }
         }
-        task generateVersionProperties {
+
+        // generates a build properties file with the current PartiQL version and most recent commit hash
+        task generateVersionAndHashProperties {
             doLast {
-                def propertiesFile = file "$generatedVersionDir/version.properties"
+                def propertiesFile = file "$generatedVersionDir/partiql.properties"
                 propertiesFile.parentFile.mkdirs()
                 def properties = new Properties()
+
+                // get current PartiQL version
                 properties.setProperty("version", version.toString())
+
+                // get most recent short commit hash
+                def commitHash = new ByteArrayOutputStream()
+                exec {
+                    commandLine 'git', 'rev-parse', '--short', 'HEAD'
+                    standardOutput = commitHash
+                }
+                properties.setProperty("commit", commitHash.toString().trim())
+
                 propertiesFile.withWriter { properties.store(it, null) }
             }
         }
-        processResources.dependsOn generateVersionProperties
+        processResources.dependsOn generateVersionAndHashProperties
     })
 
 }

cli/src/org/partiql/cli/Repl.kt

@@ -191,14 +191,14 @@ internal class Repl(private val valueFactory: ExprValueFactory,
         outputWriter.write("\n")
     }
 
-    fun retrievePartiQLVersion(): String {
-        val versionProperties = Properties()
-        versionProperties.load(this.javaClass.getResourceAsStream("/version.properties"))
-        return versionProperties.getProperty("version")
+    fun retrievePartiQLVersionAndHash(): String {
+        val properties = Properties()
+        properties.load(this.javaClass.getResourceAsStream("/partiql.properties"))
+        return "${properties.getProperty("version")}-${properties.getProperty("commit")}"
     }
 
     private fun printVersionNumber() {
-        outputWriter.write("Using version: ${retrievePartiQLVersion()}")
+        outputWriter.write("Using version: ${retrievePartiQLVersionAndHash()}")
         outputWriter.write("\n")
     }
 

cli/test/org/partiql/cli/ReplTest.kt

@@ -79,7 +79,7 @@ private class ReplTester(bindings: Bindings<ExprValue> = Bindings.empty()) {
 
     private val repl = Repl(valueFactory, input, output, parser, compiler, bindings, zeroTimer)
 
-    val partiqlVersion = repl.retrievePartiQLVersion()
+    val partiqlVersionAndHash = repl.retrievePartiQLVersionAndHash()
 
     private val actualReplPrompt = StringBuilder()
 
@@ -150,13 +150,13 @@ private class ReplTester(bindings: Bindings<ExprValue> = Bindings.empty()) {
 
 @Ignore("https://github.com/partiql/partiql-lang-kotlin/issues/266")
 class ReplTest {
-    private val partiqlVersion = ReplTester().partiqlVersion
+    private val partiqlVersionAndHash = ReplTester().partiqlVersionAndHash
 
     @Test
     fun singleQuery() {
         ReplTester().assertReplPrompt("""
             #Welcome to the PartiQL REPL!
-            #Using version: $partiqlVersion
+            #Using version: $partiqlVersionAndHash
             #PartiQL> 1+1
             #   | 
             #===' 
@@ -171,7 +171,7 @@ class ReplTest {
     fun querySemiColon() {
         ReplTester().assertReplPrompt("""
             #Welcome to the PartiQL REPL!
-            #Using version: $partiqlVersion
+            #Using version: $partiqlVersionAndHash
             #PartiQL> 1+1;
             #===' 
             #2
@@ -185,7 +185,7 @@ class ReplTest {
     fun multipleQuery() {
         ReplTester().assertReplPrompt("""
             #Welcome to the PartiQL REPL!
-            #Using version: $partiqlVersion
+            #Using version: $partiqlVersionAndHash
             #PartiQL> 1 + 1
             #   | 
             #===' 
@@ -207,7 +207,7 @@ class ReplTest {
     fun astWithoutMetas() {
         ReplTester().assertReplPrompt("""
             #Welcome to the PartiQL REPL!
-            #Using version: $partiqlVersion
+            #Using version: $partiqlVersionAndHash
             #PartiQL> 1 + 1
             #   | !!
             #===' 
@@ -236,7 +236,7 @@ class ReplTest {
     fun addToGlobalEnvAndQuery() {
         ReplTester().assertReplPrompt("""
             #Welcome to the PartiQL REPL!
-            #Using version: $partiqlVersion
+            #Using version: $partiqlVersionAndHash
             #PartiQL> !add_to_global_env {'myTable': <<{'a':1}, {'a': 2}>>}
             #   | 
             #===' 
@@ -279,7 +279,7 @@ class ReplTest {
 
         ReplTester(initialBindings).assertReplPrompt("""
             #Welcome to the PartiQL REPL!
-            #Using version: $partiqlVersion
+            #Using version: $partiqlVersionAndHash
             #PartiQL> !global_env
             #   | 
             #===' 
@@ -300,7 +300,7 @@ class ReplTest {
     fun dumpEmptyInitialEnv() {
         ReplTester().assertReplPrompt("""
             #Welcome to the PartiQL REPL!
-            #Using version: $partiqlVersion
+            #Using version: $partiqlVersionAndHash
             #PartiQL> !global_env
             #   | 
             #===' 
@@ -315,7 +315,7 @@ class ReplTest {
     fun dumpEnvAfterAltering() {
         ReplTester().assertReplPrompt("""
             #Welcome to the PartiQL REPL!
-            #Using version: $partiqlVersion
+            #Using version: $partiqlVersionAndHash
             #PartiQL> !add_to_global_env {'myTable': <<{'a':1}, {'a': 2}>>}
             #   | 
             #===' 
@@ -354,7 +354,7 @@ class ReplTest {
     fun listCommands() {
         ReplTester().assertReplPrompt("""
             #Welcome to the PartiQL REPL!
-            #Using version: $partiqlVersion
+            #Using version: $partiqlVersionAndHash
             #PartiQL> !list_commands
             #   | 
             #