pact 1.49.2 → 1.51.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbaf27920b084c3e068879eca948ec784ce829ad8779aea73125ee1c5b947218
-  data.tar.gz: 5e53c5bf61194d1bfa8e768ece8c8bacaf8c9b096b9f4ba8e8bca89ff28749b2
+  metadata.gz: 0334b2a6c3b1884ed7ca47e5cc060b97c4ef0bb2b02ce898a34ea2c67e67eba8
+  data.tar.gz: 4fa53510c36f9fc791f3282932f697f105b4e9d5ca47c11bf91bd4eb2453bf1f
 SHA512:
-  metadata.gz: 62cd377157130e34e4b8b32e9acea4ae28d00e1c89696520e3afb54f3bc534165179045cc21e9eeba41503b49d195dbd5a31f939edfafa2cd20a088304012aa2
-  data.tar.gz: b16b23ee357139cefcea6ad97cba99779776e9264b3b0d8653e9ab000a5c7f61af8d4e1b0c42b2ffc47ae32bbc464b6a67496be2ab5ffced6bc843fc8143d6e7
+  metadata.gz: 03567421b18b621002ba594284c70d4b8b38d34827aa923faf4ac4dab36094e95a232f203b1845aaeb91fd4ce25df912a8566a236182309a4d0b02ed75d32b38
+  data.tar.gz: 16155260304a4f7cadf5c43d96f7f0567a157a49dc6f2dba335e2e72506c7772d6f1767216f56c0a951b6efc231a2c6890eb261775ef6d1437797f5c8524b120

data/CHANGELOG.md

