Display git commit info when available.

Closes #580.

Author: RubenVerborgh

bin/lib/start.js

@@ -3,7 +3,6 @@
 const options = require('./options')
 const fs = require('fs')
 const extend = require('extend')
-const packageJson = require('../../package.json')
 const colors = require('colors/safe')
 
 module.exports = function (program) {
@@ -24,7 +23,7 @@ module.exports = function (program) {
   start.option('-v, --verbose', 'Print the logs to console')
 
   start.action((opts) => {
-    let argv = extend({}, opts)
+    let argv = extend({}, opts, { version: program._version })
 
     fs.readFile(process.cwd() + '/config.json', (err, file) => {
       // No file exists, not a problem
@@ -131,7 +130,7 @@ function bin (argv) {
     return 1
   }
   app.listen(argv.port, function () {
-    console.log('Solid server (solid v' + packageJson.version + ') running on \u001b[4mhttps://localhost:' + argv.port + '/\u001b[0m')
+    console.log(`Solid server (${argv.version}) running on \u001b[4mhttps://localhost:${argv.port}/\u001b[0m`)
     console.log('Press <ctrl>+c to stop')
   })
 }

bin/solid

@@ -1,15 +1,27 @@
 #!/usr/bin/env node
 
-var program = require('commander')
-var packageJson = require('../package.json')
-var loadInit = require('./lib/init')
-var loadStart = require('./lib/start')
+const program = require('commander')
+const loadInit = require('./lib/init')
+const loadStart = require('./lib/start')
+const { spawnSync } = require('child_process')
 
-program
-  .version(packageJson.version)
+program.version(getVersion())
 
 loadInit(program)
 loadStart(program)
 
 program.parse(process.argv)
 if (program.args.length === 0) program.help()
+
+function getVersion () {
+  try {
+    // Obtain version from git
+    const options = { cwd: __dirname, encoding: 'utf8' }
+    const { stdout } = spawnSync('git', ['describe', '--tags'], options)
+    return stdout.trim()
+  } catch (e) {
+    // Obtain version from package.json
+    const { version } = require('../package.json')
+    return version
+  }
+}