pact-provider-verifier 1.15.0 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68a5df8078a6d2408f6afadb8f956365f673ceed3736cdfbceb33bbebf1e89e9
-  data.tar.gz: e992a96f7b210b0b7cef7020e2c6fa5b31d7247f4ad45e932cd4489f2b7537fe
+  metadata.gz: 6aaa2449696ee3831573ec483077f0b8262e54c24a8d98dc2bf9333ff32d916e
+  data.tar.gz: c5c723af674ded08ccc2577828c19c3156574d3521d5022d0de87deb738e5297
 SHA512:
-  metadata.gz: f6526309c0ad113f6c5c6c80d086143387a45b36e3fe77a96bf2da0b2494120b3c7cae13a7fdbf07a70a0794d62b7eceee506932333f9fb248f38697fee923de
-  data.tar.gz: 5d6ec539e538572eebd3648a64f83beed3325d823214ac4d26b69ce0b879030119198a2b2a91fd43e7fa8e633b3200b9dff1d92be0b09ec5e23847795abe36a2
+  metadata.gz: 037c6cefcc939635ab745c594ea1512aaca1683986a2f75d80b984f0b6f19d294b42d6a6a29b9f8566457f0ab256d0dce0822208f05870227761233ca5ab36b9
+  data.tar.gz: 38f4a53c8a6013026b8f1b108e326f536ed05cda4e919a8cdd7fdc0950345d0ca1b0ed93e5cd07961eaca45fca8106e30ee36a60e39e2b47a1d4a7411d779043

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="v1.16.0-1"></a>
+### v1.16.0-1 (2018-07-24)
+
+
+#### Features
+
+* allow pacts to be fetched from a Pact Broker by provider name, including WIP pacts.	 ([0b80528](/../../commit/0b80528))
+* correct debug message regarding provider state URL	 ([d134ba6](/../../commit/d134ba6))
+
+
 <a name="v1.15.0-1"></a>
 ### v1.15.0-1 (2018-07-13)
 

data/lib/pact/provider_verifier/aggregate_pact_configs.rb

@@ -0,0 +1,50 @@
+require 'pact/pact_broker'
+require 'ostruct'
+
+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
+      end
+
+      def initialize(pact_urls, provider_name, consumer_version_tags, pact_broker_base_url, http_client_options)
+        @pact_urls = pact_urls
+        @provider_name = provider_name
+        @consumer_version_tags = consumer_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) }
+      end
+
+      private
+
+      attr_reader :pact_urls, :provider_name, :consumer_version_tags, :pact_broker_base_url, :http_client_options
+
+      def pacts_urls_from_broker
+        if pact_broker_base_url && provider_name
+          net_wip_pact_uris.collect{ | uri| OpenStruct.new(uri: uri, wip: true) } +
+            non_wip_pact_uris.collect{ | uri| OpenStruct.new(uri: uri) }
+        else
+          []
+        end
+      end
+
+      def non_wip_pact_uris
+        @non_wip_pact_uris ||= Pact::PactBroker.fetch_pact_uris(provider_name, consumer_version_tags, pact_broker_base_url, http_client_options)
+      end
+
+      def wip_pact_uris
+        @wip_pact_uris ||= Pact::PactBroker.fetch_wip_pact_uris(provider_name, pact_broker_base_url, http_client_options)
+      end
+
+      def net_wip_pact_uris
+        wip_pact_uris - non_wip_pact_uris
+      end
+    end
+  end
+end

data/lib/pact/provider_verifier/app.rb

@@ -2,13 +2,13 @@ require 'pact/provider_verifier/add_header_middlware'
 require 'pact/provider/rspec'
 require 'pact/message'
 require 'pact/cli/run_pact_verification'
+require 'pact/provider_verifier/aggregate_pact_configs'
 require 'rack/reverse_proxy'
 require 'faraday_middleware'
 require 'json'
 
 module Pact
   module ProviderVerifier
-
     class App
 
       PROXY_PACT_HELPER = File.expand_path(File.join(File.dirname(__FILE__), "pact_helper.rb"))
@@ -16,6 +16,7 @@ module Pact
       def initialize pact_urls, options = {}
         @pact_urls = pact_urls
         @options = options
+        @consumer_version_tags = options[:consumer_version_tag] || []
       end
 
       def self.call pact_urls, options
@@ -25,17 +26,16 @@ module Pact
       def call
         setup
 
-        exit_statuses = pact_urls.collect do |pact_url|
+        exit_statuses = all_pact_urls.collect do |pact_url|
           verify_pact pact_url
         end
 
-        # Return non-zero exit code if failures - increment for each Pact
-        exit exit_statuses.count{ | status | status != 0 }
+        exit_statuses.all?{ | status | status == 0 }
       end
 
       private
 
-      attr_reader :pact_urls, :options
+      attr_reader :pact_urls, :options, :consumer_version_tags
 
       def setup
         print_deprecation_note
