pact-provider-verifier 1.27.1 → 1.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6aa619044ae521e7f472fcb86c62389dd908d4799a509bb3a1b7b688947960b2
-  data.tar.gz: beedd9e10ca307512db6306c6888c15075caa3878c6db7cb998d377421aef5e1
+  metadata.gz: 4d1650e2874f85a92584bd114367df7d3df6c86030249c7d754ea05553e336cb
+  data.tar.gz: 4ae568f9c7c34942ea6a5245d93d47edbc67d13631535beb35ab8d43c06e55be
 SHA512:
-  metadata.gz: 549f619ce02b6367a97a4e18534861ee13f3a3f9e3e3dea527d3f4e035d253061fe46e637ec6355ce19fae14e18389e70f51c90bb21d13253ffc926199a13429
-  data.tar.gz: fdd5bb10143752116f9a5446d2c96e258aacf30fc19684e90bbf431d68104c3c2d428ce9e9a21ac4ba5cb92a5720d721e4f7a39f47e282a1a6dbfd2a98837706
+  metadata.gz: 1fbeab699e77f4c6ef85a5b4dfd5ff83165e091dbc3a0f455b363e30cf45f90a25489e65e1d6e7616fd6b698d9022cd97df05a35873a5f248cc8eff934d87fe8
+  data.tar.gz: 331ebcaaa81632a537b94af9582b38ab2b0fbec4c937db0835bf8390ed92d08a12ab03888e8f9f8f81a1e3899edc9bfe0f5560118ebc8c619e3832f7ff8ee55e

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+<a name="v1.28.0-1"></a>
+### v1.28.0-1 (2020-01-22)
+
+
+#### Features
+
+* allow Pact Broker URL and credentials to be set via environment variables	 ([c257abf](/../../commit/c257abf))
+* ensure output stream is configured to point to the error stream before fetching the pacts so the JSON and XML parsing don't get corrupted	 ([d816980](/../../commit/d816980))
+* use `lib/pact/provider_verifier/git.rb` to get git sha	 ([2dd3591](/../../commit/2dd3591))
+
+
 <a name="v1.27.1-1"></a>
 ### v1.27.1-1 (2020-01-16)
 

data/README.md

@@ -45,13 +45,13 @@ Options:
   -c, [--provider-states-setup-url=PROVIDER_STATES_SETUP_URL]
             # Base URL to setup the provider states at
       [--pact-broker-base-url=PACT_BROKER_BASE_URL]
-            # Base URL of the Pact Broker from which to retrieve the pacts.
+            # Base URL of the Pact Broker from which to retrieve the pacts. Can also be set using the environment variable PACT_BROKER_BASE_URL.
   -n, [--broker-username=BROKER_USERNAME]
-            # Pact Broker basic auth username
+            # Pact Broker basic auth username. Can also be set using the environment variable PACT_BROKER_USERNAME.
   -p, [--broker-password=BROKER_PASSWORD]
-            # Pact Broker basic auth password
+            # Pact Broker basic auth password. Can also be set using the environment variable PACT_BROKER_PASSWORD.
   -k, [--broker-token=BROKER_TOKEN]
-            # Pact Broker bearer token
+            # Pact Broker bearer token. Can also be set using the environment variable PACT_BROKER_TOKEN.
       [--provider=PROVIDER]
       [--consumer-version-tag=TAG]
             # Retrieve the latest pacts with this consumer version tag. Used in conjunction with --provider. May be specified multiple times.
@@ -81,15 +81,15 @@ Options:
             # Default: 0
 
 Description:
