Merge branch 'master' of github.com:marco-c/web-push

Author: marco-c

.eslintrc

@@ -1,8 +1,19 @@
 {
-  "parserOptions": {
-    "sourceType": "module"
+  "extends": "airbnb/legacy",
+  "env": {
+    "es6": true
   },
   "rules": {
-    "prefer-const": 2
+    "no-var": 2,
+    "no-const-assign": 2,
+    "no-console": 0,
+    "func-names": 0,
+    "vars-on-top": 0,
+    "no-use-before-define": 0,
+    "space-before-function-paren": 0,
+    "max-len": [1, 80, 4, {"ignoreComments": true, "ignoreUrls": true}],
+    "no-param-reassign": 0,
+    "quote-props": 0,
+    "wrap-iife": [2, "inside"]
   }
 }

.gitignore

@@ -1,4 +1,4 @@
-coverage
-node_modules
+coverage/
+node_modules/
 wires
 test/output/

bin/web-push.js

@@ -2,10 +2,13 @@
   "name": "web-push",
   "version": "2.2.0",
   "description": "Web Push library for Node.js",
-  "main": "index.js",
+  "main": "src/index.js",
+  "bin": {
+    "web-push": "bin/web-push.js"
+  },
   "scripts": {
-    "download-browser": "node ./test/helpers/download-test-browsers.js",
-    "lint": "./node_modules/.bin/eslint index.js test/",
+    "download-browser": "node --harmony ./test/helpers/download-test-browsers.js",
+    "lint": "node ./node_modules/eslint/bin/eslint --ignore-path .gitignore '.'",
     "pretest": "npm run lint && npm run download-browser",
     "test": "node --harmony node_modules/.bin/istanbul cover node_modules/.bin/_mocha -- --ui tdd test/test*"
   },
@@ -31,7 +34,6 @@
     "bluebird": "^3.3.5",
     "buffer-compare-shim": "^1.0.0",
     "buffer-equals-polyfill": "^1.0.0",
-    "colors": "^1.1.2",
     "create-ecdh": "^4.0.0",
     "http_ece": "^0.5.1",
     "jws": "^3.1.3",
@@ -43,7 +45,9 @@
     "chromedriver": "^2.21.2",
     "del": "^2.2.1",
     "dmg": "^0.1.0",
-    "eslint": "^2.3.0",
+    "eslint": "^2.10.2",
+    "eslint-config-airbnb": "^9.0.1",
+    "eslint-plugin-import": "^1.11.1",
     "fs-extra": "^0.30.0",
     "istanbul": "^0.4.2",
     "mkdirp": "^0.5.1",
@@ -56,9 +60,6 @@
     "temp": "^0.8.3",
     "which": "^1.2.9"
   },
-  "bin": {
-    "web-push": "bin/web-push.js"
-  },
   "engines": {
     "node": ">= v0.10.0"
   }