pact-provider-verifier 1.23.1 → 1.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '03408a7ed4910873c671ce4e5e5d387f16b014d18b1da629bb6e05baa22054f5'
-  data.tar.gz: 66d4f1151cbe96a55dbf3082ce054dc15611f32b372e8ac7ee9e21ba0b826ff8
+  metadata.gz: 7252d509ae2e2498fcd92b205a3cd814098d2218d7654e27adcf3b272fe725d2
+  data.tar.gz: 2061bb5cf8beb5da796b27b8eefc912956b98fc04b865754cfbe95579c06644e
 SHA512:
-  metadata.gz: 8393d9310408c3fb12bbba5cb2937df92a2ceac3fe7469c1788a5b114c051a030e7f2fdb39aa348a70bcb7801306d14802b688589fe7abb8bfda6c7493c45ccb
-  data.tar.gz: 8f6970ac162703fd9c39ebb259ef9a81e5d72102ab6e33bbd788831ec31e49f39c99a5aac59d3e0f2ade63235c30f2a94385c194550153aeb13cc2b031fcf2aa
+  metadata.gz: 65a2bc4f8335736f99d0c251b3610dad8140033e8c0759f606d44f81442d68fd245b1676d5aa4c112099a58bd86bf9ec2955140a4882778915be601b51b386c1
+  data.tar.gz: 613a162a2bc0563abcc86cf7e0452d0c48a1c778a2f4e4a6b1110eb360d288312a1c5a63e39a50bb284b8d467adeb2dd87e4af2264c738915f98c64cd19d36a1

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+<a name="v1.25.0-1"></a>
+### v1.25.0-1 (2019-11-09)
+
+#### Features
+
+* **gems**
+  * update pact gem to 1.42.2	 ([a8452bd](/../../commit/a8452bd))
+  * update pact gem to 1.42.1	 ([44cdd4e](/../../commit/44cdd4e))
+
+
+<a name="v1.24.0-1"></a>
+### v1.24.0-1 (2019-09-26)
+
+
+#### Features
+
+* update pact version dependency to 1.42.0	 ([828deff](/../../commit/828deff))
+* use new 'pacts for verification' endpoint when PACT_BROKER_PACTS_FOR_VERIFICATION_ENABLED is set to 'true'	 ([6e6f45b](/../../commit/6e6f45b))
+* allow --provider-version-tag to be specified, which will be applied to the provider version when the verification results are published	 ([bf4bc93](/../../commit/bf4bc93))
+
+
 <a name="v1.23.1-1"></a>
 ### v1.23.1-1 (2019-05-22)
 

data/README.md

@@ -17,7 +17,7 @@ binary-like CLI tool.
 
 ### Docker
 
-Take a look at https://github.com/DiUS/pact-provider-verifier-docker.
+Take a look at https://github.com/DiUS/pact-provider-verifier-docker or https://github.com/pact-foundation/pact-ruby-cli
 
 ### Native Installation
 
@@ -40,24 +40,24 @@ Usage:
   pact-provider-verifier PACT_URL ... -h, --provider-base-url=PROVIDER_BASE_URL
 
 Options:
