vx-service_connector 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6a64cc8707f0bb609fc5367b39af748569cdcc2
-  data.tar.gz: 82ff7676058795c32b8bf37ad3c22dee08adf11c
+  metadata.gz: 506631ac3d925645c77d80c04a25f9a0ee56b870
+  data.tar.gz: 45f29455185ae52784716d02936edad184355a60
 SHA512:
-  metadata.gz: b61692d0a884c4464b8238bc5187cb863a981a20570604865d86391255a0fe2fca7ca3b76631f488800ad9244086fc8c657b83d2fd90ab4aff4ded19a01474e1
-  data.tar.gz: 3401d3e9a432822d480a828ab29fbc78feb29038c85bd11c676fc7a6904c8af934377c34350d088a3966f1159b958267d8fdbf56d0e8d292675f0016223aaaa4
+  metadata.gz: df26dd771eaa60bec62f5849bbb8e09ece06e69e79223b5cdcb34153ef78ffc43c4b7e90e0704eddfeeb161173841d1aad2f602a668795c55caa44d0177d0782
+  data.tar.gz: 9103c4e08c2293b9274ed3c1c4860958f173e4b1181a0716d6cda0387ee83b6743092134e90ce8c10c5ea73d532d37021cc9a177e3cfbbc3e4fa96e1ff4dfa90

data/lib/vx/service_connector.rb

@@ -6,7 +6,8 @@ module Vx
 
     autoload :Base,      File.expand_path("../service_connector/base",       __FILE__)
     autoload :Github,    File.expand_path("../service_connector/github",     __FILE__)
-    autoload :GitlabV41, File.expand_path("../service_connector/gitlab_v41", __FILE__)
+    autoload :GitlabV4,  File.expand_path("../service_connector/gitlab_v4",  __FILE__)
+    autoload :GitlabV5,  File.expand_path("../service_connector/gitlab_v5",  __FILE__)
     autoload :Model,     File.expand_path("../service_connector/model",      __FILE__)
 
     extend self
@@ -18,20 +19,26 @@ module Vx
       case name.to_sym
       when :github
         Github
-      when :gitlab_v41
-        GitlabV41
+      when :gitlab_v4
+        GitlabV4
+      when :gitlab_v5
+        GitlabV5
       else
         raise ArgumentError, "Serivice for #{name.inspect} is not defined"
       end
     end
 
     def payload(name, params)
-      case name.to_sym
-      when :github
-        Github::Payload.new(params).to_model
-      else
-        raise ArgumentError, "Payload for #{name.inspect} is not defined"
-      end
+      klass =
+        case name.to_sym
+        when :github
+          Github::Payload
+        when :gitlab_v4, :gitlab_v5
+          GitlabV4::Payload
+        else
+          raise ArgumentError, "Payload for #{name.inspect} is not defined"
+        end
+      klass.new(params).to_model
     end
 
   end

data/lib/vx/service_connector/gitlab_v4.rb

@@ -0,0 +1,49 @@
+require 'gitlab'
+
+module Vx
+  module ServiceConnector
+    GitlabV4 = Struct.new(:endpoint, :private_token) do
+
+      include ServiceConnector::Base
+
+      def repos
+        @repos ||= GitlabV4::Repos.new(session).to_a
+      end
+
+      def organizations
+        []
+      end
+
+      def hooks(repo)
+        GitlabV4::Hooks.new(session, repo)
+      end
+
+      def deploy_keys(repo)
+        GitlabV4::DeployKeys.new(session, repo)
+      end
+
+      def notices(repo)
+        GitlabV4::Notices.new(session, repo)
+      end
+
+      def files(repo)
+        GitlabV4::Files.new(session, repo)
+      end
+
+      def commits(repo)
+        GitlabV4::Commits.new(session, repo)
+      end
+
+      private
+
+        def create_session
+          GitlabV4::Session.new(endpoint, private_token)
+        end
+
+    end
+  end
+end
+
+Dir[File.expand_path("../gitlab_v4/*.rb", __FILE__)].each do |f|
+  require f
+end

