Hidden files are now ignored by "build" and "server". Issue #8

nordnet · Oct 26, 2015 · ee4faf2 · ee4faf2
1 parent 3a3f08f
commit ee4faf2
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 13 deletions.
diff --git a/dist/build.js b/dist/build.js
@@ -10,6 +10,7 @@
       _ = require('lodash'),
       createHash = require('crypto').createHash,
       recursive = require('recursive-readdir'),
+      hidefile = require('hidefile'),
       chcpContext;
 
   module.exports = {
@@ -24,11 +25,7 @@
         ignore = context.ignoredFiles();
 
     recursive(chcpContext.sourceDirectory, ignore, function (err, files) {
-      var hashQueue = [];
-      for (var i in files) {
-        var file = files[i];
-        hashQueue.push(hashFile.bind(null, file));
-      }
+      var hashQueue = prepareFilesHashQueue(files);
 
       async.parallelLimit(hashQueue, 10, function (err, result) {
         var json = JSON.stringify(result, null, 2);
@@ -57,6 +54,18 @@
     return executeDfd.promise;
   }
 
+  function prepareFilesHashQueue(files) {
+    var queue = [];
+    for (var i in files) {
+      var file = files[i];
+      if (!hidefile.isHiddenSync(file)) {
+        queue.push(hashFile.bind(null, file));
+      }
+    }
+
+    return queue;
+  }
+
   function prepareConfig(context) {
     var config = {};
 

diff --git a/dist/server.js b/dist/server.js
@@ -14,6 +14,7 @@
       compression = require('compression'),
       build = require('./build.js').execute,
       minimatch = require('minimatch'),
+      hidefile = require('hidefile'),
       io,
       chcpContext,
       sourceDirectory,
@@ -85,7 +86,7 @@
     var fileIsAllowed = true;
     var relativeFilePath = path.relative(chcpContext.sourceDirectory, file);
     for (var i = 0, len = ignoredFiles.length; i < len; i++) {
-      if (minimatch(relativeFilePath, ignoredFiles[i])) {
+      if (hidefile.isHiddenSync(file) || minimatch(relativeFilePath, ignoredFiles[i])) {
         fileIsAllowed = false;
         break;
       }

diff --git a/package.json b/package.json
@@ -47,7 +47,8 @@
     "socket.io": "^1.3.6",
     "watch": "^0.16.0",
     "yargs": "^3.16.1",
-    "minimatch": "^3.0.0"
+    "minimatch": "^3.0.0",
+    "hidefile": "^1.1.0"
   },
   "devDependencies": {
     "babel": "^5.8.19",

diff --git a/src/build.js b/src/build.js
@@ -8,6 +8,7 @@
     _ = require('lodash'),
     createHash = require('crypto').createHash,
     recursive = require('recursive-readdir'),
+    hidefile = require('hidefile'),
     chcpContext;
 
   module.exports = {
@@ -22,11 +23,7 @@
       ignore = context.ignoredFiles();
 
     recursive(chcpContext.sourceDirectory, ignore, function(err, files) {
-      var hashQueue = [];
-      for (var i in files) {
-        var file = files[i];
-        hashQueue.push(hashFile.bind(null, file));
-      }
+      var hashQueue = prepareFilesHashQueue(files);
 
       async.parallelLimit(hashQueue, 10, function(err, result) {
         var json = JSON.stringify(result, null, 2);
@@ -55,6 +52,18 @@
     return executeDfd.promise;
   }
 
+  function prepareFilesHashQueue(files) {
+    var queue = [];
+    for (var i in files) {
+      var file = files[i];
+      if (!hidefile.isHiddenSync(file)) {
+        queue.push(hashFile.bind(null, file));
+      }
+    }
+
+    return queue;
+  }
+
   function prepareConfig(context) {
     var config = {};
 

diff --git a/src/server.js b/src/server.js
@@ -12,6 +12,7 @@
       compression = require('compression'),
       build = require('./build.js').execute,
       minimatch = require('minimatch'),
+      hidefile = require('hidefile'),
       io,
       chcpContext,
       sourceDirectory,
@@ -83,7 +84,7 @@
     var fileIsAllowed = true;
     var relativeFilePath = path.relative(chcpContext.sourceDirectory, file);
     for (var i=0, len=ignoredFiles.length; i<len; i++) {
-      if (minimatch(relativeFilePath, ignoredFiles[i])) {
+      if (hidefile.isHiddenSync(file) || minimatch(relativeFilePath, ignoredFiles[i])) {
         fileIsAllowed = false;
         break;
       }