vx-service_connector 0.2.18 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4d16845570b8f0a590c3a650df7a166125ceed3
-  data.tar.gz: af38d8c131297173381eaf7665584c43a1cf567f
+  metadata.gz: 2e8860acc2f0b4675438cf042873da0c64299235
+  data.tar.gz: 8f782d34ded7d0742b70be0c24d7862e02e9fc9f
 SHA512:
-  metadata.gz: 048f1d236438443d4b24515e9d3896df1e971ab40b03cead9341b293d56440abbaac66c984f743a2669bceb655d876da318c1ca5cceaec6d240490ef48275821
-  data.tar.gz: a4c4faa4ff87610eca86bb38953aefb28f4d1fd612944339fbf58ae5949da282b3a6ee63250f93b8e5588ba1ee59f7d6ab32910b45130facac9aeae8dff83525
+  metadata.gz: aeced5f68311012be6e0c93c12c8bb79d0e21defc9e8841037dc181565c8bb4172537a4e988edf1623b6332042195e0763b582e1258851ea530dca54cb0236cf
+  data.tar.gz: d4910f9c35fc9af5a901174d16b625ad7d38d729610cc1e4324d337dbb530be737450ac1b1b19213f7d9e7c12f43ec4d9358d4161389f2825d41f1bcfc965263

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

@@ -21,7 +21,7 @@ module Vx
         private
 
         def pull_request?
-          !key? 'repository'
+          !(key? 'repository') && pull_request
         end
 
         def pull_request_number
@@ -55,7 +55,7 @@ module Vx
         def web_url
           if pull_request?
             pull_request['links'] ? pull_request['links']['html']['href'] : nil
-          else
+          elsif head_commit && params['repository']
             "https://bitbucket.org#{params['repository']['absolute_url']}commits/#{head_commit['raw_node']}"
           end
         end
@@ -77,7 +77,7 @@ module Vx
         end
 
         def commits?
-          not params["commits"].empty?
+          params['commits'] && !(params['commits'].empty?)
         end
 
         def author_email
@@ -89,7 +89,11 @@ module Vx
         end
 
         def close_pull_request?
-          pull_request? && (pull_request['state'] && %w(DECLINED MERGED).include?(pull_request['state']))
+          %w(DECLINED MERGED).include?(pull_request_state)
+        end
+
+        def pull_request_state
+          pull_request? and pull_request.is_a?(Hash) and pull_request['state']
         end
 
         def pull_request_head_repo_full_name
@@ -119,11 +123,13 @@ module Vx
         end
 
         def head_commit
-          params['commits'].last || {}
+          ( params['commits'] && params['commits'].last ) || {}
         end
 
         def pull_request
-          params.first.last
+          @pull_request ||= begin
+            params.first.last.is_a?(Hash) && params.first.last
+          end
         end
 
         def key?(name)

data/lib/vx/service_connector/version.rb

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

data/spec/fixtures/bitbucket/payload/bug_2_empty_commits.json

@@ -0,0 +1,20 @@
+{
+  "object_kind": "merge_request",
+  "object_attributes": {
+    "id": 579,
+    "target_branch": "master",
+    "source_branch": "1517-doku",
+    "source_project_id": 1,
+    "author_id": 6,
+    "assignee_id": 6,
+    "title": "1517 Doku",
+    "created_at": "2014-11-12T08:57:47.000Z",
+    "updated_at": "2014-11-12T09:22:08.114Z",
+    "milestone_id": null,
+    "state": "opened",
+    "merge_status": "unchecked",
+    "target_project_id": 1,
+    "iid": 579,
+    "description": ""
+  }
+}

data/spec/lib/bitbucket_payload_spec.rb

@@ -86,4 +86,11 @@ describe Vx::ServiceConnector::Bitbucket::Payload do
     its(:ignore?) { should be_true }
   end
 
+  context 'push with empty commits in PR' do
+
+    let(:content) { read_json_fixture 'bitbucket/payload/bug_2_empty_commits' }
+
+    its(:ignore?) { should be_true }
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-service_connector
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -175,6 +175,7 @@ files:
 - spec/fixtures/bitbucket/deploy_keys.json
 - spec/fixtures/bitbucket/hooks.json
 - spec/fixtures/bitbucket/payload/bug_1_empty_commits.json
+- spec/fixtures/bitbucket/payload/bug_2_empty_commits.json
 - spec/fixtures/bitbucket/payload/created_pull_request.json
 - spec/fixtures/bitbucket/payload/declined_pull_request.json
 - spec/fixtures/bitbucket/payload/foreign_pull_request.json
@@ -264,6 +265,7 @@ test_files:
 - spec/fixtures/bitbucket/deploy_keys.json
 - spec/fixtures/bitbucket/hooks.json
 - spec/fixtures/bitbucket/payload/bug_1_empty_commits.json
+- spec/fixtures/bitbucket/payload/bug_2_empty_commits.json
 - spec/fixtures/bitbucket/payload/created_pull_request.json
 - spec/fixtures/bitbucket/payload/declined_pull_request.json
 - spec/fixtures/bitbucket/payload/foreign_pull_request.json