Merge pull request #29 from Ajedi32/match_directories

jergason · jergason · commit eebc91c67abc · 2015-10-28T08:14:38.000-06:00
Allow ignoring directories using non-negated string matchers
diff --git a/index.js b/index.js
@@ -4,7 +4,8 @@ var minimatch = require('minimatch')
 
 function patternMatcher(pattern) {
   return function(path, stats) {
-    return stats.isFile() && minimatch(path, pattern, {matchBase: true})
+    var minimatcher = new minimatch.Minimatch(pattern, {matchBase: true})
+    return (!minimatcher.negate || stats.isFile()) && minimatcher.match(path)
   }
 }
 
diff --git a/test/recursive-readdir-test.js b/test/recursive-readdir-test.js
@@ -41,6 +41,21 @@ describe('readdir', function() {
     })
   })
 
+  it('ignores the directories listed in the ignores array', function(done) {
+    var notExpectedFiles = getAbsolutePaths([
+      '/testdir/a/a', '/testdir/a/beans'
+    ])
+
+    readdir(p.join(__dirname, 'testdir'), ['**/testdir/a'], function(err, list) {
+      assert.ifError(err)
+      list.forEach(function(file) {
+        assert.equal(notExpectedFiles.indexOf(file), -1,
+          'Failed to ignore file "' + file + '".')
+      })
+      done()
+    })
+  })
+
   it('supports ignoring files with just basename globbing', function(done) {
     var notExpectedFiles = getAbsolutePaths([
       '/testdir/d.txt', '/testdir/a/beans'

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,8 @@ var minimatch = require('minimatch')`
`4`	`4`
`5`	`5`	`function patternMatcher(pattern) {`
`6`	`6`	`return function(path, stats) {`
`7`		`- return stats.isFile() && minimatch(path, pattern, {matchBase: true})`
	`7`	`+ var minimatcher = new minimatch.Minimatch(pattern, {matchBase: true})`
	`8`	`+ return (!minimatcher.negate \|\| stats.isFile()) && minimatcher.match(path)`
`8`	`9`	`}`
`9`	`10`	`}`
`10`	`11`