git2consul - npm Package Compare versions

Comparing version 0.7.4 to 0.8.0

consul_data/raft/peers.json

@@ -1,1 +0,1 @@
-["172.17.5.36:8300"]
+["172.17.9.8:8300"]

lib/git/hooks/webhook.js

@@ -216,5 +216,30 @@ var util = require('util');
 /**
+ * This object defines the properties unique to a gitlab webhook.
+ */
+exports.gitlab = {
+
+  type: 'gitlab',
+
+  isValid: function(req) {
+    return req && req.body && req.body.ref && req.body.after;
+  },
+
+  getHeadChanges: function(req) {
+    // Return a change to head, if any.
+    if (req.body.ref.indexOf('refs/heads/') === 0) {
+      return [{
+        'to_hash': req.body.after,
+        'branch': req.body.ref.substring(11)
+      }];
+    }
+
+    // Otherwise, return an empty array.
+    return [];
+  }
+};
+
+/**
  * Register an init method for each support webhook implementation.
  */
-[exports.bitbucket, exports.github, exports.stash].forEach(function(hook_impl) {
+[exports.bitbucket, exports.github, exports.stash, exports.gitlab].forEach(function(hook_impl) {
   hook_impl.init = function(repo, config) {
@@ -221,0 +246,0 @@ create_webhook(repo, config, hook_impl);

lib/git/repo.js

@@ -19,2 +19,3 @@ var _ = require('underscore');
   'stash' : require('./hooks/webhook.js').stash,
+  'gitlab' : require('./hooks/webhook.js').gitlab,
   'polling' : require('./hooks/polling.js')
@@ -21,0 +22,0 @@ };

lib/utils.js

@@ -5,3 +5,3 @@ var fs = require('fs');
  * Check to make sure the provided path is a writeable directory.  Throw an exception if not.
- */ 
+ */
 module.exports.validate_writeable_directory = function(dir) {
@@ -26,2 +26,2 @@ try {
   }
-};
+};

package.json

 {
   "name": "git2consul",
   "description": "System for moving data from git to consul",
-  "version": "0.7.4",
+  "version": "0.8.0",
   "contributors": [
@@ -6,0 +6,0 @@ {

readme.md

@@ -39,3 +39,3 @@ #### git2consul
         "name" : "vp_config",
-        "url" : "ssh://stash.vistaprint.net/team_configuration_data.git",
+        "url" : "ssh://stash.mydomain.com/team_configuration_data.git",
         "include_branch_name" : false,
@@ -42,0 +42,0 @@ "branches" : ["development", "staging", "production"],

test/git2consul_webhook_and_polling_test.js

@@ -106,2 +106,9 @@ var should = require('should');
     'fqurl': 'http://localhost:5252/bitbucketpoke'
+  },{
+    'type': 'gitlab',
+    'url': '/gitlabpoke',
+    'port': 5252,
+    'body': { after: "da1560886d4f094c3e6c9ef40349f7d38b5d27d7", ref: "refs/heads/master"},
+    'fqurl': 'http://localhost:5252/gitlabpoke',
+    'no_change_expected': true
   }],
@@ -130,2 +137,9 @@ // Test no-op changes to an incorrect branch
     'no_change_expected': true
+  },{
+    'type': 'gitlab',
+    'url': '/gitlab_bogus_branch',
+    'port': 5253,
+    'body': { after: "da1560886d4f094c3e6c9ef40349f7d38b5d27d7", ref: "refs/heads/bogus_branch"},
+    'fqurl': 'http://localhost:5253/gitlab_bogus_branch',
+    'no_change_expected': true
   }],
@@ -154,2 +168,9 @@ // Test no-op changes with non-HEAD refs
     'no_change_expected': true
+  },{
+    'type': 'gitlab',
+    'url': '/gitlab_bogus_ref',
+    'port': 5254,
+    'body': { after: "da1560886d4f094c3e6c9ef40349f7d38b5d27d7", ref: "refs/remotes/origin/master"},
+    'fqurl': 'http://localhost:5254/gitlab_bogus_ref',
+    'no_change_expected': true
   }]  
@@ -156,0 +177,0 @@ ].forEach(function(hook_config) {

No alert changes

Worsened metrics

Total package byte prevSize

20951061

decreased by-1.8%

Number of package files

42

decreased by-31.15%

Lines of code

2374

decreased by-1.17%

No dependency changes