Allow web-hooks to be configured to fire on test or deploy

config/config.html

@@ -1,53 +1,63 @@
-<div id="project_config_webhooks" class="well">
+<div id="project_config_webhooks" class="tab-pane well">
   <fieldset>
     <legend>Webhooks</legend>
     <div class="alert alert-success hide"></div>
     <p>
-      Target URLs will receive a HTTP POST from Strider
-      with a JSON payload on each project test run. These
-      enable you to receive and process real-time push
-      notifications from our system. Push notifications
-      are signed cryptographically with HMAC-SHA1 using a
-      shared secret so you can verify their
-      authenticity. Signatures are transmitted in
-      the
-      <a href="http://pubsubhubbub.googlecode.com/svn/trunk/pubsubhubbub-core-0.3.html#authednotify">
-        X-Signature-Hub header.
-      </a>
-      <a href="https://gist.github.com/3029840">See a sample payload.</a>
-    </p>
-    <div class="row-fluid">
-      <div class="span9">
+            Target URLs will receive a HTTP POST from Strider
+            with a JSON payload on each project test run. These
+            enable you to receive and process real-time push
+            notifications from our system. Push notifications
+            are signed cryptographically with HMAC-SHA1 using a
+            shared secret so you can verify their
+            authenticity. Signatures are transmitted in
+            the
+            <a href="http://pubsubhubbub.googlecode.com/svn/trunk/pubsubhubbub-core-0.3.html#authednotify">
+                X-Signature-Hub header.
+            </a>
+            <a href="https://gist.github.com/3029840">See a sample payload.</a>
+      </p>
         <table class="table">
           <thead>
             <th>Hook Title</th>
             <th>TargetURL for HTTP Post</th>
             <th>Shared secret for HMAC-SHA1 signature</th>
+            <th>Hook Trigger</th>
+            <th>Delete</th>
           </thead>
           <tbody>
+
             <tr ng-repeat-start="hook in hooks">
-              <td><input ng-model="hook.title"></td>
-              <td><input ng-model="hook.url"</td>
-              <td><input ng-model="hook.secret"></td>
-              <td class="remove">
-                <button class="btn btn-danger" ng-disabled="saving" ng-click="remove(hook)">
-                  <i class="icon-remove"></i>
-                </button>
-              </td>
-            </tr>
-            <tr ng-repeat-end>
-              <td colspan="4">
-                <textarea
-                   placeholder="You can put a custom payload format here"
-                   ng-model="hook.format">
-                </textarea>
-              </td>
+                <form class="form-inline">
+                    <td><input type="text" ng-model="hook.title"></td>
+                    <td><input type="text" ng-model="hook.url"></td>
+                    <td><input type="text" ng-model="hook.secret"></td>
+                    <td>
+                        <label class="radio inline">
+                            <input type="radio" value="test" ng-model="hook.trigger">&nbsp;Test&nbsp;&nbsp;
+                        </label>
+                        <label class="radio inline">
+                            <input type="radio" value="deploy" ng-model="hook.trigger">&nbsp;Deploy&nbsp;&nbsp;
+                        </label>
+                    </td>
+                    <td>
+                        <button class="btn-sm btn-danger" ng-disabled="saving" ng-click="remove(hook)">
+                            <i class="icon-remove"></i>
+                        </button>
+                    </td>
+                    <tr>
+                        <td colspan="4">
+                            <textarea
+                                    placeholder="You can put a custom payload format here"
+                                    ng-model="hook.format">
+                            </textarea>
+                        </td>
+                    </tr>
+                </form>
             </tr>
+            <tr ng-repeat-end></tr>
           </tbody>
         </table>
         <button class="btn btn-success" ng-click="add()" ng-disabled="saving">Add</button>
         <button class="btn" ng-click="save()" ng-disabled="saving">Save Hooks</button>
-      </div>
-    </div>
   </fieldset>
 </div>

config/config.js

@@ -3,7 +3,9 @@ app.controller('WebhooksCtrl', ['$scope', function ($scope) {
   function remove(ar, item) {
     ar.splice(ar.indexOf(item), 1);
   }
+
   $scope.hooks = $scope.pluginConfig('webhooks') || [];
+
   if (!Array.isArray($scope.hooks)) $scope.hooks = [];
   if (!$scope.hooks.length) $scope.hooks.push({});
 

config/config.less

@@ -1,14 +1,21 @@
 
 #project_config_webhooks {
-  .input-append {
-    input {
-      display: block;
-      width: 100%;
-    }
-  }
 
   textarea {
     width: 100%;
     box-sizing: border-box;
   }
+
+  table {
+    width: 100%;
+  }
+
+  fieldset {
+    max-width: 970px;
+  }
+
+  .icon-remove {
+    padding-left: 0px;
+    padding-right: 0px;
+  }
 }

worker.js

@@ -7,21 +7,50 @@ module.exports = {
     var hooks = utils.makeWebHooks(config || [], job)
     cb(null, {
       listen: function (io, context) {
-        function onTested(id, data) {
-          io.removeListener('job.status.tested', onTested)
+        io.on('job.status.tested', onTested)
+
+        // add deploy listener if job will be deploying
+        if(job.type === 'TEST_AND_DEPLOY'){
+          io.on('job.status.deployed', onDeployed)
+        }
+
+        function onTested (id, data){
           hooks.forEach(function (hook) {
-            context.comment('Firing webhook ' + hook.title)
-            try {
-              var payload = hook.prepare(data, job)
-              io.emit('plugin.webhooks.fire', hook.url, hook.secret, payload)
-            } catch (e) {
-              context.comment('Failed to prepare webhook payload: ' + e.message);
-              return
+            if(hook.trigger === 'test'){
+              context.comment('Firing Test webhook ' + hook.title)
+              try {
+                var payload = hook.prepare(data, job)
+                io.emit('plugin.webhooks.fire', hook.url, hook.secret, payload)
+              } catch (e) {
+                context.comment('Failed to prepare webhook payload: ' + e.message);
+              }
+            }
+          });
+          //always remove test listener
+          io.removeListener('job.status.tested', onTested);
+          //remove deploy listener if tests failed and one was registered
+          if (data.exitCode !== 0 && job.type === 'TEST_AND_DEPLOY'){
+            io.removeListener('job.status.deployed', onDeployed);
+          }
+        }
+
+        function onDeployed (id, data){
+          hooks.forEach(function (hook) {
+            if(hook.trigger === 'deploy'){
+              context.comment('Firing Deploy webhook ' + hook.title)
+              try {
+                var payload = hook.prepare(data, job)
+                payload['deploy_exitcode'] = (data.exitCode === 0) ? 0 : 1
+                io.emit('plugin.webhooks.fire', hook.url, hook.secret, payload)
+              } catch (e) {
+                context.comment('Failed to prepare webhook payload: ' + e.message);
+              }
             }
           })
+          //always remove deploy listener
+          io.removeListener('job.status.deployed', onDeployed);
         }
-        io.on('job.status.tested', onTested)
       }
     })
-  },
+  }
 }