vx-service_connector 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50e0b6286e4720e6caa44ed89ac5edfd3ea67ed3
-  data.tar.gz: 9578e30ab4d265fc0fb98b30862be58666a76c25
+  metadata.gz: a6bb570ebaae300ece69aeaa8af1fff7ad89a596
+  data.tar.gz: fc9b789a77f95b4ce64fa55b3c2749b230e72291
 SHA512:
-  metadata.gz: f1733ac8887b6bf9708401d01f54eb458edf3a62e8a6c42e7e8fdd258b8e921d1dbd66956429e3f1f501f6518a67a7d834c78ec0e3a68aec8b25f568d54aa207
-  data.tar.gz: d8802d9342395f8a8b1162decee03fb597855196005248257af55ff614f8512b9c704a273e40960d4e658ed8eea0bcffac2574f1e6af27437b82bc69ad41ebca
+  metadata.gz: 9dca5c56992692538e9017f9567ac9d261fc1ef3b784e598f8bbd0261d3b9e2a48fd8a80345c11e3045910b15f54ef4050ffea0f20add623d4b683f40977b4ab
+  data.tar.gz: c2ccf1066633abf7a69cd05e7753baac3cafb8e5dc71ef74dc5fb9d0a909d98a5beefd1606cb7d27a7cef5aba9cdd6d4be7e54ce17a75769d1c9d6c72654567f

data/lib/vx/service_connector.rb

@@ -8,6 +8,7 @@ module Vx
     autoload :Base,       File.expand_path("../service_connector/base",       __FILE__)
     autoload :Github,     File.expand_path("../service_connector/github",     __FILE__)
     autoload :GitlabV5,   File.expand_path("../service_connector/gitlab_v5",  __FILE__)
+    autoload :GitlabV6,   File.expand_path("../service_connector/gitlab_v6",  __FILE__)
     autoload :Model,      File.expand_path("../service_connector/model",      __FILE__)
 
     extend self
@@ -18,6 +19,8 @@ module Vx
         Github
       when :gitlab_v5
         GitlabV5
+      when :gitlab_v6
+        GitlabV6
       else
         raise ArgumentError, "Serivice for #{name.inspect} is not defined"
       end

data/lib/vx/service_connector/gitlab_v5.rb

@@ -5,7 +5,7 @@ module Vx
       include ServiceConnector::Base
 
       def repos
-        @repos ||= GitlabV5::Repos.new(session).to_a
+        @repos ||= self.class::Repos.new(session).to_a
       end
 
       def organizations
@@ -13,29 +13,29 @@ module Vx
       end
 
       def hooks(repo)
-        GitlabV5::Hooks.new(session, repo)
+        self.class::Hooks.new(session, repo)
       end
 
       def deploy_keys(repo)
-        GitlabV5::DeployKeys.new(session, repo)
+        self.class::DeployKeys.new(session, repo)
       end
 
       def notices(repo)
-        GitlabV5::Notices.new(session, repo)
+        self.class::Notices.new(session, repo)
       end
 
       def files(repo)
-        GitlabV5::Files.new(session, repo)
+        self.class::Files.new(session, repo)
       end
 
       def payload(repo, params)
-        GitlabV5::Payload.new(session, repo, params).build
+        self.class::Payload.new(session, repo, params).build
       end
 
       private
 
         def create_session
-          GitlabV5::Session.new(endpoint, private_token)
+          self.class::Session.new(endpoint, private_token)
         end
 
     end

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

@@ -24,7 +24,7 @@ module Vx
           all.select do |hook|
             hook.url =~ /#{Regexp.escape url_mask}/
           end.map do |hook|
-            session.delete hooks_url, hook_id: hook.id
+            session.delete hook_url(hook.id)
           end
         end
 
@@ -34,6 +34,10 @@ module Vx
             "/projects/#{repo.id}/hooks"
           end
 
+          def hook_url(id)
+            "#{hooks_url}?hook_id=#{id}"
+          end
+
       end
     end
   end

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

@@ -79,7 +79,11 @@ module Vx
         end
 
         def ignore?
-          sha == '0000000000000000000000000000000000000000'
+          if pull_request?
+            closed_pull_request? || !foreign_pull_request?
+          else
+            sha == '0000000000000000000000000000000000000000' || tag?
+          end
         end
 
         def pull_request
@@ -97,7 +101,7 @@ module Vx
         def commit_for_payload
           @commit_for_payload ||=
             begin
-              commits = session.get("/projects/#{repo.id}/repository/commits", ref_name: sha)
+              commits = session.get(commit_uri(repo.id, sha))
               commits.first || {}
             rescue RequestError => e
               $stderr.puts "ERROR: #{e.inspect}"