-  -h, --provider-base-url=PROVIDER_BASE_URL                          # Provider host URL
-  -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.
-  -n, [--broker-username=BROKER_USERNAME]                            # Pact Broker basic auth username
-  -p, [--broker-password=BROKER_PASSWORD]                            # Pact Broker basic auth password
-  -k, [--broker-token=BROKER_TOKEN]                                  # Pact Broker bearer token
+  -h, --provider-base-url=PROVIDER_BASE_URL                                  # Provider host URL
+  -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.
+  -n, [--broker-username=BROKER_USERNAME]                                    # Pact Broker basic auth username
+  -p, [--broker-password=BROKER_PASSWORD]                                    # Pact Broker basic auth password
+  -k, [--broker-token=BROKER_TOKEN]                                          # Pact Broker bearer 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.
-  -a, [--provider-app-version=PROVIDER_APP_VERSION]                  # Provider application version, required when publishing verification results
-  -r, [--publish-verification-results=PUBLISH_VERIFICATION_RESULTS]  # Publish verification results to the broker
-      [--custom-provider-header=CUSTOM_PROVIDER_HEADER]              # Header to add to provider state set up and pact verification requests. eg 'Authorization: Basic cGFjdDpwYWN0'. May be specified multiple times.
-      [--custom-middleware=FILE]                                     # Ruby file containing a class implementing Pact::ProviderVerifier::CustomMiddleware. This allows the response to be modified before replaying. Use with caution!
-  -v, [--verbose=VERBOSE]                                            # Verbose output
-  -f, [--format=FORMATTER]                                           # RSpec formatter. Defaults to custom Pact formatter. Other options are json and RspecJunitFormatter (which outputs xml).
-  -o, [--out=FILE]                                                   # Write output to a file instead of $stdout.
-  [--wait=SECONDS]                                                   # The number of seconds to poll for the provider to become available before running the verification
-                                                                     # Default: 0
-Verify pact(s) against a provider. Supports local and networked (http-based) files.
+      [--consumer-version-tag=TAG]                                           # Retrieve the latest pacts with   this consumer version tag. Used in conjunction with --provider. May be specified multiple times.
+      [--provider-version-tag=TAG]                                           # Tag to apply to the provider   application version. May be specified multiple times.
+  -a, [--provider-app-version=PROVIDER_APP_VERSION]                          # Provider application version,   required when publishing verification results
+  -r, [--publish-verification-results], [--no-publish-verification-results]  # Publish verification results to   the broker
+      [--custom-provider-header=CUSTOM_PROVIDER_HEADER]                      # Header to add to provider state   set up and pact verification requests. eg 'Authorization: Basic cGFjdDpwYWN0'. May be specified multiple   times.
+      [--custom-middleware=FILE]                                             # Ruby file containing a class   implementing Pact::ProviderVerifier::CustomMiddleware. This allows the response to be modified before   replaying. Use with caution!
+  -v, [--verbose=VERBOSE]                                                    # Verbose output
+  -f, [--format=FORMATTER]                                                   # RSpec formatter. Defaults to   custom Pact formatter. Other options are json and RspecJunitFormatter (which outputs xml).
+  -o, [--out=FILE]                                                           # Write output to a file instead   of $stdout.
+      [--wait=SECONDS]                                                       # The number of seconds to poll for the provider to become available before running the verification
+                                                                           # Default: 0
 ```
 
 ## Examples

data/lib/pact/provider_verifier/aggregate_pact_configs.rb

@@ -1,53 +1,50 @@
 require 'pact/pact_broker'
 require 'ostruct'
+require 'pact/provider/pact_uri'
 
 module Pact
   module ProviderVerifier
     class AggregatePactConfigs
 
-      def self.call(pact_urls, provider_name, consumer_version_tags, pact_broker_base_url, http_client_options)
-        new(pact_urls, provider_name, consumer_version_tags, pact_broker_base_url, http_client_options).call
+      def self.call(pact_urls, provider_name, consumer_version_tags, provider_version_tags, pact_broker_base_url, http_client_options)
+        new(pact_urls, provider_name, consumer_version_tags, provider_version_tags, pact_broker_base_url, http_client_options).call
       end
 
-      def initialize(pact_urls, provider_name, consumer_version_tags, pact_broker_base_url, http_client_options)
+      def initialize(pact_urls, provider_name, consumer_version_tags, provider_version_tags, pact_broker_base_url, http_client_options)
         @pact_urls = pact_urls
         @provider_name = provider_name
         @consumer_version_tags = consumer_version_tags
+        @provider_version_tags = provider_version_tags
         @pact_broker_base_url = pact_broker_base_url
         @http_client_options = http_client_options
       end
 
       def call
-         pacts_urls_from_broker + pact_urls.collect{ |uri| OpenStruct.new(uri: uri) }
+        pacts_urls_from_broker + specified_pact_uris
       end
 
       private
 
-      attr_reader :pact_urls, :provider_name, :consumer_version_tags, :pact_broker_base_url, :http_client_options
+      attr_reader :pact_urls, :provider_name, :consumer_version_tags, :provider_version_tags, :pact_broker_base_url, :http_client_options
+
+      def specified_pact_uris
+        pact_urls.collect{ | url | Pact::PactBroker.build_pact_uri(url) }
+      end
 
       def pacts_urls_from_broker
         if pact_broker_base_url && provider_name
-          net_pending_pact_uris.collect{ | uri| OpenStruct.new(uri: uri, pending: true) } +
-            non_pending_pact_uris.collect{ | uri| OpenStruct.new(uri: uri) }
+          pacts_for_verification
         else
           []
         end
       end
 
-      def non_pending_pact_uris
-        @non_pending_pact_uris ||= Pact::PactBroker.fetch_pact_uris(provider_name, consumer_version_tags, pact_broker_base_url, http_client_options)
-      end
-
-      def pending_pact_uris
-        @pending_pact_uris ||= Pact::PactBroker.fetch_pending_pact_uris(provider_name, pact_broker_base_url, http_client_options)
+      def pacts_for_verification
+        @pacts_for_verification ||= Pact::PactBroker.fetch_pact_uris_for_verification(provider_name, consumer_version_selectors, provider_version_tags, pact_broker_base_url, http_client_options)
       end
 
-      def net_pending_pact_uris
-        if ENV['PACT_INCLUDE_PENDING'] == 'true'
-          pending_pact_uris - non_pending_pact_uris
-        else
-          []
-        end
+      def consumer_version_selectors
+        consumer_version_tags.collect{ |tag| { tag: tag, latest: true } }
       end
     end
   end

data/lib/pact/provider_verifier/app.rb

@@ -17,11 +17,13 @@ module Pact
       include Pact::WaitUntilServerAvailable
 
       PROXY_PACT_HELPER = File.expand_path(File.join(File.dirname(__FILE__), "pact_helper.rb"))
+      attr_reader :pact_urls, :options, :consumer_version_tags, :provider_version_tags
 
       def initialize pact_urls, options = {}
         @pact_urls = pact_urls
         @options = options
         @consumer_version_tags = options[:consumer_version_tag] || []
+        @provider_version_tags = options[:provider_version_tag] || []
       end
 
       def self.call pact_urls, options
@@ -33,8 +35,8 @@ module Pact
 
         pact_urls = all_pact_urls
         wait_until_provider_available
-        exit_statuses = pact_urls.collect do |pact_url|
-          verify_pact pact_url
+        exit_statuses = pact_urls.collect do |pact_uri|
+          verify_pact pact_uri
         end
 
         exit_statuses.all?{ | status | status == 0 }
@@ -42,7 +44,6 @@ module Pact
 
       private
 
-      attr_reader :pact_urls, :options, :consumer_version_tags
 
       def setup
         print_deprecation_note
@@ -66,19 +67,22 @@ module Pact
         application = configure_custom_middleware(application)
         application = configure_custom_header_middleware(application)
 
-        provider_application_version = options.provider_app_version
-        publish_results  = options.publish_verification_results
+        this = self
 
         Pact.service_provider "Running Provider Application" do
           app do
             application
           end
 
-          if provider_application_version
-            app_version provider_application_version
+          if this.options.provider_app_version
+            app_version this.options.provider_app_version
           end
 
-          publish_verification_results publish_results
+          if this.provider_version_tags.any?
+            app_version_tags this.provider_version_tags
+          end
+
+          publish_verification_results this.options.publish_verification_results
         end
       end
 
@@ -134,18 +138,17 @@ module Pact
         end
       end
 
-      def verify_pact(config)
+      def verify_pact(pact_uri)
         begin
           verify_options = {
             pact_helper: PROXY_PACT_HELPER,
-            pact_uri: config.uri,
+            pact_uri: pact_uri,
             backtrace: ENV['BACKTRACE'] == 'true',
             pact_broker_username: options.broker_username,
             pact_broker_password: options.broker_password,
             pact_broker_token: options.broker_token,
             format: options.format,
             out: options.out,
-            ignore_failures: config.pending,
             request_customizer: ProviderStates::AddProviderStatesHeader
           }
           verify_options[:description] = ENV['PACT_DESCRIPTION'] if ENV['PACT_DESCRIPTION']
@@ -171,7 +174,7 @@ module Pact
 
       def all_pact_urls
         http_client_options = { username: options.broker_username, password: options.broker_password, token: options.broker_token, verbose: options.verbose }
-        AggregatePactConfigs.call(pact_urls, options.provider, consumer_version_tags, options.pact_broker_base_url, http_client_options)
+        AggregatePactConfigs.call(pact_urls, options.provider, consumer_version_tags, provider_version_tags, options.pact_broker_base_url, http_client_options)
       end
 
       def require_pact_project_pact_helper

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

@@ -19,8 +19,9 @@ module Pact
         method_option :broker_token, aliases: "-k", desc: "Pact Broker bearer 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 :provider_version_tag, type: :array, banner: "TAG", desc: "Tag to apply to the provider application version. May be specified multiple times.", :required => false
         method_option :provider_app_version, aliases: "-a", desc: "Provider application version, required when publishing verification results", :required => false
-        method_option :publish_verification_results, aliases: "-r", desc: "Publish verification results to the broker", required: false
+        method_option :publish_verification_results, aliases: "-r", desc: "Publish verification results to the broker", required: false, type: :boolean, default: 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 :custom_middleware, type: :array, banner: 'FILE', desc: "Ruby file containing a class implementing Pact::ProviderVerifier::CustomMiddleware. This allows the response to be modified before replaying. Use with caution!", :required => false
         method_option :monkeypatch, hide: true, type: :array, :required => false

data/lib/pact/provider_verifier/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module ProviderVerifier
-    VERSION = "1.23.1"
+    VERSION = "1.25.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-provider-verifier
 version: !ruby/object:Gem::Version
-  version: 1.23.1
+  version: 1.25.0
 platform: ruby
 authors:
 - Matt Fellows
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2019-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -31,14 +31,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.36'
+        version: '1.42'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.42.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.36'
+        version: '1.42'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.42.2
 - !ruby/object:Gem::Dependency
   name: pact-message
   requirement: !ruby/object:Gem::Requirement
@@ -57,22 +63,22 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -325,7 +331,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Provides a Pact verification service for use with Pact