pact-provider-verifier 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ce3798b8ee40da180087db72750ff3e72d66055
-  data.tar.gz: ec328a826124163d927bb41c25e9fa3246e667a2
+  metadata.gz: 97ee5e7e19fd6a24e650a5351856221e940e450a
+  data.tar.gz: 7cfe37f11618f7220531ec3e7c090b757ffd7932
 SHA512:
-  metadata.gz: 26ec3b274333503bed29de0549abd432416e9829a939e4fe09237ee3d2f4177ea1c89d6f2499827a3b288a81ca73937d032fd449346608668dd1d271efd4ff11
-  data.tar.gz: 4d044730f12f63c9771b49a04d5b251ac1d47471e62dc27ad387d67e490ea174de426dabaef0c596af12899c5ca0d58f34fd5735d71aa43c8090a6c7c3d4a5e6
+  metadata.gz: da0fb26de6c274930a6db27216a78e8c91d41fcede05035adf76037ce449762f9b6bb875aea1c27a7813f42d0ec80d8d3ee9a7251fdaf1a306a7ee773a368701
+  data.tar.gz: 24b29f71174bf64b65aa1b4645189a7fbe265ff7456c45428798ea6226eea30311bffb51227260f610188972d5a5b538dd72ec94b9e67ad83001d27e0ba33586

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+<a name="v1.6.0-1"></a>
+### v1.6.0-1 (2017-10-01)
+
+#### Features
+
+* **cli**
+  * allow multiple --custom-provider-header to be specified	 ([6a8573a](/../../commit/6a8573a))
+
 <a name="v1.5.0-1"></a>
 ### v1.5.0-1 (2017-10-01)
 

data/lib/pact/provider_verifier/app.rb

@@ -46,7 +46,7 @@ module Pact
       def set_environment_variables
         ENV['PROVIDER_STATES_SETUP_URL'] = options.provider_states_setup_url
         ENV['VERBOSE_LOGGING'] = options.verbose if options.verbose
-        ENV['CUSTOM_PROVIDER_HEADER'] = options.custom_provider_header if options.custom_provider_header
+        ENV['CUSTOM_PROVIDER_HEADER'] = custom_provider_headers_for_env_var if custom_provider_headers_for_env_var
       end
 
       def configure_service_provider
@@ -112,9 +112,17 @@ module Pact
         require ENV['PACT_PROJECT_PACT_HELPER'] if ENV.fetch('PACT_PROJECT_PACT_HELPER','') != ''
       end
 
+      def custom_provider_headers_for_env_var
+        if options.custom_provider_header && options.custom_provider_header.any?
+          options.custom_provider_header.join("\n")
+        end
+      end
+
       def parse_header
-        header_name, header_value = options.custom_provider_header.split(":", 2).collect(&:strip)
-        {header_name => header_value}
+        options.custom_provider_header.each_with_object({}) do | custom_provider_header, header_hash |
+          header_name, header_value = custom_provider_header.split(":", 2).collect(&:strip)
+          header_hash[header_name] = header_value
+        end
       end
 
       def print_deprecation_note

data/lib/pact/provider_verifier/cli/verify.rb

@@ -14,9 +14,9 @@ module Pact
         method_option :publish_verification_results, aliases: "-r", desc: "Publish verification results to the broker", required: false
         method_option :broker_username, aliases: "-n", desc: "Pact Broker basic auth username", :required => false
         method_option :broker_password, aliases: "-p", desc: "Pact Broker basic auth password", :required => false
-        method_option :custom_provider_header, desc: "Header to add to provider state set up and pact requests. eg 'Authorization: Basic cGFjdDpwYWN0'", :required => false
-        method_option :provider_states_url, aliases: "-s", desc: "DEPRECATED", :required => false
+        method_option :custom_provider_header, type: :array, banner: 'CUSTOM_PROVIDER_HEADER', desc: "Header to add to provider state set up and pact verification requests. eg 'Authorization: Basic cGFjdDpwYWN0'. May be specified multiple times.", :required => false
         method_option :verbose, aliases: "-v", desc: "Verbose output", :required => false
+        method_option :provider_states_url, aliases: "-s", desc: "DEPRECATED", :required => false
         method_option :pact_urls, aliases: "-u", desc: "DEPRECATED. Please provide as space separated arguments.", :required => false
 
         def verify(*pact_urls)

data/lib/pact/provider_verifier/set_up_provider_state.rb

@@ -71,21 +71,16 @@ module Pact
         ENV['VERBOSE_LOGGING']
       end
 
-      def provider_header_set?
-        ENV.fetch('CUSTOM_PROVIDER_HEADER', '') != ''
-      end
-
-      def provider_header_name
-        ENV['CUSTOM_PROVIDER_HEADER'].split(":", 2)[0]
-      end
-
-      def provider_header_value
-        ENV['CUSTOM_PROVIDER_HEADER'].split(":", 2)[1]
+      def custom_provider_headers
+        ENV.fetch('CUSTOM_PROVIDER_HEADER', '').split("\n").each_with_object({}) do | header, headers_hash |
+          header_name, header_value = header.split(":", 2).collect(&:strip)
+          headers_hash[header_name] = header_value
+        end
       end
 
       def add_custom_provider_header request
-        if provider_header_set?
-          request[provider_header_name] = provider_header_value
+        custom_provider_headers.each do | header_name, header_value |
+          request[header_name] = header_value
         end
       end
 

data/lib/pact/provider_verifier/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module ProviderVerifier
-    VERSION = "1.5.0"
+    VERSION = "1.6.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-provider-verifier
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Matt Fellows