@@ -105,6 +109,10 @@ module Vx
             end
         end
 
+        def commit_uri(repo_id, sha)
+          "/projects/#{repo_id}/repository/commits?ref_name=#{sha}"
+        end
+
       end
 
     end

data/lib/vx/service_connector/gitlab_v6.rb

@@ -0,0 +1,10 @@
+module Vx
+  module ServiceConnector
+    class GitlabV6 < GitlabV5
+    end
+  end
+end
+
+Dir[File.expand_path("../gitlab_v6/*.rb", __FILE__)].each do |f|
+  require f
+end

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

@@ -0,0 +1,7 @@
+module Vx
+  module ServiceConnector
+    class GitlabV6::DeployKeys < GitlabV5::DeployKeys
+    end
+  end
+end
+

data/lib/vx/service_connector/gitlab_v6/files.rb

@@ -0,0 +1,8 @@
+require 'base64'
+
+module Vx
+  module ServiceConnector
+    class GitlabV6::Files < GitlabV5::Files
+    end
+  end
+end

data/lib/vx/service_connector/gitlab_v6/hooks.rb

@@ -0,0 +1,11 @@
+module Vx
+  module ServiceConnector
+    class GitlabV6::Hooks < GitlabV5::Hooks
+      private
+        def hook_url(id)
+          "#{hooks_url}/#{id}"
+        end
+    end
+  end
+end
+

data/lib/vx/service_connector/gitlab_v6/notices.rb

@@ -0,0 +1,6 @@
+module Vx
+  module ServiceConnector
+    class GitlabV6::Notices < GitlabV5::Notices
+    end
+  end
+end

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

@@ -0,0 +1,105 @@
+module Vx
+  module ServiceConnector
+    class GitlabV6::Payload < GitlabV5::Payload
+
+      private
+
+        def pull_request?
+          self["object_kind"] == "merge_request"
+        end
+
+        def tag?
+          !pull_request? && self["ref"].start_with?("refs/tags/")
+        end
+
+        def pull_request_number
+          if pull_request?
+            pull_request["iid"]
+          end
+        end
+
+        def pull_request_head_repo_id
+          if pull_request?
+            pull_request["source_project_id"]
+          end
+        end
+
+        def web_url
+          if pull_request?
+            base_url = project_details["web_url"]
+            id = pull_request["iid"]
+
+            "#{base_url}/merge_requests/#{id}"
+
+          elsif u = self["repository"] && self["repository"]["homepage"]
+            "#{u}/commit/#{sha}"
+          end
+        end
+
+        def pull_request_base_repo_id
+          if pull_request?
+            pull_request["target_project_id"]
+          end
+        end
+
+        def sha
+          if pull_request?
+            commit_sha_for_pull_request
+          else
+            self["after"]
+          end
+        end
+
+        def closed_pull_request?
+          pull_request? && (%w(closed merged).include? pull_request["state"].to_s)
+        end
+
+        def pull_request
+          if pull_request?
+            self["object_attributes"]
+          end
+        end
+
+        def project_details
+          @project_details ||= begin
+            project = session.get("/projects/#{repo.id}")
+          rescue RequestError => e
+            $stderr.puts "ERROR: #{e.inspect}"
+            nil
+          end
+        end
+
+        def commit_sha_for_pull_request
+          @commit_sha ||= begin
+            branch_details = session.get("/projects/#{repo.id}/repository/branches/#{branch}")
+            branch_details["commit"]["id"]
+          rescue RequestError => e
+            $stderr.puts "ERROR: #{e.inspect}"
+            nil
+          end
+        end
+
+        def branch
+          if pull_request?
+            pull_request["source_branch"]
+          else
+            self["ref"].to_s.split("refs/heads/").last
+          end
+        end
+
+        def commit_for_payload
+          @commit_for_payload ||=
+            begin
+              commit = session.get(commit_uri(repo.id, sha))
+            rescue RequestError => e
+              $stderr.puts "ERROR: #{e.inspect}"
+              {}
+            end
+        end
+
+        def commit_uri(repo_id, sha)
+          "/projects/#{repo_id}/repository/commits/#{sha}"
+        end
+    end
+  end
+end

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

@@ -0,0 +1,6 @@
+module Vx
+  module ServiceConnector
+    class GitlabV6::Repos < GitlabV5::Repos
+    end
+  end
+end

data/lib/vx/service_connector/gitlab_v6/session.rb

@@ -0,0 +1,9 @@
+require 'sawyer'
+require 'uri'
+
+module Vx
+  module ServiceConnector
+    class GitlabV6::Session < GitlabV5::Session
+    end
+  end
+end

