fixed up the linting

Author: kiwiupover

Diff for: .eslintrc.js

@@ -1,32 +1,23 @@
 module.exports = {
   root: true,
+  extends: [
+    'simplabs',
+    'simplabs/plugins/ember',
+  ],
   parserOptions: {
     ecmaVersion: 2017,
     sourceType: 'module'
   },
-  plugins: [
-    'ember'
-  ],
-  extends: [
-    'eslint:recommended',
-    'plugin:ember/recommended'
-  ],
-  env: {
-    browser: true
-  },
-  rules: {
-  },
   overrides: [
     // node files
     {
       files: [
-        '.template-lintrc.js',
         'ember-cli-build.js',
+        'fastboot-server.js',
         'index.js',
         'testem.js',
-        'blueprints/*/index.js',
         'config/**/*.js',
-        'tests/dummy/config/**/*.js'
+        'tests/**/*.js'
       ],
       excludedFiles: [
         'addon/**',
@@ -44,8 +35,19 @@ module.exports = {
       },
       plugins: ['node'],
       rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
+        "node/no-extraneous-require": "off",
+        "node/no-unpublished-require": "off"
         // add your custom rules and overrides for node files here
       })
+    }, {
+      files: [
+        "lib/**/*.js",
+        "tests/**/*-nodetest.js",
+      ],
+      env: {
+        node: true,
+        mocha: true
+      }
     }
   ]
 };

Diff for: lib/notify.js

