Added jshint

frontend/src/js/app.js

@@ -2,7 +2,8 @@ var MINI = require('minified');
 var _=MINI._, $=MINI.$, $$=MINI.$$, EE=MINI.EE, HTML=MINI.HTML;
 
 $.ready(function() {
-
+  "use strict";
+
   // expandable/collapsible content sections
   $('.expandable').each(function(elem) {
     var collapsed = $('.collapsed', elem)[0];

gulpfile.js

@@ -7,6 +7,7 @@ var clean = require('gulp-clean');
 var concat = require('gulp-concat');
 var nib = require('nib');
 var stylus = require('gulp-stylus');
+var jshint = require('gulp-jshint');
 var minifyCSS = require('gulp-minify-css');
 var uglify = require('gulp-uglify');
 var gzip = require('gulp-gzip');
@@ -21,11 +22,13 @@ var paths = {
   stylusSrcFilesWatch: './frontend/src/stylus/*.styl',
   cssBuildFolder: './frontend/build/css',
 
-  jsHeadFiles: [
-    './frontend/src/bower/pace/pace.js',
+  jsServerFiles: [
+    './src/**/*.js',
   ],
-  jsAppFiles: [
+  jsLibFiles: [
     './frontend/src/bower/minified/dist/minified-web-src.js',
+  ],
+  jsAppFiles: [
     './frontend/src/js/**/*.js',
   ],
   jsAppFilesWatch: './frontend/src/js/**/*.js',
@@ -61,9 +64,26 @@ gulp.task('css', function () {
 });
 
 
+gulp.task('jshint-backend', function() {
+  return gulp.src(paths.jsServerFiles)
+    .pipe(jshint())
+    .pipe(jshint.reporter('default'))
+    .pipe(jshint.reporter('fail'))
+  ;
+});
+
+
+gulp.task('jshint-frontend', function() {
+  return gulp.src(paths.jsAppFiles)
+    .pipe(jshint())
+    .pipe(jshint.reporter('default'))
+    .pipe(jshint.reporter('fail'))
+  ;
+});
+
 
-gulp.task('js', function() {
-  return gulp.src( paths.jsAppFiles )
+gulp.task('js', ['jshint-frontend'], function() {
+  return gulp.src( [].concat(paths.jsLibFiles, paths.jsAppFiles) )
     .pipe( concat('app.js') )
     .pipe( uglify() )
     .pipe( gulp.dest(paths.jsBuildFolder) )
@@ -83,7 +103,7 @@ gulp.task('watch', ['css', 'js'], function() {
 
 
 
-gulp.task('build', ['css', 'js']);
+gulp.task('build', ['css', 'jshint-backend', 'js']);
 
 
 gulp.task('verify_build', function() {

package.json

@@ -48,6 +48,7 @@
     "gulp-expect-file": "0.0.6",
     "gulp-debug": "~0.3.0",
     "gulp": "~3.8.0",
-    "gulp-stylus": "~1.0.2"
+    "gulp-stylus": "~1.0.2",
+    "gulp-jshint": "~1.6.3"
   }
 }

src/controllers/jobs.js

@@ -1,3 +1,6 @@
+"use strict";
+
+
 var waigo = require('waigo');
 
 var errors = waigo.load('support/errors');
@@ -8,7 +11,9 @@ exports.view = function*() {
 
   var job = yield this.app.models.Job.getOne(jobId);
 
-  if (!job) throw new errors.RuntimeError('Job not found');
+  if (!job) {
+    throw new errors.RuntimeError('Job not found');
+  }
 
   var logs = yield this.app.models.Log.getForJob(jobId);
 

src/controllers/logs.js

@@ -1,3 +1,5 @@
+"use strict";
+
 exports.index = function*() {
   var logs = yield this.app.models.Log.getRecent(1000);
 

src/controllers/playbooks.js

@@ -1,3 +1,6 @@
+"use strict";
+
+
 var _ = require('lodash'),
   thunkify = require('thunkify'),
   waigo = require('waigo');
@@ -106,7 +109,7 @@ exports.addTrigger_getStep2 = function*() {
   var addTriggerForm = Form.new('addTrigger');
   addTriggerForm.state = this.session.createTriggerFormState;
 
-  var triggerType = new this.app.triggerTypes[addTriggerForm.fields.type.value];
+  var triggerType = new this.app.triggerTypes[addTriggerForm.fields.type.value]();
 
   var paramsForm = triggerType.getConfigParamsForm();
 
@@ -129,7 +132,7 @@ exports.addTrigger_submitStep2 = function*() {
   var addTriggerForm = Form.new('addTrigger');
   addTriggerForm.state = this.session.createTriggerFormState;
 
-  var triggerType = new this.app.triggerTypes[addTriggerForm.fields.type.value];
+  var triggerType = new this.app.triggerTypes[addTriggerForm.fields.type.value]();
 
   var paramsForm = triggerType.getConfigParamsForm();
 

src/controllers/triggers.js

@@ -1,3 +1,6 @@
+"use strict";
+
+
 var thunkify = require('thunkify'),
   waigo = require('waigo');
 
@@ -22,7 +25,9 @@ exports.view = function*() {
 
   var trigger = yield this.app.models.Trigger.getOne(triggerId);
 
-  if (!trigger) throw new errors.RuntimeError('Trigger not found');
+  if (!trigger) {
+    throw new errors.RuntimeError('Trigger not found');
+  }
 
   var jobs = yield this.app.models.Job.getForTrigger(triggerId);
 
@@ -39,7 +44,9 @@ exports.delete = function*() {
 
   var trigger = yield this.app.models.Trigger.getOne(triggerId);
 
-  if (!trigger) throw new errors.RuntimeError('Trigger not found');
+  if (!trigger) {
+    throw new errors.RuntimeError('Trigger not found');
+  }
 
   // remove
   yield this.app.models.Log.remove({trigger: triggerId}).exec()
@@ -57,7 +64,9 @@ exports.invoke = function*() {
 
   var trigger = yield this.app.models.Trigger.getOne(triggerId);
 
-  if (!trigger) throw new errors.RuntimeError('Trigger not found');
+  if (!trigger) {
+    throw new errors.RuntimeError('Trigger not found');
+  }
 
   var job = new this.app.models.Job({
     trigger: trigger._id,

src/forms/addTrigger.js

@@ -1,3 +1,6 @@
+"use strict";
+
+
 var _ = require('lodash'),
   path = require('path'),
   waigo = require('waigo');

src/models/job.js

@@ -48,12 +48,12 @@ jobSchema.method('execute', function*() {
     var trigger = yield app.models.Trigger.getOne(this.trigger);
 
     // check token
-    if (trigger.token != this.queryParams.token) {
+    if (trigger.token !== this.queryParams.token) {
       throw new Error('Incorrect auth token');
     }
 
     // trigger type
-    var triggerType = new app.triggerTypes[trigger.type];
+    var triggerType = new app.triggerTypes[trigger.type]();
 
     // playbook
     var playbook = yield app.models.Playbook.getOne(this.trigger.playbook);

src/models/trigger.js

@@ -37,7 +37,7 @@ triggerSchema.pre('save', function(next){
 triggerSchema.virtual('invokeUrlTemplate').get(function() {
   var app = waigo.load('application').app;
 
-  var triggerType = new app.triggerTypes[this.type]; 
+  var triggerType = new app.triggerTypes[this.type](); 
 
   var urlParams = triggerType.getQueryParams();
   // add token to url params list
@@ -73,7 +73,7 @@ triggerSchema.virtual('ansibleVars').get(function() {
 
   var app = waigo.load('application').app;
 
-  var triggerType = new app.triggerTypes[this.type]; 
+  var triggerType = new app.triggerTypes[this.type](); 
 
   var ret = {};
 

src/support/startup/setupAnsible.js

@@ -36,7 +36,7 @@ module.exports = function*(app) {
     var file = files[i];
 
     // assume all .yml files in this folder are playbooks
-    if ('.yml' == path.extname(file).toLowerCase()) {
+    if ('.yml' === path.extname(file).toLowerCase()) {
       var name = path.basename(file, '.yml');
 
       debug('Playbook found: ' + name);
@@ -46,7 +46,7 @@ module.exports = function*(app) {
       if (!obj) {
         debug('Adding to db: ' + name);
 
-        var obj = new app.models.Playbook({
+        obj = new app.models.Playbook({
           name: name,
           path: path.join(app.config.ansiblePlaybooks, file)
         });        

src/support/urlUtils.js

@@ -1,3 +1,6 @@
+"use strict";
+
+
 var Q = require('bluebird'),
   requestLib = require('follow-redirects'),
   url = require('url');

src/triggerTypes/shippable.js

@@ -1,3 +1,6 @@
+"use strict";
+
+
 var _ = require('lodash'),
   URL = require('url'),
   util = require('util');
@@ -89,8 +92,7 @@ Shippable.prototype.process = function*(configParams, queryParams) {
       shippable_project_id: configParams.shippable_project_id,
       shippable_expected_branch: configParams.shippable_expected_branch,
       shippable_build_branch: queryParams.shippable_build_branch,
-      shippable_build_num: params.shippable_build_num,
-      shippable_build_artifacts_url: artifactsUrl,      
+      shippable_build_num: queryParams.shippable_build_num
     }
   };
 };

src/triggerTypes/simple.js

@@ -1,3 +1,6 @@
+"use strict";
+
+
 var _ = require('lodash'),
   https = require('https'),
   URL = require('url'),

test/appFolder/config/test.js

@@ -2,6 +2,10 @@
 
 
 module.exports = function(config) {
+  config.port = parseInt(10000 + Math.random() * 20000);
+
+  config.baseURL = 'http://localhost:' + config.port;
+
   config.ansiblePlaybooks = path.join(__dirname, '..', 'playbooks');
 
   config.jobsInParallel = 1;