Upgrade broccoli-filter

.eslintignore

@@ -1,2 +1,3 @@
 test/fixture/*
 build/*
+tmp/*

.eslintrc

@@ -1,6 +1,7 @@
 {
   "extends": "nightmare-mode/node",
   "rules": {
+    "arrow-parens": [2, "always"],
     "no-console": 0,
     "prefer-arrow-callback": 0,
     "prefer-reflect": 0,

.travis.yml

@@ -1,5 +1,5 @@
 language: node_js
 node_js:
-  - '0.10'
+  - 'stable'
 before_install:
-  - npm install -g broccoli-cli
+  - npm install -g broccoli-cli

lib/index.js

@@ -1,7 +1,5 @@
 /* eslint global-require: 0, consistent-return: 0 */
 
-const path = require('path');
-
 const Filter = require('broccoli-filter');
 const CLIEngine = require('eslint').CLIEngine;
 
@@ -71,14 +69,15 @@ function EslintValidationFilter(inputTree, options) {
   }
   this.options = options || {};
   this.eslintOptions = options.options || {};
-  // set inputTree
-  this.inputTree = inputTree;
+  // call base class constructor
+  Filter.call(this, inputTree);
 
   // set formatter
-  this.formatter = require(this.options.format || 'eslint/lib/formatters/stylish');
+  this.formatter = require(this.options.format || 'eslint/lib/formatters/stylish'); // eslint-disable-line global-require
 
   this.cli = new CLIEngine(this.eslintOptions);
 
