Build: Add eslint and jscs presets & update code

Author: pdehaan

.eslintignore

@@ -1,2 +1 @@
-# Generated by integration tests
 test/fixtures/out

.eslintrc

@@ -1,14 +1,3 @@
 {
-  "rules": {
-    "semi": [2, "always"],
-    "quotes": [2, "single"],
-    "strict": [2, "global"],
-    "no-underscore-dangle": 0,
-    "consistent-return": 0
-  },
-  "env": {
-    "es6": true,
-    "browser": true,
-    "node": true
-  }
+  "extends": "gulp"
 }

.jscsrc

@@ -0,0 +1,3 @@
+{
+  "preset": "gulp"
+}

index.js

@@ -14,11 +14,11 @@ var registry = require('./lib/registry');
 var _getTask = require('./lib/get-task');
 var _setTask = require('./lib/set-task');
 
-function Undertaker(customRegistry){
+function Undertaker(customRegistry) {
   EventEmitter.call(this);
 
   this._registry = new DefaultRegistry();
-  if(customRegistry){
+  if (customRegistry) {
     this.registry(customRegistry);
   }
 

lib/get-task.js

@@ -2,17 +2,16 @@
 
 var metadata = require('./helpers/metadata');
 
-function get(name){
-  /* jshint validthis: true */
+function get(name) {
   var wrapper = this._registry.get(name);
 
-  if(!wrapper){
+  if (!wrapper) {
     return;
   }
 
   var meta = metadata.get(wrapper);
 
-  if(meta){
+  if (meta) {
     return meta.orig;
   }
 

lib/helpers/buildTree.js

@@ -4,10 +4,10 @@ var _ = require('lodash');
 
 var metadata = require('./metadata');
 
-function buildTree(tasks){
-  return _.map(tasks, function(task){
+function buildTree(tasks) {
+  return _.map(tasks, function(task) {
     var meta = metadata.get(task);
-    if(meta){
+    if (meta) {
       return meta.tree;
     }
 
@@ -17,8 +17,8 @@ function buildTree(tasks){
       tree: {
         label: name,
         type: 'function',
-        nodes: []
-      }
+        nodes: [],
+      },
     };
 
     metadata.set(task, meta);

lib/helpers/createExtensions.js

@@ -7,7 +7,7 @@ var metadata = require('./metadata');
 
 var uid = 0;
 
-function Storage(fn){
+function Storage(fn) {
   var meta = metadata.get(fn);
 
   this.fn = meta.orig || fn;
@@ -17,41 +17,41 @@ function Storage(fn){
   this.startHr = [];
 }
 
-Storage.prototype.capture = function(){
+Storage.prototype.capture = function() {
   captureLastRun(this.fn, this.captureTime);
 };
 
-Storage.prototype.release = function(){
+Storage.prototype.release = function() {
   releaseLastRun(this.fn);
 };
 
-function createExtensions(ee){
+function createExtensions(ee) {
   return {
-    create: function(fn){
+    create: function(fn) {
       return new Storage(fn);
     },
-    before: function(storage){
+    before: function(storage) {
       storage.startHr = process.hrtime();
       ee.emit('start', {
         uid: storage.uid,
         name: storage.name,
-        time: Date.now()
+        time: Date.now(),
       });
     },
-    after: function(result, storage){
-      if(result && result.state === 'error'){
+    after: function(result, storage) {
+      if (result && result.state === 'error') {
         return this.error(result.value, storage);
       }
       storage.capture();
       ee.emit('stop', {
         uid: storage.uid,
         name: storage.name,
         duration: process.hrtime(storage.startHr),
-        time: Date.now()
+        time: Date.now(),
       });
     },
-    error: function(error, storage){
-      if(Array.isArray(error)){
+    error: function(error, storage) {
+      if (Array.isArray(error)) {
         error = error[0];
       }
       storage.release();
@@ -60,9 +60,9 @@ function createExtensions(ee){
         name: storage.name,
         error: error,
         duration: process.hrtime(storage.startHr),
-        time: Date.now()
+        time: Date.now(),
       });
-    }
+    },
   };
 }
 

lib/helpers/normalizeArgs.js

@@ -4,9 +4,9 @@ var assert = require('assert');
 
 var _ = require('lodash');
 
-function normalizeArgs(registry, args){
-  function getFunction(task){
-    if(typeof task === 'function'){
+function normalizeArgs(registry, args) {
+  function getFunction(task) {
+    if (typeof task === 'function') {
       return task;
     }
 

lib/helpers/validateRegistry.js

@@ -4,8 +4,8 @@ var assert = require('assert');
 
 var _ = require('lodash');
 
-function isConstructor(registry){
-  if(!(registry && registry.prototype)){
+function isConstructor(registry) {
+  if (!(registry && registry.prototype)) {
     return false;
   }
 
@@ -14,21 +14,21 @@ function isConstructor(registry){
   var hasProtoInit = _.isFunction(registry.prototype.init);
   var hasProtoTasks = _.isFunction(registry.prototype.tasks);
 
-  if(hasProtoGet || hasProtoSet || hasProtoInit || hasProtoTasks){
+  if (hasProtoGet || hasProtoSet || hasProtoInit || hasProtoTasks) {
     return true;
   }
 
   return false;
 }
 
-function validateRegistry(registry){
+function validateRegistry(registry) {
   try {
     assert(_.isFunction(registry.get), 'Custom registry must have `get` function');
     assert(_.isFunction(registry.set), 'Custom registry must have `set` function');
     assert(_.isFunction(registry.init), 'Custom registry must have `init` function');
     assert(_.isFunction(registry.tasks), 'Custom registry must have `tasks` function');
   } catch (err) {
-    if(isConstructor(registry)){
+    if (isConstructor(registry)) {
       assert(false, 'Custom registries must be instantiated, but it looks like you passed a constructor');
     } else {
       throw err;

lib/last-run.js

@@ -3,12 +3,12 @@
 var retrieveLastRun = require('last-run');
 
 function lastRun(task, timeResolution) {
-  if(timeResolution == null){
+  if (timeResolution == null) {
     timeResolution = process.env.UNDERTAKER_TIME_RESOLUTION;
   }
 
   var fn = task;
-  if(typeof task === 'string'){
+  if (typeof task === 'string') {
     fn = this._getTask(task);
   }
 

lib/parallel.js

@@ -7,9 +7,7 @@ var buildTree = require('./helpers/buildTree');
 var normalizeArgs = require('./helpers/normalizeArgs');
 var createExtensions = require('./helpers/createExtensions');
 
-function parallel(){
-  /* jshint validthis: true */
-
+function parallel() {
   var create = this._settle ? bach.settleParallel : bach.parallel;
 
   var args = normalizeArgs(this._registry, arguments);
@@ -21,8 +19,8 @@ function parallel(){
     tree: {
       label: '<parallel>',
       type: 'function',
-      nodes: buildTree(args)
-    }
+      nodes: buildTree(args),
+    },
   });
   return fn;
 }

lib/registry.js

@@ -4,14 +4,13 @@ var _ = require('lodash');
 
 var validateRegistry = require('./helpers/validateRegistry');
 
-function setTasks(inst, task, name){
+function setTasks(inst, task, name) {
   inst.set(name, task);
   return inst;
 }
 
-function registry(newRegistry){
-  /* jshint validthis: true */
-  if(!newRegistry){
+function registry(newRegistry) {
+  if (!newRegistry) {
     return this._registry;
   }
 

lib/series.js

@@ -7,9 +7,7 @@ var buildTree = require('./helpers/buildTree');
 var normalizeArgs = require('./helpers/normalizeArgs');
 var createExtensions = require('./helpers/createExtensions');
 
-function series(){
-  /* jshint validthis: true */
-
+function series() {
   var create = this._settle ? bach.settleSeries : bach.series;
 
   var args = normalizeArgs(this._registry, arguments);
@@ -21,8 +19,8 @@ function series(){
     tree: {
       label: '<series>',
       type: 'function',
-      nodes: buildTree(args)
-    }
+      nodes: buildTree(args),
+    },
   });
   return fn;
 }

lib/set-task.js

@@ -6,9 +6,7 @@ var _ = require('lodash');
 
 var metadata = require('./helpers/metadata');
 
-function set(name, fn){
-  /* jshint validthis: true */
-
+function set(name, fn) {
   assert(name, 'Task name must be specified');
   assert(typeof name === 'string', 'Task name must be a string');
   assert(_.isFunction(fn), 'Task function must be specified');
@@ -21,7 +19,7 @@ function set(name, fn){
 
   var meta = metadata.get(fn) || {};
   var nodes = [];
-  if(meta.branch){
+  if (meta.branch) {
     nodes.push(meta.tree);
   }
 
@@ -33,8 +31,8 @@ function set(name, fn){
     tree: {
       label: name,
       type: 'task',
-      nodes: nodes
-    }
+      nodes: nodes,
+    },
   });
 }
 

lib/task.js

@@ -1,13 +1,12 @@
 'use strict';
 
-function task(name, fn){
-  /* jshint validthis: true */
-  if(typeof name === 'function'){
+function task(name, fn) {
+  if (typeof name === 'function') {
     fn = name;
     name = fn.displayName || fn.name;
   }
 
-  if(!fn){
+  if (!fn) {
     return this._getTask(name);
   }
 

lib/tree.js

@@ -4,17 +4,16 @@ var _ = require('lodash');
 
 var metadata = require('./helpers/metadata');
 
-function tree(opts){
-  /* jshint validthis: true */
+function tree(opts) {
   opts = _.defaults(opts || {}, {
-    deep: false
+    deep: false,
   });
 
   var tasks = this._registry.tasks();
-  return _.map(tasks, function(task){
+  return _.map(tasks, function(task) {
     var meta = metadata.get(task);
 
-    if(opts.deep){
+    if (opts.deep) {
       return meta.tree;
     }
 

package.json

@@ -18,7 +18,8 @@
     "lib"
   ],
   "scripts": {
-    "test": "lab -cvL --ignore store@sparkles"
+    "lint": "eslint . && jscs *.js lib/ test/",
+    "test": "lab -cv --ignore store@sparkles"
   },
   "dependencies": {
     "bach": "^0.4.1",
@@ -31,7 +32,11 @@
     "async-once": "^1.0.0",
     "code": "^1.2.1",
     "del": "^2.0.2",
+    "eslint": "1.7.3",
+    "eslint-config-gulp": "2.0.0",
     "gulp-jshint": "^1.8.4",
+    "jscs": "2.3.5",
+    "jscs-preset-gulp": "1.0.0",
     "lab": "^6.2.0",
     "once": "^1.3.1",
     "through2": "^2.0.0",

test/.eslintrc

@@ -0,0 +1,3 @@
+{
+  "extends": "gulp/test"
+}