@util.js/node-files 0.41.0 → 0.41.2

package/index.js

@@ -1,4 +1,4 @@
 "use strict";
 
-var Files = require("./lib/Files");
+const Files = require("./lib/Files");
 module.exports = new Files();

package/lib/Files.js

@@ -79,7 +79,7 @@ module.exports = class Files {
       return callback(new TypeError("We expected pathA to be defined."));
     if (!objects().isDefined(pathB))
       return callback(new TypeError("We expected pathB to be defined."));
-    var diff = childProcess().spawn("diff", [pathA, pathB]);
+    const diff = childProcess().spawn("diff", [pathA, pathB]);
     diff.on("close", (code) => {
       callback(null, code === 0);
     });
@@ -567,9 +567,6 @@ function get(dependency) {
   );
 }
 
-function asyncwaterfall() {
-  return get("async-waterfall");
-}
 function childProcess() {
   return get("child_process");
 }

package/package.json

@@ -1,10 +1,10 @@
 {
   "author": "Chris Topher <c@creemama.com>",
   "dependencies": {
-    "@util.js/objects": "0.41.0",
-    "@util.js/promises": "0.41.0",
-    "@util.js/strings": "0.41.0",
-    "graceful-fs": "4.2.6",
+    "@util.js/objects": "0.41.2",
+    "@util.js/promises": "0.41.2",
+    "@util.js/strings": "0.41.2",
+    "graceful-fs": "4.2.10",
     "mkdirp": "1.0.4",
     "ncp": "2.0.0",
     "read-last-lines": "1.8.0",
@@ -38,6 +38,6 @@
     "type": "git",
     "url": "https://github.com/creemama/utiljs/tree/master/packages/utiljs-node-files"
   },
-  "version": "0.41.0",
-  "gitHead": "1ae0fda34e06ffbc546c5ba0025b0b59a0c7727d"
+  "version": "0.41.2",
+  "gitHead": "174b81ec0ead0221b9bb6617bc254b025bd20a5a"
 }

package/test/FilesTest.js

@@ -1,11 +1,11 @@
 "use strict";
 
