First crack at fixing #64

app.js

@@ -22,3 +22,4 @@ serverController.addEndpoint('/api*', new APIController(
 ));
 // The static page controller serves the basic form of the pages
 serverController.addEndpoint('/*', new StaticPageController());
+serverController.startServer(process.env.PORT);

gulp-tasks/nodemon.js

@@ -1,7 +1,18 @@
 var gulp = require('gulp');
 var nodemon = require('gulp-nodemon');
+var env = require('gulp-env');
 
 gulp.task('nodemon', function() {
+  const PROD_PORT = 8080;
+  const DEV_PORT = 8081;
+  // This results in different ports for prod and dev
+  var port = (GLOBAL.config.env === 'prod') ? PROD_PORT : DEV_PORT;
+  env({
+    vars: {
+      PORT: port
+    }
+  });
+
   return nodemon({
     script: 'app.js'
   });

package.json

@@ -25,6 +25,7 @@
     "gulp": "^3.9.0",
     "gulp-autoprefixer": "^3.1.0",
     "gulp-bump": "^1.0.0",
+    "gulp-env": "^0.2.0",
     "gulp-eslint": "^1.0.0",
     "gulp-if": "^2.0.0",
     "gulp-imagemin": "^2.3.0",

server/controllers/server-controller.js

@@ -9,12 +9,26 @@ function ServerController() {
     layoutsDir: path.join(__dirname, '/../views/layouts'),
     partialsDir: path.join(__dirname, '/../views/partials')
   });
-  var expressServer = this.setUpServer(expressApp, handleBarsInstance);
+
+  // Set up the use of handle bars and set the path for views and layouts
+  expressApp.set('views', path.join(__dirname, '/../views'));
+  expressApp.engine('handlebars', handleBarsInstance.engine);
+  expressApp.set('view engine', 'handlebars');
+
+  // Define static assets path - i.e. styles, scripts etc.
+  expressApp.use('/',
+    express.static(path.join(__dirname + '/../../dist/')));
+
+  var expressServer = null;
 
   this.getExpressApp = function() {
     return expressApp;
   };
 
+  this.setExpressServer = function(server) {
+    expressServer = server;
+  };
+
   this.getExpressServer = function() {
     return expressServer;
   };
@@ -24,18 +38,12 @@ function ServerController() {
   };
 }
 
-ServerController.prototype.setUpServer = function(app, handleBarsInstance) {
-  // Set up the use of handle bars and set the path for views and layouts
-  app.set('views', path.join(__dirname, '/../views'));
-  app.engine('handlebars', handleBarsInstance.engine);
-  app.set('view engine', 'handlebars');
-
-  // Define static assets path - i.e. styles, scripts etc.
-  app.use('/',
-    express.static(path.join(__dirname + '/../../dist/')));
-
-  console.log('Starting server on 8080');
-  return app.listen('8080');
+ServerController.prototype.startServer = function(port) {
+  var server = this.getExpressApp().listen(port, () => {
+    var serverPort = server.address().port;
+    console.log('Server running on port ' + serverPort);
+  });
+  this.setExpressServer(server);
 };
 
 ServerController.prototype.addEndpoint = function(endpoint, controller) {