@@ -1,3 +1,47 @@
+<a name="v1.51.1"></a>
+### v1.51.1 (2020-08-12)
+
+#### Bug Fixes
+
+* update thor dependency (#218)	 ([bf3ce69](/../../commit/bf3ce69))
+* bump rake dependency per CVE-2020-8130 (#219)	 ([09feaa6](/../../commit/09feaa6))
+
+<a name="v1.51.0"></a>
+### v1.51.0 (2020-06-24)
+
+
+#### Features
+
+* allow individual interactions to be re-run by setting PACT_BROKER_INTERACTION_ID	 ([a586d80](/../../commit/a586d80))
+
+
+<a name="v1.50.1"></a>
+### v1.50.1 (2020-06-15)
+
+
+#### Bug Fixes
+
+* fix integration with pact-message-ruby (#216)	 ([d2da13e](/../../commit/d2da13e))
+
+
+<a name="v1.50.0"></a>
+### v1.50.0 (2020-04-25)
+
+
+#### Features
+
+* Set expected interactions on mock service but without writing them to pact file (#210)	 ([14f5327](/../../commit/14f5327))
+
+
+<a name="v1.49.3"></a>
+### v1.49.3 (2020-04-22)
+
+
+#### Bug Fixes
+
+* pact selection verification options logging	 ([9ff59f4](/../../commit/9ff59f4))
+
+
 <a name="v1.49.2"></a>
 ### v1.49.2 (2020-04-08)
 

data/lib/pact/cli.rb

@@ -4,6 +4,9 @@ require 'pact/provider/configuration'
 
 module Pact
   class CLI < Thor
+    def self.exit_on_failure? # Thor 1.0 deprecation guard
+      false
+    end
 
     desc 'verify', "Verify a pact"
     method_option :pact_helper, aliases: "-h", desc: "Pact helper file", :required => true
@@ -18,6 +21,8 @@ module Pact
                   default: Pact.configuration.interactions_replay_order
     method_option :description, aliases: "-d", desc: "Interaction description filter"
     method_option :provider_state, aliases: "-s", desc: "Provider state filter"
+    method_option :interaction_index, type: :numeric, desc: "Index filter"
+    method_option :pact_broker_interaction_id, desc: "Pact Broker interaction ID filter"
     method_option :format, aliases: "-f", banner: "FORMATTER", desc: "RSpec formatter. Defaults to custom Pact formatter. [j]son may also be used."
     method_option :out, aliases: "-o", banner: "FILE", desc: "Write output to a file instead of $stdout."
 

data/lib/pact/cli/spec_criteria.rb

@@ -6,8 +6,11 @@ module Pact
         criteria = {}
 
         criteria[:description] = Regexp.new(options[:description]) if options[:description]
+        criteria[:_id] = options[:pact_broker_interaction_id] if options[:pact_broker_interaction_id]
+        criteria[:index] = options[:interaction_index] if options[:interaction_index]
 
         provider_state = options[:provider_state]
+
         if provider_state
           if provider_state.length == 0
             criteria[:provider_state] = nil #Allow PACT_PROVIDER_STATE="" to mean no provider state

data/lib/pact/consumer/consumer_contract_builder.rb

@@ -25,6 +25,10 @@ module Pact
         @mock_service_base_url = "http://#{attributes[:host]}:#{attributes[:port]}"
       end
 
+      def without_writing_to_pact
+        interaction_builder.without_writing_to_pact
+      end
+
       def given(provider_state)
         interaction_builder.given(provider_state)
       end

data/lib/pact/consumer/interaction_builder.rb

@@ -13,6 +13,12 @@ module Pact
         @callback = block
       end
 
+      def without_writing_to_pact
+        interaction.metadata ||= {}
+        interaction.metadata[:write_to_pact] = false
+        self
+      end
+
       def upon_receiving description
         @interaction.description = description
         self

data/lib/pact/pact_broker/fetch_pact_uris_for_verification.rb

@@ -4,10 +4,12 @@ require 'pact/provider/pact_uri'
 require 'pact/errors'
 require 'pact/pact_broker/fetch_pacts'
 require 'pact/pact_broker/notices'
+require 'pact/pact_broker/pact_selection_description'
 
 module Pact
   module PactBroker
     class FetchPactURIsForVerification
+      include PactSelectionDescription
       attr_reader :provider, :consumer_version_selectors, :provider_version_tags, :broker_base_url, :http_client_options, :http_client, :options
 
       PACTS_FOR_VERIFICATION_RELATION = 'beta:provider-pacts-for-verification'.freeze
@@ -84,18 +86,7 @@ module Pact
       end
 
       def log_message
-        latest = consumer_version_selectors.any? ? "" : "latest "
-        message = "INFO: Fetching pacts for #{provider} from #{broker_base_url} with the selection criteria: "
-        if consumer_version_selectors.any?
-          desc = consumer_version_selectors.collect do |selector|
-            all_or_latest = selector[:all] ? "all for tag" : "latest for tag"
-            # TODO support fallback
-            name = selector[:fallback] ? "#{selector[:tag]} (or #{selector[:fallback]} if not found)" : selector[:tag]
-            "#{all_or_latest} #{name}"
-          end.join(", ")
-          message << ": #{desc}"
-        end
-        Pact.configuration.output_stream.puts message
+        Pact.configuration.output_stream.puts "INFO: #{pact_selection_description(provider, consumer_version_selectors, options, broker_base_url)}"
       end
     end
   end

data/lib/pact/pact_broker/pact_selection_description.rb

@@ -0,0 +1,24 @@
+module Pact
+  module PactBroker
+    module PactSelectionDescription
+      def pact_selection_description(provider, consumer_version_selectors, options, broker_base_url)
+        latest = consumer_version_selectors.any? ? "" : "latest "
+        message = "Fetching pacts for #{provider} from #{broker_base_url} with the selection criteria: "
+        if consumer_version_selectors.any?
+          desc = consumer_version_selectors.collect do |selector|
+            all_or_latest = !selector[:latest] ? "all for tag" : "latest for tag"
+            # TODO support fallback
+            fallback = selector[:fallback] || selector[:fallbackTag]
+            name = fallback ? "#{selector[:tag]} (or #{fallback} if not found)" : selector[:tag]
+            "#{all_or_latest} #{name}"
+          end.join(", ")
+          if options[:include_wip_pacts_since]
+            desc = "#{desc}, work in progress pacts created after #{options[:include_wip_pacts_since]}"
+          end
+          message << "#{desc}"
+        end
+        message
+      end
+    end
+  end
+end

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

@@ -22,6 +22,33 @@ module Pact
         end
 
         dsl do
+          def app &block
+            self.app_block = block
+          end
+
+          def app_version application_version
+            self.application_version = application_version
+          end
+
+          def app_version_tags tags
+            self.tags = tags
+          end
+
+          def publish_verification_results publish_verification_results
+            self.publish_verification_results = publish_verification_results
+            Pact::RSpec.with_rspec_2 do
+              Pact.configuration.error_stream.puts "WARN: Publishing of verification results is currently not supported with rspec 2. If you would like this functionality, please feel free to submit a PR!"
+            end
+          end
+
+          def honours_pact_with consumer_name, options = {}, &block
+            create_pact_verification consumer_name, options, &block
+          end
+
+          def honours_pacts_from_pact_broker &block
+            create_pact_verification_from_broker &block
+          end
+
           def builder &block
             self.app_block = lambda { RackToMessageAdapter.new(block)  }
           end

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

@@ -93,17 +93,32 @@ module Pact
 
         def interaction_rerun_command_for example
           example_description = example.metadata[:pact_interaction_example_description]
-          if ENV['PACT_INTERACTION_RERUN_COMMAND']
+
+          _id = example.metadata[:pact_interaction]._id
+          index = example.metadata[:pact_interaction].index
+          provider_state = example.metadata[:pact_interaction].provider_state
+          description = example.metadata[:pact_interaction].description
+          pactfile_uri = example.metadata[:pactfile_uri]
+
+          if _id && ENV['PACT_INTERACTION_RERUN_COMMAND_FOR_BROKER']
+            cmd = String.new(ENV['PACT_INTERACTION_RERUN_COMMAND_FOR_BROKER'])
+            cmd.gsub!("<PACT_URI>", example.metadata[:pactfile_uri].to_s)
+            cmd.gsub!("<PACT_BROKER_INTERACTION_ID>", "#{_id}")
+            colorizer.wrap("#{cmd} ", ::RSpec.configuration.failure_color) + colorizer.wrap("# #{example_description}", ::RSpec.configuration.detail_color)
+          elsif ENV['PACT_INTERACTION_RERUN_COMMAND']
             cmd = String.new(ENV['PACT_INTERACTION_RERUN_COMMAND'])
-            provider_state = example.metadata[:pact_interaction].provider_state
-            description = example.metadata[:pact_interaction].description
-            pactfile_uri = example.metadata[:pactfile_uri]
             cmd.gsub!("<PACT_URI>", pactfile_uri.to_s)
             cmd.gsub!("<PACT_DESCRIPTION>", description)
             cmd.gsub!("<PACT_PROVIDER_STATE>", "#{provider_state}")
+            cmd.gsub!("<PACT_INTERACTION_INDEX>", "#{index}")
             colorizer.wrap("#{cmd} ", ::RSpec.configuration.failure_color) + colorizer.wrap("# #{example_description}", ::RSpec.configuration.detail_color)
           else
-            colorizer.wrap("* #{example_description}", ::RSpec.configuration.failure_color)
+            message = if _id
+              "* #{example_description} (to re-run just this interaction, set environment variable PACT_BROKER_INTERACTION_ID=\"#{_id}\")"
+            else
+              "* #{example_description} (to re-run just this interaction, set environment variables PACT_DESCRIPTION=\"#{description}\" PACT_PROVIDER_STATE=\"#{provider_state}\")"
+            end
+            colorizer.wrap(message, ::RSpec.configuration.failure_color)
           end
         end
 

data/lib/pact/tasks/task_helper.rb

@@ -7,6 +7,7 @@ module Pact
   module TaskHelper
 
     PACT_INTERACTION_RERUN_COMMAND = "bundle exec rake pact:verify:at[<PACT_URI>] PACT_DESCRIPTION=\"<PACT_DESCRIPTION>\" PACT_PROVIDER_STATE=\"<PACT_PROVIDER_STATE>\""
+    PACT_INTERACTION_RERUN_COMMAND_FOR_BROKER = "bundle exec rake pact:verify:at[<PACT_URI>] PACT_BROKER_INTERACTION_ID=\"<PACT_BROKER_INTERACTION_ID>\""
 
     extend self
 
@@ -34,6 +35,8 @@ module Pact
       command_parts << "--backtrace" if ENV['BACKTRACE'] == 'true'
       command_parts << "--description #{Shellwords.escape(ENV['PACT_DESCRIPTION'])}" if ENV['PACT_DESCRIPTION']
       command_parts << "--provider-state #{Shellwords.escape(ENV['PACT_PROVIDER_STATE'])}" if ENV['PACT_PROVIDER_STATE']
+      command_parts << "--pact-broker-interaction-id #{Shellwords.escape(ENV['PACT_BROKER_INTERACTION_ID'])}" if ENV['PACT_BROKER_INTERACTION_ID']
+      command_parts << "--interaction-index #{Shellwords.escape(ENV['PACT_INTERACTION_INDEX'])}" if ENV['PACT_INTERACTION_INDEX']
       command_parts.flatten.join(" ")
     end
 
@@ -41,7 +44,9 @@ module Pact
       Pact.configuration.output_stream.puts command
       temporarily_set_env_var 'PACT_EXECUTING_LANGUAGE', 'ruby' do
         temporarily_set_env_var 'PACT_INTERACTION_RERUN_COMMAND', PACT_INTERACTION_RERUN_COMMAND do
-          exit_status = system(command) ? 0 : 1
+          temporarily_set_env_var 'PACT_INTERACTION_RERUN_COMMAND_FOR_BROKER', PACT_INTERACTION_RERUN_COMMAND_FOR_BROKER do
+            exit_status = system(command) ? 0 : 1
+          end
         end
       end
     end

data/lib/pact/version.rb

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

data/pact.gemspec

@@ -28,14 +28,14 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'rspec', '~> 3.0'
   gem.add_runtime_dependency 'rack-test', '>= 0.6.3', '< 2.0.0'
-  gem.add_runtime_dependency 'thor', '~> 0.20'
+  gem.add_runtime_dependency 'thor', '>= 0.20', '< 2.0'
   gem.add_runtime_dependency 'webrick', '~> 1.3'
   gem.add_runtime_dependency 'term-ansicolor', '~> 1.0'
 
   gem.add_runtime_dependency 'pact-support', '~> 1.9'
   gem.add_runtime_dependency 'pact-mock_service', '~> 3.0', '>= 3.3.1'
 
-  gem.add_development_dependency 'rake', '~> 10.0'
+  gem.add_development_dependency 'rake', '~> 13.0'
   gem.add_development_dependency 'webmock', '~> 3.0'
   gem.add_development_dependency 'fakefs', '0.5' # 0.6.0 blows up
   gem.add_development_dependency 'hashie', '~> 2.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.49.2
+  version: 1.51.1
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2020-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -52,16 +52,22 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.20'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.20'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
@@ -130,14 +136,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -319,6 +325,7 @@ files:
 - lib/pact/pact_broker/fetch_pact_uris_for_verification.rb
 - lib/pact/pact_broker/fetch_pacts.rb
 - lib/pact/pact_broker/notices.rb
+- lib/pact/pact_broker/pact_selection_description.rb
 - lib/pact/project_root.rb
 - lib/pact/provider.rb
 - lib/pact/provider/configuration.rb
@@ -396,8 +403,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Enables consumer driven contract testing, providing a mock service and DSL