saddler-reporter-support-git 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 891a763e94e162a7a2e3473568f9a533940a11fd
-  data.tar.gz: cdb847f5f0492954885e83572ef9e89a94990684
+  metadata.gz: c7ba3ee6e561109454cbb6c3950b6d47765185c3
+  data.tar.gz: 7ec693a4ed2a65272a062ffa89fc9b6c35374a06
 SHA512:
-  metadata.gz: fc0f7b5de524e134706b0e06982dd8f50b765649c7002fcc0c119c043fb5f01ae7a17346da61840076a135a8f413b6fa812cf4adcf69e98e895eb619f5ea26ad
-  data.tar.gz: 114b78f556477601e19415ff869aa511eff1bd6556dbaf1dda6261e691f6228640cf57065935dc49ee474d0e568877408d9ec54410ea993ad628f7fa82f434d5
+  metadata.gz: 118874bdf3f7559dc161b7e3bdd61355d24f38e7fd078be7db146b2e8f1047cf420dd1e2cc3804dab6006edf1bde329b66c257192aaa49a16f3139f0ed8368ae
+  data.tar.gz: 0f9fbc34acce66de0be4396a34071a366418748317e3d8f9a96573992d7c41d307dafd7de2eb278fd046f6a436052872168dec78367f45714b1da28e9b7239a5

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+<a name="2.0.0"></a>
+# [2.0.0](https://github.com/packsaddle/ruby-saddler-reporter-support-git/compare/v1.0.0...v2.0.0) (2016-05-14)
+
+* Support GitHub pull request builder plugin for Jenkins users!
+
+
+### Bug Fixes
+
+* **repository:** consider invalid object name([d96c1a9](https://github.com/packsaddle/ruby-saddler-reporter-support-git/commit/d96c1a9)), closes [#39](https://github.com/packsaddle/ruby-saddler-reporter-support-git/issues/39)
+
+
+### Features
+
+* **repository:** add env_tracking_branch_name([9d0ba44](https://github.com/packsaddle/ruby-saddler-reporter-support-git/commit/9d0ba44))
+
+
+
 <a name="1.0.0"></a>
 # [1.0.0](https://github.com/packsaddle/ruby-saddler-reporter-support-git/compare/v0.3.0...v1.0.0) (2016-05-01)
 

data/README.md

@@ -21,6 +21,14 @@
 
 `bundle exec yard server -r` and `open http://localhost:8808`.
 
+## Confirmed
+
+We confirm this gem on
+
+* Travis-ci
+* Circle CI
+* GitHub pull request builder plugin (Jenkins)
+
 
 ## Changelog
 

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

@@ -4,8 +4,11 @@ require 'env_branch'
 require 'saddler/reporter/support/git/version'
 require 'saddler/reporter/support/git/repository'
 
+# saddler
 module Saddler
+  # saddler reporter
   module Reporter
+    # saddler reporter support
     module Support
       # Git support utility for saddler-reporter
       module Git

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

@@ -2,6 +2,9 @@ module Saddler
   module Reporter
     module Support
       module Git
+        # No tracking branch name
+        class NoTrackingBranchNameError < ArgumentError; end
+
         # Git repository support utility for saddler-reporter
         class Repository
           attr_reader :git
@@ -61,20 +64,38 @@ module Saddler
           def merging_object
             return head unless merge_commit?(head)
             commit = head.parents.select do |parent|
-              ![tracking.sha, origin_tracking.sha].include?(parent.sha)
+              ![dig_sha(tracking), dig_sha(origin_tracking)].compact.include?(parent.sha)
             end
             return commit.last if commit.count == 1
             head # fallback
           end
 
-          # @return [::Git::Object] git object for `tracking_branch_name`
+          # @return [::Git::Branches] git branches
+          def git_branches
+            @git_branches ||= @git.branches
+          end
+
+          # @return [::Git::Object, nil] git object for `tracking_branch_name`
           def tracking
-            @git.object(tracking_branch_name)
+            target = tracking_branch_name
+            return unless git_branches[target]
+
+            @git.object(target)
           end
 
-          # @return [::Git::Object] git object for `origin/tracking_branch_name`
+          # @param target [#sha]
+          #
+          # @return [String, nil] object's sha
+          def dig_sha(target)
+            target && target.sha
+          end
+
+          # @return [::Git::Object, nil] git object for `origin/tracking_branch_name`
           def origin_tracking
-            @git.object("origin/#{tracking_branch_name}")
+            target = "origin/#{tracking_branch_name}"
+            return unless git_branches[target]
+
+            @git.object(target)
           end
 
           # @return [::Git::Config] git config instance
@@ -84,15 +105,34 @@ module Saddler
             @git.config
           end
 
+          # @return [String] tracking branch name
+          #
+          # @raise [NoTrackingBranchNameError] if there is no tracking branch name
+          def tracking_branch_name
+            @tracking_branch_name ||= begin
+                                          name = env_tracking_branch_name || git_tracking_branch_name
+                                          raise NoTrackingBranchNameError if !name || name.empty?
+                                          name
+                                        end
+          end
+
+          # @return [String, nil] tracking branch name from env
+          def env_tracking_branch_name
+            # GitHub pull request builder plugin (for Jenkins)
+            if ENV['ghprbTargetBranch'] && !ENV['ghprbTargetBranch'].empty?
+              ENV['ghprbTargetBranch']
+            end
+          end
+
           # @example tracking branch
           #   # from git config
           #   { "branch.spike/no-valid-master.merge" => "refs/heads/develop" }
           #   => "develop"
           #
-          # @return [String] tracking branch name
+          # @return [String, nil] tracking branch name
           #
           # @see http://stackoverflow.com/questions/4950725/how-do-i-get-git-to-show-me-which-branches-are-tracking-what
-          def tracking_branch_name
+          def git_tracking_branch_name
             config
               .select { |k, _| /\Abranch.*merge\Z/ =~ k }
               .values

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

@@ -2,7 +2,8 @@ module Saddler
   module Reporter
     module Support
       module Git
-        VERSION = '1.0.0'.freeze
+        # version
+        VERSION = '2.0.0'.freeze
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saddler-reporter-support-git
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - sanemat
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-01 00:00:00.000000000 Z
+date: 2016-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git