pact_broker-client 1.37.0 → 1.37.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 780fdf6ce281a9e3d94de58bb68705d0aa4b9b9fb7262ae1331c246c8dda5d6a
-  data.tar.gz: f15abe101f78db4245f654f2f2717d8b78be861146769c83e32a655e43c3ecc8
+  metadata.gz: 5ee5df1eb310d1b9e093c4221ac3761f24cf7038dc923311cef87bc2d51fffcf
+  data.tar.gz: 0332f399dd793f3ab9a2e37446bee976770ba4e37ddbed83ebe2ef00074a20ad
 SHA512:
-  metadata.gz: 27c3f50858c65ea0fc07a0b88c8eee758cfeb09f37c81d01d767a040ad51b377b43dd6fc080e9ae4f08dae4d10c379a9cda9b9d1dc456f680e06f2fc87860543
-  data.tar.gz: 6ce9d5caf203b2b41d5fd665f84b43109bf0ebec81019bb2747de2723de6f0b60cc38ecadd6e6cad7a4cd43e625ea96c595475a9c8f48f8b75c3c1180ff960db
+  metadata.gz: 6c3ba1e4b3303fe74c5227fdbd24c919cf6ce63bac1a85ec98e04b75618f6f75074b7cbba5933f5140ba80da903fc5c43b381c240639a0795d4cc4e835ec6244
+  data.tar.gz: 64104a222d139eb496ebe1c4a0850c755e96e1437ab337aafe480b549bea89da49684b67108b4314fbd0fa66bd03a6ef346f04848b0340f13a0bbe1b796f22cc

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+<a name="v1.37.1"></a>
+### v1.37.1 (2021-03-11)
+
+#### Bug Fixes
+
+* set username from PACT_BROKER_USERNAME environment variable correctly when -u specified for create-or-update-webhook and create-webhook	 ([2411396](/../../commit/2411396))
+
 <a name="v1.37.0"></a>
 ### v1.37.0 (2021-03-01)
 

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

@@ -287,15 +287,15 @@ module PactBroker
 
           def pact_broker_client_options
             client_options = { verbose: options.verbose }
-            client_options[:token] =  options.broker_token if options.broker_token
-            if options.broker_username
+            client_options[:token] = options.broker_token || ENV['PACT_BROKER_TOKEN']
+            if options.broker_username || ENV['PACT_BROKER_USERNAME']
               client_options[:basic_auth] = {
-                  username: options.broker_username,
-                  password: options.broker_password
-                }
+                  username: options.broker_username || ENV['PACT_BROKER_USERNAME'],
+                  password: options.broker_password || ENV['PACT_BROKER_PASSWORD']
+                }.compact
             end
 
-            client_options
+            client_options.compact
           end
 
           def parse_webhook_events

data/lib/pact_broker/client/cli/create_or_update_webhook_long_desc.txt

@@ -1 +1,3 @@
-Create a curl command that executes the request that you want your webhook to execute, then replace "curl" with "pact-broker create-or-update-webhook" and add the consumer, provider, event types and broker details. Note that the URL must be the first parameter when executing create-or-update-webhook and a uuid must also be provided. You can generate a valid UUID by using the `generate-uuid` command.
+Create a curl command that executes the request that you want your webhook to execute, then replace "curl" with "pact-broker create-or-update-webhook" and add the consumer, provider, event types and broker details. Note that the URL must be the first parameter when executing create-or-update-webhook and a uuid must also be provided. You can generate a valid UUID by using the `generate-uuid` command.
+
+Note that the -u option from the curl command clashes with the -u option from the pact-broker CLI. When used in this command, the -u will be used as a curl option. Please use the --broker-username or environment variable for the Pact Broker username.

data/lib/pact_broker/client/cli/create_webhook_long_desc.txt

@@ -1 +1,3 @@
 Create a curl command that executes the request that you want your webhook to execute, then replace "curl" with "pact-broker create-webhook" and add the consumer, provider, event types and broker details. Note that the URL must be the first parameter when executing create-webhook.
+
+Note that the -u option from the curl command clashes with the -u option from the pact-broker CLI. When used in this command, the -u will be used as a curl option. Please use the --broker-username or environment variable for the Pact Broker username.

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

@@ -22,10 +22,7 @@ module PactBroker
           def self.add_broker_config_from_environment_variables argv
             return argv if argv[0] == 'help' || argv.empty?
 
-            new_argv = add_option_from_environment_variable(argv, 'broker-base-url', 'b', 'PACT_BROKER_BASE_URL')
-            new_argv = add_option_from_environment_variable(new_argv, 'broker-username', 'u', 'PACT_BROKER_USERNAME')
-            new_argv = add_option_from_environment_variable(new_argv, 'broker-token', 'k', 'PACT_BROKER_TOKEN')
-            add_option_from_environment_variable(new_argv, 'broker-password', 'p', 'PACT_BROKER_PASSWORD')
+            add_option_from_environment_variable(argv, 'broker-base-url', 'b', 'PACT_BROKER_BASE_URL')
           end
 
           def self.add_option_from_environment_variable argv, long_name, short_name, environment_variable_name
@@ -117,4 +114,4 @@ module PactBroker
       end
     end
   end
-end
+end

data/lib/pact_broker/client/version.rb

@@ -1,5 +1,5 @@
 module PactBroker
   module Client
-    VERSION = '1.37.0'
+    VERSION = '1.37.1'
   end
 end

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

@@ -1,4 +1,6 @@
 require 'pact_broker/client/cli/broker'
+require 'pact_broker/client/cli/version_selector_options_parser'
+require 'pact_broker/client/can_i_deploy'
 
 module PactBroker
   module Client

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

@@ -28,7 +28,7 @@ module PactBroker::Client::CLI
             "http://pact-broker",
             ["spec/support/cli_test_pacts/foo.json"],
             { number: "1.2.3", tags: [], version_required: false },
-            { verbose: nil }
+            { }
           )
           invoke_broker
         end

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

@@ -52,12 +52,9 @@ module PactBroker::Client::CLI
         ENV['PACT_BROKER_TOKEN'] = 'token'
       end
 
-      it "populates the options from the environment variables" do
+      it "populates the base URL from the environment variables" do
         expect(Delegate).to receive(:call) do | options |
           expect(options.broker_base_url).to eq 'http://foo'
-          expect(options.broker_username).to eq 'username'
-          expect(options.broker_password).to eq 'password'
-          expect(options.broker_token).to eq 'token'
         end
         TestThor.start(%w{test_using_env_vars})
       end
@@ -65,9 +62,6 @@ module PactBroker::Client::CLI
       it "does not override a value specifed on the command line" do
         expect(Delegate).to receive(:call) do | options |
           expect(options.broker_base_url).to eq 'http://bar'
-          expect(options.broker_username).to eq 'username'
-          expect(options.broker_password).to eq 'password'
-          expect(options.broker_token).to eq 'token'
         end
         TestThor.start(%w{test_using_env_vars --broker-base-url http://bar})
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker-client
 version: !ruby/object:Gem::Version
-  version: 1.37.0
+  version: 1.37.1
 platform: ruby
 authors:
 - Beth Skurrie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-28 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -337,7 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.11
+rubygems_version: 3.2.14
 signing_key: 
 specification_version: 4
 summary: See description