@@ -92,16 +92,17 @@ module Pact
         end
       end
 
-      def verify_pact pact_url
+      def verify_pact config
         begin
           verify_options = {
             pact_helper: PROXY_PACT_HELPER,
-            pact_uri: pact_url,
+            pact_uri: config.uri,
             backtrace: ENV['BACKTRACE'] == 'true',
             pact_broker_username: options.broker_username,
             pact_broker_password: options.broker_password,
             format: options.format,
-            out: options.out
+            out: options.out,
+            wip: config.wip
           }
           verify_options[:description] = ENV['PACT_DESCRIPTION'] if ENV['PACT_DESCRIPTION']
           verify_options[:provider_state] = ENV['PACT_PROVIDER_STATE'] if ENV['PACT_PROVIDER_STATE']
@@ -124,6 +125,11 @@ module Pact
         configure_service_provider
       end
 
+      def all_pact_urls
+        http_client_options = { username: options.broker_username, password: options.broker_password }
+        AggregatePactConfigs.call(pact_urls, options.provider, consumer_version_tags, options.pact_broker_base_url, http_client_options)
+      end
+
       def require_pact_project_pact_helper
         require ENV['PACT_PROJECT_PACT_HELPER'] if ENV.fetch('PACT_PROJECT_PACT_HELPER','') != ''
       end

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

@@ -7,24 +7,33 @@ module Pact
   module ProviderVerifier
     module CLI
       class Verify < CustomThor
+
+        class InvalidArgumentsError < ::Thor::Error; end
+
         desc 'PACT_URL ...', "Verify pact(s) against a provider. Supports local and networked (http-based) files."
         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 :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 :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 :provider, required: false
+        method_option :consumer_version_tag, type: :array, desc: "Retrieve the latest pacts with this consumer version tag. Used in conjuction with --provider.", :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 :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 :monkeypatch, hide: true, type: :array, :required => false
         method_option :verbose, aliases: "-v", desc: "Verbose output", :required => false
         method_option :provider_states_url, aliases: "-s", :required => false, hide: true
         method_option :format, banner: "FORMATTER", aliases: "-f", desc: "RSpec formatter. Defaults to custom Pact formatter. Other options are json and RspecJunitFormatter (which outputs xml)."
         method_option :out, aliases: "-o", banner: "FILE", desc: "Write output to a file instead of $stdout."
+        method_option :wip, type: :boolean, default: false, desc: "If WIP, process will always exit with exit code 0", hide: true
         method_option :pact_urls, aliases: "-u", hide: true, :required => false
 
         def verify(*pact_urls)
+          validate_verify
           print_deprecation_warnings
-          Pact::ProviderVerifier::App.call(merged_urls(pact_urls), options)
+          success = Pact::ProviderVerifier::App.call(merged_urls(pact_urls), options)
+          exit_with_non_zero_status if !success && !options.wip
         end
 
         default_task :verify
@@ -46,6 +55,20 @@ module Pact
               $stderr.puts "WARN: The --pact-urls option is deprecated. Please pass in a space separated list of URLs as the first arguments to the pact-provider-verifier command."
             end
           end
+
+          def validate_verify
+            if options.pact_broker_base_url && (options.provider.nil? || options.provider == "")
+              raise InvalidArgumentsError, "No value provided for required option '--provider'"
+            end
+          end
+
+          def exit_with_non_zero_status
+            exit 1
+          end
+
+          def exit_on_failure?
+            true
+          end
         end
       end
     end

data/lib/pact/provider_verifier/set_up_provider_state.rb

@@ -92,7 +92,7 @@ module Pact
 
       def log_request
         if verbose?
-          $stdout.puts "DEBUG: Setting up provider state '#{provider_state}' for consumer '#{consumer}' using provider state server at #{provider_states_setup_url}"
+          $stdout.puts "DEBUG: Setting up provider state '#{provider_state}' for consumer '#{consumer}' using provider state set up URL #{provider_states_setup_url}"
         end
       end
 

data/lib/pact/provider_verifier/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module ProviderVerifier
-    VERSION = "1.15.0"
+    VERSION = "1.16.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-provider-verifier
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.16.0
 platform: ruby
 authors:
 - Matt Fellows
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-12 00:00:00.000000000 Z
+date: 2018-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -31,14 +31,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '1.33'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.33.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '1.33'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.33.1
 - !ruby/object:Gem::Dependency
   name: pact-message
   requirement: !ruby/object:Gem::Requirement
@@ -299,6 +305,7 @@ files:
 - bin/pact-provider-verifier
 - lib/pact/provider_verifier.rb
 - lib/pact/provider_verifier/add_header_middlware.rb
+- lib/pact/provider_verifier/aggregate_pact_configs.rb
 - lib/pact/provider_verifier/app.rb
 - lib/pact/provider_verifier/cli/custom_thor.rb
 - lib/pact/provider_verifier/cli/verify.rb