vx-service_connector 0.2.19 → 0.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e8860acc2f0b4675438cf042873da0c64299235
-  data.tar.gz: 8f782d34ded7d0742b70be0c24d7862e02e9fc9f
+  metadata.gz: be3cec4a635997e6ec7fbfe8ad9c030b8206f7a4
+  data.tar.gz: b8674641becff7494dcc92798e91acb0c1a21937
 SHA512:
-  metadata.gz: aeced5f68311012be6e0c93c12c8bb79d0e21defc9e8841037dc181565c8bb4172537a4e988edf1623b6332042195e0763b582e1258851ea530dca54cb0236cf
-  data.tar.gz: d4910f9c35fc9af5a901174d16b625ad7d38d729610cc1e4324d337dbb530be737450ac1b1b19213f7d9e7c12f43ec4d9358d4161389f2825d41f1bcfc965263
+  metadata.gz: aafa13cf97ffd8e1f17c109d514104c7c4f9fce3cba43b3c55c4d1694e6c25770831b991c2b3908ed072c264e3b89ec157a84bd6af2071fe8351461049e960c6
+  data.tar.gz: 29888d03c6b2a95b3b16d08932b429b1546a0498e3b41dfcc75afdab20934c3a49c929e7d3455d160fc84f189c9de8371cb15cd51e19c2431ce4715949143283

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

@@ -6,7 +6,7 @@ module Vx
 
         def build
           ServiceConnector::Model::Payload.new(
-            !!ignore?,
+            !valid?,
             !!pull_request?,
             pull_request_number,
             branch,
@@ -21,6 +21,14 @@ module Vx
 
         private
 
+        def valid?
+          if ignore?
+            false
+          else
+            message && author && author_email || false
+          end
+        end
+
         def message
           commit_for_payload["title"]
         end
@@ -120,7 +128,7 @@ module Vx
             session.get("/projects/#{repo.id}")
           rescue RequestError => e
             $stderr.puts "ERROR: #{e.inspect}"
-            nil
+            {}
           end
         end
 
@@ -149,7 +157,7 @@ module Vx
         def commit_for_payload
           @commit_for_payload ||=
             begin
-              if not ignore?
+              if !ignore? && sha
                 session.get(commit_uri(repo.id, sha))
               else
                 {}

data/lib/vx/service_connector/model.rb

@@ -29,7 +29,7 @@ module Vx
         def to_hash ; to_h end
 
         def ignore?
-          skip || message.to_s =~ /#{PAYLOAD_IGNORE_RE}/
+          !!(skip || message.to_s =~ /#{PAYLOAD_IGNORE_RE}/)
         end
 
         class << self

data/lib/vx/service_connector/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module ServiceConnector
-    VERSION = "0.2.19"
+    VERSION = "0.2.20"
   end
 end

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

@@ -0,0 +1,20 @@
+{
+  "object_kind": "merge_request",
+  "object_attributes": {
+    "id": 575,
+    "target_branch": "master",
+    "source_branch": "vs-reject-code-request",
+    "source_project_id": 1,
+    "author_id": 12,
+    "assignee_id": 3,
+    "title": "Reject Code Request",
+    "created_at": "2014-11-06T23:29:31.000Z",
+    "updated_at": "2014-11-13T09:40:15.563Z",
+    "milestone_id": null,
+    "state": "opened",
+    "merge_status": "unchecked",
+    "target_project_id": 1,
+    "iid": 575,
+    "description": ""
+  }
+}

data/spec/lib/gitlab_v6_payload_spec.rb

@@ -61,4 +61,23 @@ describe Vx::ServiceConnector::GitlabV6::Payload do
 
     its(:ignore?) { should be_true }
   end
+
+  context "when identity is not authorized on push request" do
+    before do
+      mock_project_not_found 1
+      mock_get_commit_not_found 1, "decc3915e29d7ae1786bb981b2ea3702afae592a"
+    end
+    its(:ignore?) { should be_true }
+  end
+
+  context "when identity is not authorized on merge request" do
+    let(:content) { read_json_fixture("gitlab_v6/payload/merge_request") }
+    before do
+      mock_project_not_found 1
+      mock_branch_not_found 1, "some-branch-name"
+      mock_get_commit_not_found 1, "a7c31647c6449c3d98c4027d97e00b3048ac3bbf"
+    end
+    its(:ignore?) { should be_true }
+  end
+
 end

data/spec/support/gitlab_v6_web_mocks.rb

@@ -31,4 +31,31 @@ module GitlabV6WebMocks
   def mock_project(pid)
     mock_get "projects/#{pid}", 'project'
   end
+
+  def mock_project_not_found(pid)
+    stub_request(:get, "http://example.com/api/v3/projects/#{pid}").
+      with(:headers => {'Accept'=>'application/json', 'PRIVATE-TOKEN' => "token"}).
+      to_return(
+        :status => 404,
+        :body => {:status=>"404", :error=>"Not Found"}.to_json,
+        :headers => {'Content-Type' => 'application/json'})
+  end
+
+  def mock_get_commit_not_found(pid, sha)
+    stub_request(:get, "http://example.com/api/v3/projects/#{pid}/repository/commits/#{sha}").
+      with(:headers => {'Accept'=>'application/json', 'PRIVATE-TOKEN' => "token"}).
+      to_return(
+        :status => 404,
+        :body => {:status=>"404", :error=>"Not Found"}.to_json,
+        :headers => {'Content-Type' => 'application/json'})
+  end
+
+  def mock_branch_not_found(pid, name)
+    stub_request(:get, "http://example.com/api/v3/projects/#{pid}/repository/branches/#{name}").
+      with(:headers => {'Accept'=>'application/json', 'PRIVATE-TOKEN' => "token"}).
+      to_return(
+        :status => 404,
+        :body => {:status=>"404", :error=>"Not Found"}.to_json,
+        :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.2.19
+  version: 0.2.20
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -206,6 +206,7 @@ files:
 - spec/fixtures/gitlab_v6/commits.json
 - spec/fixtures/gitlab_v6/deploy_keys.json
 - spec/fixtures/gitlab_v6/hooks.json
+- spec/fixtures/gitlab_v6/payload/bug_1.json
 - spec/fixtures/gitlab_v6/payload/closed_merge_request.json
 - spec/fixtures/gitlab_v6/payload/merge_request.json
 - spec/fixtures/gitlab_v6/payload/merged_merge_request.json
@@ -296,6 +297,7 @@ test_files:
 - spec/fixtures/gitlab_v6/commits.json
 - spec/fixtures/gitlab_v6/deploy_keys.json
 - spec/fixtures/gitlab_v6/hooks.json
+- spec/fixtures/gitlab_v6/payload/bug_1.json
 - spec/fixtures/gitlab_v6/payload/closed_merge_request.json
 - spec/fixtures/gitlab_v6/payload/merge_request.json
 - spec/fixtures/gitlab_v6/payload/merged_merge_request.json