vx-service_connector 0.0.5 → 0.0.6

data/spec/fixtures/github/payload/pull_request.json

@@ -384,7 +384,6 @@
       "received_events_url":"https://api.github.com/users/FreddySerg/received_events",
       "type":"User"
    },
-   "token":"00fc9c85c40d0e261e77bb0f1d9d0f",
    "id":"9",
    "project":{
 

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

@@ -64,7 +64,6 @@
       "name":"dima-exe",
       "email":"dima.exe@gmail.com"
    },
-   "token":"4328934d-7c7a-4f44-b731-605d83d9ba40",
    "repo_callback":{
       "ref":"refs/tags/v0.0.1",
       "after":"2d6e206be0b94c9694af0ad37a7bf44207500b9f",

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

@@ -0,0 +1,32 @@
+{
+  "before": "0000000000000000000000000000000000000000",
+  "after": "decc3915e29d7ae1786bb981b2ea3702afae592a",
+  "ref": "refs/heads/testing",
+  "user_id": 13,
+  "user_name": "Dmitry",
+  "repository": {
+    "name": "event_generator",
+    "url": "git@git.dev.gorod-skidok.com:serverist2/event_generator.git",
+    "description": null,
+    "homepage": "http://git.dev.gorod-skidok.com/serverist2/event_generator"
+  },
+  "commits": null,
+  "total_commits_count": 0,
+  "_service": "gitlab",
+  "token": "cb170b9c-8274-43e6-80c8-f1a744ac43b4",
+  "repo_callback": {
+    "before": "0000000000000000000000000000000000000000",
+    "after": "decc3915e29d7ae1786bb981b2ea3702afae592a",
+    "ref": "refs/heads/testing",
+    "user_id": 13,
+    "user_name": "Dmitry",
+    "repository": {
+      "name": "event_generator",
+      "url": "git@git.dev.gorod-skidok.com:serverist2/event_generator.git",
+      "description": null,
+      "homepage": "http://git.dev.gorod-skidok.com/serverist2/event_generator"
+    },
+    "commits": null,
+    "total_commits_count": 0
+  }
+}

data/spec/lib/github_payload_spec.rb

@@ -1,136 +1,85 @@
 require 'spec_helper'
 
 describe Vx::ServiceConnector::Github::Payload do
+
+  include GithubWebMocks
+
   let(:content) { read_json_fixture("github/payload/push") }
-  let(:payload) { described_class.new content }
+  let(:github)  { Vx::ServiceConnector::Github.new 'login', 'token' }
+  let(:repo)    { create :repo }
+  let(:payload) { github.payload repo, content }
   subject { payload }
 
   context "push" do
-    let(:url) { "https://github.com/evrone/ci-worker-test-repo/compare/b665f9023956...687753389908"  }
+    let(:url) { "https://github.com/evrone/ci-worker-test-repo/commit/687753389908e70801dd4ff5448be908642055c6"  }
 
     its(:pull_request?)       { should be_false }
     its(:pull_request_number) { should be_nil }
-    its(:head)                { should eq '84158c732ff1af3db9775a37a74ddc39f5c4078f' }
-    its(:base)                { should eq 'b665f90239563c030f1b280a434b3d84daeda1bd' }
+    its(:sha)                 { should eq '84158c732ff1af3db9775a37a74ddc39f5c4078f' }
     its(:branch)              { should eq 'master' }
     its(:branch_label)        { should eq 'master' }
-    its(:url)                 { should eq url }
-
-    its(:pull_request_head_repo_id){ should be_nil }
-    its(:pull_request_base_repo_id){ should be_nil }
+    its(:message)             { should eq 'test commit #3' }
+    its(:author)              { should eq 'Dmitry Galinsky' }
+    its(:author_email)        { should eq 'dima.exe@gmail.com' }
+    its(:web_url)             { should eq url }
+    its(:ignore?)             { should be_false }
   end
 
   context "pull_request" do
     let(:content) { read_json_fixture("github/payload/pull_request") }
-    let(:url)     { "https://api.github.com/repos/evrone/cybergifts/pulls/177" }
+    let(:url)     { "https://github.com/evrone/cybergifts/pull/177" }
+    let(:sha)     { '84158c732ff1af3db9775a37a74ddc39f5c4078f' }
+
+    before do
+      mock_get_commit 'evrone/cybergifts', sha
+    end
 
     its(:pull_request?)       { should be_true }
     its(:pull_request_number) { should eq 177 }
-    its(:head)                { should eq '84158c732ff1af3db9775a37a74ddc39f5c4078f' }
-    its(:base)                { should eq 'a1ea1a6807ab8de87e0d685b7d5dcad0c081254e' }
+    its(:sha)                 { should eq sha }
     its(:branch)              { should eq 'test' }
     its(:branch_label)        { should eq 'dima-exe:test' }
-    its(:url)                 { should eq url }
-
-    its(:pull_request_head_repo_id){ should eq 7155123 }
-    its(:pull_request_base_repo_id){ should eq 7155123 }
+    its(:message)             { should eq 'Fix all the bugs' }
+    its(:author)              { should eq 'Monalisa Octocat' }
+    its(:author_email)        { should eq 'support@github.com' }
+    its(:web_url)             { should eq url }
+    its(:ignore?)             { should be_true }
   end
 
-  context "tag?" do
+  context "push tag" do
     let(:content) { read_json_fixture("github/payload/push_tag") }
-    subject { payload.tag? }
-    it { should be_true }
+    its(:ignore?) { should be_true }
+  end
 
-    context "when regular push" do
-      let(:content) { read_json_fixture("github/payload/push") }
-      it { should be_false }
-    end
+  context "closed pull request" do
+    let(:content) { read_json_fixture("github/payload/closed_pull_request") }
 
-    context "when pull request" do
-      let(:content) { read_json_fixture("github/payload/pull_request") }
-      it { should be_false }
+    before do
+      mock_get_commit 'evrone/cybergifts', '84158c732ff1af3db9775a37a74ddc39f5c4078f'
     end
-  end
 
-  context "closed_pull_request?" do
-    subject { payload.closed_pull_request? }
-    context "when state is closed" do
-      let(:content) { read_json_fixture("github/payload/closed_pull_request") }
-      it { should be_true }
-    end
+    its(:ignore?) { should be_true }
   end
 
-  context "foreign_pull_request?" do
-    subject { payload.foreign_pull_request? }
-
-    context "when same repo" do
-      let(:content) { read_json_fixture("github/payload/pull_request") }
-      it { should be_false }
-    end
+  context "foreign pull request" do
+    let(:content) { read_json_fixture("github/payload/foreign_pull_request") }
 
-    context "when different repo" do
-      let(:content) { read_json_fixture("github/payload/foreign_pull_request") }
-      it { should be_true }
+    before do
+      mock_get_commit 'evrone/serverist-email-provider', 'f57c385116139082811442ad48cb6127c29eb351'
     end
 
-    context "when is not pull request" do
-      it { should be_false }
-    end
+    its(:ignore?) { should be_false }
   end
 
-  context "ignore?" do
-    subject { payload.ignore? }
-
-    context "when pull request" do
-      let(:content) { read_json_fixture("github/payload/foreign_pull_request") }
-      it {  should be_false}
+  context "pull request with same repo" do
 
-      context "and is closed" do
-        before do
-          expect(payload).to receive(:closed_pull_request?) { true }
-        end
-        it { should be_true }
-      end
-
-      context "and same repo" do
-        let(:content) { read_json_fixture("github/payload/pull_request") }
-        it { should be_true }
-      end
-    end
+    let(:content) { read_json_fixture("github/payload/pull_request") }
 
-    context "when regular commit" do
-      it { should be_false }
-
-      context "and deleted branch" do
-        before do
-          expect(payload).to receive(:head) { '0000000000000000000000000000000000000000'  }
-        end
-        it { should be_true }
-      end
-
-      context "and tag created" do
-        before do
-          expect(payload).to receive(:tag?) { true }
-        end
-        it { should be_true }
-      end
+    before do
+      mock_get_commit 'evrone/cybergifts', '84158c732ff1af3db9775a37a74ddc39f5c4078f'
     end
-  end
 
-  context "to_model" do
-    subject { payload.to_model }
-    it { should be_instance_of(Vx::ServiceConnector::Model::Payload) }
-
-    its(:values) { should eq(
-      [false,
-       nil,
-       "84158c732ff1af3db9775a37a74ddc39f5c4078f",
-       "b665f90239563c030f1b280a434b3d84daeda1bd",
-       "master",
-       "master",
-       "https://github.com/evrone/ci-worker-test-repo/compare/b665f9023956...687753389908",
-       false]
-    ) }
+    its(:ignore?) { should be_true }
   end
 
 end

data/spec/lib/github_spec.rb

@@ -133,27 +133,4 @@ describe Vx::ServiceConnector::Github do
     end
   end
 
-  context "(commits)" do
-    let(:sha)  { 'sha' }
-
-    context "get" do
-      subject { github.commits(repo).get sha }
-
-      context "success" do
-        before { mock_get_commit  }
-        it { should be }
-        its(:sha)          { should eq '6dcb09b5b57875f334f61aebed695e2e4193db5e' }
-        its(:message)      { should eq 'Fix all the bugs' }
-        its(:author)       { should eq 'Monalisa Octocat' }
-        its(:author_email) { should eq 'support@github.com' }
-        its(:http_url)     { should be_nil }
-      end
-
-      context "not found" do
-        before { mock_get_commit_not_found }
-        it { should be_nil }
-      end
-    end
-  end
-
 end

data/spec/lib/gitlab_v5_payload_spec.rb

@@ -0,0 +1,33 @@
+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

@@ -13,6 +13,32 @@ describe Vx::ServiceConnector::GitlabV5 do
 
   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' }
@@ -40,4 +66,52 @@ describe Vx::ServiceConnector::GitlabV5 do
       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

data/spec/lib/model_spec.rb

@@ -2,36 +2,11 @@ require 'spec_helper'
 
 describe "(models)" do
   context Vx::ServiceConnector::Model::Payload do
-    let(:values)  {
-      [false, nil, 'head', 'base', 'master', 'master:label',
-       'http://example.com', false]
-    }
-    let(:payload) { described_class.new(*values) }
-    subject { payload }
-
-    it { should be }
-    its(:values) { should eq values }
-
-    context "to_hash" do
-      subject { payload.to_hash }
-      it { should eq({
-        :base                => "base",
-        :branch              => "master",
-        :branch_label        => "master:label",
-        :head                => "head",
-        :ignore?             => false,
-        :pull_request?       => false,
-        :pull_request_number => nil,
-        :url                 => "http://example.com"
-      }) }
-    end
 
     context ".from_hash" do
-      let(:params) { payload.to_hash }
-      let(:new_payload) { described_class.from_hash params }
-      subject { new_payload }
-
-      its(:values) { should eq payload.values }
+      let(:params) { Vx::ServiceConnector::Model.test_payload_attributes }
+      subject { described_class.from_hash(params).to_hash }
+      it { should eq params }
     end
   end
 end

data/spec/lib/service_connector_spec.rb

@@ -2,17 +2,6 @@ require 'spec_helper'
 
 describe Vx::ServiceConnector do
 
-  context ".payload" do
-    subject { described_class.payload type, params }
-
-    context ":github" do
-      let(:type)   { :github }
-      let(:params) { read_json_fixture("github/payload/push") }
-      it { should be }
-      it { should be_an_instance_of(Vx::ServiceConnector::Model::Payload) }
-    end
-  end
-
   context "to" do
     subject { described_class.to(name).to_s }
 
@@ -21,34 +10,10 @@ describe Vx::ServiceConnector do
       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_v5" do
-      let(:name) { :gitlab_v5 }
-      it { should be }
-    end
-  end
-
 end

data/spec/support/github_web_mocks.rb

@@ -1,7 +1,7 @@
 module GithubWebMocks
 
-  def mock_get_commit
-    mock_get "https://api.github.com/repos/full/name/commits/sha", 'commit'
+  def mock_get_commit(repo_name, sha)
+    mock_get "https://api.github.com/repos/#{repo_name}/commits/#{sha}", 'commit'
   end
 
   def mock_get_commit_not_found

data/spec/support/gitlab_v5_web_mocks.rb

@@ -1,16 +1,55 @@
 module GitlabV5WebMocks
+
+  def mock_repos
+    mock_get "projects", 'projects'
+  end
+
   def mock_deploy_keys
-    mock_get "projects/1/keys", "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\"}"
+    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
+
+  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
+
   def mock_get(url, fixture)
     stub_request(:get, "http://example.com/api/v3/#{url}").
       with(:headers => {'Accept'=>'application/json', 'PRIVATE-TOKEN' => "token"}).

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-service_connector
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -112,24 +112,20 @@ files:
 - lib/vx/service_connector/base.rb
 - lib/vx/service_connector/error.rb
 - lib/vx/service_connector/github.rb
-- lib/vx/service_connector/github/commits.rb
 - lib/vx/service_connector/github/deploy_keys.rb
 - lib/vx/service_connector/github/files.rb
 - lib/vx/service_connector/github/hooks.rb
 - 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_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/gitlab_v5/files.rb
+- lib/vx/service_connector/gitlab_v5/hooks.rb
+- lib/vx/service_connector/gitlab_v5/notices.rb
+- 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/model.rb
 - lib/vx/service_connector/version.rb
 - spec/fixtures/github/add_deploy_key.json
@@ -146,25 +142,21 @@ files:
 - spec/fixtures/github/payload/push.json
 - spec/fixtures/github/payload/push_tag.json
 - spec/fixtures/github/user_repos.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/commits.json
 - spec/fixtures/gitlab_v5/deploy_keys.json
+- spec/fixtures/gitlab_v5/hooks.json
+- spec/fixtures/gitlab_v5/payload/push.json
+- spec/fixtures/gitlab_v5/projects.json
+- spec/fixtures/gitlab_v5/user_keys.json
 - spec/lib/github_payload_spec.rb
 - spec/lib/github_spec.rb
-- spec/lib/gitlab_v4_payload_spec.rb
-- spec/lib/gitlab_v4_spec.rb
+- spec/lib/gitlab_v5_payload_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_v4_web_mocks.rb
 - spec/support/gitlab_v5_web_mocks.rb
 - spec/support/read_fixture.rb
 - vx-service_connector.gemspec
@@ -207,24 +199,20 @@ test_files:
 - spec/fixtures/github/payload/push.json
 - spec/fixtures/github/payload/push_tag.json
 - spec/fixtures/github/user_repos.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/commits.json
 - spec/fixtures/gitlab_v5/deploy_keys.json
+- spec/fixtures/gitlab_v5/hooks.json
+- spec/fixtures/gitlab_v5/payload/push.json
+- spec/fixtures/gitlab_v5/projects.json
+- spec/fixtures/gitlab_v5/user_keys.json
 - spec/lib/github_payload_spec.rb
 - spec/lib/github_spec.rb
-- spec/lib/gitlab_v4_payload_spec.rb
-- spec/lib/gitlab_v4_spec.rb
+- spec/lib/gitlab_v5_payload_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_v4_web_mocks.rb
 - spec/support/gitlab_v5_web_mocks.rb
 - spec/support/read_fixture.rb