Use ESLint instead of JSHint and JSCS

.eslintrc

@@ -0,0 +1,13 @@
+{
+  "extends": "airbnb/legacy",
+  "rules": {
+    "func-names": 0,
+    "vars-on-top": 0,
+    "id-length": 0,
+    "comma-dangle": [2, "never"]
+  },
+  "env": {
+    "mocha": true,
+    "node": true
+  }
+}

.frigg.yml

@@ -1,7 +1,7 @@
 tasks:
   - npm install
-  - make lint
-  - make cover
+  - npm run lint
+  - npm run coverage
 
 coverage:
   path: coverage/cobertura-coverage.xml

README.md

@@ -90,17 +90,28 @@ as long as they're present in the channel mapping.
 ## Tests
 Run the tests with:
 ```bash
-$ make test
+$ npm test
 ```
 
+## Style Guide
+slack-irc uses a slightly modified version of the
+[Airbnb Style Guide](https://github.com/airbnb/javascript/tree/master/es5).
+[ESLint](http://eslint.org/) is used to make sure this is followed correctly, which can be run with:
+
+```bash
+$ npm run lint
+```
+
+The deviations from the Airbnb Style Guide can be seen in  the [.eslintrc](.eslintrc) file.
+
 ## Docker
 A third-party Docker container can be found [here](https://github.com/caktux/slackbridge/).
 
 ## License
 
 (The MIT License)
 
-Copyright (c) 2015 Martin Ek <mail@ekmartin.no>
+Copyright (c) 2015 Martin Ek <mail@ekmartin.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

index.js

@@ -3,12 +3,12 @@
 var createBots = require('./lib/helpers').createBots;
 var logger = require('winston');
 
-/*istanbul ignore next*/
+/* istanbul ignore next */
 if (process.env.NODE_ENV === 'development') {
   logger.level = 'debug';
 }
 
-/* istanbul ignore next*/
+/* istanbul ignore next */
 if (!module.parent) {
   require('./lib/cli')();
 }

lib/helpers.js

@@ -1,5 +1,4 @@
 var _ = require('lodash');
-var path = require('path');
 var Bot = require('./bot');
 var errors = require('./errors');
 

package.json

@@ -19,7 +19,9 @@
   },
   "scripts": {
     "start": "node index.js",
-    "test": "make test"
+    "lint": "eslint . --ignore-path .gitignore",
+    "coverage": "istanbul cover _mocha $(find test -name '*.test.js') && istanbul report cobertura",
+    "test": "npm run lint && npm run coverage"
   },
   "bin": {
     "slack-irc": "./index.js"
@@ -38,11 +40,13 @@
   },
   "devDependencies": {
     "chai": "~2.3.0",
+    "eslint": "~1.6.0",
+    "eslint-config-airbnb": "~0.1.0",
     "istanbul": "~0.3.5",
     "jscs": "~1.13.1",
     "jshint": "~2.7.0",
     "mocha": "~2.2.5",
-    "rewire": "^2.3.1",
+    "rewire": "~2.3.1",
     "sinon": "~1.14.1",
     "sinon-chai": "~2.7.0"
   }

test/bot-events.test.js

@@ -1,4 +1,4 @@
-/* jshint expr: true */
+/* eslint no-unused-expressions: 0 */
 var chai = require('chai');
 var sinonChai = require('sinon-chai');
 var sinon = require('sinon');
@@ -7,7 +7,6 @@ var irc = require('irc');
 var logger = require('winston');
 var Bot = rewire('../lib/bot');
 var SlackStub = require('./stubs/slack-stub');
-var ChannelStub = require('./stubs/channel-stub');
 var ClientStub = require('./stubs/irc-client-stub');
 var config = require('./fixtures/single-test-config.json');
 

test/bot.test.js

@@ -1,7 +1,6 @@
-/* jshint expr: true */
+/* eslint no-unused-expressions: 0 */
 var chai = require('chai');
 var sinonChai = require('sinon-chai');
-var sinon = require('sinon');
 var rewire = require('rewire');
 var irc = require('irc');
 var Bot = rewire('../lib/bot');

test/cli.test.js

@@ -1,4 +1,4 @@
-/* jshint expr: true */
+/* eslint no-unused-expressions: 0 */
 var chai = require('chai');
 var sinon = require('sinon');
 var sinonChai = require('sinon-chai');

test/create-bots.test.js

@@ -1,6 +1,5 @@
-/* jshint expr: true */
+/* eslint no-unused-expressions: 0 */
 var chai = require('chai');
-var logger = require('winston');
 var sinon = require('sinon');
 var sinonChai = require('sinon-chai');
 var createBots = require('../lib/helpers').createBots;

test/stubs/slack-stub.js

@@ -10,7 +10,7 @@ function SlackStub() {
 util.inherits(SlackStub, events.EventEmitter);
 
 SlackStub.prototype.getChannelStub = function() {
-  if (this.returnWrongStubInfo) return;
+  if (this.returnWrongStubInfo) return null;
   return new ChannelStub();
 };