+  this.eslintrc = inputTree;
 
   this.testGenerator = options.testGenerator;
   if (this.testGenerator) {
@@ -92,29 +91,21 @@ EslintValidationFilter.prototype.constructor = EslintValidationFilter;
 EslintValidationFilter.prototype.extensions = ['js'];
 EslintValidationFilter.prototype.targetExtension = 'js';
 
-EslintValidationFilter.prototype.write = function write(readTree, destDir) {
-  return readTree(this.inputTree).then((srcDir) => {
-    if (!this.eslintrc) {
-      this.eslintrc = srcDir;
-    }
-
-    return Filter.prototype.write.call(this, readTree, destDir);
-  });
-};
-
 EslintValidationFilter.prototype.processString = function processString(content, relativePath) {
+  'use strict'; // eslint-disable-line strict
+
   // verify file content
-  const result = this.cli.executeOnFiles([path.join(this.eslintrc, relativePath)]);
-  const filteredResults = filterAllIgnoredFileMessages(result);
+  const output = this.cli.executeOnText(content, this.eslintrc + '/' + relativePath);
+  const filteredOutput = filterAllIgnoredFileMessages(output);
 
   // if verification has result
-  if (filteredResults.results.length &&
-      filteredResults.results[0].messages.length) {
+  if (filteredOutput.results.length &&
+      filteredOutput.results[0].messages.length) {
 
     // log formatter output
-    console.log(this.formatter(filteredResults.results));
+    console.log(this.formatter(filteredOutput.results));
 
-    if (getResultSeverity(filteredResults.results) > 0) {
+    if (getResultSeverity(filteredOutput.results) > 0) {
       if ('throwOnError' in this.internalOptions && this.internalOptions.throwOnError === true) {
         // throw error if severe messages exist
         throw new Error('severe rule errors');
@@ -125,8 +116,8 @@ EslintValidationFilter.prototype.processString = function processString(content,
   if (this.testGenerator) {
     let messages = [];
 
-    if (filteredResults.results.length) {
-      messages = filteredResults.results[0].messages || [];
+    if (filteredOutput.results.length) {
+      messages = filteredOutput.results[0].messages || [];
     }
 
     return this.testGenerator(relativePath, messages);

package.json

@@ -8,7 +8,8 @@
     "babelify": "babel lib --out-dir build",
     "prepublish": "npm run babelify",
     "lint": "eslint .",
-    "test": "npm run babelify && rm -rf lintbuild/ && ./node_modules/broccoli-cli/bin/broccoli build lintbuild > broccoli-build.out && node node_modules/mocha/bin/mocha lintbuild/test.js"
+    "babelify-tests": "babel test --ignore fixture --out-dir build/test",
+    "test": "npm run babelify && npm run babelify-tests && npm run lint && node_modules/mocha/bin/mocha build/test/test.js"
   },
   "repository": {
     "type": "git",
@@ -36,7 +37,7 @@
   },
   "homepage": "https://github.com/jonathanKingston/broccoli-lint-eslint",
   "dependencies": {
-    "broccoli-filter": "^0.1.12",
+    "broccoli-filter": "^1.2.3",
     "eslint": "^2.3.0"
   },
   "devDependencies": {
@@ -45,6 +46,7 @@
     "broccoli": "^0.16.9",
     "broccoli-cli": "^1.0.0",
     "broccoli-merge-trees": "^1.1.1",
+    "chai": "^3.5.0",
     "eslint-config-nightmare-mode": "^2.3.0",
     "mocha": "^2.2.4",
     "rimraf": "^2.5.1"

test/.eslintrc

@@ -1,21 +1,4 @@
 {
-  "extends": "nightmare-mode/node",
-  "rules": {
-    "no-console": 0,
-    "prefer-arrow-callback": 0,
-    "prefer-reflect": 0,
-    "prefer-template": 0,
-    "no-restricted-syntax": [2, "WithStatement"],
-    "no-empty-label": 0,
-    "no-labels": 2,
-    "space-after-keywords": 0,
-    "space-before-keywords": 0,
-    "space-return-throw-case": 0,
-    "keyword-spacing": 2,
-    "newline-per-chained-call": 0,
-    "no-magic-numbers": 0,
-    "arrow-spacing": 0
-  },
   "env": {
     "mocha": true
   }

test/fixture/.eslintrc

@@ -0,0 +1,3 @@
+{
+  "extends": "nightmare-mode/node"
+}

test/fixture/3.js

@@ -0,0 +1,7 @@
+function noNewLineBeforeReturn() {
+  const foo = 'foo';
+
+  console.log(foo);
+}
+
+noNewLineBeforeReturn();

test/helpers/run-eslint.js

@@ -0,0 +1,35 @@
+const broccoli = require('broccoli');
+const eslint = require('../../index');
+
+module.exports = function runEslint(path, _options) {
+  const options = _options || {};
+  const buildLog = [];
+  const consoleLog = console.log;
+
+  // stub console.log so we can get the formatter's output
+  console.log = function appendToBuildLog(...args) {
+    const text = args.join(' ');
+
+    buildLog.push(text);
+  };
+
+  // default options
+  options.format = options.format || 'eslint/lib/formatters/compact';
+  options.options = options.options || {};
+  options.options.ignore = options.options.ignore || false;
+
+  const tree = eslint(path, options);
+  const builder = new broccoli.Builder(tree);
+  const promise = builder.build().then(function builderThen() {
+    return buildLog.join('\n');
+  });
+
+  promise.finally(function builderCleanup() {
+    builder.cleanup();
+
+    // restore the original console.log
+    console.log = consoleLog;
+  });
+
+  return promise;
+};

test/test.js

@@ -1,18 +1,50 @@
-const assert = require('assert');
-const fs = require('fs');
-const rimraf = require('rimraf');
+const expect = require('chai').expect;
+const runEslint = require('./helpers/run-eslint');
+const FIXTURES = 'test/fixture';
+const CAMELCASE = '(camelcase)';
+const CONSOLE = '(no-console)';
+const CUSTOM_RULES = 'testing custom rules';
+const DOUBLEQUOTE = 'Strings must use doublequote.';
+const FILEPATH = 'fixture/1.js';
 
-afterEach(function afterEach() {
-  rimraf.sync('temp');
-  rimraf.sync('broccoli-build.out');
-});
+describe('EslintValidationFilter', function describeEslintValidationFilter() {
+  it('should report errors', function shouldReportErrors() {
+    // lint test fixtures
+    const promise = runEslint(FIXTURES);
+
+    return promise.then(function assertLinting(buildLog) {
+      expect(buildLog, 'Used eslint validation').to.have.string(CAMELCASE);
+      expect(buildLog, 'Shows filepath').to.have.string(FILEPATH);
+      expect(buildLog, 'Used relative config - console not allowed').to.have.string(CONSOLE);
+      expect(buildLog, 'Used relative config - single quotes').to.not.have.string(DOUBLEQUOTE);
+      expect(buildLog, 'No custom rules defined').to.not.have.string(CUSTOM_RULES);
+    });
+  });
+
+  it('should accept rule paths', function shouldAcceptRulePaths() {
+    // lint test fixtures using a custom rule
+    const promise = runEslint(FIXTURES, {
+      options: {
+        rulePaths: ['conf/rules']
+      }
+    });
+
+    return promise.then(function assertLinting(buildLog) {
+      expect(buildLog, 'Used custom rule').to.have.string(CUSTOM_RULES);
+    });
+  });
 
-it('should reported errors', function shouldReportErrors() {
-  const buildLog = fs.readFileSync('broccoli-build.out').toString();
-  const NOT_FOUND = -1;
+  it('should accept config file path', function shouldAcceptConfigFile() {
+    // lint test fixtures using a config file at a non-default path
+    const promise = runEslint(FIXTURES, {
+      options: {
+        configFile: 'conf/eslint.json'
+      }
+    });
 
-  assert(buildLog.indexOf('Strings must use doublequote.') !== NOT_FOUND, 'Used eslint validation - strings');
-  assert(buildLog.indexOf('is not in camel case') !== NOT_FOUND, 'Used eslint validation - camel case');
-  assert(buildLog.indexOf('testing custom rules') !== NOT_FOUND, 'Used custom rulesdir rules');
-  assert(buildLog.indexOf('fixture/1.js') !== NOT_FOUND, 'Shows filepath');
+    return promise.then(function assertLinting(buildLog) {
+      expect(buildLog, 'Used alternate config - console allowed').to.not.have.string(CONSOLE);
+      expect(buildLog, 'Used alternate config - double quotes').to.have.string(DOUBLEQUOTE);
+    });
+  });
 });