Added eslint tasks to build (both) and travis step (grunt only)

deleted jslintrc file
Addresses #274

Author: bmuenzenmeyer

.jslintrc

@@ -138,6 +138,12 @@ module.exports = function (grunt) {
         }
       }
     },
+    eslint: {
+      options: {
+        configFile: './.eslintrc'
+      },
+      target: ['./builder/*']
+    },
     bsReload: {
       css: path.resolve(paths().public.root + '**/*.css')
     }
@@ -152,10 +158,10 @@ module.exports = function (grunt) {
   grunt.registerTask('default', ['patternlab', 'copy:main', 'copy:styleguide']);
 
   //travis CI task
-  grunt.registerTask('travis', ['nodeunit', 'patternlab']);
+  grunt.registerTask('travis', ['nodeunit', 'eslint', 'patternlab']);
 
   grunt.registerTask('serve', ['patternlab', 'copy:main', 'copy:styleguide', 'browserSync', 'watch:all']);
 
-  grunt.registerTask('build', ['nodeunit', 'concat']);
+  grunt.registerTask('build', ['nodeunit', 'eslint', 'concat']);
 
 };

Gruntfile.js

@@ -8,7 +8,6 @@
  *
  */
 
-
 "use strict";
 
 var pattern_assembler = function () {
@@ -78,6 +77,12 @@ var pattern_assembler = function () {
     }
   }
 
+  //http://stackoverflow.com/questions/6274339/how-can-i-shuffle-an-array-in-javascript
+  function shuffle(o) {
+        for (var j, x, i = o.length; i; j = Math.floor(Math.random() * i), x = o[--i], o[i] = o[j], o[j] = x);
+    return o;
+  }
+
   function buildListItems(container) {
     //combine all list items into one structure
     var list = [];
@@ -297,8 +302,7 @@ var pattern_assembler = function () {
   }
 
   function mergeData(obj1, obj2) {
-    /*eslint-disable guard-for-in, no-param-reassign*/
-    if (typeof obj2 === 'undefined') {
+        if (typeof obj2 === 'undefined') {
       obj2 = {};
     }
     for (var p in obj1) {
@@ -326,13 +330,6 @@ var pattern_assembler = function () {
     return obj2;
   }
 
-  //http://stackoverflow.com/questions/6274339/how-can-i-shuffle-an-array-in-javascript
-  function shuffle(o) {
-    /*eslint-disable curly*/
-    for (var j, x, i = o.length; i; j = Math.floor(Math.random() * i), x = o[--i], o[i] = o[j], o[j] = x);
-    return o;
-  }
-
   function parseDataLinksHelper(patternlab, obj, key) {
     var linkRE, dataObjAsString, linkMatches, expandedLink;
 

builder/pattern_assembler.js

@@ -9,6 +9,7 @@ var pkg = require('./package.json'),
     strip_banner = require('gulp-strip-banner'),
     header = require('gulp-header'),
     nodeunit = require('gulp-nodeunit'),
+    eslint = require('gulp-eslint'),
     browserSync = require('browser-sync').create();
 
 require('gulp-load')(gulp);
@@ -151,6 +152,14 @@ gulp.task('connect', ['lab'], function () {
 
 });
 
+//lint
+gulp.task('eslint', function () {
+  return gulp.src(['./builder/*.js', '!node_modules/**'])
+    .pipe(eslint())
+    .pipe(eslint.format())
+    .pipe(eslint.failAfterError());
+});
+
 //unit test
 gulp.task('nodeunit', function () {
   return gulp.src('./test/**/*_tests.js')
@@ -170,7 +179,7 @@ gulp.task('prelab', ['clean', 'assets']);
 gulp.task('lab', ['prelab', 'patternlab'], function (cb) { cb(); });
 gulp.task('patterns', ['patternlab:only_patterns']);
 gulp.task('serve', ['lab', 'connect']);
-gulp.task('travis', ['lab', 'nodeunit']);
+gulp.task('build', ['eslint', 'nodeunit', 'banner']);
 
 gulp.task('version', ['patternlab:version']);
 gulp.task('help', ['patternlab:help']);

gulpfile.js

@@ -13,10 +13,10 @@
   },
   "devDependencies": {
     "browser-sync": "^2.11.1",
-    "eslint": "^2.2.0",
     "gulp": "^3.9.0",
     "gulp-connect": "^2.3.1",
     "gulp-copy": "0.0.2",
+    "gulp-eslint": "^2.0.0",
     "gulp-header": "^1.7.1",
     "gulp-load": "^0.1.1",
     "gulp-nodeunit": "0.0.5",

package.gulp.json

@@ -13,13 +13,13 @@
   },
   "devDependencies": {
     "bs-html-injector": "^3.0.0",
-    "eslint": "^2.2.0",
     "grunt": "~0.4.5",
     "grunt-browser-sync": "^2.2.0",
     "grunt-contrib-concat": "^0.5.1",
     "grunt-contrib-copy": "^0.8.2",
     "grunt-contrib-nodeunit": "^0.4.1",
-    "grunt-contrib-watch": "^0.6.1"
+    "grunt-contrib-watch": "^0.6.1",
+    "grunt-eslint": "^18.0.0"
   },
   "keywords": [
     "Pattern Lab",