data/lib/vx/service_connector/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module ServiceConnector
-    VERSION = "0.0.10"
+    VERSION = "0.0.11"
   end
 end

data/spec/fixtures/gitlab_v6/branch.json

@@ -0,0 +1,22 @@
+{
+    "name": "some-branch-name",
+    "commit": {
+        "id": "a7c31647c6449c3d98c4027d97e00b3048ac3bbf",
+        "parents": [{
+            "id": "aa7544c196ccf44a24e21c9aed12a0b246919fe0"
+        }],
+        "tree": "c5752d5f3b43e847f4f7fd0cdfdd1259e5009d45",
+        "message": "hhh",
+        "author": {
+            "name": "John Doe",
+            "email": "john@doe.com"
+        },
+        "committer": {
+            "name": "John Doe",
+            "email": "john@doe.com"
+        },
+        "authored_date": "2014-04-02T23:40:31-07:00",
+        "committed_date": "2014-04-03T02:40:29-07:00"
+    },
+    "protected": false
+}

data/spec/fixtures/gitlab_v6/commit.json

@@ -0,0 +1,11 @@
+{
+    "id": "2dd0fdf94c7d0a74921e178b3b5229e60ce5d03e",
+    "short_id": "2dd0fdf94c7",
+    "title": "Replace sanitize with escape once",
+    "author_name": "Dmitriy Zaporozhets",
+    "author_email": "dzaporozhets@sphereconsultinginc.com",
+    "created_at": "2014-04-03T03:06:13-07:00",
+    "parent_ids": ["3a974a1e369bf2b16ee41d925cf3d2d44842d0d0"],
+    "committed_date": "2014-04-03T03:06:13-07:00",
+    "authored_date": "2014-04-03T03:06:13-07:00"
+}

data/spec/fixtures/gitlab_v6/commits.json

@@ -0,0 +1,10 @@
+[
+    {
+        "id": "2dd0fdf94c7d0a74921e178b3b5229e60ce5d03e",
+        "short_id": "2dd0fdf94c7",
+        "title": "Replace sanitize with escape once",
+        "author_name": "Dmitriy Zaporozhets",
+        "author_email": "dzaporozhets@sphereconsultinginc.com",
+        "created_at": "2014-04-03T03:06:13-07:00"
+    }
+]

data/spec/fixtures/gitlab_v6/deploy_keys.json

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

data/spec/fixtures/gitlab_v6/hooks.json

@@ -0,0 +1,11 @@
+[
+    {
+        "id": 57,
+        "url": "http://example.com/hook",
+        "created_at": "2014-04-03T09:38:28.431Z",
+        "project_id": 2,
+        "push_events": true,
+        "issues_events": false,
+        "merge_requests_events": true
+    }
+]

data/spec/fixtures/gitlab_v6/payload/closed_merge_request.json

@@ -0,0 +1,20 @@
+{
+    "object_kind": "merge_request",
+    "object_attributes": {
+        "id": 5,
+        "target_branch": "master",
+        "source_branch": "some-branch-name",
+        "source_project_id": 2,
+        "author_id": 1,
+        "assignee_id": 1,
+        "title": "Uiu",
+        "created_at": "2014-04-03T10:04:12.153Z",
+        "updated_at": "2014-04-03T10:04:18.012Z",
+        "milestone_id": null,
+        "state": "closed",
+        "merge_status": "can_be_merged",
+        "target_project_id": 2,
+        "iid": 5,
+        "description": "some desc..."
+    }
+}

data/spec/fixtures/gitlab_v6/payload/merge_request.json

@@ -0,0 +1,20 @@
+{
+    "object_kind": "merge_request",
+    "object_attributes": {
+        "id": 5,
+        "target_branch": "master",
+        "source_branch": "some-branch-name",
+        "source_project_id": 2,
+        "author_id": 1,
+        "assignee_id": 1,
+        "title": "Uiu",
+        "created_at": "2014-04-03T10:04:12.153Z",
+        "updated_at": "2014-04-03T10:04:12.153Z",
+        "milestone_id": null,
+        "state": "opened",
+        "merge_status": "unchecked",
+        "target_project_id": 2,
+        "iid": 5,
+        "description": "some desc..."
+    }
+}

data/spec/fixtures/gitlab_v6/payload/push.json

