Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/api.js
	package.json

Author: kfatehi

CHANGELOG.md

@@ -0,0 +1,21 @@
+## 1.0.4
+
+Bugfixes:
+
+  - fixed an issue if group name is changed in gitlab
+
+## 1.0.3
+
+Features:
+
+  - #4
+
+Bugfixes:
+
+  - added gravatar requirement to package.json
+
+## 1.0.2
+
+Bugfixes:
+
+  - #2

README.md

@@ -21,6 +21,7 @@ contributors
   * Martin Ericson (http://www.devbox.com)
   * [nodefourtytwo/strider-gitlab](https://github.com/nodefourtytwo/strider-gitlab)
   * [jonlil](https://github.com/jonlil)
+  * [edy](https://github.com/edy)
 
 license
 =======

lib/api.js

@@ -7,7 +7,9 @@ module.exports = {
     get: get,
     parseRepo: parseRepo,
     createHooks: createHooks,
-    deleteHooks: deleteHooks
+    deleteHooks: deleteHooks,
+    addDeployKey: addDeployKey,
+    removeDeployKey: removeDeployKey
 };
 
 
@@ -36,14 +38,14 @@ function parseRepo(repo){
         name: repo.path_with_namespace,
         display_name: repo.path_with_namespace,
         display_url: repo.web_url,
-        group: repo.namespace.name,
+        group: repo.namespace.path,
         private: !repo.public,
         config: {
             auth: { type: 'ssh' },
             scm: 'git',
-            url: repo.web_url,
+            url: repo.ssh_url_to_repo,
             owner: repo.owner,
-            repo: repo.http_url_to_repo,
+            repo: repo.web_url,
             pull_requests: 'none',
             whitelist: []
         }
@@ -97,3 +99,49 @@ function deleteHooks(config, repo_id, url, callback) {
         });
     });
 }
+
+function addDeployKey(config, repo_id, title, key, callback){
+    var qpm = { private_token: config.api_key },
+        endpoint_url = config.api_url + "/projects/" + repo_id + "/keys?" + qs.stringify(qpm);
+
+    request.post({
+        url: endpoint_url,
+        body: {
+            title: title,
+            key: key
+        },
+        json: true
+    }, function (err, response, body){
+        if (err) return callback(err);
+        if (response.status !== 201) return callback(response.status);
+
+        return callback(null, true)
+    });
+}
+
+function removeDeployKey(config, repo_id, title, callback){
+    var qpm = { private_token: config.api_key },
+        endpoint_url = config.api_url + "/projects/" + repo_id + "/keys";
+
+    // Fetch all deploy keys from Gitlab
+    request.get({
+        url: endpoint_url + "?" + qs.stringify(qpm),
+        json: true
+    }, function(err, res){
+        var deleted = false;
+
+        async.each(res.body, function(key, cb){
+            // Remove all webhooks matching url
+            if (key.title == title){
+                var deploy_key_url = endpoint_url +"/"+ key.id + "?" + qs.stringify(qpm);
+
+                request.del(deploy_key_url, function(err, res){
+                    deleted = true;
+                    cb(err);
+                });
+            } else cb();
+        }, function(err){
+            callback(err, deleted);
+        });
+    });
+}

lib/webapp.js

@@ -1,6 +1,7 @@
 var api = require('./api'),
     webhooks = require('./webhooks'),
     util = require('util'),
+    async = require('async'),
     _ = require('lodash'),
     hostname = process.env.strider_server_name || 'http://localhost:3000';
 
@@ -91,19 +92,37 @@ module.exports = {
 
     setupRepo: function(account, config, project, done) {
         var url = hostname + '/' + project.name + '/api/gitlab/webhook';
+        var deploy_key_title = util.format('strider-%s', project.name);
 
         if (!account.api_key) return done(new Error('Gitlab account not configured'));
 
-        return api.createHooks(account, project.provider.repo_id, url, function(err){
+        // Create webhooks and add deploykey
+        return async.parallel([
+            function(callback){
+                api.createHooks(account, project.provider.repo_id, url, callback);
+            },
+            function(callback){
+                api.addDeployKey(account, project.provider.repo_id, deploy_key_title, project.branches[0].pubkey, callback);
+            }
+        ], function(err){
             done(err, config);
         });
     },
 
     teardownRepo: function(account, config, project, done) {
         var url = hostname + '/' + project.name + '/api/gitlab/webhook';
+        var deploy_key_title = util.format('strider-%s', project.name);
 
         if (!account.api_key) return done(new Error('Gitlab account not configured'));
 
-        return api.deleteHooks(account, project.provider.repo_id, url, done);
+        // Remove webhooks and deploykey
+        return async.parallel([
+            function(callback){
+                api.deleteHooks(account, project.provider.repo_id, url, callback);
+            },
+            function(callback){
+                api.removeDeployKey(account, project.provider.repo_id, deploy_key_title, callback);
+            }
+        ], done);
     }
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "strider-gitlab",
-  "version": "1.0.1",
+  "version": "1.0.4",
   "description": "A gitlab provider for strider",
   "repository": {
     "type": "git",