pact 1.55.4 → 1.57.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5df3588ab530c1daf855cfe6277e5753d8ca788066951f3e08ef181af615b1d7
-  data.tar.gz: f13b6198bd1e1383a4dd978ca77bcdc65ee1a60498be14e17bb19ce1622274f5
+  metadata.gz: 2f5bff8179ed3588a9363fd864b36527a51672bc2f0812778e188f60571975c1
+  data.tar.gz: 8bec6ad8f69b8a60836256c261f32c288624ae1a876e452acedfc62daeffebc8
 SHA512:
-  metadata.gz: 476546bb221362d55c77df417d04a9f00a69bedc042ab6aabc059d498dc094f24f810ec25ea3f167ad77e366c4d8fd8d95b473d2d8d74ca5a58027d9d03e0e00
-  data.tar.gz: 500c176acb2a0f3e4b611b373afc0a868af0ba3bfa8d2082c4e192ffe00b80a4a63a11cadd408d19c28105091b73961c09ce2193d47705a3355b870fa9f777bf
+  metadata.gz: a0638972bc29d64815a6d29fbd46a88092eb0d748e21f0da41cde9e485c63fa1158cbf03d9b4d638d273b1caff78470d07d40377be176804fab62e96aecce043
+  data.tar.gz: 9161da6d7c9490db14c7472ca54e0c8a0d7a8fdad65f033694a31db8d80097f3a343098fc41f4c12fb59f12a3ae5a36f2b5503ade581eeb1f9c0f8fb66e74920

data/CHANGELOG.md

@@ -1,3 +1,39 @@
+<a name="v1.57.0"></a>
+### v1.57.0 (2021-01-27)
+
+#### Features
+
+* allow verbose flag to be set when publishing verifications	 ([9238e4c](/../../commit/9238e4c))
+
+<a name="v1.56.0"></a>
+### v1.56.0 (2021-01-22)
+
+#### Features
+
+* catch and log error during help text generation	 ([182a7cd](/../../commit/182a7cd))
+
+<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)
 

data/lib/pact/cli.rb

@@ -16,6 +16,7 @@ module Pact
     method_option :pact_broker_password, aliases: "-w", desc: "Pact broker password"
     method_option :pact_broker_token, aliases: "-k", desc: "Pact broker token"
     method_option :backtrace, aliases: "-b", desc: "Show full backtrace", :default => false, :type => :boolean
+    method_option :verbose, aliases: "-v", desc: "Show verbose HTTP logging", :default => false, :type => :boolean
     method_option :interactions_replay_order, aliases: "-o",
                   desc: "Interactions replay order: randomised or recorded (default)",
                   default: Pact.configuration.interactions_replay_order

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
@@ -78,6 +79,7 @@ module Pact
       def pact_spec_options
         {
           full_backtrace: options[:backtrace],
+          verbose: options[:verbose] || ENV['VERBOSE'] == 'true',
           criteria: SpecCriteria.call(options),
           format: options[:format],
           out: options[:out],

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/help/write.rb

@@ -21,6 +21,8 @@ module Pact
         def call
           clean_reports_dir
           write
+        rescue StandardError => e
+          Pact.configuration.error_stream.puts("ERROR: Error generating help output - #{e.class} #{e.message} \n" + e.backtrace.join("\n"))
         end
 
         private

data/lib/pact/provider/pact_spec_runner.rb

@@ -75,6 +75,7 @@ module Pact
         end
 
         # For the Pact::Provider::RSpec::PactBrokerFormatter
+        Pact.provider_world.verbose = options[:verbose]
         Pact.provider_world.pact_sources = pact_sources
         jsons = pact_jsons
         executing_with_ruby = executing_with_ruby?

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

@@ -36,7 +36,7 @@ module Pact
               pact_source: pact_source,
               consumer_contract: consumer_contract,
               criteria: options[:criteria]
-              )
+            )
           end
         end
 

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/rspec/pact_broker_formatter.rb

@@ -25,7 +25,7 @@ module Pact
         end
 
         def close(_notification)
-          Pact::Provider::VerificationResults::PublishAll.call(Pact.provider_world.pact_sources, output_hash)
+          Pact::Provider::VerificationResults::PublishAll.call(Pact.provider_world.pact_sources, output_hash, { verbose: Pact.provider_world.verbose })
         end
 
       private

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

@@ -17,15 +17,15 @@ module Pact
         PROVIDER_RELATION = 'pb:provider'.freeze
         VERSION_TAG_RELATION = 'pb:version-tag'.freeze
 
-        def self.call pact_source, verification_result
-          new(pact_source, verification_result).call
+        def self.call pact_source, verification_result, options = {}
+          new(pact_source, verification_result, options).call
         end
 
-        def initialize pact_source, verification_result
+        def initialize pact_source, verification_result, options = {}
           @pact_source = pact_source
           @verification_result = verification_result
           http_client_options = pact_source.uri.options.reject{ |k, v| ![:username, :password, :token].include?(k) }
-          @http_client = Pact::Hal::HttpClient.new(http_client_options)
+          @http_client = Pact::Hal::HttpClient.new(http_client_options.merge(verbose: options[:verbose]))
           @pact_entity = Pact::Hal::Entity.new(pact_source.uri, pact_source.pact_hash, http_client)
         end
 

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

@@ -6,20 +6,21 @@ module Pact
     module VerificationResults
       class PublishAll
 
-        def self.call pact_sources, test_results_hash
-          new(pact_sources, test_results_hash).call
+        def self.call pact_sources, test_results_hash, options = {}
+          new(pact_sources, test_results_hash, options).call
         end
 
-        def initialize pact_sources, test_results_hash
+        def initialize pact_sources, test_results_hash, options = {}
           @pact_sources = pact_sources
           @test_results_hash = test_results_hash
+          @options = options
         end
 
         def call
           verification_results.collect do | (pact_source, verification_result) |
             published = false
             begin
-              published = Publish.call(pact_source, verification_result)
+              published = Publish.call(pact_source, verification_result, { verbose: options[:verbose] })
             ensure
               print_after_verification_notices(pact_source, verification_result, published)
             end
@@ -42,7 +43,7 @@ module Pact
           end
         end
 
-        attr_reader :pact_sources, :test_results_hash
+        attr_reader :pact_sources, :test_results_hash, :options
       end
     end
   end

data/lib/pact/provider/world.rb

@@ -14,7 +14,7 @@ module Pact
   module Provider
     class World
 
-      attr_accessor :pact_sources, :failed_examples
+      attr_accessor :pact_sources, :failed_examples, :verbose
 
       def provider_states
         @provider_states_proxy ||= Pact::Provider::State::ProviderStateProxy.new

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.4"
+  VERSION = "1.57.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.55.4
+  version: 1.57.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-09 00:00:00.000000000 Z
+date: 2021-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -405,7 +405,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.7
 signing_key: 
 specification_version: 4
 summary: Enables consumer driven contract testing, providing a mock service and DSL