@@ -0,0 +1,25 @@
+{
+    "before": "0000000000000000000000000000000000000000",
+    "after": "decc3915e29d7ae1786bb981b2ea3702afae592a",
+    "ref": "refs/heads/testing",
+    "user_id": 13,
+    "user_name": "Dmitry",
+    "project_id": 1,
+    "repository": {
+        "name": "event_generator",
+        "url": "git@git.dev.gorod-skidok.com:serverist2/event_generator.git",
+        "description": "",
+        "homepage": "http://git.dev.gorod-skidok.com/serverist2/event_generator"
+    },
+    "commits": [{
+        "id": "decc3915e29d7ae1786bb981b2ea3702afae592a",
+        "message": "test",
+        "timestamp": "2014-04-02T23:40:31-07:00",
+        "url": "http://git.dev.gorod-skidok.com/serverist2/event_generator/commit/decc3915e29d7ae1786bb981b2ea3702afae592a",
+        "author": {
+            "name": "Dmitry",
+            "email": "some@mail.com"
+        }
+    }],
+    "total_commits_count": 1
+}

data/spec/fixtures/gitlab_v6/payload/push_tag.json

@@ -0,0 +1,14 @@
+{
+    "ref": "refs/tags/v1",
+    "before": "0000000000000000000000000000000000000000",
+    "after": "decc3915e29d7ae1786bb981b2ea3702afae592a",
+    "user_id": 1,
+    "user_name": "Administrator",
+    "project_id": 2,
+    "repository": {
+        "name": "seopl",
+        "url": "git@localhost:root/seopl.git",
+        "description": "",
+        "homepage": "http://localhost/root/seopl"
+    }
+}

data/spec/fixtures/gitlab_v6/project.json

@@ -0,0 +1,46 @@
+{
+    "id": 2,
+    "description": "",
+    "default_branch": "master",
+    "public": true,
+    "visibility_level": 20,
+    "ssh_url_to_repo": "git@localhost:example/sqerp.git",
+    "http_url_to_repo": "http://localhost/example/sqerp.git",
+    "web_url": "http://localhost/example/sqerp",
+    "owner": {
+        "id": 1,
+        "username": "root",
+        "email": "admin@local.host",
+        "name": "Administrator",
+        "state": "active",
+        "created_at": "2014-03-24T15:45:56.548Z"
+    },
+    "name": "sqerp",
+    "name_with_namespace": "Administrator / sqerp",
+    "path": "sqerp",
+    "path_with_namespace": "example/sqerp",
+    "issues_enabled": true,
+    "merge_requests_enabled": true,
+    "wall_enabled": false,
+    "wiki_enabled": true,
+    "snippets_enabled": false,
+    "created_at": "2014-04-03T09:37:48.838Z",
+    "last_activity_at": "2014-04-03T14:06:02.254Z",
+    "namespace": {
+        "id": 1,
+        "name": "root",
+        "path": "root",
+        "owner_id": 1,
+        "created_at": "2014-03-24T15:45:56.691Z",
+        "updated_at": "2014-03-24T15:45:56.691Z",
+        "description": "",
+        "avatar": null
+    },
+    "permissions": {
+        "project_access": {
+            "access_level": 40,
+            "notification_level": 3
+        },
+        "group_access": null
+    }
+}

data/spec/fixtures/gitlab_v6/projects.json

@@ -0,0 +1,41 @@
+[
+    {
+        "id": 9,
+        "description": "",
+        "default_branch": "master",
+        "public": false,
+        "visibility_level": 20,
+        "ssh_url_to_repo": "git@example.com:example/sqerp.git",
+        "http_url_to_repo": "http://example.com:80/example/sqerp.git",
+        "web_url": "http://example.com:80/example/sqerp",
+        "owner": {
+            "id": 1,
+            "username": "root",
+            "email": "admin@local.host",
+            "name": "Administrator",
+            "state": "active",
+            "created_at": "2014-03-24T15:45:56.548Z"
+        },
+        "name": "sqerp",
+        "name_with_namespace": "Administrator / sqerp",
+        "path": "sqerp",
+        "path_with_namespace": "example/sqerp",
+        "issues_enabled": true,
+        "merge_requests_enabled": true,
+        "wall_enabled": false,
+        "wiki_enabled": true,
+        "snippets_enabled": false,
+        "created_at": "2014-04-03T09:37:48.838Z",
+        "last_activity_at": "2014-04-03T10:06:15.587Z",
+        "namespace": {
+            "id": 1,
+            "name": "root",
+            "path": "root",
+            "owner_id": 1,
+            "created_at": "2014-03-24T15:45:56.691Z",
+            "updated_at": "2014-03-24T15:45:56.691Z",
+            "description": "",
+            "avatar": null
+        }
+    }
+]