data/lib/vx/service_connector/{gitlab_v41 → gitlab_v4}/commits.rb

@@ -2,7 +2,7 @@ require 'base64'
 
 module Vx
   module ServiceConnector
-    class GitlabV41
+    class GitlabV4
       Commits = Struct.new(:session, :repo) do
 
         def get(sha)

data/lib/vx/service_connector/{gitlab_v41 → gitlab_v4}/deploy_keys.rb

@@ -1,6 +1,6 @@
 module Vx
   module ServiceConnector
-    class GitlabV41
+    class GitlabV4
       DeployKeys = Struct.new(:session, :repo) do
 
         def all

data/lib/vx/service_connector/{gitlab_v41 → gitlab_v4}/files.rb

@@ -2,7 +2,7 @@ require 'base64'
 
 module Vx
   module ServiceConnector
-    class GitlabV41
+    class GitlabV4
       Files = Struct.new(:session, :repo) do
 
         def get(sha, path)

data/lib/vx/service_connector/{gitlab_v41 → gitlab_v4}/hooks.rb

@@ -1,6 +1,6 @@
 module Vx
   module ServiceConnector
-    class GitlabV41
+    class GitlabV4
       Hooks = Struct.new(:session, :repo) do
 
         def all
@@ -8,7 +8,12 @@ module Vx
         end
 
         def create(url, token)
-          session.post hooks_url, url: url
+          session.post(
+            hooks_url,
+            url: url,
+            push_events: true,
+            merge_requests_events: true
+          )
         end
 
         def destroy(url_mask)

data/lib/vx/service_connector/{gitlab_v41 → gitlab_v4}/notices.rb

@@ -1,6 +1,6 @@
 module Vx
   module ServiceConnector
-    class GitlabV41
+    class GitlabV4
       Notices = Struct.new(:session, :repo) do
 
         def create(build_sha, build_status, build_url, description)

data/lib/vx/service_connector/gitlab_v4/payload.rb

@@ -0,0 +1,126 @@
+module Vx
+  module ServiceConnector
+    class GitlabV4
+      class Payload
+
+        def initialize(params)
+          @params = params || {}
+        end
+
+        def pull_request?
+          self["object_kind"] == 'merge_request'
+        end
+
+        def tag?
+          false
+        end
+
+        def pull_request_number
+          if pull_request?
+            pull_request["id"]
+          end
+        end
+
+        def head
+          if pull_request?
+            cid = (pull_request["st_commits"] || []).first
+            cid && cid["id"]
+          else
+            self["after"]
+          end
+        end
+
+        def base
+          if pull_request?
+            cid = (pull_request["st_commits"] || []).first
+            cid && cid["parent_ids"] && cid["parent_ids"].first
+          else
+            self["before"]
+          end
+        end
+
+        def branch
+          if pull_request?
+            pull_request["source_branch"]
+          else
+            self["ref"].to_s.split("refs/heads/").last
+          end
+        end
+
+        def branch_label
+          branch
+        end
+
+        def url
+          self["commits"] && self["commits"].first && self["commits"].first["url"]
+        end
+
+        def pull_request_head_repo_id
+          if pull_request?
+            pull_request["target_project_id"]
+          end
+        end
+
+        def pull_request_base_repo_id
+          if pull_request?
+            pull_request["source_project_id"]
+          end
+        end
+
+        def closed_pull_request?
+          false
+        end
+
+        def foreign_pull_request?
+          pull_request_base_repo_id != pull_request_head_repo_id
+        end
+
+        def pull_request_status
+          if pull_request?
+            pull_request["merge_status"]
+          end
+        end
+
+        def ignore_pull_request?
+          if pull_request?
+            pull_request_status != 'unchecked'
+          end
+        end
+
+        def ignore?
+          head == '0000000000000000000000000000000000000000' ||
+            ignore_pull_request?
+        end
+
+        def to_model
+          ServiceConnector::Model::Payload.new(
+            !!pull_request?,
+            pull_request_number,
+            head,
+            base,
+            branch,
+            branch_label,
+            url,
+            !!ignore?
+          )
+        end
+
+        private
+
+          def pull_request
+            self["object_attributes"] || {}
+          end
+
+          def key?(name)
+            @params.key? name
+          end
+
+          def [](val)
+            @params[val]
+          end
+
+      end
+
+    end
+  end
+end

