pact_broker-client 1.67.0 → 1.68.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f188bc33e3294bd2bea28a4bebd4f3d9c2047da2e36b1e4a435e04878d89b4b
-  data.tar.gz: fab940f0461e06d9ed0fb81be5947ad749a75616c85c42c312d8aecfc038eb86
+  metadata.gz: 34449d696b8c2dd03158cb963bb29d5a98df30563b1dfc34172a2e0005421824
+  data.tar.gz: 77f60ba7270a1b1fb8f59a41fd97e047d28536d6857d88109a52efedb6b018ff
 SHA512:
-  metadata.gz: '0129bc2ee4f7e871adc49c1e21056dff0c49d8ff286582a0c01418c317e29c04b543ab70b41e52ccdffd64bfbffec712fd7fe930f1ffe8971d5c9d9b17fad747'
-  data.tar.gz: 3a76b75837e15f3e9a31a3bd8624a3d160d5c9e547235fb4d01f688906decd9ab2819a359c9fb22224707c6e17b5b1f8826bf93c1146439c6268ae20bb62d506
+  metadata.gz: 62f45e1885ff173605607913f796f87c1dae40b2618c92b240ffca95fd9e2be4cbae2c50d89676ac82fb26b6e0deb610bec00b2f81a23314b4d9a2927f7c9a9b
+  data.tar.gz: 4bac04b4928c5f1846a963f7b8fb27a860332090ae7c69edce1de6537f63974e5a959ed62333a5fa17feda196525503d6dda3c470794303ddb9d03aff9723063

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+<a name="v1.68.0"></a>
+### v1.68.0 (2023-07-08)
+
+#### Features
+
+* support Cirrus CI environment	 ([7610f28](/../../commit/7610f28))
+
+#### Bug Fixes
+
+* pact-broker --help command failed with Could not find command "__broker_base_url" (#135)	 ([7edfd58](/../../commit/7edfd58))
+
 <a name="v1.67.0"></a>
 ### v1.67.0 (2023-05-04)
 

data/lib/pact_broker/client/cli/custom_thor.rb

@@ -15,19 +15,6 @@ module PactBroker
         using PactBroker::Client::HashRefinements
 
         no_commands do
-          def initialize(args = [], options = {}, config = {})
-            super
-            postprocess_options
-          end
-
-          def postprocess_options
-            new_options = {}
-            if options.include?("broker_base_url")
-              new_options["broker_base_url"] = options["broker_base_url"].chomp('/')
-            end
-            self.options = options.merge(new_options)
-          end
-
           def self.exit_on_failure?
             true
           end
@@ -41,7 +28,7 @@ module PactBroker
           end
 
           def self.add_broker_config_from_environment_variables argv
-            return argv if argv[0] == 'help' || argv.empty?
+            return argv if argv[0] == '--help' || argv[0] == 'help' || argv.empty?
 
             add_option_from_environment_variable(argv, 'broker-base-url', 'b', 'PACT_BROKER_BASE_URL')
           end
@@ -129,7 +116,7 @@ module PactBroker
           end
 
           def pact_broker_client_options
-            client_options = { verbose: options.verbose, pact_broker_base_url: options.broker_base_url }
+            client_options = { verbose: options.verbose, pact_broker_base_url: options.broker_base_url&.chomp('/') }
             client_options[:token] = options.broker_token || ENV['PACT_BROKER_TOKEN']
             if options.broker_username || ENV['PACT_BROKER_USERNAME']
               client_options[:basic_auth] = {

data/lib/pact_broker/client/git.rb

@@ -14,6 +14,7 @@ CI_BRANCH CI_COMMIT_ID https://documentation.codeship.com/pro/builds-and-configu
 bamboo.repository.git.branch https://confluence.atlassian.com/bamboo/bamboo-variables-289277087.html
 BITBUCKET_BRANCH BITBUCKET_COMMIT https://confluence.atlassian.com/bitbucket/variables-in-pipelines-794502608.html
 BUILD_SOURCEBRANCHNAME BUILD_SOURCEVERSION Azure
+CIRRUS_BRANCH CIRRUS_CHANGE_IN_REPO https://cirrus-ci.org/guide/writing-tasks/#environment-variables
 =end
 
 # Keep in sync with pact-provider-verifier/lib/pact/provider_verifier/git.rb
@@ -25,8 +26,8 @@ module PactBroker
       using PactBroker::Client::HashRefinements
 
       COMMAND = 'git rev-parse --abbrev-ref HEAD'.freeze
-      BRANCH_ENV_VAR_NAMES = %w{GITHUB_HEAD_REF GITHUB_REF BUILDKITE_BRANCH CIRCLE_BRANCH TRAVIS_BRANCH GIT_BRANCH GIT_LOCAL_BRANCH APPVEYOR_REPO_BRANCH CI_COMMIT_REF_NAME BITBUCKET_BRANCH BUILD_SOURCEBRANCHNAME}.freeze
-      COMMIT_ENV_VAR_NAMES = %w{GITHUB_SHA BUILDKITE_COMMIT CIRCLE_SHA1 TRAVIS_COMMIT GIT_COMMIT APPVEYOR_REPO_COMMIT CI_COMMIT_ID BITBUCKET_COMMIT BUILD_SOURCEVERSION}
+      BRANCH_ENV_VAR_NAMES = %w{GITHUB_HEAD_REF GITHUB_REF BUILDKITE_BRANCH CIRCLE_BRANCH TRAVIS_BRANCH GIT_BRANCH GIT_LOCAL_BRANCH APPVEYOR_REPO_BRANCH CI_COMMIT_REF_NAME BITBUCKET_BRANCH BUILD_SOURCEBRANCHNAME CIRRUS_BRANCH}.freeze
+      COMMIT_ENV_VAR_NAMES = %w{GITHUB_SHA BUILDKITE_COMMIT CIRCLE_SHA1 TRAVIS_COMMIT GIT_COMMIT APPVEYOR_REPO_COMMIT CI_COMMIT_ID BITBUCKET_COMMIT BUILD_SOURCEVERSION CIRRUS_CHANGE_IN_REPO}
       BUILD_URL_ENV_VAR_NAMES = %w{BUILDKITE_BUILD_URL CIRCLE_BUILD_URL TRAVIS_BUILD_WEB_URL BUILD_URL }
 
       def self.commit

data/lib/pact_broker/client/version.rb

@@ -1,5 +1,5 @@
 module PactBroker
   module Client
-    VERSION = '1.67.0'
+    VERSION = '1.68.0'
   end
 end

data/spec/lib/pact_broker/client/cli/custom_thor_spec.rb

@@ -27,6 +27,15 @@ module PactBroker::Client::CLI
       Delegate.call(options)
     end
 
+    desc '', ''
+    method_option :broker_base_url, required: true, aliases: "-b"
+    method_option :broker_username, aliases: "-u"
+    method_option :broker_password, aliases: "-p"
+    method_option :broker_token, aliases: "-k"
+    def test_pact_broker_client_options
+      Delegate.call(pact_broker_client_options)
+    end
+
     desc '', ''
     ignored_and_hidden_potential_options_from_environment_variables
     def test_without_parameters
@@ -74,17 +83,17 @@ module PactBroker::Client::CLI
 
     it "removes trailing slashes from the broker base url when passed as an arg" do
       expect(Delegate).to receive(:call) do | options |
-        expect(options.broker_base_url).to eq 'http://bar'
+        expect(options[:pact_broker_base_url]).to eq 'http://bar'
       end
-      TestThor.start(%w{test_using_env_vars --broker-base-url http://bar/})
+      TestThor.start(%w{test_pact_broker_client_options --broker-base-url http://bar/})
     end
 
     it "removes trailing slashes from the broker base url when passed as an env var" do
       ENV['PACT_BROKER_BASE_URL'] = 'http://bar/'
       expect(Delegate).to receive(:call) do | options |
-        expect(options.broker_base_url).to eq 'http://bar'
+        expect(options[:pact_broker_base_url]).to eq 'http://bar'
       end
-      TestThor.start(%w{test_using_env_vars})
+      TestThor.start(%w{test_pact_broker_client_options})
     end
 
     describe ".turn_muliple_tag_options_into_array" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker-client
 version: !ruby/object:Gem::Version
-  version: 1.67.0
+  version: 1.68.0
 platform: ruby
 authors:
 - Beth Skurrie
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-17 00:00:00.000000000 Z
+date: 2023-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -449,7 +449,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.4.15
 signing_key:
 specification_version: 4
 summary: See description