pact_broker-client 1.22.2 → 1.22.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75295a78acaadb74c74e234d673982775de4cccf
-  data.tar.gz: '09bd59aeb0988ff92e39e4b34cff32f7f3e5b743'
+  metadata.gz: f11962b86d8bb10ac4cba0dd5dee6c7054dfbb7b
+  data.tar.gz: 145fbe4eea4cdaa5a52e53ff39390e3dc56f5012
 SHA512:
-  metadata.gz: 6d96ba5a749a584ce43543c7e73b1c99492a32abb576542050834d098e0110b4cba9c3a99ab42655b2df08c6ac130025799404a8793eca1529cda5bd52893a30
-  data.tar.gz: 32eb09fba1962190454e721e8062cce0b7ed79d8215e16ccfbfa51b522bcd043bea02d0cdde00deacc383e8b997941912cc7fd8297d8f1af4ba31670ec0c7371
+  metadata.gz: 5d4a0987ef3f98dac660ef283f451358410cd647135965974d33b87a828c04df659a975e2964fe7394cad1075d2064a22d8055f449ce0f43b3c7bdbb4c0df01f
+  data.tar.gz: 13355657783a999487465fcf326a4ec9ef271b6ec7dd04cb97c94cab744a34b89236c36a8b9c9adba132d23229fc0f7a7eb25d16751b4b1630a64a84dae627a4

data/.travis.yml

@@ -5,8 +5,8 @@ rvm:
   - 2.4.1
 
 before_install:
-  - git show-ref | grep $(git log --pretty=%h -1) | sed 's|.*/\(.*\)|\1|' | sort -u | grep -v HEAD
-  - git show -s --pretty=%d HEAD
-  - git for-each-ref --format='%(objectname) %(refname:short)' refs/heads | awk "/^$(git rev-parse HEAD)/ {print \$2}"
-  - git show -s --pretty=%D HEAD | tr -s ', ' '\n' | grep -v HEAD | head -n1
-  - git name-rev --name-only HEAD
+  - (git show-ref | grep $(git log --pretty=%h -1) | sed 's|.*/\(.*\)|\1|' | sort -u | grep -v HEAD) || true
+  - (git show -s --pretty=%d HEAD) || true
+  - (git for-each-ref --format='%(objectname) %(refname:short)' refs/heads | awk "/^$(git rev-parse HEAD)/ {print \$2}") || true
+  - (git show -s --pretty=%D HEAD | tr -s ', ' '\n' | grep -v HEAD | head -n1) || true
+  - (git name-rev --name-only HEAD) || true

data/lib/pact_broker/client/git.rb

@@ -18,7 +18,7 @@ bamboo.repository.git.branch https://confluence.atlassian.com/bamboo/bamboo-vari
 module PactBroker
   module Client
     module Git
-      COMMAND = 'git branch --remote --verbose --no-abbrev --contains'.freeze
+      COMMAND = 'git name-rev --name-only HEAD'.freeze
       BRANCH_ENV_VAR_NAMES = %w{BUILDKITE_BRANCH CIRCLE_BRANCH TRAVIS_BRANCH GIT_BRANCH GIT_LOCAL_BRANCH APPVEYOR_REPO_BRANCH CI_COMMIT_REF_NAME}.freeze
 
       def self.branch

data/lib/pact_broker/client/version.rb

@@ -1,5 +1,5 @@
 module PactBroker
   module Client
-    VERSION = '1.22.2'
+    VERSION = '1.22.3'
   end
 end

data/spec/lib/pact_broker/client/git_spec.rb

@@ -26,7 +26,7 @@ module PactBroker
 
         context "when there is no known environment variable for the branch", skip_ci: true do
           it "attempts to execute a git command to determine the value" do
-            expect { subject }.to_not raise_error
+            expect(subject).to_not be_empty
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker-client
 version: !ruby/object:Gem::Version
-  version: 1.22.2
+  version: 1.22.3
 platform: ruby
 authors:
 - Beth Skurrie