data/lib/vx/service_connector/gitlab_v4/repos.rb

@@ -0,0 +1,73 @@
+module Vx
+  module ServiceConnector
+    class GitlabV4
+      Repos = Struct.new(:session) do
+
+        def to_a
+          session.get("/projects").map do |proj|
+            proj_to_model proj
+          end
+        end
+
+        private
+
+          def proj_to_model(repo)
+            Model::Repo.new(
+              repo.id,
+              compute_name_with_namespace(repo),
+              compute_is_private(repo),
+              compute_ssh_url(repo),
+              compute_web_url(repo),
+              repo.description
+            )
+          end
+
+          def compute_name_with_namespace(repo)
+            if repo.path_with_namespace
+              # for version 5.x
+              repo.path_with_namespace
+            else
+              # for version 4.x
+              hn = session.uri.hostname.to_s.split(".")[-2]
+              hm ||= session.uri.hostname
+              [hn, repo.name.downcase].join("/").downcase
+            end
+          end
+
+          def compute_ssh_url(repo)
+            if repo.ssh_url
+              # for version 6.x
+              repo.ssh_url
+            else
+              # for version 5.x or 4.x
+              name = repo.path_with_namespace || repo.name
+              "git@#{session.uri.hostname}:#{name.downcase}.git"
+            end
+          end
+
+          def compute_web_url(repo)
+            if repo.web_url
+              # for version 6.x
+              repo.web_url
+            else
+              # for version 5.x or 4.x
+              name = repo.path_with_namespace || repo.name
+              "#{session.uri.scheme}://#{session.uri.hostname}:#{session.uri.port}/#{name.downcase}"
+            end
+          end
+
+          def compute_is_private(repo)
+            case
+              # for version before 6.x
+            when repo.private != nil
+              repo.private
+              # for version 6.x
+            when repo.public != nil
+              !repo.public
+            end
+          end
+
+      end
+    end
+  end
+end

data/lib/vx/service_connector/{gitlab_v41 → gitlab_v4}/session.rb

@@ -3,7 +3,7 @@ require 'uri'
 
 module Vx
   module ServiceConnector
-    class GitlabV41
+    class GitlabV4
 
       Session = Struct.new(:endpoint, :private_token) do
 
@@ -18,7 +18,7 @@ module Vx
         end
 
         def delete(url, options = {})
-          res = agent.call :delete, request_url(url), options
+          res = agent.call :delete, request_url(url), nil, query: options
           response! res
         end
 

data/lib/vx/service_connector/gitlab_v5.rb

@@ -0,0 +1,21 @@
+require 'gitlab'
+
+module Vx
+  module ServiceConnector
+    class GitlabV5 < GitlabV4
+
+      def repos
+        @repos ||= GitlabV4::Repos.new(session).to_a
+      end
+
+      def deploy_keys(repo)
+        GitlabV5::DeployKeys.new(session, repo)
+      end
+
+    end
+  end
+end
+
+Dir[File.expand_path("../gitlab_v5/*.rb", __FILE__)].each do |f|
+  require f
+end

data/lib/vx/service_connector/gitlab_v5/deploy_keys.rb

@@ -0,0 +1,26 @@
+module Vx
+  module ServiceConnector
+    class GitlabV5
+      DeployKeys = Struct.new(:session, :repo) do
+
+        def all
+          session.get "/projects/#{repo.id}/keys"
+        end
+
+        def create(key_name, public_key)
+          session.post "/projects/#{repo.id}/keys", title: key_name, key: public_key
+        end
+
+        def destroy(key_name)
+          all.select do |key|
+            key.title == key_name
+          end.map do |key|
+            session.delete "/projects/#{repo.id}/keys/#{key.id}"
+          end
+        end
+
+      end
+    end
+  end
+end
+

data/lib/vx/service_connector/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module ServiceConnector
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/spec/fixtures/gitlab_v4/payload/merge_request1_unchecked.json

