CWD solution for local paths

robashton · Mar 26, 2012 · 1a86a2e · 1a86a2e
1 parent b97a2b1
commit 1a86a2e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/src/builder.js b/src/builder.js
@@ -18,15 +18,20 @@ module.exports = (function(require) {
   Builder.prototype = {  
 
     run: function() {
+      var oldWd = process.cwd();
+      process.chdir(this.cfg.root || oldWd);
+
       var root = new DirectoryWalker(this.cfg.in);
       var self = this;
 
       root.on('error', function(err) {
         self.emit('error', err);
+        process.chdir(oldWd);
       });
 
       root.on('completed', function() {
         self.completed = true;
+        process.chdir(oldWd);
       });
 
       root.on('file', function(path) {
@@ -62,9 +67,6 @@ module.exports = (function(require) {
         } 
         handler.handle(path, function(err, data) {
           if(err) { self.emit('error', err); return; }
-          if(self.cfg.root) {
-            path = path.replace(self.cfg.root, '');
-          }
           self.data[path] = data;
           self.notifyPendingDecrease();       
         });

diff --git a/test/out/packaging_directory_with_root_specified.json b/test/out/packaging_directory_with_root_specified.json
diff --git a/test/out/packing_directory_additional_handler.json b/test/out/packing_directory_additional_handler.json
diff --git a/test/out/packing_directory_default_options.json b/test/out/packing_directory_default_options.json
diff --git a/test/tests.js b/test/tests.js
@@ -91,9 +91,9 @@ describe("Packaging a directory with a root specified", function() {
 
   before(function(done) {
     swallowTests.packageDirectoryAndLoadPackage({
-      in: './in/assets',
+      in: './assets',
       out: './out/packaging_directory_with_root_specified.json',
-      root: 'in/assets'
+      root: 'in'
     },
     function(err, pkg) {
       if(err) throw err;
@@ -103,8 +103,8 @@ describe("Packaging a directory with a root specified", function() {
   });
 
   it("Should remove the root from the path", function() {
-    var packageJson = builtPackage.getRaw('/models/hovercraft.json');
+    var packageJson = builtPackage.getRaw('assets/models/hovercraft.json');
-    assert(packageJson)    
+    assert(packageJson);    
   });
 });