pact 1.55.2 → 1.55.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5bc7edfd2afca203239799e173f2245076887f4d38df625bbaec1ddfc655fda
-  data.tar.gz: c71945880bf5878c9e712b67f5b87262b7f72444b1628c12dc8eaec725022653
+  metadata.gz: 90eaa90df07b95c461c6172d516567dfccb033e3a45e09b4bd5c9ef95038261b
+  data.tar.gz: e4d5c2d42dd9409dc774127d7be200ebefc772af3030573f366234b5e3defce2
 SHA512:
-  metadata.gz: b8d062c28996f29d6424577b3514baa14510b546d3d914abd8d3d12ad2c626cef82a4dd6a7251b2d05fd3fa1c593e2d86862d3dac1b91c7e6757e9b7d7eaf9d7
-  data.tar.gz: 73feb7558cec7e7dc0b78469951c79a0313e0df86d7c85a677963a499c633b2e0d0877783f57ac2b141bb612cf0de8f9474eb5ccf5c8e7d5d2465d22ae16b73f
+  metadata.gz: 61eae7be6115674cc66044e007293430f68dcd6d0f445e9d8fbad664a84fbe43c4b608ed3f106d61b20c5c85ea91499278d2ec4edd00429e4286222cf35c570d
+  data.tar.gz: aa4cc70bce5d401511d500c7ab31f03724c23444607e594e895c7bac867f0c0ba4e97032ff93197e50ef9df11145bf3447bfdbe013f70cf0fc226331c744c983

data/CHANGELOG.md