data/spec/lib/gitlab_payload_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+[5, 6].each do |version|
+  gitlab_version = "GitlabV#{version}"
+  describe Vx::ServiceConnector.const_get(gitlab_version)::Payload do
+
+    include const_get("#{gitlab_version}WebMocks")
+
+    let(:content) { read_json_fixture("gitlab_v#{version}/payload/push") }
+    let(:repo)    { create :repo }
+    let(:gitlab)  { Vx::ServiceConnector.const_get(gitlab_version).new 'http://example.com', 'token' }
+    let(:payload) { gitlab.payload(repo, content) }
+    subject { payload }
+
+    context "push" do
+      let(:sha) { 'decc3915e29d7ae1786bb981b2ea3702afae592a' }
+      let(:url) { "http://git.dev.gorod-skidok.com/serverist2/event_generator/commit/decc3915e29d7ae1786bb981b2ea3702afae592a"  }
+
+      before do
+        mock_get_commit 1, sha
+      end
+
+      its(:pull_request?)       { should be_false }
+      its(:pull_request_number) { should be_nil }
+      its(:sha)                 { should eq sha }
+      its(:branch)              { should eq 'testing' }
+      its(:branch_label)        { should eq 'testing' }
+      its(:message)             { should eq 'Replace sanitize with escape once' }
+      its(:author)              { should eq 'Dmitriy Zaporozhets' }
+      its(:author_email)        { should eq 'dzaporozhets@sphereconsultinginc.com' }
+      its(:web_url)             { should eq url }
+      its(:ignore?)             { should be_false }
+    end
+  end
+end

data/spec/lib/gitlab_spec.rb

@@ -0,0 +1,122 @@
+require 'spec_helper'
+
+[5, 6].each do |version|
+  klass = Vx::ServiceConnector.const_get("GitlabV#{version}")
+  describe klass do
+    require_relative "../support/gitlab_v#{version}_spec_helpers"
+    include const_get("GitlabV#{version}SpecHelpers")
+
+    include const_get("GitlabV#{version}WebMocks")
+
+    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 "(notices)" do
+      let(:notices) { gitlab.notices(repo) }
+
+      context "create" do
+        subject { notices.create nil, nil, nil, nil }
+        it { should be :not_available }
+      end
+    end
+
+    context "(repos)" do
+      subject { gitlab.repos }
+
+      before do
+        mock_repos
+      end
+
+      it { should have(1).item }
+
+      context "values" do
+        subject { gitlab.repos.map(&:values) }
+        it { should eq(
+          project_list
+        ) }
+      end
+    end
+
+    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
+
+    context "(hooks)" do
+      let(:url)   { 'url' }
+      let(:token) { 'token' }
+      let(:hooks) { gitlab.hooks(repo) }
+
+      context "all" do
+        subject { hooks.all }
+        before { mock_hooks }
+        it { should have(1).item }
+      end
+
+      context "create" do
+        subject { hooks.create url, token }
+        before { mock_add_hook }
+        it { should be }
+      end
+
+      context "destroy" do
+        let(:mask) { "http://example.com" }
+        subject { hooks.destroy mask }
+        before do
+          mock_hooks
+          mock_remove_hook
+        end
+        it { should have(1).item }
+      end
+    end
+
+    context "(files)" do
+      let(:sha)  { 'sha' }
+      let(:path) { 'path' }
+
+      context "get" do
+        subject { gitlab.files(repo).get sha, path }
+
+        context "success" do
+          before { mock_get_file  }
+          it { should eq 'content' }
+        end
+
+        context "not found" do
+          before { mock_get_file_not_found }
+          it { should be_nil }
+        end
+      end
+    end
+
+  end
+end

data/spec/lib/gitlab_v6_payload_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe Vx::ServiceConnector::GitlabV6::Payload do
+
+  include const_get("GitlabV6WebMocks")
+
+  let(:content) { read_json_fixture("gitlab_v6/payload/push") }
+  let(:repo)    { create :repo }
+  let(:gitlab)  { Vx::ServiceConnector::GitlabV6.new 'http://example.com', 'token' }
+  let(:payload) { gitlab.payload(repo, content) }
+  subject { payload }
+
+  context "pull_request" do
+    let(:content) { read_json_fixture("gitlab_v6/payload/merge_request") }
+    let(:sha)     { 'a7c31647c6449c3d98c4027d97e00b3048ac3bbf' }
+
+    before do
+      mock_get_commit 1, sha
+      mock_branch 1, "some-branch-name"
+      mock_project 1
+    end
+
+    its(:pull_request?)       { should be_true }
+    its(:pull_request_number) { should eq 5 }
+    its(:sha)                 { should eq sha }
+    its(:branch)              { should eq 'some-branch-name' }
+    its(:message)             { should eq 'Replace sanitize with escape once' }
+    its(:author)              { should eq 'Dmitriy Zaporozhets' }
+    its(:author_email)        { should eq 'dzaporozhets@sphereconsultinginc.com' }
+    its(:web_url)             { should eq "http://localhost/example/sqerp/merge_requests/5" }
+    its(:ignore?)             { should be_true }
+  end
+
+  context "push tag" do
+    let(:sha) { 'decc3915e29d7ae1786bb981b2ea3702afae592a' }
+
+    before do
+      mock_get_tag 1, sha
+    end
+
+    let(:content) { read_json_fixture("gitlab_v6/payload/push_tag") }
+    its(:ignore?) { should be_true }
+  end
+
+  context "closed pull request" do
+    let(:content) { read_json_fixture("gitlab_v6/payload/closed_merge_request") }
+
+    before do
+      mock_get_commit 1, 'a7c31647c6449c3d98c4027d97e00b3048ac3bbf'
+      mock_branch 1, "some-branch-name"
+      mock_project 1
+    end
+
+    its(:ignore?) { should be_true }
+  end
+end