@@ -0,0 +1,47 @@
+{
+  "object_kind": "merge_request",
+  "object_attributes": {
+    "id": 1,
+    "target_branch": "master",
+    "source_branch": "one",
+    "source_project_id": 1,
+    "author_id": 1,
+    "assignee_id": null,
+    "title": "One",
+    "created_at": "2014-01-29T16:14:38.113Z",
+    "updated_at": "2014-01-29T16:14:45.845Z",
+    "st_commits": [
+      {
+        "id": "d0862adb2c46aecb3db4cb4a50867599e4015cf9",
+        "message": "one",
+        "parent_ids": [
+          "f1f92a4ef47a4257973282718449154938c3684d"
+        ],
+        "authored_date": "2014-01-29T16:13:20+00:00",
+        "author_name": "Dmitry Galinsky",
+        "author_email": "dima.exe@gmail.com",
+        "committed_date": "2014-01-29T16:13:20+00:00",
+        "committer_name": "Dmitry Galinsky",
+        "committer_email": "dima.exe@gmail.com"
+      }
+    ],
+    "st_diffs": [
+      {
+        "diff": "--- a/README\n+++ b/README\n@@ -1 +1,2 @@\n 1\n+2",
+        "new_path": "README",
+        "old_path": "README",
+        "a_mode": null,
+        "b_mode": "100644",
+        "new_file": false,
+        "renamed_file": false,
+        "deleted_file": false
+      }
+    ],
+    "milestone_id": null,
+    "state": "opened",
+    "merge_status": "unchecked",
+    "target_project_id": 1,
+    "iid": 1,
+    "description": "."
+  }
+}

data/spec/fixtures/gitlab_v4/payload/merge_request2_can_be_merge.json

@@ -0,0 +1,47 @@
+{
+  "object_kind": "merge_request",
+  "object_attributes": {
+    "id": 1,
+    "target_branch": "master",
+    "source_branch": "one",
+    "source_project_id": 1,
+    "author_id": 1,
+    "assignee_id": null,
+    "title": "One",
+    "created_at": "2014-01-29T16:14:38.000Z",
+    "updated_at": "2014-01-29T16:14:49.246Z",
+    "st_commits": [
+      {
+        "id": "d0862adb2c46aecb3db4cb4a50867599e4015cf9",
+        "message": "one",
+        "parent_ids": [
+          "f1f92a4ef47a4257973282718449154938c3684d"
+        ],
+        "authored_date": "2014-01-29T16:13:20+00:00",
+        "author_name": "Dmitry Galinsky",
+        "author_email": "dima.exe@gmail.com",
+        "committed_date": "2014-01-29T16:13:20+00:00",
+        "committer_name": "Dmitry Galinsky",
+        "committer_email": "dima.exe@gmail.com"
+      }
+    ],
+    "st_diffs": [
+      {
+        "diff": "--- a/README\n+++ b/README\n@@ -1 +1,2 @@\n 1\n+2",
+        "new_path": "README",
+        "old_path": "README",
+        "a_mode": null,
+        "b_mode": "100644",
+        "new_file": false,
+        "renamed_file": false,
+        "deleted_file": false
+      }
+    ],
+    "milestone_id": null,
+    "state": "opened",
+    "merge_status": "can_be_merged",
+    "target_project_id": 1,
+    "iid": 1,
+    "description": "."
+  }
+}

data/spec/fixtures/gitlab_v5/deploy_keys.json

@@ -0,0 +1,14 @@
+[
+  {
+    "id": 1,
+    "title" : "Public key",
+    "key": "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4 596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4 soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0=",
+    "created_at":"2013-10-02T10:12:29Z"
+  },
+  {
+    "id": 3,
+    "title" : "me@example.com",
+    "key": "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4 596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4 soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0=",
+    "created_at":"2013-10-02T11:12:29Z"
+  }
+]