-  To verify a pact from a known URL, specify one or more PACT_URL arguments. If the pact is
-  hosted in a Pact Broker that uses authentication, specify the relevant
-  --broker-username/--broker-password or --broker-token fields. To dynamically fetch pacts
-  from a Pact Broker based on the provider name, specify the --pact-broker-base-url,
-  --provider and relevant authentication fields.
+  To verify a pact from a known URL, specify one or more PACT_URL arguments. If the pact
+  is hosted in a Pact Broker that uses authentication, specify the relevant
+  --broker-username/--broker-password or --broker-token fields. To dynamically fetch
+  pacts from a Pact Broker based on the provider name, specify the
+  --pact-broker-base-url, --provider and relevant authentication fields.
 
   Selectors: These are specified using JSON strings. The keys are 'tag' (the name of the consumer
-  version tag) and 'latest' (true|false). For example '{"tag": "master", "latest": true}'.
-  For a detailed explanation of selectors, see https://pact.io/selectors
+  version tag) and 'latest' (true|false). For example '{"tag": "master", "latest":
+  true}'. For a detailed explanation of selectors, see https://pact.io/selectors
 ```
 
 ## Examples

data/lib/pact/provider_verifier/app.rb

@@ -50,6 +50,7 @@ module Pact
 
 
       def setup
+        configure_output
         print_deprecation_note
         set_environment_variables
         require_rspec_monkeypatch_for_jsonl
@@ -90,6 +91,14 @@ module Pact
         end
       end
 
+      def configure_output
+        if options[:format] && !options[:out]
+          # Don't want to mess up the JSON parsing with messages to stdout, so send it to stderr
+          require 'pact/configuration'
+          Pact.configuration.output_stream = Pact.configuration.error_stream
+        end
+      end
+
       def configure_reverse_proxy
         provider_base_url = options.provider_base_url
         Rack::ReverseProxy.new do
@@ -173,18 +182,24 @@ module Pact
         Pact.clear_configuration
         Pact.clear_consumer_world
         Pact.clear_provider_world
+        configure_output
         configure_service_provider
       end
 
       def all_pact_urls
-        http_client_options = { username: options.broker_username, password: options.broker_password, token: options.broker_token, verbose: options.verbose }
+        http_client_options = {
+          username: options.broker_username || ENV['PACT_BROKER_USERNAME'],
+          password: options.broker_password || ENV['PACT_BROKER_PASSWORD'],
+          token: options.broker_token || ENV['PACT_BROKER_TOKEN'],
+          verbose: options.verbose
+        }
         AggregatePactConfigs.call(
           pact_urls,
           options.provider,
           consumer_version_tags,
           consumer_version_selectors,
           provider_version_tags,
-          options.pact_broker_base_url,
+          options.pact_broker_base_url || ENV['PACT_BROKER_BASE_URL'],
           http_client_options,
           { enable_pending: options.enable_pending }
           )

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

@@ -25,10 +25,10 @@ module Pact
                   "\n\n" + SELECTOR_DOCS
         method_option :provider_base_url, aliases: "-h", desc: "Provider host URL", :required => true
         method_option :provider_states_setup_url, aliases: "-c", desc: "Base URL to setup the provider states at", :required => false
-        method_option :pact_broker_base_url, desc: "Base URL of the Pact Broker from which to retrieve the pacts.", :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 :broker_token, aliases: "-k", desc: "Pact Broker bearer token", :required => false
+        method_option :pact_broker_base_url, desc: "Base URL of the Pact Broker from which to retrieve the pacts. Can also be set using the environment variable PACT_BROKER_BASE_URL.", :required => false
+        method_option :broker_username, aliases: "-n", desc: "Pact Broker basic auth username. Can also be set using the environment variable PACT_BROKER_USERNAME.", :required => false
+        method_option :broker_password, aliases: "-p", desc: "Pact Broker basic auth password. Can also be set using the environment variable PACT_BROKER_PASSWORD.", :required => false
+        method_option :broker_token, aliases: "-k", desc: "Pact Broker bearer token. Can also be set using the environment variable PACT_BROKER_TOKEN.", :required => false
         method_option :provider, required: false
         method_option :consumer_version_tag, type: :array, banner: "TAG", desc: "Retrieve the latest pacts with this consumer version tag. Used in conjunction with --provider. May be specified multiple times.", :required => false
         method_option :consumer_version_selector, type: :array, banner: "SELECTOR", desc: "JSON string specifying a selector that identifies which pacts to verify. May be specified multiple times. See below for further documentation.", :required => false

data/lib/pact/provider_verifier/git.rb

@@ -5,7 +5,7 @@ require 'pact/provider_verifier/error'
 module Pact
   module ProviderVerifier
     module Git
-      COMMAND = 'git name-rev --name-only HEAD'.freeze
+      COMMAND = 'git rev-parse --abbrev-ref 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/provider_verifier/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module ProviderVerifier
-    VERSION = "1.27.1"
+    VERSION = "1.28.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-provider-verifier
 version: !ruby/object:Gem::Version
-  version: 1.27.1
+  version: 1.28.0
 platform: ruby
 authors:
 - Matt Fellows
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-17 00:00:00.000000000 Z
+date: 2020-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -31,14 +31,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.43'
+        version: '1.46'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.46.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.43'
+        version: '1.46'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.46.1
 - !ruby/object:Gem::Dependency
   name: pact-message
   requirement: !ruby/object:Gem::Requirement