saddler-reporter-support-git 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7466560b02e7c4227e113d4c375e20d6063c1565
-  data.tar.gz: e080c3a0b2a914aed5b4f4ec7c6c4ae38d2246d4
+  metadata.gz: 2f7fe24ed28766a102e53119476d1e15ab8c2195
+  data.tar.gz: 172a13808496ba48e7156006feff7e46a18411a9
 SHA512:
-  metadata.gz: f6f52383fc838407b5716d3f893819b3bc8c52a178c1bfb911683eaf2c49d68a94527457ea5477469f48d08a802ef31c6aeeecb94ab2e8b333c98655a6e253b9
-  data.tar.gz: b9ee3c11b900ac0524c21e1bbe8a56cd2268a27743a309569e01df91ce25f292da7aaff7421902f3fdb7bbda95e88b9926b14b3e8b1bd982aa643f53339a42d3
+  metadata.gz: 0139464d5ee171f37e64e569cdc7993eec84c3304251f8af1998f87915bcf89ec9c4e0bb1623f1918a6661fe2892f20c1490ea0d0fe8833fac8035f1985751f9
+  data.tar.gz: 09ed5547ad5060078d8a1cabc15c5e4ef3be8f81e6b112421b6bcda6b3012f18d3b0f3237f1b853cd66396684596e7ec9cfd8623f658770f92e15fa4ef4f9342

data/lib/saddler/reporter/support/git/repository.rb

@@ -32,6 +32,35 @@ module Saddler
             @git.object('HEAD')
           end
 
+          def merging_sha
+            merging_object.sha
+          end
+
+          # This for GitHub pull request diff file.
+          # if head is commit which already merged,
+          # head's parent objects include merging object
+          # and (master or origin/master)
+          def merging_object
+            return head unless merge_commit?(head)
+            commit = head.parents.select do |parent|
+              ![master.sha, origin_master.sha].include?(parent.sha)
+            end
+            return commit.last if commit.count == 1
+            head # fallback
+          end
+
+          def master
+            @git.object('master')
+          end
+
+          def origin_master
+            @git.object('origin/master')
+          end
+
+          def merge_commit?(commit)
+            commit.parents.count == 2
+          end
+
           def push_endpoint
             (env_push_endpoint || 'github.com').chomp('/')
           end

data/lib/saddler/reporter/support/git/version.rb

@@ -2,7 +2,7 @@ module Saddler
   module Reporter
     module Support
       module Git
-        VERSION = '0.1.2'
+        VERSION = '0.1.3'
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saddler-reporter-support-git
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - sanemat