@@ -1,3 +1,40 @@
+<a name="v1.55.7"></a>
+### v1.55.7 (2020-11-25)
+
+#### Bug Fixes
+
+* add consumer name to the selection description (#229)	 ([5127036](/../../commit/5127036))
+
+<a name="v1.55.6"></a>
+### v1.55.6 (2020-11-06)
+
+#### Bug Fixes
+
+* require rspec now that pact-support does not depend on it	 ([5b5c27c](/../../commit/5b5c27c))
+
+<a name="v1.55.5"></a>
+### v1.55.5 (2020-10-12)
+
+#### Bug Fixes
+
+* **security**
+  * hide personal access token given in uri (#225)	 ([f6db12d](/../../commit/f6db12d))
+
+<a name="v1.55.4"></a>
+### v1.55.4 (2020-10-09)
+
+#### Bug Fixes
+
+* add back missing output describing the interactions filter	 ([1a2d7c1](/../../commit/1a2d7c1))
+
+<a name="v1.55.3"></a>
+### v1.55.3 (2020-09-28)
+
+#### Bug Fixes
+
+* correct logic for determining if all interactions for a pact have been verified	 ([c4f968e](/../../commit/c4f968e))
+* de-duplicate re-run commands	 ([0813498](/../../commit/0813498))
+
 <a name="v1.55.2"></a>
 ### v1.55.2 (2020-09-26)
 

data/lib/pact/cli/run_pact_verification.rb

@@ -27,6 +27,7 @@ module Pact
         # With RSpec3, if the pact_helper loads a library that adds its own formatter before we set one,
         # we will get a ProgressFormatter too, and get little dots sprinkled throughout our output.
         # Load a NilFormatter here to prevent that.
+        require 'rspec'
         require 'pact/rspec'
         ::RSpec.configuration.add_formatter Pact::RSpec.formatter_class.const_get('NilFormatter')
       end

data/lib/pact/pact_broker/pact_selection_description.rb

@@ -2,14 +2,14 @@ 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"
+            consumer = selector[:consumer] ? "of consumer #{selector[:consumer]}" : nil
             fallback = selector[:fallback] || selector[:fallbackTag]
             name = fallback ? "#{selector[:tag]} (or #{fallback} if not found)" : selector[:tag]
-            "#{all_or_latest} #{name}"
+            [all_or_latest, name, consumer].compact.join(" ")
           end.join(", ")
           if options[:include_wip_pacts_since]
             desc = "#{desc}, work in progress pacts created after #{options[:include_wip_pacts_since]}"

data/lib/pact/provider/pact_source.rb

@@ -1,6 +1,7 @@
 require 'pact/consumer_contract/pact_file'
 require 'pact/hal/http_client'
 require 'pact/hal/entity'
+require 'pact/consumer_contract'
 
 module Pact
   module Provider
@@ -24,6 +25,10 @@ module Pact
         uri.metadata[:pending]
       end
 
+      def consumer_contract
+        @consumer_contract ||= Pact::ConsumerContract.from_json(pact_json)
+      end
+
       def hal_entity
         http_client_keys = [:username, :password, :token]
         http_client_options = uri.options.reject{ |k, _| !http_client_keys.include?(k) }

data/lib/pact/provider/pact_uri.rb

@@ -17,7 +17,7 @@ module Pact
       end
 
       def basic_auth?
-        !!username
+        !!username && !!password
       end
 
       def username
@@ -29,12 +29,23 @@ module Pact
       end
 
       def to_s
-        if basic_auth? && uri.start_with?('http://', 'https://')
+        if basic_auth? && http_or_https_uri?
           URI(@uri).tap { |x| x.userinfo="#{username}:*****"}.to_s
+        elsif personal_access_token? && http_or_https_uri?
+          URI(@uri).tap { |x| x.userinfo="*****"}.to_s
         else
           uri
         end
       end
+
+      private def personal_access_token?
+        !!username && !password
+      end
+
+      private def http_or_https_uri?
+        uri.start_with?('http://', 'https://')
+      end
+      
     end
   end
 end

data/lib/pact/provider/rspec.rb

@@ -26,8 +26,10 @@ module Pact
           Pact.configuration.output_stream.puts "INFO: Reading pact at #{pact_uri}"
           consumer_contract = Pact::ConsumerContract.from_json(pact_json)
           suffix = pact_uri.metadata[:pending] ? " [PENDING]": ""
+          example_group_description = "Verifying a pact between #{consumer_contract.consumer.name} and #{consumer_contract.provider.name}#{suffix}"
+          example_group_metadata = { pactfile_uri: pact_uri, pact_criteria: options[:criteria] }
 
-          ::RSpec.describe "Verifying a pact between #{consumer_contract.consumer.name} and #{consumer_contract.provider.name}#{suffix}", pactfile_uri: pact_uri do
+          ::RSpec.describe example_group_description, example_group_metadata do
             honour_consumer_contract consumer_contract, options.merge(
               pact_json: pact_json,
               pact_uri: pact_uri,
@@ -90,8 +92,7 @@ module Pact
             pact_uri: options[:pact_uri],
             pact_source: options[:pact_source],
             pact_ignore_failures: options[:pact_source].pending? || options[:ignore_failures],
-            pact_consumer_contract: options[:consumer_contract],
-            pact_criteria: options[:criteria]
+            pact_consumer_contract: options[:consumer_contract]
           }
 
           describe description_for(interaction), metadata do

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

@@ -25,6 +25,7 @@ module Pact
         C = ::Term::ANSIColor
 
         def example_group_started(notification)
+          # This is the metadata on the top level "Verifying a pact between X and Y" describe block
           if @group_level == 0
             Pact.configuration.output_stream.puts
             pact_uri = notification.group.metadata[:pactfile_uri]
@@ -128,7 +129,7 @@ module Pact
         def interaction_rerun_commands examples
           examples.collect do |example|
             interaction_rerun_command_for example
-          end.compact
+          end.compact.uniq
         end
 
         def interaction_unique_key(example)

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

@@ -8,7 +8,7 @@ module Pact
   module RSpec
     module Matchers
       module RSpec2Delegator
-        # For backwards compatiblity with rspec-2
+        # For backwards compatibility with rspec-2
         def method_missing(method, *args, &block)
           if method_name == :failure_message_for_should
             failure_message method, *args, &block

data/lib/pact/provider/verification_results/create.rb

@@ -28,7 +28,23 @@ module Pact
         end
 
         def publishable?
-          executed_interactions_count == all_interactions_count && all_interactions_count > 0
+          if defined?(@publishable)
+            @publishable
+          else
+            @publishable = pact_source.consumer_contract.interactions.all? do | interaction |
+              examples_for_pact_uri.any?{ |e| example_is_for_interaction?(e, interaction) }
+            end && examples_for_pact_uri.count > 0
+          end
+        end
+
+        def example_is_for_interaction?(example, interaction)
+          # Use the Pact Broker id if supported
+          if interaction._id
+            example[:pact_interaction]._id == interaction._id
+          else
+            # fall back to object equality (based on the field values of the interaction)
+            example[:pact_interaction] == interaction
+          end
         end
 
         def examples_for_pact_uri
@@ -39,18 +55,6 @@ module Pact
           examples_for_pact_uri.count{ |e| e[:status] != 'passed' }
         end
 
-        def executed_interactions_count
-          examples_for_pact_uri
-            .collect { |e| e[:pact_interaction].object_id }
-            .uniq
-            .count
-        end
-
-        def all_interactions_count
-          interactions = (pact_source.pact_hash['interactions'] || pact_source.pact_hash['messages'])
-          interactions ? interactions.count : 0
-        end
-
         def test_results_hash_for_pact_uri
           {
             tests: examples_for_pact_uri.collect{ |e| clean_example(e) },

data/lib/pact/version.rb

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

data/pact.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |gem|
   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-support', '~> 1.15'
   gem.add_runtime_dependency 'pact-mock_service', '~> 3.0', '>= 3.3.1'
 
   gem.add_development_dependency 'rake', '~> 13.0'
@@ -43,6 +43,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'faraday', '~> 0.13'
   gem.add_development_dependency 'conventional-changelog', '~> 1.3'
   gem.add_development_dependency 'bump', '~> 0.5'
-  gem.add_development_dependency 'pact-message', '~> 0.6'
+  gem.add_development_dependency 'pact-message', '~> 0.8'
   gem.add_development_dependency 'rspec-its', '~> 1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.55.2
+  version: 1.55.7
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-26 00:00:00.000000000 Z
+date: 2020-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -102,14 +102,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: pact-mock_service
   requirement: !ruby/object:Gem::Requirement
@@ -248,14 +248,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement