Merge pull request #36 from VisualTesting/feature/config

Enabling App and Project base configuration

Author: elicwhite

.jscsrc

@@ -37,11 +37,14 @@
   "requireCapitalizedConstructors": true,
   "requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch"],
   "requireDotNotation": true,
+  "requireFunctionDeclarations": true,
   "requireLineFeedAtFileEnd": true,
   "requireSpaceBeforeBinaryOperators": ["?", "+", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
   "requireSpaceAfterBinaryOperators": ["?", "+", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
   "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try"],
   "requirePaddingNewLinesInObjects": true,
+  "requirePaddingNewLinesAfterBlocks": true,
+  "requirePaddingNewLinesBeforeLineComments": true,
   "requireParenthesesAroundIIFE": true,
   "requireSpacesInConditionalExpression": true,
   "requireCommaBeforeLineBreak": true,
@@ -50,5 +53,9 @@
   "validateJSDoc": {
     "checkParamNames": true,
     "requireParamTypes": true
+  },
+  "validateQuoteMarks": {
+    "mark": "'",
+    "escape": true
   }
 }

.jshintrc

@@ -12,7 +12,6 @@
     "noarg": true,
     "nonbsp": true,
     "nonew": true,
-    "quotmark": "single",
     "regexp": true,
     "undef": true,
     "unused": true,

Gruntfile.js

@@ -15,7 +15,8 @@ module.exports = function(grunt) {
       express: {
         files: [
           'server.js',
-          'server/**/*.{js,json}'
+          'server/**/*.{js,json}',
+          'visualtesting.conf.js'
         ],
         tasks: ['express:dev'],
         options: {

package.json

@@ -12,15 +12,16 @@
     "github": "^0.2.3",
     "grunt-cli": "^0.1.13",
     "grunt-express-server": "~0.4.5",
+    "keymirror": "^0.1.1",
     "load-grunt-tasks": "~3.1.0",
+    "merge": "^1.2.0",
     "method-override": "~2.3.1",
     "morgan": "~1.5.1",
     "multer": "^0.1.8",
     "node-resemble-js": "0.0.4",
     "node-uuid": "^1.4.2",
     "pngjs-image": "^0.9.3",
     "recursive-readdir": "^1.2.1",
-    "symbol": "^0.2.1",
     "tar.gz": "^0.1.1"
   },
   "devDependencies": {

server.js

@@ -1,13 +1,11 @@
 'use strict';
 
-var app = require('./server/app');
+var App = require('./server/app');
+var app = new App();
 
-var config = {};
+var Configuration = require('./server/configuration');
+var config = new Configuration();
+require('./visualtesting.conf.js')(config);
 
-config.ip = '0.0.0.0';
-config.port = '9000';
-
-// Start server
-app.listen(config.port, config.ip, function() {
-  console.log('Express server listening on %s:%d, in %s mode', config.ip, config.port, app.get('env'));
-});
+app.useConfiguration(config);
+app.start();

server/actions.js

@@ -1,12 +1,44 @@
 'use strict';
 
+var assert = require('chai').assert;
 var dispatcher = require('./dispatcher');
 var constants = require('./constants');
 
 var Actions = {
-  diffSha: function(sha) {
+  diffSha: function(options) {
+    assert.isObject(options);
+    assert.isString(options.project);
+    assert.isString(options.sha);
+
     dispatcher.emit(constants.diffSha, {
-      sha: sha
+      project: options.project,
+      sha: options.sha
+    });
+  },
+
+  setBuildStatus: function(options) {
+    assert.isObject(options);
+    assert.isString(options.project);
+    assert.isString(options.sha);
+    assert.isString(options.status);
+
+    dispatcher.emit(constants.setBuildStatus, {
+      project: options.project,
+      sha: options.sha,
+      status: options.status
+    });
+  },
+
+  addComment: function(options) {
+    assert.isObject(options);
+    assert.isString(options.project);
+    assert.isString(options.sha);
+    assert.isString(options.comment);
+
+    dispatcher.emit(constants.SERVICE_ADD_COMMENT, {
+      project: options.project,
+      sha: options.sha,
+      comment: options.comment
     });
   }
 };

server/app.js

@@ -3,28 +3,73 @@
 var express = require('express');
 var errorHandler = require('errorhandler');
 
-process.env.NODE_ENV = process.env.NODE_ENV || 'development';
+var Api = require('./controllers/api');
 
-var app = express();
+var config;
 
-app.use(function(req, res, next) {
-  res.header('Access-Control-Allow-Origin', '*');
-  res.header('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept');
-  next();
-});
+var instance;
 
-require('./config/express')(app);
-require('./routes')(app);
-require('./checkBuild');
-
-// Error handler - has to be last
-if (app.get('env') !== 'production') {
-  app.use(errorHandler({
+function setErrorHandler() {
+  instance.use(errorHandler({
     log: function(err, str, req) {
       console.error('Error in', req.method, req.url, err);
       console.error(str);
     }
   }));
 }
 
-module.exports = app;
+function App() {
+  process.env.NODE_ENV = process.env.NODE_ENV || 'development';
+
+  instance = express();
+
+  instance.use(function(req, res, next) {
+    res.header('Access-Control-Allow-Origin', '*');
+    res.header('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept');
+    next();
+  });
+
+  require('./config/express')(instance);
+}
+
+App.prototype = {
+  useConfiguration: function(newConfig) {
+    config = newConfig;
+
+    require('./routes')({
+      app: instance,
+      api: new Api(config)
+    });
+
+    var CheckBuild = require('./checkBuild');
+    var checkBuild = new CheckBuild(config);
+    checkBuild.register();
+
+    var ServiceListener = require('./serviceListener');
+    var serviceListener = new ServiceListener(config);
+    serviceListener.register();
+
+    if (instance.get('env') !== 'production') {
+      setErrorHandler();
+    }
+  },
+
+  start: function() {
+    var ip = config.getIp();
+    var port = config.getPort();
+
+    instance.listen(port, ip, function() {
+      console.log('Express server listening on %s:%d, in %s mode', ip, port, instance.get('env'));
+    });
+  }
+};
+
+if (process.env.NODE_ENV === 'test') {
+  Object.defineProperty(App.prototype, '_instance', {
+    get: function() {
+      return instance;
+    }
+  });
+}
+
+module.exports = App;