Merge pull request #16 from amiel/fix-absolute-dist-dir

Fix case distDir is an absolute path

Author: lukemelia

index.js

@@ -56,8 +56,8 @@ module.exports = {
         var fileOutputPattern  = this.readConfig('fileOutputPattern');
         var inputPath          = path.join(distDir, fileInputPattern);
         var outputPath         = path.join(distDir, fileOutputPattern);
-        var absoluteInputPath  = path.join(root, inputPath);
-        var absoluteOutputPath = path.join(root, outputPath);
+        var absoluteInputPath  = path.resolve(root, inputPath);
+        var absoluteOutputPath = path.resolve(root, outputPath);
 
         this.log('generating `' + outputPath + '` from `' + inputPath + '`', { verbose: true });
 

tests/unit/index-nodetest.js

@@ -8,9 +8,11 @@ describe('the deploy plugin object', function() {
   var fakeRoot;
   var plugin;
   var promise;
+  var distDir;
 
   before(function() {
-    fakeRoot =  process.cwd() + '/tests/fixtures';
+    fakeRoot = process.cwd() + '/tests/fixtures';
+    distDir = 'dist';
   });
 
   beforeEach(function() {
@@ -33,7 +35,7 @@ describe('the deploy plugin object', function() {
           fileInputPattern: 'index.html',
           fileOutputPattern: 'index.json',
           distDir: function(context) {
-            return 'dist';
+            return distDir;
           },
           projectRoot: function(context) {
             return fakeRoot;
@@ -80,5 +82,20 @@ describe('the deploy plugin object', function() {
           assert.deepEqual(result.distFiles, ['index.json']);
         });
     });
+
+    describe('when the distDir is an absolute path', function() {
+      before(function() {
+        distDir = fakeRoot + '/dist';
+      });
+
+      it('still works', function() {
+        return assert.isFulfilled(promise)
+          .then(function() {
+            var json = require(fakeRoot + '/dist/index.json');
+
+            assert.equal(Object.keys(json).length, 4);
+          });
+      });
+    });
   });
 });