pact 1.33.0 → 1.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de02591d62ceb1e65c23c33d8c3ccdb2ccb37a68
-  data.tar.gz: 5f2d9cf06014c76dc47e918efd5f97472285274d
+  metadata.gz: cb9f3147fb9ff1878469700cb000042058f043dd
+  data.tar.gz: 8c8058099ee03e3fc35081590c217ca5c02663c9
 SHA512:
-  metadata.gz: e04b4c8dff9d92cdf4f9c46b3570627e851e44d6f024eb231b6353fd2411d49e5959e83a8119dbd05c5c7cb0c392f5dd62a6f33029cf0248c354fe66f6f35184
-  data.tar.gz: 83c288ddc6c441d4d58f5e36163cab1faa5718d1fd13b73e9c5853f01c66f52408df5e536dd01e52bc5b15787a9376bd9df97e98449fc43a258ad634b9e87e8e
+  metadata.gz: 54fb5bad27bd4610b9b690d2cf4a332d78a10bcf25d1f6e10b66e5904e76389f61aeba6844fb526365e22f8419465b034984f6275544e5a392c7a016c1772525
+  data.tar.gz: 68885f0aabdc5707a6caf763b565eb41532c72a87d960a6179a17b133a48d67693f0f95fd85e20272770690e4a4b5280951efd68cce54dc9ce509a8fb7ee753b

data/CHANGELOG.md

@@ -1,3 +1,44 @@
+<a name="v1.34.0"></a>
+### v1.34.0 (2018-09-06)
+
+
+#### Features
+
+* **verify**
+  * add request customizer for pact-provider-verifier	 ([4ae0b58](/../../commit/4ae0b58))
+
+
+#### Bug Fixes
+
+* add missing require for net/http	 ([fe2ebb1](/../../commit/fe2ebb1))
+
+
+<a name="v1.33.2"></a>
+### v1.33.2 (2018-09-06)
+
+
+#### Bug Fixes
+
+* add missing requires for pact/errors	 ([0e01451](/../../commit/0e01451))
+
+
+<a name="v1.33.1"></a>
+### v1.33.1 (2018-08-28)
+
+
+#### Features
+
+* rename 'wip pacts' to 'pending pacts'	 ([6a46ebb](/../../commit/6a46ebb))
+
+* **verify cli**
+  * rename --wip to --ignore-failures	 ([8e2dffd](/../../commit/8e2dffd))
+
+
+#### Bug Fixes
+
+* correct version for dependency on pact-mock_service	 ([01c0df7](/../../commit/01c0df7))
+
+
 <a name="v1.33.0"></a>
 ### v1.33.0 (2018-08-07)
 

data/lib/pact/cli/run_pact_verification.rb

@@ -72,7 +72,8 @@ module Pact
           criteria: SpecCriteria.call(options),
           format: options[:format],
           out: options[:out],
-          wip: options[:wip]
+          ignore_failures: options[:ignore_failures],
+          request_customizer: options[:request_customizer]
         }
       end
     end

data/lib/pact/cli.rb

@@ -8,7 +8,7 @@ module Pact
     desc 'verify', "Verify a pact"
     method_option :pact_helper, aliases: "-h", desc: "Pact helper file", :required => true
     method_option :pact_uri, aliases: "-p", desc: "Pact URI"
-    method_option :wip, type: :boolean, default: false, desc: "If WIP, process will always exit with exit code 0", hide: true
+    method_option :ignore_failures, type: :boolean, default: false, desc: "Process will always exit with exit code 0", hide: true
     method_option :pact_broker_username, aliases: "-u", desc: "Pact broker user name"
     method_option :pact_broker_password, aliases: "-w", desc: "Pact broker password"
     method_option :backtrace, aliases: "-b", desc: "Show full backtrace", :default => false, :type => :boolean

data/lib/pact/hal/entity.rb

@@ -1,6 +1,7 @@
 require 'uri'
 require 'delegate'
 require 'pact/hal/link'
+require 'pact/errors'
 
 module Pact
   module Hal
@@ -36,9 +37,11 @@ module Pact
         Link.new(@links[key].merge(method: http_method), @client).run(*args)
       end
 
-      def _link(key)
+      def _link(key, fallback_key = nil)
         if @links[key]
           Link.new(@links[key], @client)
+        elsif fallback_key && @links[fallback_key]
+          Link.new(@links[fallback_key], @client)
         else
           nil
         end

data/lib/pact/hal/http_client.rb

@@ -1,4 +1,5 @@
 require 'pact/retry'
+require 'net/http'
 
 module Pact
   module Hal

data/lib/pact/pact_broker/fetch_pacts.rb

@@ -1,6 +1,7 @@
 require 'pact/hal/entity'
 require 'pact/hal/http_client'
 require 'pact/provider/pact_uri'
+require 'pact/errors'
 
 module Pact
   module PactBroker

data/lib/pact/pact_broker/{fetch_wip_pacts.rb → fetch_pending_pacts.rb}