data/spec/lib/{gitlab_v41_payload_spec.rb → gitlab_v4_payload_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe Vx::ServiceConnector::GitlabV41::Payload do
-  let(:content) { read_json_fixture("gitlab_v41/payload/push") }
+describe Vx::ServiceConnector::GitlabV4::Payload do
+  let(:content) { read_json_fixture("gitlab_v4/payload/push") }
   let(:payload) { described_class.new content }
   subject { payload }
 
@@ -21,6 +21,15 @@ describe Vx::ServiceConnector::GitlabV41::Payload do
   end
 
   context "pull_request" do
+    let(:content) { read_json_fixture("gitlab_v4/payload/merge_request1_unchecked") }
+
+    its(:pull_request?)       { should be_true }
+    its(:pull_request_number) { should eq 1 }
+    its(:ignore?)             { should be_false }
+    its(:head)                { should eq 'd0862adb2c46aecb3db4cb4a50867599e4015cf9' }
+    its(:base)                { should eq 'f1f92a4ef47a4257973282718449154938c3684d' }
+    its(:branch)              { should eq 'one' }
+    its(:url)                 { should be_nil }
   end
 
   context "tag?" do

data/spec/lib/{gitlab_v41_spec.rb → gitlab_v4_spec.rb}

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe Vx::ServiceConnector::GitlabV41 do
+describe Vx::ServiceConnector::GitlabV4 do
 
-  include GitlabV41WebMocks
+  include GitlabV4WebMocks
 
   let(:endpoint)  { 'http://example.com' }
   let(:token)     { 'token' }
@@ -34,7 +34,7 @@ describe Vx::ServiceConnector::GitlabV41 do
     context "values" do
       subject { gitlab.repos.map(&:values) }
       it { should eq(
-        [[9, "example.com/sqerp", true, "git@example.com:sqerp.git", "http://example.com:80/sqerp", nil]]
+        [[9, "example/sqerp", true, "git@example.com:sqerp.git", "http://example.com:80/sqerp", nil]]
       ) }
     end
   end

data/spec/lib/gitlab_v5_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+describe Vx::ServiceConnector::GitlabV5 do
+
+  include GitlabV5WebMocks
+
+  let(:endpoint)  { 'http://example.com' }
+  let(:token)     { 'token' }
+  let(:repo)      { create :repo }
+  let(:gitlab)    { described_class.new endpoint, token }
+
+  subject { gitlab }
+
+  it { should be }
+
+  context "(deploy_keys)" do
+    let(:key_name)    { 'me@example.com' }
+    let(:public_key)  { 'public key' }
+    let(:deploy_keys) { gitlab.deploy_keys(repo) }
+
+    context "all" do
+      subject { deploy_keys.all }
+      before { mock_deploy_keys  }
+      it { should have(2).items }
+    end
+
+    context "create" do
+      subject { deploy_keys.create key_name, public_key }
+      before { mock_add_deploy_key }
+      it { should be }
+    end
+
+    context "destroy" do
+      subject { deploy_keys.destroy key_name }
+      before do
+        mock_deploy_keys
+        mock_delete_deploy_key
+      end
+
+      it { should have(1).item }
+    end
+  end
+end

data/spec/lib/service_connector_spec.rb

@@ -14,15 +14,39 @@ describe Vx::ServiceConnector do
   end
 
   context "to" do
-    subject { described_class.to name }
+    subject { described_class.to(name).to_s }
 
     context ":github" do
       let(:name) { :github }
+      it { should be_include("Github") }
+    end
+
+    context ":gitlab_v4" do
+      let(:name) { :gitlab_v4 }
+      it { should be_include("GitlabV4") }
+    end
+
+    context ":gitlab_v5" do
+      let(:name) { :gitlab_v5 }
+      it { should be_include("GitlabV5") }
+    end
+  end
+
+  context "payload" do
+    subject { described_class.payload(name, {}) }
+
+    context ":github" do
+      let(:name) { :github }
+      it { should be }
+    end
+
+    context ":gitlab_v4" do
+      let(:name) { :gitlab_v4 }
       it { should be }
     end
 
-    context ":gitlab_v41" do
-      let(:name) { :gitlab_v41 }
+    context ":gitlab_v5" do
+      let(:name) { :gitlab_v5 }
       it { should be }
     end
   end

data/spec/support/{gitlab_v41_web_mocks.rb → gitlab_v4_web_mocks.rb}

@@ -1,4 +1,4 @@
-module GitlabV41WebMocks
+module GitlabV4WebMocks
 
   def mock_repos
     mock_get "projects", 'projects'
@@ -13,15 +13,15 @@ module GitlabV41WebMocks
   end
 
   def mock_delete_user_key
-    mock_delete "user/keys/589", '{}'
+    mock_delete "user/keys/589", nil
   end
 
   def mock_add_hook
-    mock_post "projects/1/hooks", "{\"url\":\"url\"}"
+    mock_post "projects/1/hooks", "{\"url\":\"url\",\"push_events\":true,\"merge_requests_events\":true}"
   end
 
   def mock_remove_hook
-    mock_delete "projects/1/hooks", "{\"hook_id\":57}"
+    mock_delete "projects/1/hooks?hook_id=57", ""
   end
 
   def mock_hooks
@@ -55,7 +55,7 @@ module GitlabV41WebMocks
       with(:headers => {'Accept'=>'application/json', 'PRIVATE-TOKEN' => "token"}).
       to_return(
         :status => 200,
-        :body => read_fixture("gitlab_v41/#{fixture}.json"),
+        :body => read_fixture("gitlab_v4/#{fixture}.json"),
         :headers => {'Content-Type' => 'application/json'})
   end
 

data/spec/support/gitlab_v5_web_mocks.rb

@@ -0,0 +1,34 @@
+module GitlabV5WebMocks
+  def mock_deploy_keys
+    mock_get "projects/1/keys", "deploy_keys"
+  end
+
+  def mock_add_deploy_key
+    mock_post "projects/1/keys", "{\"title\":\"me@example.com\",\"key\":\"public key\"}"
+  end
+
+  def mock_delete_deploy_key
+    mock_delete "projects/1/keys/3", nil
+  end
+
+  def mock_get(url, fixture)
+    stub_request(:get, "http://example.com/api/v3/#{url}").
+      with(:headers => {'Accept'=>'application/json', 'PRIVATE-TOKEN' => "token"}).
+      to_return(
+        :status => 200,
+        :body => read_fixture("gitlab_v5/#{fixture}.json"),
+        :headers => {'Content-Type' => 'application/json'})
+  end
+
+  def mock_post(url, body)
+    stub_request(:post, "http://example.com/api/v3/#{url}").
+      with(:headers => {'Accept'=>'application/json', }, body: body).
+      to_return(:status => 200, :body => "{}", :headers => {'Content-Type' => 'application/json'})
+  end
+
+  def mock_delete(url, body)
+    stub_request(:delete, "http://example.com/api/v3/#{url}").
+      with(:headers => {'Accept'=>'application/json', }, body: body).
+      to_return(:status => 200, :body => "{}", :headers => {'Content-Type' => 'application/json'})
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vx-service_connector
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Dmitry Galinsky
@@ -119,15 +119,17 @@ files:
 - lib/vx/service_connector/github/notices.rb
 - lib/vx/service_connector/github/payload.rb
 - lib/vx/service_connector/github/repos.rb
-- lib/vx/service_connector/gitlab_v41.rb
-- lib/vx/service_connector/gitlab_v41/commits.rb
-- lib/vx/service_connector/gitlab_v41/deploy_keys.rb
-- lib/vx/service_connector/gitlab_v41/files.rb
-- lib/vx/service_connector/gitlab_v41/hooks.rb
-- lib/vx/service_connector/gitlab_v41/notices.rb
-- lib/vx/service_connector/gitlab_v41/payload.rb
-- lib/vx/service_connector/gitlab_v41/repos.rb
-- lib/vx/service_connector/gitlab_v41/session.rb
+- lib/vx/service_connector/gitlab_v4.rb
+- lib/vx/service_connector/gitlab_v4/commits.rb
+- lib/vx/service_connector/gitlab_v4/deploy_keys.rb
+- lib/vx/service_connector/gitlab_v4/files.rb
+- lib/vx/service_connector/gitlab_v4/hooks.rb
+- lib/vx/service_connector/gitlab_v4/notices.rb
+- lib/vx/service_connector/gitlab_v4/payload.rb
+- lib/vx/service_connector/gitlab_v4/repos.rb
+- lib/vx/service_connector/gitlab_v4/session.rb
+- lib/vx/service_connector/gitlab_v5.rb
+- lib/vx/service_connector/gitlab_v5/deploy_keys.rb
 - lib/vx/service_connector/model.rb
 - lib/vx/service_connector/version.rb
 - spec/fixtures/github/add_deploy_key.json
@@ -144,21 +146,26 @@ files:
 - spec/fixtures/github/payload/push.json
 - spec/fixtures/github/payload/push_tag.json
 - spec/fixtures/github/user_repos.json
-- spec/fixtures/gitlab_v41/commits.json
-- spec/fixtures/gitlab_v41/hooks.json
-- spec/fixtures/gitlab_v41/payload/push.json
-- spec/fixtures/gitlab_v41/projects.json
-- spec/fixtures/gitlab_v41/user_keys.json
+- spec/fixtures/gitlab_v4/commits.json
+- spec/fixtures/gitlab_v4/hooks.json
+- spec/fixtures/gitlab_v4/payload/merge_request1_unchecked.json
+- spec/fixtures/gitlab_v4/payload/merge_request2_can_be_merge.json
+- spec/fixtures/gitlab_v4/payload/push.json
+- spec/fixtures/gitlab_v4/projects.json
+- spec/fixtures/gitlab_v4/user_keys.json
+- spec/fixtures/gitlab_v5/deploy_keys.json
 - spec/lib/github_payload_spec.rb
 - spec/lib/github_spec.rb
-- spec/lib/gitlab_v41_payload_spec.rb
-- spec/lib/gitlab_v41_spec.rb
+- spec/lib/gitlab_v4_payload_spec.rb
+- spec/lib/gitlab_v4_spec.rb
+- spec/lib/gitlab_v5_spec.rb
 - spec/lib/model_spec.rb
 - spec/lib/service_connector_spec.rb
 - spec/spec_helper.rb
 - spec/support/create.rb
 - spec/support/github_web_mocks.rb
-- spec/support/gitlab_v41_web_mocks.rb
+- spec/support/gitlab_v4_web_mocks.rb
+- spec/support/gitlab_v5_web_mocks.rb
 - spec/support/read_fixture.rb
 - vx-service_connector.gemspec
 homepage: ''
@@ -200,19 +207,24 @@ test_files:
 - spec/fixtures/github/payload/push.json
 - spec/fixtures/github/payload/push_tag.json
 - spec/fixtures/github/user_repos.json
-- spec/fixtures/gitlab_v41/commits.json
-- spec/fixtures/gitlab_v41/hooks.json
-- spec/fixtures/gitlab_v41/payload/push.json
-- spec/fixtures/gitlab_v41/projects.json
-- spec/fixtures/gitlab_v41/user_keys.json
+- spec/fixtures/gitlab_v4/commits.json
+- spec/fixtures/gitlab_v4/hooks.json
+- spec/fixtures/gitlab_v4/payload/merge_request1_unchecked.json
+- spec/fixtures/gitlab_v4/payload/merge_request2_can_be_merge.json
+- spec/fixtures/gitlab_v4/payload/push.json
+- spec/fixtures/gitlab_v4/projects.json
+- spec/fixtures/gitlab_v4/user_keys.json
+- spec/fixtures/gitlab_v5/deploy_keys.json
 - spec/lib/github_payload_spec.rb
 - spec/lib/github_spec.rb
-- spec/lib/gitlab_v41_payload_spec.rb
-- spec/lib/gitlab_v41_spec.rb
+- spec/lib/gitlab_v4_payload_spec.rb
+- spec/lib/gitlab_v4_spec.rb
+- spec/lib/gitlab_v5_spec.rb
 - spec/lib/model_spec.rb
 - spec/lib/service_connector_spec.rb
 - spec/spec_helper.rb
 - spec/support/create.rb
 - spec/support/github_web_mocks.rb
-- spec/support/gitlab_v41_web_mocks.rb
+- spec/support/gitlab_v4_web_mocks.rb
+- spec/support/gitlab_v5_web_mocks.rb
 - spec/support/read_fixture.rb

data/lib/vx/service_connector/gitlab_v41.rb

@@ -1,49 +0,0 @@
-require 'gitlab'
-
-module Vx
-  module ServiceConnector
-    GitlabV41 = Struct.new(:endpoint, :private_token) do
-
-      include ServiceConnector::Base
-
-      def repos
-        @repos ||= GitlabV41::Repos.new(session).to_a
-      end
-
-      def organizations
-        []
-      end
-
-      def hooks(repo)
-        GitlabV41::Hooks.new(session, repo)
-      end
-
-      def deploy_keys(repo)
-        GitlabV41::DeployKeys.new(session, repo)
-      end
-
-      def notices(repo)
-        GitlabV41::Notices.new(session, repo)
-      end
-
-      def files(repo)
-        GitlabV41::Files.new(session, repo)
-      end
-
-      def commits(repo)
-        GitlabV41::Commits.new(session, repo)
-      end
-
-      private
-
-        def create_session
-          GitlabV41::Session.new(endpoint, private_token)
-        end
-
-    end
-  end
-end
-
-Dir[File.expand_path("../gitlab_v41/*.rb", __FILE__)].each do |f|
-  require f
-end

data/lib/vx/service_connector/gitlab_v41/payload.rb

@@ -1,93 +0,0 @@
-module Vx
-  module ServiceConnector
-    class GitlabV41
-      class Payload
-
-        def initialize(params)
-          @params = params || {}
-        end
-
-        def pull_request?
-          false
-        end
-
-        def tag?
-          false
-        end
-
-        def pull_request_number
-          nil
-        end
-
-        def head
-          self["after"]
-        end
-
-        def base
-          self["before"]
-        end
-
-        def branch
-          self["ref"].to_s.split("refs/heads/").last
-        end
-
-        def branch_label
-          branch
-        end
-
-        def url
-          self["commits"] && self["commits"].first && self["commits"].first["url"]
-        end
-
-        def pull_request_head_repo_id
-          nil
-        end
-
-        def pull_request_base_repo_id
-          nil
-        end
-
-        def closed_pull_request?
-          false
-        end
-
-        def foreign_pull_request?
-          false
-        end
-
-        def ignore?
-          head == '0000000000000000000000000000000000000000'
-        end
-
-        def to_model
-          ServiceConnector::Model::Payload.new(
-            !!pull_request,
-            pull_request_number,
-            head,
-            base,
-            branch,
-            branch_label,
-            url,
-            !!ignore?
-          )
-        end
-
-        private
-
-          def pull_request
-            self["pull_request"]
-          end
-
-          def key?(name)
-            @params.key? name
-          end
-
-          def [](val)
-            @params[val]
-          end
-
-      end
-
-    end
-  end
-end

data/lib/vx/service_connector/gitlab_v41/repos.rb

@@ -1,40 +0,0 @@
-module Vx
-  module ServiceConnector
-    class GitlabV41
-      Repos = Struct.new(:session) do
-
-        def to_a
-          session.get("/projects").map do |proj|
-            proj_to_model proj
-          end
-        end
-
-        private
-
-          def proj_to_model(repo)
-            Model::Repo.new(
-              repo.id,
-              compute_name_with_namespace(repo),
-              repo.private,
-              compute_ssh_url(repo),
-              compute_web_url(repo),
-              repo.description
-            )
-          end
-
-          def compute_name_with_namespace(repo)
-            [session.uri.hostname, repo.name.downcase].join("/")
-          end
-
-          def compute_ssh_url(repo)
-            "git@#{session.uri.hostname}:#{repo.name.downcase}.git"
-          end
-
-          def compute_web_url(repo)
-            "#{session.uri.scheme}://#{session.uri.hostname}:#{session.uri.port}/#{repo.name.downcase}"
-          end
-
-      end
-    end
-  end
-end