Fix some bugs when extracting archives, add some tests.

lib/resolve/Resolver.js

@@ -4,8 +4,6 @@ var Q = require('q');
 var tmp = require('tmp');
 var mkdirp = require('mkdirp');
 var bowerJson = require('bower-json');
-var pathspec = require('pathspec');
-var rimraf = require('rimraf');
 var glob = require('glob');
 var config = require('../config');
 var createError = require('../util/createError');

lib/resolve/resolvers/GitFsResolver.js

@@ -1,5 +1,4 @@
 var util = require('util');
-var fs = require('fs');
 var Q = require('q');
 var mout = require('mout');
 var GitResolver = require('./GitResolver');

lib/util/copy.js

@@ -14,10 +14,10 @@ function copy(reader, writer) {
 
         // If we got an error, simply reject the deferred
         if (err) {
-            return deferred.reject(err);
+            deferred.reject(err);
+        } else {
+            deferred.resolve();
         }
-
-        return deferred.resolve();
     };
 
     // Reader

lib/util/extract.js

@@ -77,17 +77,17 @@ function getExtractor(archive) {
 function isSingleDir(dir) {
     return Q.nfcall(fs.readdir, dir)
     .then(function (files) {
-        var dir;
+        var singleDir;
 
         if (files.length !== 1) {
             return false;
         }
 
-        dir = files[0];
+        singleDir = path.join(dir, files[0]);
 
-        return Q.nfcall(fs.stat, dir)
+        return Q.nfcall(fs.stat, singleDir)
         .then(function (stat) {
-            return !stat.isDirectory() ? files[0] : false;
+            return stat.isDirectory() ? singleDir : false;
         });
     });
 }
@@ -109,7 +109,7 @@ function moveSingleDirContents(dir) {
         return Q.all(promises);
     })
     .then(function () {
-        return Q.rmdir(dir);
+        return Q.nfcall(fs.rmdir, dir);
     });
 }