@@ -1,13 +1,15 @@
 require 'pact/hal/entity'
 require 'pact/hal/http_client'
 require 'pact/provider/pact_uri'
+require 'pact/errors'
 
 module Pact
   module PactBroker
-    class FetchWipPacts
+    class FetchPendingPacts
       attr_reader :provider, :tags, :broker_base_url, :http_client_options, :http_client, :index_entity
 
-      WIP_PROVIDER_RELATION = 'beta:wip-provider-pacts'.freeze
+      PENDING_PROVIDER_RELATION = 'beta:pending-provider-pacts'.freeze
+      WIP_PROVIDER_RELATION = 'beta:wip-provider-pacts'.freeze # deprecated
       PACTS = 'pacts'.freeze
       PB_PACTS = 'pb:pacts'.freeze
       HREF = 'href'.freeze
@@ -25,7 +27,7 @@ module Pact
 
       def call
         if index.success?
-          wip_pacts_for_provider
+          pending_pacts_for_provider
         else
           raise Pact::Error.new("Error retrieving #{broker_base_url} status=#{index_entity.response.code} #{index_entity.response.raw_body}")
         end
@@ -37,8 +39,8 @@ module Pact
         @index_entity ||= Pact::Hal::Link.new({ "href" => broker_base_url }, http_client).get
       end
 
-      def wip_pacts_for_provider
-        link = index_entity._link(WIP_PROVIDER_RELATION)
+      def pending_pacts_for_provider
+        link = index_entity._link(WIP_PROVIDER_RELATION, PENDING_PROVIDER_RELATION)
         if link
           get_pact_urls(link.expand(provider: provider).get)
         else

data/lib/pact/pact_broker.rb

@@ -1,5 +1,5 @@
 require 'pact/pact_broker/fetch_pacts'
-require 'pact/pact_broker/fetch_wip_pacts'
+require 'pact/pact_broker/fetch_pending_pacts'
 
 #
 # @public Use by Pact Provider Verifier
@@ -12,8 +12,8 @@ module Pact
       Pact::PactBroker::FetchPacts.call(*args).collect(&:uri)
     end
 
-    def fetch_wip_pact_uris *args
-      Pact::PactBroker::FetchWipPacts.call(*args).collect(&:uri)
+    def fetch_pending_pact_uris *args
+      Pact::PactBroker::FetchPendingPacts.call(*args).collect(&:uri)
     end
   end
 end

data/lib/pact/provider/configuration/pact_verification_from_broker.rb

@@ -1,6 +1,7 @@
 require 'pact/shared/dsl'
 require 'pact/provider/world'
 require 'pact/pact_broker/fetch_pacts'
+require 'pact/errors'
 
 module Pact
   module Provider

data/lib/pact/provider/pact_spec_runner.rb

@@ -91,7 +91,7 @@ module Pact
           ::RSpec::Core::CommandLine.new(NoConfigurationOptions.new)
             .run(::RSpec.configuration.output_stream, ::RSpec.configuration.error_stream)
         end
-        options[:wip] ? 0 : exit_code
+        options[:ignore_failures] ? 0 : exit_code
       end
 
       def rspec_runner_options
@@ -120,7 +120,8 @@ module Pact
         pact_sources.each do | pact_source |
           options = {
             criteria: @options[:criteria],
-            wip: @options[:wip]
+            ignore_failures: @options[:ignore_failures],
+            request_customizer: @options[:request_customizer]
           }
           honour_pactfile pact_source.uri, ordered_pact_json(pact_source.pact_json), options
         end
@@ -147,7 +148,7 @@ module Pact
 
         ::RSpec.configuration.full_backtrace = @options[:full_backtrace]
 
-        ::RSpec.configuration.failure_color = :yellow if @options[:wip]
+        ::RSpec.configuration.failure_color = :yellow if @options[:ignore_failures]
       end
 
       def ordered_pact_json(pact_json)

data/lib/pact/provider/rspec/formatter_rspec_3.rb

@@ -42,12 +42,12 @@ module Pact
           summary.failed_examples.collect{ |e| e.metadata[:pact_interaction_example_description] }.uniq.size
         end
 
-        def wip?(summary)
-          summary.failed_examples.any?{ |e| e.metadata[:pact_wip] }
+        def ignore_failures?(summary)
+          summary.failed_examples.any?{ |e| e.metadata[:pact_ignore_failures] }
         end
 
         def failure_title summary
-          if wip?(summary)
+          if ignore_failures?(summary)
             "#{failed_interactions_count(summary)} pending"
           else
             ::RSpec::Core::Formatters::Helpers.pluralize(failed_interactions_count(summary), "failure")
@@ -69,7 +69,7 @@ module Pact
         end
 
         def print_rerun_commands summary
-          if wip?(summary)
+          if ignore_failures?(summary)
             output.puts("\nPending interactions: (Failures listed here are expected and do not affect your suite's status)\n\n")
           else
             output.puts("\nFailed interactions:\n\n")

data/lib/pact/provider/rspec.rb

