🚥 CI: Update configs for CI services

* Setup CI for a lint, build, test sequence
* Remove ucompiler, just use babel directly
* Add command for publishing with apm (`npm run apm-publish -- <bump>`)

Author: Spain

.eslintignore

@@ -1 +1,2 @@
 spec/fixtures/**/*.js
+lib/**/*.js

.gitignore

@@ -1,6 +1,4 @@
-node_modules
+/lib/
+/node_modules/
 *.log
 .idea
-
-# Keep node_modules test fixtures
-!spec/fixtures/local-eslint/node_modules

.travis.yml

@@ -10,4 +10,7 @@ notifications:
     on_failure: change
 os: osx
 
-script: 'curl -s https://raw.githubusercontent.com/atom/ci/master/build-package.sh | sh'
+script:
+  - npm i
+  - npm run compile
+  - 'curl -s https://raw.githubusercontent.com/atom/ci/master/build-package.sh | sh'

appveyor.yml

@@ -14,5 +14,7 @@ build_script:
   - cd %APPVEYOR_BUILD_FOLDER%
   - SET PATH=%LOCALAPPDATA%\atom\bin;%PATH%
   - apm clean
+  - npm i
+  - npm run compile
   - apm install
   - apm test

circle.yml

@@ -1,13 +1,15 @@
 dependencies:
-  override:
-    - wget -O atom-amd64.deb https://atom.io/download/deb
+  pre:
     - sudo apt-get update
+    - sudo apt-get install wget
+  post:
+    - wget -O atom-amd64.deb https://atom.io/download/deb
     - sudo dpkg --install atom-amd64.deb || true
     - sudo apt-get -f install -y
-    - atom -v
-    - apm install
 test:
   override:
-    - ./node_modules/.bin/eslint lib
-    - ./node_modules/.bin/eslint spec
+    - npm run lint
+    - npm run compile
+    - atom -v
+    - apm install
     - apm test

lib/helpers.js

@@ -1,47 +1,19 @@
-'use strict';
 'use babel';
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.spawnWorker = spawnWorker;
-exports.getModulesDirectory = getModulesDirectory;
-exports.getIgnoresFile = getIgnoresFile;
-exports.getEslintFromDirectory = getEslintFromDirectory;
-exports.getNodePrefixPath = getNodePrefixPath;
-exports.getBundledEslintDirectory = getBundledEslintDirectory;
-exports.getEslintDirectory = getEslintDirectory;
-exports.getEslintConfig = getEslintConfig;
-exports.getEslint = getEslint;
+import Path from 'path';
+import FS from 'fs';
+import ChildProcess from 'child_process';
+import CP from 'childprocess-promise';
+import { findFile as find } from 'atom-linter';
 
