Merge pull request #47 from blackflux/dev

[Gally]: master <- dev
blackflux · Apr 1, 2019 · 25826fd · 25826fd
2 parents feddf3d + 646e27d
commit 25826fd
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -47,11 +47,11 @@
     "babel-eslint": "10.0.1",
     "chai": "4.2.0",
     "coveralls": "3.0.3",
-    "eslint": "5.15.3",
+    "eslint": "5.16.0",
     "js-gardener": "1.38.2",
     "nyc": "13.3.0",
     "semantic-release": "15.13.3",
-    "tmp": "0.0.33"
+    "tmp": "0.1.0"
   },
   "nyc": {
     "tempDir": "./coverage/.nyc_output",

diff --git a/src/logic/guess-file.js b/src/logic/guess-file.js
@@ -4,6 +4,9 @@ const path = require('path');
 module.exports = (filepath) => {
   const dirname = path.dirname(filepath);
   const basename = path.basename(filepath);
+  if (!fs.existsSync(dirname) || !fs.lstatSync(dirname).isDirectory()) {
+    return null;
+  }
   const relevantFiles = fs
     .readdirSync(dirname)
     .filter(f => f === basename || (f.startsWith(`${basename}.`) && f.lastIndexOf('.') <= basename.length));

diff --git a/test/logic/guess-file.spec.js b/test/logic/guess-file.spec.js
@@ -39,4 +39,9 @@ describe('Testing guessFile', () => {
     executeTest(['file.json.json'], 'file', null);
     executeTest(['file..json'], 'file', null);
   });
+
+  it('Testing parent folder missing', () => {
+    executeTest([], 'folder/file', null);
+    executeTest(['folder'], 'folder/file', null);
+  });
 });
diff --git a/yarn.lock b/yarn.lock
@@ -2035,10 +2035,10 @@ eslint@5.15.1:
     table "^5.2.3"
     text-table "^0.2.0"
 
-eslint@5.15.3:
-  version "5.15.3"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.15.3.tgz#c79c3909dc8a7fa3714fb340c11e30fd2526b8b5"
-  integrity sha512-vMGi0PjCHSokZxE0NLp2VneGw5sio7SSiDNgIUn2tC0XkWJRNOIoHIg3CliLVfXnJsiHxGAYrkw0PieAu8+KYQ==
+eslint@5.16.0:
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"
+  integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     ajv "^6.9.1"
@@ -2060,7 +2060,7 @@ eslint@5.15.3:
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     inquirer "^6.2.2"
-    js-yaml "^3.12.0"
+    js-yaml "^3.13.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.3.0"
     lodash "^4.17.11"
@@ -3542,7 +3542,7 @@ js-yaml@3.12.2:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@3.13.0, js-yaml@^3.11.0, js-yaml@^3.12.0, js-yaml@^3.4.2, js-yaml@^3.6.1, js-yaml@^3.9.0:
+js-yaml@3.13.0, js-yaml@^3.11.0, js-yaml@^3.12.0, js-yaml@^3.13.0, js-yaml@^3.4.2, js-yaml@^3.6.1, js-yaml@^3.9.0:
   version "3.13.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.0.tgz#38ee7178ac0eea2c97ff6d96fff4b18c7d8cf98e"
   integrity sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==
@@ -6606,6 +6606,13 @@ tmp@0.0.33, tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
+tmp@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877"
+  integrity sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==
+  dependencies:
+    rimraf "^2.6.3"
+
 to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"