fixes mjeanroy#10 by using the bower cache instead of tmp directories

package.json

@@ -29,11 +29,11 @@
   "homepage": "https://github.com/mjeanroy/bower-npm-resolver",
   "dependencies": {
     "escape-string-regexp": "^1.0.5",
+    "mkdirp": "^0.5.1",
     "npm": ">=1.0.0",
     "q": "1.4.1",
     "request": "2.72.0",
     "tar-fs": "1.12.0",
-    "tmp": "0.0.28",
     "underscore": "1.8.3"
   },
   "devDependencies": {
@@ -47,6 +47,7 @@
     "gulp-jasmine": "2.3.0",
     "gulp-util": "3.0.7",
     "jasmine-core": "2.4.1",
-    "run-sequence": "1.1.5"
+    "run-sequence": "1.1.5",
+    "tmp": "0.0.28"
   }
 }

src/npm-utils.js

@@ -30,7 +30,6 @@
  */
 
 var Q = require('q');
-var fs = require('fs');
 var npm = require('npm');
 var path = require('path');
 
@@ -131,14 +130,10 @@ module.exports = {
    * @return {Promise} The promise object.
    */
   downloadTarball: function(pkg, version, dir) {
-    var oldCWD = process.cwd();
     process.chdir(dir);
     return execPackCommand([pkg + '@' + version])
       .then(function(filename) {
         return path.resolve(dir || process.cwd(), filename[0]);
-      })
-      .finally(function() {
-        process.chdir(oldCWD);
       });
   }
 };

src/resolver.js

@@ -22,12 +22,12 @@
  * SOFTWARE.
  */
 
- /**
-  * Factory function for the resolver.
-  * Will be called only one time by Bower, to instantiate resolver.
-  */
+/**
+ * Factory function for the resolver.
+ * Will be called only one time by Bower, to instantiate resolver.
+ */
 
-var tmp = require('tmp');
+var mkdirp = require('mkdirp');
 var path = require('path');
 var npmUtils = require('./npm-utils');
 var extract = require('./extract');
@@ -129,22 +129,20 @@ module.exports = function resolver(bower) {
       var pkg = extractPackageName(endpoint.source);
 
       // Directory where the tgz will be stored.
-      var tmpTar = tmp.dirSync({
-        unsafeCleanup: true
-      });
+      var compressedDir = path.join(bower.config.storage.packages, 'npm-resolver/compressed');
+      mkdirp.sync(compressedDir);
 
       // Directory where the tgz file will be extracted.
-      var tmpPackage = tmp.dirSync({
-        unsafeCleanup: true
-      });
+      var uncompressedDir = path.join(bower.config.storage.packages, 'npm-resolver/uncompressed', pkg, endpoint.target);
+      mkdirp.sync(uncompressedDir);
 
       logger.debug('npm-resolver', 'downloading tarball for: ' + pkg + '#' + endpoint.target);
-      return npmUtils.downloadTarball(pkg, endpoint.target, tmpTar.name)
+      return npmUtils.downloadTarball(pkg, endpoint.target, compressedDir)
 
         // Download ok, extract tarball.
         .then(function(tarballPath) {
-          logger.debug('npm-resolver', 'extracting tarball from: ' + tarballPath);
-          return extract.tgz(tarballPath, tmpPackage.name);
+          logger.debug('npm-resolver', 'extracting tarball from: "' + tarballPath + '" to "' + uncompressedDir);
+          return extract.tgz(tarballPath, uncompressedDir);
         })
 
         // Patch configuration with `package.json` file if `bower.json` does not exist.
@@ -157,16 +155,6 @@ module.exports = function resolver(bower) {
               removeIgnores: true
             };
           });
-        })
-
-        // When an error occured, remove temporary directory.
-        .catch(function() {
-          tmpPackage.removeCallback();
-        })
-
-        // Always remove the temporary directory for the tgz file.
-        .finally(function() {
-          tmpTar.removeCallback();
         });
     }
   };

test/resolver-spec.js

@@ -28,18 +28,32 @@ var factory = require('../src/resolver');
 var npmUtils = require('../src/npm-utils');
 var extract = require('../src/extract');
 var bowerUtils = require('../src/bower-utils');
+var tmp = require('tmp');
 
 describe('resolver', function() {
   var resolver;
+  var tmpDir;
 
   beforeEach(function() {
+    tmpDir = tmp.dirSync({
+      unsafeCleanup: true
+    });
+
     resolver = factory({
-      config: {},
+      config: {
+        storage: {
+          packages: tmpDir.name
+        }
+      },
       version: '1.7.7',
       logger: jasmine.createSpyObj('logger', ['debug'])
     });
   });
 
+  afterEach(function() {
+    tmpDir.removeCallback();
+  });
+
   it('should get list of releases', function(done) {
     var source = 'npm:bower';
     var defer = Q.defer();