@@ -1,41 +1,38 @@
-var RSVP       = require('rsvp');
-var CoreObject = require('core-object');
-var request    = require('request');
-var merge      = require('lodash/object/merge');
-
-var post = RSVP.denodeify(request.post);
+const RSVP = require('rsvp');
+const CoreObject = require('core-object');
+const request = require('request');
+const merge = require('lodash/object/merge');
 
 function optsValid(opts) {
   return opts.url && opts.headers && opts.method && opts.body;
 }
 
 module.exports = CoreObject.extend({
-  init: function(options) {
+  init(options) {
     this._plugin = options.plugin;
 
     this._client = this._plugin.readConfig('httpClient') || request;
   },
 
-  _defaults: function() {
+  _defaults() {
     return {
       method: 'POST',
       headers: {},
       json: true
-    }
+    };
   },
 
-  send: function(serviceKey, opts) {
-    var opts        = opts || {};
-    var plugin      = this._plugin;
-    var makeRequest = RSVP.denodeify(this._client);
-    var critical = (('critical' in opts) ? delete opts.critical : false);
+  send(serviceKey, opts = {}) {
+    let plugin = this._plugin;
+    let makeRequest = RSVP.denodeify(this._client);
+    let critical = (('critical' in opts) ? delete opts.critical : false);
 
-    var requestOpts = merge(this._defaults(), opts);
+    let requestOpts = merge(this._defaults(), opts);
 
     if (optsValid(requestOpts)) {
       return makeRequest(requestOpts)
         .then(function(response) {
-          var body = '';
+          let body = '';
 
           if (response && response.body) {
             body = response.body;
@@ -45,27 +42,27 @@ module.exports = CoreObject.extend({
             body = JSON.stringify(body);
           }
 
-          if (critical && !(300 > response.statusCode && response.statusCode >= 200)) {
+          if (critical && !(response.statusCode < 300 && response.statusCode >= 200)) {
             return RSVP.reject(response.statusCode);
           }
 
-          plugin.log(serviceKey + ' => ' + body);
-        }.bind(this))
+          plugin.log(`${serviceKey} => ${body}`);
+        })
         .catch(function(error) {
-          var errorMessage = serviceKey + ' => ' + error;
+          let errorMessage = `${serviceKey} => ${error}`;
 
           if (critical) {
             return RSVP.reject(error);
           }
           plugin.log(errorMessage, { color: 'red' });
         });
     } else {
-      var warningMessage = 'No request issued! Request options invalid! You have to specify `url`, `headers`, `method` and `body`.';
+      let warningMessage = 'No request issued! Request options invalid! You have to specify `url`, `headers`, `method` and `body`.';
 
       if (critical) {
         return RSVP.reject(warningMessage);
       }
-      plugin.log(serviceKey+' => '+warningMessage, { color: 'yellow', verbose: true });
+      plugin.log(`${serviceKey} => ${warningMessage}`, { color: 'yellow', verbose: true });
       return RSVP.resolve();
     }
   }

Diff for: lib/service.js

@@ -1,15 +1,15 @@
-var CoreObject = require('core-object');
-var merge = require('lodash/object/merge');
-var mapValues = require('lodash/object/mapValues');
-var pick = require('lodash/object/pick');
+const CoreObject = require('core-object');
+const merge = require('lodash/object/merge');
+const mapValues = require('lodash/object/mapValues');
+const pick = require('lodash/object/pick');
 
 module.exports = CoreObject.extend({
-  init: function(options) {
+  init(options) {
     this.serviceOptions = merge(options.defaults, options.user, options.hook || {});
   },
 
-  buildServiceCall: function(context) {
-    var opts = mapValues(this.serviceOptions, function(value) {
+  buildServiceCall(context) {
+    let opts = mapValues(this.serviceOptions, function(value) {
       return typeof value === 'function' ? value.bind(this.serviceOptions)(context) : value;
     }.bind(this));
 

Diff for: package.json

@@ -52,7 +52,9 @@
     "ember-source": "~3.4.0",
     "ember-source-channel-url": "^1.1.0",
     "ember-try": "^1.0.0",
-    "eslint-plugin-ember": "^5.2.0",
+    "eslint-config-simplabs": "^0.4.0",
+    "eslint-plugin-ember": "^3.6.2",
+    "eslint-plugin-mocha": "^4.11.0",
     "eslint-plugin-node": "^7.0.1",
     "glob": "^5.0.15",
     "loader.js": "^4.7.0",

Diff for: tests/runner.js

@@ -1,14 +1,14 @@
 'use strict';
 
-var glob = require('glob');
-var Mocha = require('mocha');
+let glob = require('glob');
+let Mocha = require('mocha');
 
-var mocha = new Mocha({
+let mocha = new Mocha({
   reporter: 'spec'
 });
 
-var arg = process.argv[2];
-var root = 'tests/';
+let arg = process.argv[2];
+let root = 'tests/';
 
 function addFiles(mocha, files) {
   glob.sync(root + files).forEach(mocha.addFile.bind(mocha));
@@ -22,6 +22,6 @@ if (arg === 'all') {
 
 mocha.run(function(failures) {
   process.on('exit', function() {
-    process.exit(failures);
+    process.exit(failures);  // eslint-disable-line
   });
 });

Diff for: tests/unit/index-nodetest.js

@@ -1,6 +1,6 @@
 const Promise = require('rsvp');
 const chai = require('chai');
-const chaiAsPromised = require("chai-as-promised");
+const chaiAsPromised = require('chai-as-promised');
 
 chai.use(chaiAsPromised);
 
@@ -12,7 +12,7 @@ describe('webhooks plugin', function() {
   let BUGSNAG_URI = 'http://notify.bugsnag.com/deploy';
 
   before(function() {
-    subject = require('../../index');
+    subject = require('../../index'); // eslint-disable-line node/no-missing-require
   });
 
   beforeEach(function() {
@@ -24,7 +24,7 @@ describe('webhooks plugin', function() {
 
     callbackReturnValue = undefined;
 
-    mockHTTP = function(context) {
+    mockHTTP = function() {
       return function(opts, cb) {
         serviceCalls.push({
           url: opts.url,
@@ -34,13 +34,13 @@ describe('webhooks plugin', function() {
         });
 
         cb(callbackReturnValue);
-      }
+      };
     };
 
     mockUi = {
       messages: [],
-      write: function() {},
-      writeLine: function(message) {
+      write() {},
+      writeLine(message) {
         this.messages.push(message);
       }
     };
@@ -52,7 +52,7 @@ describe('webhooks plugin', function() {
 
       if (!opts.verbose || (opts.verbose && this.ui.verbose)) {
         this.ui.write('|    ');
-        this.ui.writeLine('- ' + message);
+        this.ui.writeLine(`- ${message}`);
       }
     };
 
@@ -61,19 +61,19 @@ describe('webhooks plugin', function() {
 
       config: {
         webhooks: {
-          services: services,
+          services,
           httpClient: mockHTTP
         }
       }
-    }
+    };
   });
 
   it('has a name', function() {
     assert.equal(plugin.name, 'webhooks');
   });
 
   describe('configuring services', function() {
-    it("warns of services that are configured but have not hook turned on", function() {
+    it('warns of services that are configured but have not hook turned on', function() {
       services.bugsnag = {
         apiKey: '1234'
       };
@@ -84,12 +84,12 @@ describe('webhooks plugin', function() {
 
       plugin.beforeHook(context);
       plugin.configure(context);
+      plugin.setup(context);
 
-      let promise = plugin.setup(context);
       let messages = mockUi.messages;
 
       assert.isAbove(messages.length, 0);
-      assert.equal(messages[0], '- Warning! bugsnag - Service configuration found but no hook specified in deploy configuration. Service will not be notified.')
+      assert.equal(messages[0], '- Warning! bugsnag - Service configuration found but no hook specified in deploy configuration. Service will not be notified.');
     });
 
     describe('preconfigured services', function() {
@@ -121,7 +121,7 @@ describe('webhooks plugin', function() {
 
         it('calls custom-url for preconfigured services when url is passed via config', function() {
           let CUSTOM_BUGSNAG_URI = 'http://bugsnag.simplabs.com/deploy';
-          services.bugsnag.url   = CUSTOM_BUGSNAG_URI;
+          services.bugsnag.url = CUSTOM_BUGSNAG_URI;
 
           plugin.beforeHook(context);
           plugin.configure(context);
@@ -222,13 +222,13 @@ describe('webhooks plugin', function() {
           return assert.isFulfilled(promise)
             .then(function() {
               assert.equal(serviceCalls.length, 0);
-            })
+            });
         });
 
         it('is possible to specify hooks where slack should be notified', function() {
           let webhookURL = 'https://hooks.slack.com/services/my-webhook-url';
           services.slack = {
-            webhookURL: webhookURL,
+            webhookURL,
 
             didDeploy: {
               body: {
@@ -276,7 +276,7 @@ describe('webhooks plugin', function() {
               assert.equal(serviceCalls.length, 2);
 
               let didActivateMessage = serviceCalls[0];
-              let didDeployMessage   = serviceCalls[1];
+              let didDeployMessage = serviceCalls[1];
 
               assert.deepEqual(didActivateMessage.body, { text: 'didActivate' });
               assert.deepEqual(didActivateMessage.url, webhookURL);