Merge pull request #88 from twbs/eslint

Integrate ESLint

Gruntfile.js

@@ -1,6 +1,7 @@
-'use strict';
+/*eslint-env node */
 
 module.exports = function (grunt) {
+  'use strict';
 
   // Force use of Unix newlines
   grunt.util.linefeed = '\n';
@@ -54,7 +55,7 @@ module.exports = function (grunt) {
       },
       test: {
         src: ['test/**/*.js', '!test/lib/**/*.js']
-      },
+      }
     },
     jscs: {
       gruntfile: {
@@ -70,6 +71,20 @@ module.exports = function (grunt) {
         src: '<%= jshint.test.src %>'
       }
     },
+    eslint: {
+      options: {
+        config: '.eslintrc'
+      },
+      gruntfile: {
+        src: '<%= jshint.gruntfile.src %>'
+      },
+      lib: {
+        src: '<%= jshint.lib.src %>'
+      },
+      test: {
+        src: '<%= jshint.test.src %>'
+      }
+    },
     watch: {
       gruntfile: {
         files: '<%= jshint.gruntfile.src %>',
@@ -82,12 +97,12 @@ module.exports = function (grunt) {
       test: {
         files: '<%= jshint.test.src %>',
         tasks: ['jshint:test', 'nodeunit']
-      },
-    },
+      }
+    }
   });
 
   // Default task.
-  grunt.registerTask('lint', ['jshint', 'jscs']);
+  grunt.registerTask('lint', ['jshint', 'jscs', 'eslint']);
   grunt.registerTask('test', ['dist', 'nodeunit', 'qunit']);
   grunt.registerTask('dist', ['browserify', 'usebanner']);
   grunt.registerTask('default', ['lint', 'dist', 'test']);

package.json

@@ -34,6 +34,7 @@
     "grunt-contrib-nodeunit": "^0.4.1",
     "grunt-contrib-qunit": "^0.5.2",
     "grunt-contrib-watch": "^0.6.1",
+    "grunt-eslint": "^1.1.0",
     "grunt-jscs": "^0.7.1",
     "jquery": "~2.1.1",
     "load-grunt-tasks": "^0.6.0",

src/bootlint.js

@@ -4,7 +4,8 @@
  * Copyright (c) 2014 Christopher Rebert
  * Licensed under the MIT License.
  */
- /*eslint-env node */
+
+/*eslint-env node */
 
 var cheerio = require('cheerio');
 

test/bootlint_test.js

@@ -1,9 +1,13 @@
+/*eslint-env node */
+
 'use strict';
 
 var bootlint = require('../src/bootlint.js');
 var fs = require('fs');
+var path = require('path');
+
 function _fixtureNameToFilepath(name) {
-    return __dirname + '/fixtures/' + name;
+    return path.join(__dirname, '/fixtures/', name);
 }
 function utf8Fixture(name) {
     return fs.readFileSync(_fixtureNameToFilepath(name), {encoding: 'utf8'});
@@ -29,7 +33,7 @@ function utf16Fixture(name) {
         test.ifError(value)
 */
 
-exports['bootlint'] = {
+exports.bootlint = {
     setUp: function (done) {
         // setup here
         done();

test/fixtures/generic-qunit.js

@@ -1,8 +1,14 @@
 /* global QUnit, expect, bootlint */
+/*eslint-env browser */
+
 QUnit.test(window.location.pathname, function (assert) {
+    'use strict';
+
     expect(1);
     var lints = Array.prototype.slice.call(document.querySelectorAll('#bootlint>li'));
-    var expectedLintMsgs = lints.map(function (item) { return item.dataset.lint; });
+    var expectedLintMsgs = lints.map(function (item) {
+        return item.dataset.lint;
+    });
     var actualLintMsgs = bootlint.lintCurrentDocument();
     assert.deepEqual(actualLintMsgs, expectedLintMsgs);
 });