data/spec/lib/service_connector_spec.rb

@@ -14,6 +14,11 @@ describe Vx::ServiceConnector do
       let(:name) { :gitlab_v5 }
       it { should be_include("GitlabV5") }
     end
+
+    context ":gitlab_v6" do
+      let(:name) { :gitlab_v6 }
+      it { should be_include("GitlabV6") }
+    end
   end
 
 end

data/spec/support/gitlab_v5_spec_helpers.rb

@@ -0,0 +1,5 @@
+module GitlabV5SpecHelpers
+  def project_list
+    [[9, "example/sqerp", true, "git@example.com:sqerp.git", "http://example.com:80/sqerp", nil]]
+  end
+end

data/spec/support/gitlab_v5_web_mocks.rb

@@ -1,54 +1,7 @@
-module GitlabV5WebMocks
-
-  def mock_repos
-    mock_get "projects?per_page=30", 'projects'
-  end
-
-  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_add_hook
-    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", ""
-  end
+require_relative "gitlab_web_mocks"
 
-  def mock_hooks
-    mock_get "projects/1/hooks", 'hooks'
-  end
-
-  def mock_get_file
-    stub_request(:get, "http://example.com/api/v3/projects/1/repository/commits/sha/blob?filepath=path").
-      with(:headers => {'Accept'=>'application/json', 'Content-Type'=>'application/json', 'Private-Token'=>'token'}).
-      to_return(:status => 200, :body => "content")
-  end
-
-  def mock_get_file_not_found
-    stub_request(:get, "http://example.com/api/v3/projects/1/repository/commits/sha/blob?filepath=path").
-      with(:headers => {'Accept'=>'application/json', 'Content-Type'=>'application/json', 'Private-Token'=>'token'}).
-      to_return(:status => 404, :body => "")
-  end
-
-  def mock_get_commit(pid, sha)
-    mock_get "projects/#{pid}/repository/commits?ref_name=#{sha}", 'commits'
-  end
-
-  def mock_get_commit_not_found
-    stub_request(:get, "http://example.com/api/v3/projects/1/repository/commits?ref_name=sha").
-      with(:headers => {'Accept'=>'application/json', 'Content-Type'=>'application/json', 'Private-Token'=>'token'}).
-      to_return(:status => 404, :body => "")
-  end
+module GitlabV5WebMocks
+  include GitlabWebMocks
 
   def mock_get(url, fixture)
     stub_request(:get, "http://example.com/api/v3/#{url}").
@@ -59,15 +12,11 @@ module GitlabV5WebMocks
         :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'})
+  def mock_remove_hook
+    mock_delete "projects/1/hooks?hook_id=57", ""
   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'})
+  def mock_get_commit(pid, sha)
+    mock_get "projects/#{pid}/repository/commits?ref_name=#{sha}", 'commits'
   end
 end

data/spec/support/gitlab_v6_spec_helpers.rb

@@ -0,0 +1,5 @@
+module GitlabV6SpecHelpers
+  def project_list
+    [[9, "example/sqerp", true, "git@example.com:example/sqerp.git", "http://example.com:80/example/sqerp", ""]]
+  end
+end

data/spec/support/gitlab_v6_web_mocks.rb

@@ -0,0 +1,34 @@
+require_relative "gitlab_web_mocks"
+
+module GitlabV6WebMocks
+  include GitlabWebMocks
+
+  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_v6/#{fixture}.json"),
+        :headers => {'Content-Type' => 'application/json'})
+  end
+
+  def mock_remove_hook
+    mock_delete "projects/1/hooks/57", ""
+  end
+
+  def mock_get_commit(pid, sha)
+    mock_get "projects/#{pid}/repository/commits/#{sha}", 'commit'
+  end
+
+  def mock_get_tag(pid, sha)
+    mock_get_commit(pid, sha)
+  end
+
+  def mock_branch(pid, branch_name)
+    mock_get "projects/#{pid}/repository/branches/#{branch_name}", 'branch'
+  end
+
+  def mock_project(pid)
+    mock_get "projects/#{pid}", 'project'
+  end
+end