-const { assert, expect } = require("chai"),
-  files = require("..");
+const { assert, expect } = require("chai");
+const files = require("..");
 
 describe("Files", function () {
   const waterfall = require("async-waterfall");
-  const targetDir = __dirname + "/../target";
+  const targetDir = files.join(__dirname, "..", "target");
   const emptyDir = targetDir + "/emptyDir";
   const jsonDir = targetDir + "/filesWithExtension";
   files.mkdirpSync(targetDir);
@@ -349,8 +349,8 @@ describe("Files", function () {
       expect(await files.diff(__filename, __filename)).to.be.ok;
     });
     it("should return false if both paths are different files", (callback) => {
-      const pathA = __dirname + "/FilesTest.js";
-      const pathB = __dirname + "/../index.js";
+      const pathA = files.join(__dirname, "FilesTest.js");
+      const pathB = files.join(__dirname, "..", "index.js");
       expect(files.isFile(pathA)).to.be.ok;
       expect(files.isFile(pathB)).to.be.ok;
       files.diff(pathA, pathB, (error, result) => {
@@ -360,7 +360,7 @@ describe("Files", function () {
       });
     });
     it("should return false if both paths are different directories", (callback) => {
-      files.diff(__dirname, __dirname + "/..", (error, result) => {
+      files.diff(__dirname, files.join(__dirname, ".."), (error, result) => {
         expect(error).to.be.null;
         expect(result).to.be.false;
         callback();
@@ -476,6 +476,10 @@ describe("Files", function () {
       files.filesWithExtension(
         { dir: emptyDir, ext: "json" },
         (error, result) => {
+          if (error) {
+            done(error);
+            return;
+          }
           try {
             expect(result).to.have.members([]);
             done();
@@ -502,6 +506,10 @@ describe("Files", function () {
         files.filesWithExtension(
           { dir: jsonDir + "/", ext: "json" },
           (error, result) => {
+            if (error) {
+              done(error);
+              return;
+            }
             try {
               expect(result).to.have.members([
                 jsonDir + "/package.json",
@@ -527,6 +535,10 @@ describe("Files", function () {
     it("should return [] if ext is empty", (done) => {
       prepareDirWithJsonFiles().then(() => {
         files.filesWithExtension({ dir: jsonDir, ext: "" }, (error, result) => {
+          if (error) {
+            done(error);
+            return;
+          }
           try {
             expect(result).to.have.members([]);
             done();
@@ -632,20 +644,23 @@ describe("Files", function () {
       expect(truth).to.be.ok;
     });
     it("should be false for FilesTest.js", (done) => {
-      files.isDirectory(__dirname + "/FilesTest.js", function (error, truth) {
-        try {
-          expect(error).to.be.null;
-          expect(truth).to.be.false;
-          done();
-        } catch (err) {
-          done(err);
+      files.isDirectory(
+        files.join(__dirname, "FilesTest.js"),
+        function (error, truth) {
+          try {
+            expect(error).to.be.null;
+            expect(truth).to.be.false;
+            done();
+          } catch (err) {
+            done(err);
+          }
         }
-      });
+      );
     });
     it("should error for UnlikelyToExist.js", async function () {
       try {
-        await files.isDirectory(__dirname + "/UnlikelyToExist.js");
-        exect.fail("We expected #isDirectory to throw an exception.");
+        await files.isDirectory(files.join(__dirname, "UnlikelyToExist.js"));
+        expect.fail("We expected #isDirectory to throw an exception.");
       } catch (error) {
         expect(error).to.be.an.instanceof(Error);
       }
@@ -671,11 +686,12 @@ describe("Files", function () {
       expect(files.isDirectorySync(__dirname)).to.be.ok;
     });
     it("should return false for FilesTest.js", () => {
-      expect(files.isDirectorySync(__dirname + "/FilesTest.js")).to.be.false;
+      expect(files.isDirectorySync(files.join(__dirname, "FilesTest.js"))).to.be
+        .false;
     });
     it("should throw an exception for UnlikelyToExist.js", () => {
       expect(() => {
-        files.isDirectorySync(__dirname + "/UnlikelyToExist.js");
+        files.isDirectorySync(files.join(__dirname, "UnlikelyToExist.js"));
       }).to.throw(/ENOENT.*/);
     });
     it("should throw an exception for /unlikely/to/exist/dir/", () => {
@@ -702,7 +718,7 @@ describe("Files", function () {
       expect(truth).to.be.false;
     });
     it("should be true for FilesTest.js", (done) => {
-      files.isFile(__dirname + "/FilesTest.js", (error, truth) => {
+      files.isFile(files.join(__dirname, "FilesTest.js"), (error, truth) => {
         try {
           expect(error).to.be.null;
           expect(truth).to.be.ok;
@@ -714,8 +730,8 @@ describe("Files", function () {
     });
     it("should error for UnlikelyToExist.js", async function () {
       try {
-        await files.isFile(__dirname + "/UnlikelyToExist.js");
-        exect.fail("We expected #isFile to throw an exception.");
+        await files.isFile(files.join(__dirname, "UnlikelyToExist.js"));
+        expect.fail("We expected #isFile to throw an exception.");
       } catch (error) {
         expect(error).to.be.an.instanceof(Error);
       }
@@ -741,11 +757,11 @@ describe("Files", function () {
       expect(files.isFileSync(__dirname)).to.be.false;
     });
     it("should return false for FilesTest.js", () => {
-      expect(files.isFileSync(__dirname + "/FilesTest.js")).to.be.ok;
+      expect(files.isFileSync(files.join(__dirname, "FilesTest.js"))).to.be.ok;
     });
     it("should throw an exception for UnlikelyToExist.js", () => {
       expect(function () {
-        files.isFileSync(__dirname + "/UnlikelyToExist.js");
+        files.isFileSync(files.join(__dirname, "UnlikelyToExist.js"));
       }).to.throw(/ENOENT.*/);
     });
     it("should throw an exception for /unlikely/to/exist/dir/", () => {
@@ -757,7 +773,7 @@ describe("Files", function () {
 
   describe("#mkdirp and #rmrf", function () {
     it("should create and destroy a new directory hierarchy", function (done) {
-      var testDir = targetDir + "/this/is/a/nested/dir";
+      const testDir = targetDir + "/this/is/a/nested/dir";
       waterfall(
         [
           function (cb) {
@@ -799,7 +815,7 @@ describe("Files", function () {
 
   describe("#rmrf", function () {
     it("should delete files", function (done) {
-      var testFile = targetDir + "/frog.txt";
+      const testFile = targetDir + "/frog.txt";
       files.mkdirpSync(targetDir);
       files.closeSync(files.openSync(testFile, "w"));
       waterfall(
@@ -830,7 +846,7 @@ describe("Files", function () {
 
   describe("#mkdirpSync and #rmrfSync", function () {
     it("should create and destroy a new directory hierarchy", function () {
-      var testDir = targetDir + "/this/is/a/nested/dir";
+      const testDir = targetDir + "/this/is/a/nested/dir";
       files.rmrfSync(targetDir);
       expect(function () {
         files.isDirectorySync(targetDir);
@@ -1044,7 +1060,7 @@ describe("Files", function () {
     });
 
     it("should create an empty file", function (done) {
-      var touchFile = targetDir + "/foo.bar";
+      const touchFile = targetDir + "/foo.bar";
       expect(function () {
         files.isFileSync(touchFile);
       }).to.throw(/ENOENT.*/);
@@ -1091,7 +1107,7 @@ describe("Files", function () {
     it("should write a file and notify a callback", (callback) => {
       const testFile = targetDir + "/writeFileTestCallback.txt";
       files.rmrf(testFile, (error) => {
-        if (error) return calback(error);
+        if (error) return callback(error);
         files.mkdirp(targetDir, (erro) => {
           if (erro) return callback(erro);
           files.writeFile(testFile, "writeFileTest", "utf8", (err) => {

package/test/Files_sanitizeFilename_Test.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const { expect } = require("chai"),
-  files = require("..");
+const { expect } = require("chai");
+const files = require("..");
 
 describe("Files#sanitizeFilename", () => {
   it("should sanitize filenames", () => {