Merge pull request #6 from arxanas/master

arxanas updates

app.js

@@ -16,4 +16,4 @@ var server = http.createServer(function(req, res) {
 var eioServer = eio(server).on('connection', router)
 
 require('log-timestamp')
-console.log('Started up')
+console.log(`Started up ${CONFIG.VERSION}`)

config.server.js.default

@@ -1,5 +1,28 @@
+'use strict';
+
+const execSync = require('child_process').execSync
+
+let versionInfo = execSync('git describe --always --long')
+  .toString()
+  .trim()
+let versionInfoParts = versionInfo.split('-')
+
+const VERSION =
+  versionInfoParts.length === 3
+
+  // Show the number of commits past the most recent tag, and the commit hash
+  // identifier. For example, `v2.0.0+3 (123abc)` indicates three commits past
+  // version 2.0.0, at commit `123abc`. (In the `git-describe` output, there is
+  // always a `g` before the commit hash, which stands for 'git', so we remove
+  // that.)
+  ? `${versionInfoParts[0]}+${versionInfoParts[1]} (${versionInfoParts[2].slice(1)})`
+
+  // If there is no tag, just display the commit hash.
+  : versionInfo
+
 module.exports = {
   PORT: 1337,
+  VERSION,
   STRINGS: {
     BRANDING: {
       DEFAULT_USERNAME: 'ninja',

public/src/app.js

@@ -14,6 +14,7 @@ let App = {
     id: null,
     name: STRINGS.BRANDING.DEFAULT_USERNAME,
 
+    serverVersion: null,
     numUsers: 0,
     numPlayers: 0,
     numActiveGames: 0,

public/src/components/lobby.js

@@ -22,17 +22,7 @@ export default React.createClass({
         d.header({},
           d.h1({ className: 'lobby-header' },
             Spaced(...STRINGS.BRANDING.SITE_NAME))),
-
-        d.p({},
-          Spaced(
-            `${App.state.numUsers}
-            ${App.state.numUsers === 1 ? 'user' : 'users'}
-            connected`,
-            `${App.state.numPlayers}
-            ${App.state.numPlayers === 1 ? 'player' : 'players'}
-            playing
-            ${App.state.numActiveGames}
-            ${App.state.numActiveGames === 1 ? 'game' : 'games'}`)),
+        ServerInfo(),
         d.p({ className: 'error' }, App.err),
         Create(),
         Join(),
@@ -98,6 +88,27 @@ function Motd() {
       d.div({}, motd))
 }
 
+function ServerInfo() {
+  let numUsers =
+    `${App.state.numUsers}
+    ${App.state.numUsers === 1 ? 'user' : 'users'}
+    connected`
+
+  let numPlayers =
+    `${App.state.numPlayers}
+    ${App.state.numPlayers === 1 ? 'player' : 'players'}
+    playing
+    ${App.state.numActiveGames}
+    ${App.state.numActiveGames === 1 ? 'game' : 'games'}`
+
+  let serverVersion =
+    App.state.serverVersion
+    ? `Running ${App.state.serverVersion}`
+    : null
+
+  return d.p({}, Spaced(...[numUsers, numPlayers, serverVersion]))
+}
+
 function Create() {
   let seats = _.seq(100, 2).map(x =>
     d.option({}, x))

public/src/components/spacer.js

@@ -1,6 +1,8 @@
 let d = React.DOM
 
 export function Spaced(...elements) {
+  elements = elements.filter(x => x)
+
   let parts = []
   for (let part of elements) {
     parts.push(d.span({}, part))

src/router.js

@@ -1,4 +1,4 @@
-const {MOTD} = require('../config.server')
+const {VERSION} = require('../config.server')
 var Game = require('./game')
 var Room = require('./room')
 var Sock = require('./sock')
@@ -40,5 +40,5 @@ module.exports = function (ws) {
   sock.on('create', create)
 
   Game.broadcastGameInfo()
-  sock.send('set', { motd: MOTD })
+  sock.send('set', { serverVersion: VERSION })
 }