data/spec/support/gitlab_web_mocks.rb

@@ -0,0 +1,56 @@
+module GitlabWebMocks
+
+  def mock_repos
+    mock_get "projects?per_page=30", 'projects'
+  end
+
+  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_add_hook
+    mock_post "projects/1/hooks", "{\"url\":\"url\",\"push_events\":true,\"merge_requests_events\":true}"
+  end
+
+  def mock_hooks
+    mock_get "projects/1/hooks", 'hooks'
+  end
+
+  def mock_get_file
+    stub_request(:get, "http://example.com/api/v3/projects/1/repository/commits/sha/blob?filepath=path").
+      with(:headers => {'Accept'=>'application/json', 'Content-Type'=>'application/json', 'Private-Token'=>'token'}).
+      to_return(:status => 200, :body => "content")
+  end
+
+  def mock_get_file_not_found
+    stub_request(:get, "http://example.com/api/v3/projects/1/repository/commits/sha/blob?filepath=path").
+      with(:headers => {'Accept'=>'application/json', 'Content-Type'=>'application/json', 'Private-Token'=>'token'}).
+      to_return(:status => 404, :body => "")
+  end
+
+  def mock_get_commit_not_found
+    stub_request(:get, "http://example.com/api/v3/projects/1/repository/commits?ref_name=sha").
+      with(:headers => {'Accept'=>'application/json', 'Content-Type'=>'application/json', 'Private-Token'=>'token'}).
+      to_return(:status => 404, :body => "")
+  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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-service_connector
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -140,6 +140,14 @@ files:
 - lib/vx/service_connector/gitlab_v5/payload.rb
 - lib/vx/service_connector/gitlab_v5/repos.rb
 - lib/vx/service_connector/gitlab_v5/session.rb
+- lib/vx/service_connector/gitlab_v6.rb
+- lib/vx/service_connector/gitlab_v6/deploy_keys.rb
+- lib/vx/service_connector/gitlab_v6/files.rb
+- lib/vx/service_connector/gitlab_v6/hooks.rb
+- lib/vx/service_connector/gitlab_v6/notices.rb
+- lib/vx/service_connector/gitlab_v6/payload.rb
+- lib/vx/service_connector/gitlab_v6/repos.rb
+- lib/vx/service_connector/gitlab_v6/session.rb
 - lib/vx/service_connector/instrumentation.rb
 - lib/vx/service_connector/model.rb
 - lib/vx/service_connector/version.rb
@@ -163,16 +171,32 @@ files:
 - spec/fixtures/gitlab_v5/payload/push.json
 - spec/fixtures/gitlab_v5/projects.json
 - spec/fixtures/gitlab_v5/user_keys.json
+- spec/fixtures/gitlab_v6/branch.json
+- spec/fixtures/gitlab_v6/commit.json
+- spec/fixtures/gitlab_v6/commits.json
+- spec/fixtures/gitlab_v6/deploy_keys.json
+- spec/fixtures/gitlab_v6/hooks.json
+- spec/fixtures/gitlab_v6/payload/closed_merge_request.json
+- spec/fixtures/gitlab_v6/payload/merge_request.json
+- spec/fixtures/gitlab_v6/payload/push.json
+- spec/fixtures/gitlab_v6/payload/push_tag.json
+- spec/fixtures/gitlab_v6/project.json
+- spec/fixtures/gitlab_v6/projects.json
 - spec/lib/github_payload_spec.rb
 - spec/lib/github_spec.rb
-- spec/lib/gitlab_v5_payload_spec.rb
-- spec/lib/gitlab_v5_spec.rb
+- spec/lib/gitlab_payload_spec.rb
+- spec/lib/gitlab_spec.rb
+- spec/lib/gitlab_v6_payload_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_v5_spec_helpers.rb
 - spec/support/gitlab_v5_web_mocks.rb
+- spec/support/gitlab_v6_spec_helpers.rb
+- spec/support/gitlab_v6_web_mocks.rb
+- spec/support/gitlab_web_mocks.rb
 - spec/support/read_fixture.rb
 - vx-service_connector.gemspec
 homepage: ''
@@ -220,14 +244,30 @@ test_files:
 - spec/fixtures/gitlab_v5/payload/push.json
 - spec/fixtures/gitlab_v5/projects.json
 - spec/fixtures/gitlab_v5/user_keys.json
