Merge pull request #55 from jonschlinkert/master

addresses absolute-glob issue 53

index.js

@@ -6,6 +6,7 @@ var unique = require('unique-stream');
 
 var glob = require('glob');
 var Minimatch = require('minimatch').Minimatch;
+var resolveGlob = require('to-absolute-glob');
 var glob2base = require('glob2base');
 var path = require('path');
 var extend = require('extend');
@@ -46,7 +47,7 @@ var gs = {
       stream.write({
         cwd: opt.cwd,
         base: basePath,
-        path: path.resolve(opt.cwd, filename),
+        path: filename,
       });
     });
 
@@ -165,20 +166,6 @@ function isNegative(pattern) {
   }
 }
 
-function resolveGlob(glob, opt) {
-  var mod = '';
-  if (glob[0] === '!') {
-    mod = glob[0];
-    glob = glob.slice(1);
-  }
-  if (opt.root && glob[0] === '/') {
-    glob = path.resolve(opt.root, '.' + glob);
-  } else {
-    glob = path.resolve(opt.cwd, glob);
-  }
-  return mod + glob;
-}
-
 function indexGreaterThan(index) {
   return function(obj) {
     return obj.index > index;

package.json

@@ -10,11 +10,12 @@
   "dependencies": {
     "extend": "^3.0.0",
     "glob": "^5.0.3",
+    "glob2base": "^0.0.12",
     "minimatch": "^2.0.1",
     "ordered-read-streams": "^0.3.0",
-    "glob2base": "^0.0.12",
-    "unique-stream": "^2.0.2",
-    "through2": "^0.6.0"
+    "through2": "^0.6.0",
+    "to-absolute-glob": "^0.1.1",
+    "unique-stream": "^2.0.2"
   },
   "devDependencies": {
     "coveralls": "^2.11.2",

test/main.js

@@ -25,6 +25,24 @@ describe('glob-stream', function() {
       });
     });
 
+    it('should return only folder name stream from a glob', function(done) {
+      var folderCount = 0;
+      var stream = gs.create('./fixtures/whatsgoingon/*/', { cwd: __dirname });
+      stream.on('error', function(err) {
+        throw err;
+      });
+      stream.on('data', function(file) {
+        should.exist(file);
+        should.exist(file.path);
+        String(join(file.path, '')).should.equal(join(__dirname, './fixtures/whatsgoingon/hey/'));
+        folderCount++;
+      });
+      stream.on('end', function() {
+        folderCount.should.equal(1);
+        done();
+      });
+    });
+
     it('should return a file name stream from a glob', function(done) {
       var stream = gs.create('./fixtures/*.coffee', { cwd: __dirname });
       should.exist(stream);