Handle linux paths on windows.

Author: dsherret

index.js

@@ -8,18 +8,9 @@ module.exports = function(glob, options) {
   // default options
   var opts = options || {};
 
-  // ensure cwd is absolute
-  var cwd = path.resolve(opts.cwd ? opts.cwd : process.cwd());
-  cwd = unixify(cwd);
-
-  var rootDir = opts.root;
-  // if `options.root` is defined, ensure it's absolute
-  if (rootDir) {
-    rootDir = unixify(rootDir);
-    if (process.platform === 'win32' || !isAbsolute(rootDir)) {
-      rootDir = unixify(path.resolve(rootDir));
-    }
-  }
+  // ensure provided paths are absolute
+  var cwd = ensureAbsolute(opts.cwd ? opts.cwd : process.cwd());
+  var rootDir = opts.root ? ensureAbsolute(opts.root) : undefined;
 
   // trim starting ./ from glob patterns
   if (glob.slice(0, 2) === './') {
@@ -54,6 +45,11 @@ module.exports = function(glob, options) {
   return ing.negated ? '!' + glob : glob;
 };
 
+function ensureAbsolute(filepath) {
+  var absoluteFilepath = isAbsolute(filepath) ? filepath : path.resolve(filepath);
+  return unixify(absoluteFilepath);
+}
+
 function unixify(filepath) {
   return filepath.replace(/\\/g, '/');
 }

test.js

@@ -56,34 +56,39 @@ describe('resolve', function () {
       assert.equal(actual, unixify(path.resolve('.')) + '/\\!(foo)');
     });
 
-    it('should make a glob absolute from a cwd', function () {
+    it('should make a glob absolute from a relative cwd', function () {
       actual = resolve('a/*.js', {cwd: 'foo'});
       assert.equal(actual, unixify(path.resolve('foo/a/*.js')));
     });
 
-    it('should make a negative glob absolute from a cwd', function () {
+    it('should make a negative glob absolute from a relative cwd', function () {
       actual = resolve('!a/*.js', {cwd: 'foo'});
       assert.equal(actual, '!' + unixify(path.resolve('foo/a/*.js')));
     });
 
-    it('should make a glob absolute from a root path', function () {
+    it('should make a glob absolute from an absolute cwd', function () {
+      actual = resolve('a/*.js', {cwd: '/foo'});
+      assert.equal(actual, unixify('/foo/a/*.js'));
+    });
+
+    it('should make a glob absolute from a relative root path', function () {
       actual = resolve('/a/*.js', {root: 'foo'});
       assert.equal(actual, unixify(path.resolve('foo/a/*.js')));
     });
 
     it('should make a glob absolute from a root slash', function () {
       actual = resolve('/a/*.js', {root: '/'});
-      assert.equal(actual, unixify(path.resolve('/a/*.js')));
+      assert.equal(actual, unixify('/a/*.js'));
     });
 
-    it('should make a glob absolute from a negative root path', function () {
+    it('should make a glob absolute from a negative relative root path', function () {
       actual = resolve('!/a/*.js', {root: 'foo'});
       assert.equal(actual, '!' + unixify(path.resolve('foo/a/*.js')));
     });
 
     it('should make a negative glob absolute from a negative root path', function () {
       actual = resolve('!/a/*.js', {root: '/'})
-      assert.equal(actual, '!' + unixify(path.resolve('/a/*.js')));
+      assert.equal(actual, '!' + unixify('/a/*.js'));
     });
   });
 
@@ -93,14 +98,14 @@ describe('resolve', function () {
       assert.equal(actual, unixify(path.resolve('foo/bar')) + '\\!(baz)');
     });
 
-    it('should make a glob absolute from a root path', function () {
+    it('should make a glob absolute from a relative root path', function () {
       actual = resolve('/a/*.js', {root: 'foo\\bar\\baz'});
       assert.equal(actual, unixify(path.resolve('foo/bar/baz/a/*.js')));
     });
 
     it('should make a glob absolute from a root slash', function () {
       actual = resolve('/a/*.js', {root: '\\'});
-      assert.equal(actual, unixify(path.resolve('/a/*.js')));
+      assert.equal(actual, unixify('/a/*.js'));
     });
   });
 });