@@ -21,7 +21,7 @@ module Pact
         include ::RSpec::Core::DSL
 
         def honour_pactfile pact_uri, pact_json, options
-          pact_description = options[:wip] ? "WIP pact" : "pact"
+          pact_description = options[:ignore_failures] ? "Pending pact" : "pact"
           Pact.configuration.output_stream.puts "INFO: Reading #{pact_description} at #{pact_uri}"
           Pact.configuration.output_stream.puts "INFO: Filtering interactions by: #{options[:criteria]}" if options[:criteria] && options[:criteria].any?
           consumer_contract = Pact::ConsumerContract.from_json(pact_json)
@@ -74,7 +74,7 @@ module Pact
             pact_interaction: interaction,
             pact_interaction_example_description: interaction_description_for_rerun_command(interaction),
             pact_uri: options[:pact_uri],
-            pact_wip: options[:wip]
+            pact_ignore_failures: options[:ignore_failures]
           }
 
           describe description_for(interaction), metadata do
@@ -85,7 +85,7 @@ module Pact
               interaction_context.run_once :before do
                 Pact.configuration.logger.info "Running example '#{Pact::RSpec.full_description(example)}'"
                 set_up_provider_state interaction.provider_state, options[:consumer]
-                replay_interaction interaction
+                replay_interaction interaction, options[:request_customizer]
                 interaction_context.last_response = last_response
               end
             end

data/lib/pact/provider/test_methods.rb

@@ -14,8 +14,9 @@ module Pact
       include Pact::Logging
       include Rack::Test::Methods
 
-      def replay_interaction interaction
+      def replay_interaction interaction, request_customizer = nil
         request = Request::Replayable.new(interaction.request)
+        request = request_customizer.call(request, interaction) if request_customizer
         args = [request.path, request.body, request.headers]
 
         logger.info "Sending #{request.method.upcase} request to path: \"#{request.path}\" with headers: #{request.headers}, see debug logs for body"

data/lib/pact/tasks/task_helper.rb

@@ -28,7 +28,7 @@ module Pact
       command_parts << "-S pact verify"
       command_parts << "--pact-helper" << Shellwords.escape(pact_helper.end_with?(".rb") ? pact_helper : pact_helper + ".rb")
       (command_parts << "--pact-uri" << pact_uri) if pact_uri
-      command_parts << "--wip" if verification_opts[:wip]
+      command_parts << "--ignore-failures" if verification_opts[:ignore_failures]
       command_parts << "--pact-broker-username" << ENV['PACT_BROKER_USERNAME'] if ENV['PACT_BROKER_USERNAME']
       command_parts << "--pact-broker-password" << ENV['PACT_BROKER_PASSWORD'] if ENV['PACT_BROKER_PASSWORD']
       command_parts << "--backtrace" if ENV['BACKTRACE'] == 'true'

data/lib/pact/tasks/verification_task.rb

@@ -30,11 +30,11 @@ module Pact
 
     attr_reader :pact_spec_configs
     attr_accessor :rspec_opts
-    attr_accessor :wip
+    attr_accessor :ignore_failures
 
     def initialize(name)
       @rspec_opts = nil
-      @wip = false
+      @ignore_failures = false
       @pact_spec_configs = []
       @name = name
       yield self
@@ -76,7 +76,7 @@ module Pact
           require 'pact/tasks/task_helper'
 
           exit_statuses = pact_spec_configs.collect do | config |
-            Pact::TaskHelper.execute_pact_verify config[:uri], config[:pact_helper], rspec_opts, { wip: wip }
+            Pact::TaskHelper.execute_pact_verify config[:uri], config[:pact_helper], rspec_opts, { ignore_failures: ignore_failures }
           end
 
           Pact::TaskHelper.handle_verification_failure do

data/lib/pact/version.rb

@@ -1,4 +1,4 @@
 # Remember to bump pact-provider-proxy when this changes major version
 module Pact
-  VERSION = "1.33.0"
+  VERSION = "1.34.0"
 end

data/pact.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'term-ansicolor', '~> 1.0'
 
   gem.add_runtime_dependency 'pact-support', '~> 1.7'
-  gem.add_runtime_dependency 'pact-mock_service', '~> 2.10.0'
+  gem.add_runtime_dependency 'pact-mock_service', '~> 2.10'
 
   gem.add_development_dependency 'rake', '~> 10.0.3'
   gem.add_development_dependency 'webmock', '~> 3.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.33.0
+  version: 1.34.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-06 00:00:00.000000000 Z
+date: 2018-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -138,14 +138,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '2.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -323,7 +323,7 @@ files:
 - lib/pact/hal/link.rb
 - lib/pact/pact_broker.rb
 - lib/pact/pact_broker/fetch_pacts.rb
-- lib/pact/pact_broker/fetch_wip_pacts.rb
+- lib/pact/pact_broker/fetch_pending_pacts.rb
 - lib/pact/project_root.rb
 - lib/pact/provider.rb
 - lib/pact/provider/configuration.rb