Fix: Use stream-combiner to propagate errors

Author: yocontra

index.js

@@ -1,4 +1,5 @@
 var es = require('event-stream');
+var Combine = require('stream-combiner');
 var glob = require('glob');
 var minimatch = require('minimatch');
 var path = require('path');
@@ -67,9 +68,7 @@ module.exports = us = {
 
     // stream to check against negatives
     var filterStream = es.map(function(filename, cb) {
-      var matcha = function(pattern) {
-        return isMatch(filename, pattern);
-      };
+      var matcha = isMatch.bind(null, filename);
       if (!negatives.every(matcha)) return cb(null, filename); // pass
       cb(); // ignore
     });
@@ -96,10 +95,7 @@ module.exports = us = {
     });
 
     // then just pipe them to a single stream and return it
-    var aggregate = es.pause();
-    streams.forEach(function(gStream){
-      gStream.pipe(aggregate);
-    });
+    var aggregate = Combine.apply(null, streams);
     return aggregate;
   }
 };

package.json

@@ -9,7 +9,8 @@
   "dependencies": {
     "glob": "~3.2.7",
     "event-stream": "~3.0.18",
-    "minimatch": "~0.2.12"
+    "minimatch": "~0.2.12",
+    "stream-combiner": "0.0.2"
   },
   "devDependencies": {
     "mocha": "*",

test/main.js

@@ -91,5 +91,23 @@ describe('glob-stream', function() {
       });
     });
 
+    it('should return a file name stream from two globs and a negative', function(done) {
+      var stream = gs.create(["./fixtures/*.coffee", "./fixtures/whatsgoingon/*.coffee"], {cwd: __dirname});
+      should.exist(stream);
+      stream.on('error', function(err) {
+        throw err;
+      });
+      stream.on('data', function(file) {
+        should.exist(file);
+        should.exist(file.path);
+        should.exist(file.base);
+        should.exist(file.cwd);
+        String(file.cwd).should.equal(__dirname);
+        String(file.base).should.equal("fixtures/");
+        String(file.path).should.equal(join(__dirname, "./fixtures/test.coffee"));
+        done();
+      });
+    });
+
   });
 });