adding support for multiple branches

README.md

@@ -80,25 +80,27 @@
       "prod": {
         "script": "/home/me/update_prod.sh",
         "branch": "master" // optional branch matcher
+            // "branch" can also be an array of branches:
+            // e.g. `[ "master", "develop" ]`
       },
       "dev": {
         "script": "/home/me/update_dev.sh",
-        "branch": "develop" // optional branch matcher
+        "branch": [ "release", "develop" ] // optional branch matcher
       }
     }
 
 Where `/home/me/update_prod.sh` is something like:
 
     #!/usr/bin/env bash
     cd /path/to/mysite
-    
+
     # For safty, you can stash any changes, although best practice says
     # there shouldn't be any here.
     # git stash
-    
+
     git checkout master
     git pull
-    
+
     make restart
 
 

example.json

@@ -6,6 +6,6 @@
     },
     "gofish" : {
         "script": "./test/script.js",
-        "branch"  : "master"
+        "branch"  : ["master"]
     }
 }

index.js

@@ -87,13 +87,20 @@ var server = http.createServer(function (request, response) {
             return;
         }
 
-        if (config[endpoint].branch &&
-                !ref.match(config[endpoint].branch)) {
-            console.warn('Skipping request:\n -> %s doesn\'t match %s',
-                            ref, config[endpoint].branch);
-            response.writeHead(200, {'Content-Type': 'text/plain'});
-            response.end();
-            return;
+        var branch = config[endpoint].branch;
+        if (branch) {
+            var skip = function() {
+                console.warn('Skipping request:\n -> %s doesn\'t match %s', ref, branch);
+                response.writeHead(200, {'Content-Type': 'text/plain'});
+                response.end();
+            };
+
+            if (Array.isArray(branch)) {
+                if (!branch.some(function(i) { return ref.match(i) })) return skip();
+            } else {
+                if (!ref.match(branch)) return skip();
+            }
+
         }
 
         if (config[endpoint].script) {

test/test.js

@@ -7,6 +7,7 @@ var fs      = require('fs');
 var qs      = require('querystring');
 var format  = require('util').format;
 var request = require('request-lite');
+var async   = require('async');
 
 // supress output
 
@@ -31,16 +32,49 @@ var server = require('../');
 tape('git fish', function (group) {
 
     group.test('test valid json', function (test) {
-        request.post('http://localhost:10888/test1?token=go-fish', { json: post_data }, function(err, res, body) {
-            test.error(err, 'should not error')
-            test.ok(res, 'should return response');
-            test.equal(res.statusCode, 200, 'should return 200');
-            setTimeout(function () {
-                // give it a second
-                test.ok(fs.existsSync('/tmp/.git.fish.test.out'), 'should run script');
-                cleanup();
-                test.end();
-            }, 200);
+        async.series([
+            function(callback) {
+                request.post('http://localhost:10888/test1?token=go-fish', { json: post_data }, function(err, res, body) {
+                    test.error(err, 'should not error')
+                    test.ok(res, 'should return response');
+                    test.equal(res.statusCode, 200, 'should return 200');
+                    setTimeout(function () {
+                        // give it a bit
+                        test.ok(fs.existsSync('/tmp/.git.fish.test.out'), 'should run script');
+                        cleanup();
+                        callback();
+                    }, 200);
+                });
+            },
+            function(callback) {
+                request.post('http://localhost:10888/test2?token=go-fish', { json: post_data }, function(err, res, body) {
+                    test.error(err, 'should not error')
+                    test.ok(res, 'should return response');
+                    test.equal(res.statusCode, 200, 'should return 200');
+                    setTimeout(function () {
+                        // give it a bit
+                        test.ok(fs.existsSync('/tmp/.git.fish.test.out'), 'should run script');
+                        cleanup();
+                        callback();
+                    }, 200);
+                });
+            },
+            function(callback) {
+                request.post('http://localhost:10888/test3?token=go-fish', { json: post_data }, function(err, res, body) {
+                    test.error(err, 'should not error')
+                    test.ok(res, 'should return response');
+                    test.equal(res.statusCode, 200, 'should return 200');
+                    setTimeout(function () {
+                        // give it a bit
+                        test.ok(fs.existsSync('/tmp/.git.fish.test.out'), 'should run script');
+                        cleanup();
+                        callback();
+                    }, 200);
+                });
+            },
+        ],
+        function() {
+            test.end();
         });
     });
 

test/test.json

@@ -7,6 +7,10 @@
     "test2" : {
         "script": "test/script.js",
         "branch"  : "master"
+    },
+    "test3" : {
+        "script": "test/script.js",
+        "branch"  : ["master", "develop"]
     }
 }