-var _path = require('path');
-
-var _path2 = _interopRequireDefault(_path);
-
-var _fs = require('fs');
-
-var _fs2 = _interopRequireDefault(_fs);
-
-var _child_process = require('child_process');
-
-var _child_process2 = _interopRequireDefault(_child_process);
-
-var _childprocessPromise = require('childprocess-promise');
-
-var _childprocessPromise2 = _interopRequireDefault(_childprocessPromise);
-
-var _atomLinter = require('atom-linter');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function spawnWorker() {
+export function spawnWorker() {
   let shouldLive = true;
   const env = Object.create(process.env);
   delete env.NODE_PATH;
   delete env.NODE_ENV;
   const data = { stdout: [], stderr: [] };
-  const child = _child_process2.default.fork(__dirname + '/worker.js', [], { env: env, silent: true });
-  const worker = new _childprocessPromise2.default(child);
+  const child = ChildProcess.fork(__dirname + '/worker.js', [], { env, silent: true });
+  const worker = new CP(child);
   function killer() {
     shouldLive = false;
     child.kill();
@@ -60,23 +32,23 @@ function spawnWorker() {
     child.emit('exit-linter', shouldLive);
   });
   process.on('exit', killer);
-  return { child: child, worker: worker, subscription: { dispose: function () {
+  return { child, worker, subscription: { dispose: function () {
         killer();
         process.removeListener('exit', killer);
       } } };
 }
 
-function getModulesDirectory(fileDir) {
-  return (0, _atomLinter.findFile)(fileDir, 'node_modules');
+export function getModulesDirectory(fileDir) {
+  return find(fileDir, 'node_modules');
 }
 
-function getIgnoresFile(fileDir) {
-  return _path2.default.dirname((0, _atomLinter.findFile)(fileDir, '.eslintignore'));
+export function getIgnoresFile(fileDir) {
+  return Path.dirname(find(fileDir, '.eslintignore'));
 }
 
-function getEslintFromDirectory(path) {
+export function getEslintFromDirectory(path) {
   try {
-    return require(_path2.default.join(path, 'lib', 'cli.js'));
+    return require(Path.join(path, 'lib', 'cli.js'));
   } catch (e) {
     if (e.code === 'MODULE_NOT_FOUND') {
       throw new Error('ESLint not found, Please install or make sure Atom is getting $PATH correctly');
@@ -86,11 +58,11 @@ function getEslintFromDirectory(path) {
 
 let nodePrefixPath = null;
 
-function getNodePrefixPath() {
+export function getNodePrefixPath() {
   if (nodePrefixPath === null) {
     const npmCommand = process.platform === 'win32' ? 'npm.cmd' : 'npm';
     try {
-      nodePrefixPath = _child_process2.default.spawnSync(npmCommand, ['get', 'prefix']).output[1].toString().trim();
+      nodePrefixPath = ChildProcess.spawnSync(npmCommand, ['get', 'prefix']).output[1].toString().trim();
     } catch (e) {
       throw new Error('Unable to execute `npm get prefix`. Please make sure Atom is getting $PATH correctly');
     }
@@ -100,41 +72,37 @@ function getNodePrefixPath() {
 
 let bundledEslintDirectory = null;
 
-function getBundledEslintDirectory() {
+export function getBundledEslintDirectory() {
   if (bundledEslintDirectory === null) {
-    bundledEslintDirectory = _path2.default.normalize(_path2.default.join(__dirname, '..', 'node_modules', 'eslint'));
+    bundledEslintDirectory = Path.normalize(Path.join(__dirname, '..', 'node_modules', 'eslint'));
   }
   return bundledEslintDirectory;
 }
 
-function getEslintDirectory(params) {
-  let modulesPath = arguments.length <= 1 || arguments[1] === undefined ? null : arguments[1];
-
+export function getEslintDirectory(params, modulesPath = null) {
   if (params.global) {
     const prefixPath = getNodePrefixPath();
     if (process.platform === 'win32') {
-      return _path2.default.join(params.nodePath || prefixPath, 'node_modules', 'eslint');
-    } else {
-      return _path2.default.join(params.nodePath || prefixPath, 'lib', 'node_modules', 'eslint');
-    }
-  } else {
-    const eslintPath = _path2.default.join(modulesPath || getModulesDirectory(params.fileDir), 'eslint');
-    try {
-      _fs2.default.accessSync(eslintPath, _fs2.default.R_OK);
-      return eslintPath;
-    } catch (_) {
-      return getBundledEslintDirectory();
+      return Path.join(params.nodePath || prefixPath, 'node_modules', 'eslint');
     }
+    return Path.join(params.nodePath || prefixPath, 'lib', 'node_modules', 'eslint');
+  }
+  const eslintPath = Path.join(modulesPath || getModulesDirectory(params.fileDir), 'eslint');
+  try {
+    FS.accessSync(eslintPath, FS.R_OK);
+    return eslintPath;
+  } catch (_) {
+    return getBundledEslintDirectory();
   }
 }
 
-function getEslintConfig(params) {
-  const configFile = (0, _atomLinter.findFile)(params.fileDir, ['.eslintrc.js', '.eslintrc.yaml', '.eslintrc.yml', '.eslintrc.json', '.eslintrc']) || null;
+export function getEslintConfig(params) {
+  const configFile = find(params.fileDir, ['.eslintrc.js', '.eslintrc.yaml', '.eslintrc.yml', '.eslintrc.json', '.eslintrc']) || null;
   if (configFile) {
     return configFile;
   }
 
-  const packagePath = (0, _atomLinter.findFile)(params.fileDir, 'package.json');
+  const packagePath = find(params.fileDir, 'package.json');
   if (packagePath && Boolean(require(packagePath).eslintConfig)) {
     return packagePath;
   }
@@ -152,7 +120,7 @@ let eslint;
 let lastEslintDirectory;
 let lastModulesPath;
 
-function getEslint(params) {
+export function getEslint(params) {
   const modulesPath = getModulesDirectory(params.fileDir);
   const eslintDirectory = getEslintDirectory(params, modulesPath);
   if (eslintDirectory !== lastEslintDirectory) {
@@ -166,5 +134,5 @@ function getEslint(params) {
     } else process.env.NODE_PATH = '';
     require('module').Module._initPaths();
   }
-  return { eslint: eslint, eslintDirectory: eslintDirectory };
+  return { eslint, eslintDirectory };
 }

lib/main.js

@@ -1,25 +1,11 @@
-'use strict';
 'use babel';
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+import Path from 'path';
+import { CompositeDisposable } from 'atom';
+import { spawnWorker } from './helpers';
+import escapeHTML from 'escape-html';
 
-var _path = require('path');
-
-var _path2 = _interopRequireDefault(_path);
-
-var _atom = require('atom');
-
-var _helpers = require('./helpers');
-
-var _escapeHtml = require('escape-html');
-
-var _escapeHtml2 = _interopRequireDefault(_escapeHtml);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-exports.default = {
+export default {
   config: {
     lintHtmlFiles: {
       title: 'Lint HTML Files',
@@ -68,38 +54,36 @@ exports.default = {
     }
   },
   activate: function () {
-    var _this = this;
-
     require('atom-package-deps').install();
 
-    this.subscriptions = new _atom.CompositeDisposable();
+    this.subscriptions = new CompositeDisposable();
     this.active = true;
     this.worker = null;
     this.scopes = ['source.js', 'source.jsx', 'source.js.jsx', 'source.babel', 'source.js-semantic'];
 
     const embeddedScope = 'source.js.embedded.html';
-    this.subscriptions.add(atom.config.observe('linter-eslint.lintHtmlFiles', function (lintHtmlFiles) {
+    this.subscriptions.add(atom.config.observe('linter-eslint.lintHtmlFiles', lintHtmlFiles => {
       if (lintHtmlFiles) {
-        _this.scopes.push(embeddedScope);
+        this.scopes.push(embeddedScope);
       } else {
-        if (_this.scopes.indexOf(embeddedScope) !== -1) {
-          _this.scopes.splice(_this.scopes.indexOf(embeddedScope), 1);
+        if (this.scopes.indexOf(embeddedScope) !== -1) {
+          this.scopes.splice(this.scopes.indexOf(embeddedScope), 1);
         }
       }
     }));
     this.subscriptions.add(atom.commands.add('atom-text-editor', {
-      'linter-eslint:fix-file': function () {
+      'linter-eslint:fix-file': () => {
         const textEditor = atom.workspace.getActiveTextEditor();
         const filePath = textEditor.getPath();
-        const fileDir = _path2.default.dirname(filePath);
+        const fileDir = Path.dirname(filePath);
 
         if (!textEditor || textEditor.isModified()) {
           // Abort for invalid or unsaved text editors
           atom.notifications.addError('Linter-ESLint: Please save before fixing');
           return;
         }
 
-        _this.worker.request('FIX', {
+        this.worker.request('FIX', {
           fileDir: fileDir,
           filePath: filePath,
           global: atom.config.get('linter-eslint.useGlobalEslint'),
@@ -113,18 +97,13 @@ exports.default = {
       }
     }));
 
-    const initializeWorker = function () {
-      if (_this.active) {
-        var _spawnWorker = (0, _helpers.spawnWorker)();
-
-        const child = _spawnWorker.child;
-        const worker = _spawnWorker.worker;
-        const subscription = _spawnWorker.subscription;
-
-        _this.worker = worker;
-        _this.subscriptions.add(subscription);
-        child.on('exit-linter', function (shouldLive) {
-          _this.worker = null;
+    const initializeWorker = () => {
+      if (this.active) {
+        const { child, worker, subscription } = spawnWorker();
+        this.worker = worker;
+        this.subscriptions.add(subscription);
+        child.on('exit-linter', shouldLive => {
+          this.worker = null;
           // Respawn if it crashed. See atom/electron#3446
           if (shouldLive) {
             initializeWorker();
@@ -139,24 +118,22 @@ exports.default = {
     this.subscriptions.dispose();
   },
   provideLinter: function () {
-    var _this2 = this;
-
     const Helpers = require('atom-linter');
     return {
       name: 'ESLint',
       grammarScopes: this.scopes,
       scope: 'file',
       lintOnFly: true,
-      lint: function (textEditor) {
+      lint: textEditor => {
         const text = textEditor.getText();
         if (text.length === 0) {
           return Promise.resolve([]);
         }
         const filePath = textEditor.getPath();
-        const fileDir = _path2.default.dirname(filePath);
+        const fileDir = Path.dirname(filePath);
         const showRule = atom.config.get('linter-eslint.showRuleIdInMessage');
 
-        return _this2.worker.request('JOB', {
+        return this.worker.request('JOB', {
           fileDir: fileDir,
           filePath: filePath,
           contents: text,
@@ -170,13 +147,7 @@ exports.default = {
           if (response.length === 1 && response[0].message === 'File ignored because of your .eslintignore file. Use --no-ignore to override.') {
             return [];
           }
-          return response.map(function (_ref) {
-            let message = _ref.message;
-            let line = _ref.line;
-            let severity = _ref.severity;
-            let ruleId = _ref.ruleId;
-            let column = _ref.column;
-
+          return response.map(function ({ message, line, severity, ruleId, column }) {
             const range = Helpers.rangeFromLineNumber(textEditor, line - 1);
             if (column) {
               range[0][1] = column - 1;
@@ -190,7 +161,7 @@ exports.default = {
               range: range
             };
             if (showRule) {
-              ret.html = `<span class="badge badge-flexible">${ ruleId || 'Fatal' }</span> ${ (0, _escapeHtml2.default)(message) }`;
+              ret.html = `<span class="badge badge-flexible">${ ruleId || 'Fatal' }</span> ${ escapeHTML(message) }`;
             } else {
               ret.text = message;
             }

lib/reporter.js

@@ -1,5 +1,6 @@
-'use strict'
+'use strict';
 // This file is used by eslint to hand the errors over to the worker
-module.exports = function(results) {
-  global.__LINTER_RESPONSE = results[0].messages
-}
+
+module.exports = function (results) {
+  global.__LINTER_RESPONSE = results[0].messages;
+};