Properly account for nested .gitignore - Fix #2

Author: SBoudrias

lib/index.js

@@ -3,21 +3,29 @@ var fs = require('fs');
 var path = require('path');
 var gulpIgnore = require('gulp-ignore');
 
-var appendStars = function (str) {
+var appendStars = function (dirname, str) {
+  var prefix = '';
+  if (dirname) {
+    prefix = dirname + '/';
+  }
   return [
-    str + '**',
-    str + '/**'
+    prefix + str + '**',
+    prefix + str + '/**'
   ];
 };
 
 module.exports = function (gitignorePath) {
   gitignorePath = path.resolve(gitignorePath || '.gitignore');
+  var dirname = path.dirname(path.relative(process.cwd(), gitignorePath));
+  if (dirname === '.') {
+    dirname = '';
+  }
 
   var contents = fs.readFileSync(gitignorePath, 'utf8');
   var ignoredFiles = contents.split('\n')
     .map(str => str.trim())
     .filter(Boolean) // ignore empty lines
-    .map(appendStars)
+    .map(str => appendStars(dirname, str))
     .reduce((m, paths) => m.concat(paths), []);
 
   return gulpIgnore.exclude(ignoredFiles);

test/index.js

@@ -26,6 +26,7 @@ describe('gulp-exclude-gitignore', function () {
 
     this.stub.withArgs(path.resolve('.gitignore'), 'utf8').returns(contents);
     this.stub.withArgs(path.resolve('custom.gitignore'), 'utf8').returns('bar\n');
+    this.stub.withArgs(path.resolve('sub/.gitignore'), 'utf8').returns('a.txt\n');
   });
 
   afterEach(function () {
@@ -81,4 +82,22 @@ describe('gulp-exclude-gitignore', function () {
     stream.write(fakeFile('bar/c.txt'));
     stream.end();
   });
+
+  it('correctly account for nested .gitignore', function (done) {
+    var stream = excludeGitignore('sub/.gitignore');
+
+    var filePaths = [];
+    stream.on('data', function (file) {
+      filePaths.push(file.relative);
+    });
+
+    stream.on('finish', function () {
+      assert.deepEqual(filePaths, ['a.txt']);
+      done();
+    });
+
+    stream.write(fakeFile('a.txt'));
+    stream.write(fakeFile('sub/a.txt'));
+    stream.end();
+  });
 });