closes #164 and #235 fix wrong usage of matchBase option of minimatch…

…, use relative to watchDirectory path fore matching
foreversd · May 4, 2012 · 44c2337 · 44c2337
1 parent 2a7c477
commit 44c2337
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/forever/plugins/watch.js b/lib/forever/plugins/watch.js
@@ -18,8 +18,10 @@ function watchFilter(fileName) {
     return false;
   }
 
+  fileName = path.relative(this.watchDirectory, fileName);
+
   for (var key in this.watchIgnorePatterns) {
-    if (minimatch(fileName, this.watchIgnorePatterns[key], { matchBase: this.watchDirectory })) {
+    if (minimatch(fileName, this.watchIgnorePatterns[key], { matchBase: true })) {
       return false;
     }
   }
@@ -53,4 +55,4 @@ exports.attach = function () {
       }
     }
   });
-};
+};
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
     "daemon": "https://github.com/AvianFlu/daemon.node/tarball/master",
     "flatiron": "0.1.x",
     "microtime": "0.2.x",
-    "minimatch": "0.0.x",
+    "minimatch": "0.2.x",
     "nconf": "0.5.x",
     "nssocket": "0.3.x",
     "node-fork": "0.4.x",