Merge 87ce6f2 into 0a8777d

veged · Jan 10, 2018 · aa0aafa · aa0aafa
2 parents 0a8777d + 87ce6f2
commit aa0aafa
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -13,7 +13,6 @@
         "no-cond-assign": "off",
 
         "semi" : "error",
-        "indent" : ["error", 4],
         "no-mixed-spaces-and-tabs" : "error",
         "max-len" : ["error", { "code" : 120 }],
         "eol-last" : "error",

diff --git a/.travis.yml b/.travis.yml
@@ -6,8 +6,9 @@ matrix:
   include:
     - node_js: "4"
     - node_js: "6"
+    - node_js: "8"
       env: COVERALLS=1
-    - node_js: "7"
+    - node_js: "9"
 
 after_success:
   - if [ "x$COVERALLS" = "x1" ]; then npm run coveralls; fi
diff --git a/lib/cmd.js b/lib/cmd.js
@@ -1,3 +1,4 @@
+/* eslint-disable class-methods-use-this */
 'use strict';
 
 const

diff --git a/lib/coaobject.js b/lib/coaobject.js
@@ -1,3 +1,4 @@
+/* eslint-disable class-methods-use-this */
 'use strict';
 
 const Q = require('q');

diff --git a/lib/completion.js b/lib/completion.js
@@ -62,7 +62,7 @@ function dumpScript(name) {
 
     fs.readFile(path.resolve(__dirname, 'completion.sh'), 'utf8', function(err, d) {
         if(err) return defer.reject(err);
-        d = d.replace(/{{cmd}}/g, path.basename(name)).replace(/^\#\!.*?\n/, '');
+        d = d.replace(/{{cmd}}/g, path.basename(name)).replace(/^#!.*?\n/, '');
 
         process.stdout.on('error', onError);
         process.stdout.write(d, () => defer.resolve());

diff --git a/package.json b/package.json
@@ -29,8 +29,8 @@
   "devDependencies": {
     "chai": "~1.7.2",
     "coveralls": "^2.11.16",
-    "eslint": "^3.15.0",
-    "eslint-config-pedant": "^0.8.0",
+    "eslint": "^4.15.0",
+    "eslint-config-pedant": "^1.0.0",
     "mocha": "~1.21.4",
     "nyc": "^10.1.2"
   },