ESlint 2.0

.codeclimate.yml

@@ -9,7 +9,7 @@ engines:
 ratings:
   paths:
   - bin/eslint.js
-  - lib/checks.js
+  - lib/*.js
 exclude_paths:
 - "node_modules/**"
 - "test/**"

.eslintrc

@@ -1,8 +1,10 @@
 {
   "env": {
-    "node": true
+    "node": true,
+    "mocha": true
   },
   "rules": {
+    "block-spacing": 2,
     "brace-style": [2, "1tbs", { "allowSingleLine": true }],
     "comma-dangle": [2, "never"],
     "comma-style": [2, "first", { exceptions: {ArrayExpression: true, ObjectExpression: true} }],

Dockerfile

@@ -1,17 +1,30 @@
-FROM mhart/alpine-node:5.4
+FROM node:6.3.1-slim
 MAINTAINER Code Climate <hello@codeclimate.com>
 
 WORKDIR /usr/src/app
+COPY npm-shrinkwrap.json /usr/src/app/
 COPY package.json /usr/src/app/
 
-RUN apk --update add git && \
+RUN apt-get update && \
+    apt-get install -y git jq && \
     npm install && \
-    apk del --purge git
+    git clone https://github.com/eslint/eslint.git && \
+    ESLINT_DOCS_VERSION=`npm -j ls eslint | jq -r .dependencies.eslint.version` && \
+    cd eslint && \
+    git checkout v$ESLINT_DOCS_VERSION && \
+    cd .. && \
+    mkdir -p /usr/src/app/lib/docs/rules/ && \
+    cp ./eslint/docs/rules/* /usr/src/app/lib/docs/rules/ && \
+    rm -rf eslint && \
+    apt-get purge -y git jq && \
+    apt-get autoremove -y
 
+RUN adduser -u 9000 --gecos "" --disabled-password app
 COPY . /usr/src/app
+RUN chown -R app:app /usr/src/app
 
-RUN adduser -u 9000 -D app
 USER app
+
 VOLUME /code
 WORKDIR /code
 

Makefile

@@ -1,9 +1,16 @@
-.PHONY: image test
+.PHONY: image test citest shrinkwrap
 
 IMAGE_NAME ?= codeclimate/codeclimate-eslint
 
 image:
 	docker build --rm -t $(IMAGE_NAME) .
 
 test: image
-	docker run --rm --workdir="/usr/src/app" $(IMAGE_NAME) npm run test
+	docker run --rm $(IMAGE_NAME) sh -c "cd /usr/src/app && npm run test"
+
+citest:
+	docker run --rm $(IMAGE_NAME) sh -c "cd /usr/src/app && npm run test"
+
+shrinkwrap: image
+	docker run --rm --workdir /usr/src/app $(IMAGE_NAME) sh -c \
+	  'npm shrinkwrap >/dev/null && cat npm-shrinkwrap.json' > npm-shrinkwrap.json

bin/eslint.js

@@ -8,8 +8,11 @@ process.chdir(CODE_DIR);
 var stdout = console.log;
 console.log = console.error;
 
-var CLIEngine = require("eslint").CLIEngine;
-var docs = require("eslint").docs;
+var eslint = require('../lib/eslint-patch')(require('eslint'));
+
+var BatchSanitizer = require("../lib/batch_sanitizer");
+var CLIEngine = eslint.CLIEngine;
+var docs = eslint.docs;
 var fs = require("fs");
 var glob = require("glob");
 var options = { extensions: [".js"], ignore: true, reset: false, useEslintrc: true };
@@ -43,6 +46,8 @@ function buildIssueJson(message, path) {
   if(message.fatal) {
     checkName = "fatal";
   }
+  var line = message.line || 1;
+  var column = message.column || 1;
 
   var issue = {
     type: "issue",
@@ -56,12 +61,12 @@ function buildIssueJson(message, path) {
       path: path,
       positions: {
         begin: {
-          line: message.line || 1,
-          column: message.column || 1
+          line: line,
+          column: column
         },
         end: {
-          line: message.line || 1,
-          column: message.column || 1
+          line: line,
+          column: column
         }
       }
     },
@@ -165,6 +170,10 @@ runWithTiming("engineConfig", function () {
       options.extensions = userConfig.extensions;
     }
 
+    if (userConfig.ignore_path) {
+      options.ignorePath = userConfig.ignore_path;
+    }
+
     if (userConfig.debug) {
       debug = true;
     }
@@ -181,17 +190,19 @@ function analyzeFiles() {
   var batchNum = 0
     , batchSize = 10
     , batchFiles
-    , batchReport;
+    , batchReport
+    , sanitizedBatchFiles;
 
   while(analysisFiles.length > 0) {
     batchFiles = analysisFiles.splice(0, batchSize);
+    sanitizedBatchFiles = (new BatchSanitizer(batchFiles)).sanitizedFiles();
 
     if (debug) {
       process.stderr.write("Analyzing: " + batchFiles + "\n");
     }
 
     runWithTiming("analyze-batch-" + batchNum, function() {
-       batchReport = cli.executeOnFiles(batchFiles);
+       batchReport = cli.executeOnFiles(sanitizedBatchFiles);
     });
     runWithTiming("report-batch" + batchNum, function() {
       batchReport.results.forEach(function(result) {

circle.yml

@@ -1,25 +1,34 @@
 machine:
   services:
     - docker
-  environment:
-    CLOUDSDK_CORE_DISABLE_PROMPTS: 1
-    PRIVATE_REGISTRY: us.gcr.io/code_climate
-    image_name: codeclimate-eslint
+
+dependencies:
+  override:
+    - >
+      docker run
+      --env CIRCLE_BRANCH
+      --env CIRCLE_PROJECT_REPONAME
+      --env CIRCLE_TOKEN
+      --env GCR_JSON_KEY
+      --volume /var/run/docker.sock:/var/run/docker.sock
+      codeclimate/patrick pull || true
+    - make image
 
 test:
   override:
-    - IMAGE_NAME="$PRIVATE_REGISTRY/$CIRCLE_PROJECT_REPONAME:b$CIRCLE_BUILD_NUM" make test
+    - make citest
 
 deployment:
   registry:
     branch: master
-    owner: codeclimate
     commands:
-      - echo $gcloud_json_key_base64 | sed 's/ //g' | base64 -d > /tmp/gcloud_key.json
-      - curl https://sdk.cloud.google.com | bash
-      - gcloud auth activate-service-account $gcloud_account_email --key-file /tmp/gcloud_key.json
-      - gcloud docker -a
-      - docker push $PRIVATE_REGISTRY/$CIRCLE_PROJECT_REPONAME:b$CIRCLE_BUILD_NUM
+      - >
+        docker run
+        --env CIRCLE_BUILD_NUM
+        --env CIRCLE_PROJECT_REPONAME
+        --env GCR_JSON_KEY
+        --volume /var/run/docker.sock:/var/run/docker.sock
+        codeclimate/patrick push gcr
 
 notify:
   webhooks:

lib/batch_sanitizer.js

@@ -0,0 +1,41 @@
+var fs = require("fs");
+
+var MINIFIED_AVG_LINE_LENGTH_CUTOFF = 100;
+
+function BatchSanitizer(files, stderr) {
+  this.files = files;
+  this.stderr = stderr || process.stderr;
+}
+
+BatchSanitizer.prototype.sanitizedFiles = function() {
+  var sanitizedFiles = [];
+
+  for(var i = 0; i < this.files.length; i++) {
+    if (this.isMinified(this.files[i])) {
+      this.stderr.write("WARN: Skipping " + this.files[i] + ": it appears to be minified\n");
+    } else {
+      sanitizedFiles.push(this.files[i]);
+    }
+  }
+
+  return sanitizedFiles;
+};
+
+BatchSanitizer.prototype.isMinified = function(path) {
+  var buf = fs.readFileSync(path)
+    , newline = "\n".charCodeAt(0)
+    , lineCount = 0
+    , charsSeen = 0;
+
+  for(var i = 0; i < buf.length; i++) {
+    if (buf[i] === newline) {
+      lineCount++;
+    } else {
+      charsSeen++;
+    }
+  }
+
+  return (charsSeen / lineCount) >= MINIFIED_AVG_LINE_LENGTH_CUTOFF;
+};
+
+module.exports = BatchSanitizer;

lib/docs.js

@@ -0,0 +1,40 @@
+/**
+ * @fileoverview Providing easy access to rule documentation
+ */
+
+'use strict';
+
+var fs = require('fs')
+  , path = require('path');
+
+//------------------------------------------------------------------------------
+// Privates
+//------------------------------------------------------------------------------
+
+var docs = Object.create(null);
+
+function load() {
+  var docsDir = path.join(__dirname, '/docs/rules');
+
+  fs.readdirSync(docsDir).forEach(function(file) {
+    var content = fs.readFileSync(docsDir + '/' + file, 'utf8');
+
+    // Remove the .md extension from the filename
+    docs[file.slice(0, -3)] = content;
+  });
+}
+
+//------------------------------------------------------------------------------
+// Public Interface
+//------------------------------------------------------------------------------
+
+exports.get = function(ruleId) {
+  return docs[ruleId];
+};
+
+//------------------------------------------------------------------------------
+// Initialization
+//------------------------------------------------------------------------------
+
+// loads existing docs
+load();

lib/eslint-patch.js

@@ -0,0 +1,33 @@
+'use strict';
+var meld = require('meld');
+var docs = require('./docs');
+
+var supportedPlugins = ['react', 'babel'];
+
+module.exports = function patcher(eslint) {
+
+  meld.around(eslint.CLIEngine, 'loadPlugins', function(joinPoint) {
+    var pluginNames = joinPoint.args[0];
+    var filteredPluginNames = pluginNames.filter(function(pluginName) {
+      return supportedPlugins.indexOf(pluginName) >= 0;
+    });
+    return joinPoint.proceed(filteredPluginNames);
+  });
+
+  meld.around(eslint.CLIEngine, 'addPlugin', function() {
+    return;
+  });
+
+  // meld.around(eslint.CLIEngine.Config, 'loadPackage', function(joinPoint) {
+  //   var filePath = joinPoint.args[0];
+  //   if (filePath.match(/^eslint-config-airbnb.*/)) {
+  //     return joinPoint.proceed();
+  //   } else {
+  //     return {};
+  //   }
+  // });
+
+  eslint.docs = docs;
+
+  return eslint;
+};