Switch to path.resolve

.eslintrc.yml

@@ -50,6 +50,8 @@ rules:
   linebreak-style:
     - error
     - unix
+  no-path-concat:
+    - error
   no-trailing-spaces:
     - error
   quotes:

bin/_cli/options.js

@@ -1,6 +1,6 @@
 const defaults = {
     command: 'validate',
-    config: './.nginx-linter.json',
+    config: '~/.nginx-linter.json',
     includes: ['/etc/nginx/*.conf', '/etc/nginx/**/*.conf'],
     followIncludes: true,
     excludes: [],

test/cli/commands.spec.js

@@ -1,4 +1,5 @@
 let assert = require('assert');
+let path = require('path');
 let {main} = require('../../bin/_cli/commands');
 
 let stubConsole = new Proxy({}, {
@@ -31,13 +32,13 @@ describe('cli/commands', () => {
             assert.strictEqual(exitCode, 1);
         });
         it('simple.conf', () => {
-            let exitCode = main(['--include', __dirname + '/../examples/simple.conf'], stubConsole);
+            let exitCode = main(['--include', path.resolve(__dirname, '..', 'examples', 'simple.conf')], stubConsole);
             assert.strictEqual(exitCode, 0);
             let message = stubConsole.invocations.log[stubConsole.invocations.log.length - 1];
             assert.ok(/Validation succeeded!.*Files: 1, Errors: 0$/.test(message), `Expected success summary, got '${message}'`);
         });
         it('if-is-evil.conf', () => {
-            let exitCode = main(['--include', __dirname + '/../examples/if-is-evil.conf'], stubConsole);
+            let exitCode = main(['--include', path.resolve(__dirname, '..', 'examples', 'if-is-evil.conf')], stubConsole);
             assert.strictEqual(exitCode, 1);
             let message = stubConsole.invocations.log[stubConsole.invocations.log.length - 1];
             assert.ok(/Validation failed!.*Files: 1, Errors: 3$/.test(message), `Expected success summary, got '${message}'`);

test/parser.spec.js

@@ -1,6 +1,7 @@
 let assert = require('assert');
-let parser = require('../lib/parser');
 let fs = require('fs');
+let path = require('path');
+let parser = require('../lib/parser');
 
 function punctuation(text) {
     return { type: 'punctuation', text };
@@ -169,7 +170,7 @@ describe('parser', () => {
         for (let configFileName in TEST_CONFIGS) {
             let expectedParseTree = TEST_CONFIGS[configFileName];
             it(`should handle ${configFileName} file`, () => {
-                let actualParseTree = parser.parse(fs.readFileSync(__dirname + '/examples/' + configFileName, 'utf8'));
+                let actualParseTree = parser.parse(fs.readFileSync(path.resolve(__dirname, 'examples', configFileName), 'utf8'));
                 assert.deepStrictEqual(sanitizeParseTree(actualParseTree), expectedParseTree);
             });
         }

test/rules/rule-if-is-evil.spec.js

@@ -1,8 +1,9 @@
 let assert = require('assert');
+let fs = require('fs');
+let path = require('path');
 let parser = require('../../lib/parser');
 let {runRules} = require('../../lib/rules/runner');
 let ifIsEvilRule = require('../../lib/rules/rule-if-is-evil');
-let fs = require('fs');
 
 function testConfig(name, mode, contents, expectedErrors) {
     return { name, mode, contents, expectedErrors };
@@ -59,7 +60,7 @@ location / {
             },
         },
     ]),
-    testConfig('if-is-evil.conf file', 'mostly', fs.readFileSync(__dirname + '/../examples/if-is-evil.conf', 'utf8'), [
+    testConfig('if-is-evil.conf file', 'mostly', fs.readFileSync(path.resolve(__dirname, '..', 'examples', 'if-is-evil.conf'), 'utf8'), [
         {
             rule: 'if-is-evil',
             type: 'error',

test/rules/rule-indentation.spec.js

@@ -1,5 +1,6 @@
 let assert = require('assert');
 let fs = require('fs');
+let path = require('path');
 let parser = require('../../lib/parser');
 let {runRules} = require('../../lib/rules/runner');
 let indentationRule = require('../../lib/rules/rule-indentation');
@@ -67,8 +68,8 @@ location / {
             },
         },
     ]),
-    testConfig('simple.conf', 4, fs.readFileSync(__dirname + '/../examples/simple.conf', 'utf8'), []),
-    testConfig('lua.conf', 4, fs.readFileSync(__dirname + '/../examples/lua.conf', 'utf8'), []),
+    testConfig('simple.conf', 4, fs.readFileSync(path.resolve(__dirname, '..', 'examples', 'simple.conf'), 'utf8'), []),
+    testConfig('lua.conf', 4, fs.readFileSync(path.resolve(__dirname, '..', 'examples', 'lua.conf'), 'utf8'), []),
 ];
 
 describe('rules/indentation', () => {

test/rules/rule-line-ending.spec.js

@@ -1,8 +1,9 @@
 let assert = require('assert');
+let fs = require('fs');
+let path = require('path');
 let parser = require('../../lib/parser');
 let {runRules} = require('../../lib/rules/runner');
 let lineEndingRule = require('../../lib/rules/rule-line-ending');
-let fs = require('fs');
 
 function testConfig(name, lineEnding, contents, expectedErrors) {
     return { name, lineEnding, contents, expectedErrors };
@@ -42,7 +43,7 @@ const TEST_CONFIGS = [
             },
         },
     ]),
-    testConfig('newlines.conf', 'lf', fs.readFileSync(__dirname + '/../examples/newlines.conf', 'utf8'), [
+    testConfig('newlines.conf', 'lf', fs.readFileSync(path.resolve(__dirname, '..', 'examples', 'newlines.conf'), 'utf8'), [
         {
             rule: 'line-ending',
             text: 'Expected lf, found crlf',

test/rules/rule-strict-location.spec.js

@@ -1,8 +1,9 @@
 let assert = require('assert');
+let fs = require('fs');
+let path = require('path');
 let parser = require('../../lib/parser');
 let {runRules} = require('../../lib/rules/runner');
 let strictLocationRule = require('../../lib/rules/rule-strict-location');
-let fs = require('fs');
 
 function testConfig(name, contents, expectedErrors) {
     return { name, contents, expectedErrors };
@@ -26,7 +27,7 @@ location / {
     return 204;
 }
     `, []),
-    testConfig('strict-location.conf', fs.readFileSync(__dirname + '/../examples/strict-location.conf', 'utf8'), [
+    testConfig('strict-location.conf', fs.readFileSync(path.resolve(__dirname, '..', 'examples', 'strict-location.conf'), 'utf8'), [
         {
             rule: 'strict-location',
             type: 'error',

test/rules/rule-trailing-whitespace.spec.js

@@ -1,5 +1,6 @@
 let assert = require('assert');
 let fs = require('fs');
+let path = require('path');
 let parser = require('../../lib/parser');
 let {runRules} = require('../../lib/rules/runner');
 let trailingWhitespaceRule = require('../../lib/rules/rule-trailing-whitespace');
@@ -30,8 +31,8 @@ const TEST_CONFIGS = [
             },
         },
     ]),
-    testConfig('simple.conf', fs.readFileSync(__dirname + '/../examples/simple.conf', 'utf8'), []),
-    testConfig('lua.conf', fs.readFileSync(__dirname + '/../examples/lua.conf', 'utf8'), []),
+    testConfig('simple.conf', fs.readFileSync(path.resolve(__dirname, '..', 'examples', 'simple.conf'), 'utf8'), []),
+    testConfig('lua.conf', fs.readFileSync(path.resolve(__dirname, '..', 'examples', 'lua.conf'), 'utf8'), []),
 ];
 
 describe('rules/trailing-whitespace', () => {