+- spec/fixtures/gitlab_v6/branch.json
+- spec/fixtures/gitlab_v6/commit.json
+- spec/fixtures/gitlab_v6/commits.json
+- spec/fixtures/gitlab_v6/deploy_keys.json
+- spec/fixtures/gitlab_v6/hooks.json
+- spec/fixtures/gitlab_v6/payload/closed_merge_request.json
+- spec/fixtures/gitlab_v6/payload/merge_request.json
+- spec/fixtures/gitlab_v6/payload/push.json
+- spec/fixtures/gitlab_v6/payload/push_tag.json
+- spec/fixtures/gitlab_v6/project.json
+- spec/fixtures/gitlab_v6/projects.json
 - spec/lib/github_payload_spec.rb
 - spec/lib/github_spec.rb
-- spec/lib/gitlab_v5_payload_spec.rb
-- spec/lib/gitlab_v5_spec.rb
+- spec/lib/gitlab_payload_spec.rb
+- spec/lib/gitlab_spec.rb
+- spec/lib/gitlab_v6_payload_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_v5_spec_helpers.rb
 - spec/support/gitlab_v5_web_mocks.rb
+- spec/support/gitlab_v6_spec_helpers.rb
+- spec/support/gitlab_v6_web_mocks.rb
+- spec/support/gitlab_web_mocks.rb
 - spec/support/read_fixture.rb

data/spec/lib/gitlab_v5_payload_spec.rb

@@ -1,33 +0,0 @@
-require 'spec_helper'
-
-describe Vx::ServiceConnector::GitlabV5::Payload do
-
-  include GitlabV5WebMocks
-
-  let(:content) { read_json_fixture("gitlab_v5/payload/push") }
-  let(:repo)    { create :repo }
-  let(:gitlab)  { Vx::ServiceConnector::GitlabV5.new 'http://example.com', 'token' }
-  let(:payload) { gitlab.payload(repo, content) }
-  subject { payload }
-
-  context "push" do
-    let(:sha) { 'decc3915e29d7ae1786bb981b2ea3702afae592a' }
-    let(:url) { "http://git.dev.gorod-skidok.com/serverist2/event_generator/commit/decc3915e29d7ae1786bb981b2ea3702afae592a"  }
-
-    before do
-      mock_get_commit 1, sha
-    end
-
-    its(:pull_request?)       { should be_false }
-    its(:pull_request_number) { should be_nil }
-    its(:sha)                 { should eq sha }
-    its(:branch)              { should eq 'testing' }
-    its(:branch_label)        { should eq 'testing' }
-    its(:message)             { should eq 'Replace sanitize with escape once' }
-    its(:author)              { should eq 'Dmitriy Zaporozhets' }
-    its(:author_email)        { should eq 'dzaporozhets@sphereconsultinginc.com' }
-    its(:web_url)             { should eq url }
-    its(:ignore?)             { should be_false }
-  end
-
-end

data/spec/lib/gitlab_v5_spec.rb

@@ -1,117 +0,0 @@
-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 "(notices)" do
-    let(:notices) { gitlab.notices(repo) }
-
-    context "create" do
-      subject { notices.create nil, nil, nil, nil }
-      it { should be :not_available }
-    end
-  end
-
-  context "(repos)" do
-    subject { gitlab.repos }
-
-    before do
-      mock_repos
-    end
-
-    it { should have(1).item }
-
-    context "values" do
-      subject { gitlab.repos.map(&:values) }
-      it { should eq(
-        [[9, "example/sqerp", true, "git@example.com:sqerp.git", "http://example.com:80/sqerp", nil]]
-      ) }
-    end
-  end
-
-  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
-
-  context "(hooks)" do
-    let(:url)   { 'url' }
-    let(:token) { 'token' }
-    let(:hooks) { gitlab.hooks(repo) }
-
-    context "all" do
-      subject { hooks.all }
-      before { mock_hooks }
-      it { should have(1).item }
-    end
-
-    context "create" do
-      subject { hooks.create url, token }
-      before { mock_add_hook }
-      it { should be }
-    end
-
-    context "destroy" do
-      let(:mask) { "http://example.com" }
-      subject { hooks.destroy mask }
-      before do
-        mock_hooks
-        mock_remove_hook
-      end
-      it { should have(1).item }
-    end
-  end
-
-  context "(files)" do
-    let(:sha)  { 'sha' }
-    let(:path) { 'path' }
-
-    context "get" do
-      subject { gitlab.files(repo).get sha, path }
-
-      context "success" do
-        before { mock_get_file  }
-        it { should eq 'content' }
-      end
-
-      context "not found" do
-        before { mock_get_file_not_found }
-        it { should be_nil }
-      end
-    end
-  end
-
-end