Merge pull request #166 from devMYC/fix

fixed command line bug when passing env variables to post-deploy hook

Author: Unitech

deploy.js

@@ -87,6 +87,9 @@ function deployForEnv(deploy_conf, env, args, cb) {
   if (process.platform !== 'win32' && process.platform !== 'win64')
     target_conf.path = path.resolve(target_conf.path);
 
+  var originalPostDeploy = typeof target_conf['post-deploy'] === 'string'
+    ? target_conf['post-deploy']
+    : '';
   if (Array.isArray(target_conf.host)) {
     series(target_conf.host.reduce(function (jobs, host) {
       jobs.push(function (done) {
@@ -96,10 +99,12 @@ function deployForEnv(deploy_conf, env, args, cb) {
         }
 
         target_conf.host = host;
-        target_conf['post-deploy'] = 'export ' + objectToEnvVars(target_conf.env) + ' && ' + target_conf['post-deploy']
-        var custom_data = JSON.stringify(target_conf);
+        target_conf['post-deploy'] = prependEnvVars(
+          originalPostDeploy,
+          objectToEnvVars(target_conf.env)
+        );
 
-        spawn(custom_data, args, done);
+        spawn(JSON.stringify(target_conf), args, done);
       });
       return jobs;
     }, []), cb);
@@ -109,7 +114,11 @@ function deployForEnv(deploy_conf, env, args, cb) {
       console.log('--> on host %s', target_conf.host);
     }
 
-    target_conf['post-deploy'] = 'export ' + objectToEnvVars(target_conf.env) + ' && ' + target_conf['post-deploy']
+    target_conf['post-deploy'] = prependEnvVars(
+      originalPostDeploy,
+      objectToEnvVars(target_conf.env)
+    );
+
     spawn(JSON.stringify(target_conf), args, cb);
   }
 
@@ -122,6 +131,14 @@ function objectToEnvVars(obj) {
   }).join(' ')
 }
 
+/**
+ * @param {string} cmd
+ * @param {string} envVars
+ */
+function prependEnvVars(cmd, envVars) {
+  return (envVars && 'export ' + envVars + (cmd && ' && ')) + cmd;
+}
+
 module.exports = {
   deployForEnv: deployForEnv
 };

test/deploy.mocha.js

@@ -32,7 +32,8 @@ describe('deploy', function() {
           host: 'host',
           repo: 'repo',
           path: 'path',
-          ref: 'ref'
+          ref: 'ref',
+          'post-deploy': 'post-deploy',
         }
       }
     })
@@ -145,7 +146,26 @@ describe('deploy', function() {
             echoData.repo.should.eql(conf.staging.repo)
             echoData.path.should.eql(path.resolve(conf.staging.path))
             echoData.host.should.eql(conf.staging.host)
-            done()
+            echoData['post-deploy'].should.eql(conf.staging['post-deploy'])
+
+            conf.staging.env = { a: 1, b: 2 }
+            deploy.deployForEnv(conf, 'staging', [], function() {
+              spawnCalls.length.should.equal(2)
+              spawnCalls[1][1][1].should.be.a.String
+              echoData = JSON.parse( spawnCalls[1][1][1].match(/^echo '(.+?)'/)[1] )
+              echoData['post-deploy'].should.eql(
+                'export A=1 B=2 && ' + conf.staging['post-deploy']
+              )
+
+              conf.staging['post-deploy'] = ''
+              deploy.deployForEnv(conf, 'staging', [], function() {
+                spawnCalls.length.should.equal(3)
+                spawnCalls[2][1][1].should.be.a.String
+                echoData = JSON.parse( spawnCalls[2][1][1].match(/^echo '(.+?)'/)[1] )
+                echoData['post-deploy'].should.eql('export A=1 B=2')
+                done()
+              })
+            })
           })
         })
 
@@ -231,6 +251,7 @@ describe('deploy', function() {
             echoData.repo.should.eql(conf.staging.repo)
             echoData.path.should.eql(path.resolve(conf.staging.path))
             echoData.host.should.eql(hosts[spawnCount])
+            echoData['post-deploy'].should.eql(conf.staging['post-deploy'])
 
             spawnCount += 1
 
@@ -245,6 +266,39 @@ describe('deploy', function() {
           })
         })
 
+        it('echoes JSON blobs with customized host and env attributes', function(done) {
+          var spawnCount = 0
+
+          spawnNotifier.on('spawned', function(proc) {
+            var pipeFrom = spawnCalls[spawnCount][1][1].split(/\s*\|\s*/)[0]
+            pipeFrom.should.be.ok
+
+            var echoJSON = pipeFrom.match(/^echo '(.+?)'/)[1]
+            echoJSON.should.be.ok
+
+            var echoData = JSON.parse(echoJSON)
+            echoData.should.be.an.Object
+
+            echoData.ref.should.eql(conf.staging.ref)
+            echoData.repo.should.eql(conf.staging.repo)
+            echoData.path.should.eql(path.resolve(conf.staging.path))
+            echoData.host.should.eql(hosts[spawnCount])
+            echoData['post-deploy'].should.eql('export A=1 B=2 && ' + conf.staging['post-deploy'])
+
+            spawnCount += 1
+
+            process.nextTick(function() {
+              proc.emit('close', 0)
+            })
+          })
+
+          Object.assign(conf.staging, { env: { a: 1, b: 2 } })
+          deploy.deployForEnv(conf, 'staging', [], function() {
+            spawnCount.should.eql(4)
+            done()
+          })
+        })
+
         it('invokes our callback with supplied argument arrays', function(done) {
           var argsIn = [1,2,'three','four']
           spawnNotifier.on('spawned', function(proc) {