pact 1.41.2 → 1.48.0

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

@@ -1,6 +1,6 @@
 require 'pact/shared/dsl'
 require 'pact/provider/world'
-require 'pact/pact_broker/fetch_pacts'
+require 'pact/pact_broker/fetch_pact_uris_for_verification'
 require 'pact/errors'
 
 module Pact
@@ -14,10 +14,11 @@ module Pact
         # in parent scope, it will clash with these ones,
         # so put an underscore in front of the name to be safer.
 
-        attr_accessor :_provider_name, :_pact_broker_base_url, :_consumer_version_tags, :_basic_auth_options, :_verbose
+        attr_accessor :_provider_name, :_pact_broker_base_url, :_consumer_version_tags, :_provider_version_tags, :_basic_auth_options, :_verbose
 
-        def initialize(provider_name)
+        def initialize(provider_name, provider_version_tags)
           @_provider_name = provider_name
+          @_provider_version_tags = provider_version_tags
           @_consumer_version_tags = []
           @_verbose = false
         end
@@ -45,10 +46,27 @@ module Pact
         private
 
         def create_pact_verification
-          fetch_pacts = Pact::PactBroker::FetchPacts.new(_provider_name, _consumer_version_tags, _pact_broker_base_url, _basic_auth_options.merge(verbose: _verbose))
+          fetch_pacts = Pact::PactBroker::FetchPactURIsForVerification.new(
+            _provider_name,
+            consumer_version_selectors,
+            _provider_version_tags,
+            _pact_broker_base_url,
+            _basic_auth_options.merge(verbose: _verbose)
+          )
+
           Pact.provider_world.add_pact_uri_source fetch_pacts
         end
 
+        def consumer_version_selectors
+          # TODO support "all"
+          _consumer_version_tags.collect do | tag |
+            {
+              tag: tag,
+              latest: true
+            }
+          end
+        end
+
         def validate
           raise Pact::Error.new("Please provide a pact_broker_base_url from which to retrieve the pacts") unless _pact_broker_base_url
         end

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

@@ -65,7 +65,7 @@ module Pact
         end
 
         def create_pact_verification_from_broker(&block)
-          PactVerificationFromBroker.build(name, &block)
+          PactVerificationFromBroker.build(name, tags, &block)
         end
 
         def finalize

data/lib/pact/provider/help/content.rb

@@ -5,8 +5,8 @@ module Pact
     module Help
       class Content
 
-        def initialize pact_jsons
-          @pact_jsons = pact_jsons
+        def initialize pact_sources
+          @pact_sources = pact_sources
         end
 
         def text
@@ -15,7 +15,7 @@ module Pact
 
         private
 
-        attr_reader :pact_jsons
+        attr_reader :pact_sources
 
         def help_text
           temp_dir = Pact.configuration.tmp_dir
@@ -28,7 +28,7 @@ module Pact
         end
 
         def pact_diffs
-          pact_jsons.collect do | pact_json |
+          pact_sources.collect do | pact_json |
             PactDiff.call(pact_json)
           end.compact.join("\n")
         end

data/lib/pact/provider/help/pact_diff.rb

@@ -1,26 +1,24 @@
+require 'pact/hal/entity'
+
 module Pact
   module Provider
     module Help
-
       class PactDiff
-
         class PrintPactDiffError < StandardError; end
 
-        attr_reader :pact_json, :output
+        attr_reader :pact_source, :output
 
-        def initialize pact_json
-          @pact_json = pact_json
+        def initialize pact_source
+          @pact_source = pact_source
         end
 
-        def self.call pact_json
-          new(pact_json).call
+        def self.call pact_source
+          new(pact_source).call
         end
 
         def call
           begin
-            if diff_rel && diff_url
-              header + "\n" + get_diff
-            end
+            header + "\n" + get_diff
           rescue PrintPactDiffError => e
             return e.message
           end
@@ -32,35 +30,13 @@ module Pact
           "The following changes have been made since the previous distinct version of this pact, and may be responsible for verification failure:\n"
         end
 
-        def pact_hash
-          @pact_hash ||= json_load(pact_json)
-        end
-
-        def links
-          pact_hash['_links'] || pact_hash['links']
-        end
-
-        def diff_rel
-          return nil unless links
-          key = links.keys.find { | key | key =~ /diff/ && key =~ /distinct/ && key =~ /previous/}
-          key ? links[key] : nil
-        end
-
-        def diff_url
-          diff_rel['href']
-        end
-
         def get_diff
           begin
-            open(diff_url) { | file | file.read }
+            pact_source.hal_entity._link!("pb:diff-previous-distinct").get!(nil, "Accept" => "text/plain").body
           rescue StandardError => e
-            raise PrintPactDiffError.new("Tried to retrieve diff with previous pact from #{diff_url}, but received response code #{e}.")
+            raise PrintPactDiffError.new("Tried to retrieve diff with previous pact, but received error #{e.class} #{e.message}.")
           end
         end
-
-        def json_load json
-          JSON.load(json, nil, { max_nesting: 50 })
-        end
       end
     end
   end

data/lib/pact/provider/help/write.rb

@@ -9,12 +9,12 @@ module Pact
 
         HELP_FILE_NAME = 'help.md'
 
-        def self.call pact_jsons, reports_dir = Pact.configuration.reports_dir
-          new(pact_jsons, reports_dir).call
+        def self.call pact_sources, reports_dir = Pact.configuration.reports_dir
+          new(pact_sources, reports_dir).call
         end
 
-        def initialize pact_jsons, reports_dir
-          @pact_jsons = pact_jsons
+        def initialize pact_sources, reports_dir
+          @pact_sources = pact_sources
           @reports_dir = File.expand_path(reports_dir)
         end
 
@@ -25,7 +25,7 @@ module Pact
 
         private
 
-        attr_reader :reports_dir, :pact_jsons
+        attr_reader :reports_dir, :pact_sources
 
         def clean_reports_dir
           raise "Cleaning report dir #{reports_dir} would delete project!" if reports_dir_contains_pwd
@@ -46,9 +46,8 @@ module Pact
         end
 
         def help_text
-          Content.new(pact_jsons).text
+          Content.new(pact_sources).text
         end
-
       end
     end
   end

data/lib/pact/provider/pact_helper_locator.rb

@@ -22,4 +22,3 @@ module Pact
     end
   end
 end
-

data/lib/pact/provider/pact_source.rb

@@ -1,10 +1,12 @@
 require 'pact/consumer_contract/pact_file'
+require 'pact/hal/http_client'
+require 'pact/hal/entity'
 
 module Pact
   module Provider
     class PactSource
 
-      attr_reader :uri
+      attr_reader :uri # PactURI class
 
       def initialize uri
         @uri = uri
@@ -17,6 +19,13 @@ module Pact
       def pact_hash
         @pact_hash ||= JSON.load(pact_json, nil, { max_nesting: 50 })
       end
+
+      def hal_entity
+        http_client_keys = [:username, :password, :token]
+        http_client_options = uri.options.reject{ |k, _| !http_client_keys.include?(k) }
+        http_client = Pact::Hal::HttpClient.new(http_client_options)
+        Pact::Hal::Entity.new(uri, pact_hash, http_client)
+      end
     end
   end
 end

data/lib/pact/provider/pact_spec_runner.rb

@@ -9,9 +9,8 @@ require 'pact/provider/pact_source'
 require 'pact/provider/help/write'
 require 'pact/provider/verification_results/publish_all'
 require 'pact/provider/rspec/pact_broker_formatter'
-
-require_relative 'rspec'
-
+require 'pact/provider/rspec/json_formatter'
+require 'pact/provider/rspec'
 
 module Pact
   module Provider
@@ -80,7 +79,7 @@ module Pact
         executing_with_ruby = executing_with_ruby?
 
         config.after(:suite) do | suite |
-          Pact::Provider::Help::Write.call(jsons) if executing_with_ruby
+          Pact::Provider::Help::Write.call(Pact.provider_world.pact_sources) if executing_with_ruby
         end
       end
 
@@ -91,7 +90,7 @@ module Pact
           ::RSpec::Core::CommandLine.new(NoConfigurationOptions.new)
             .run(::RSpec.configuration.output_stream, ::RSpec.configuration.error_stream)
         end
-        options[:ignore_failures] ? 0 : exit_code
+        pending_mode? ? 0 : exit_code
       end
 
       def rspec_runner_options
@@ -118,12 +117,12 @@ module Pact
 
       def initialize_specs
         pact_sources.each do | pact_source |
-          options = {
-            criteria: @options[:criteria],
-            ignore_failures: @options[:ignore_failures],
-            request_customizer: @options[:request_customizer]
+          spec_options = {
+            criteria: options[:criteria],
+            ignore_failures: options[:ignore_failures],
+            request_customizer: options[:request_customizer]
           }
-          honour_pactfile pact_source.uri, ordered_pact_json(pact_source.pact_json), options
+          honour_pactfile pact_source, ordered_pact_json(pact_source.pact_json), spec_options
         end
       end
 
@@ -134,11 +133,12 @@ module Pact
 
         output = options[:out] || Pact.configuration.output_stream
         if options[:format]
-          ::RSpec.configuration.add_formatter options[:format], output
-          if !options[:out]
-            # Don't want to mess up the JSON parsing with messages to stdout, so send it to stderr
-            Pact.configuration.output_stream = Pact.configuration.error_stream
-          end
+          formatter = options[:format] == 'json' ? Pact::Provider::RSpec::JsonFormatter : options[:format]
+          # Send formatted output to $stdout for parsing, unless a file is specified
+          output = options[:out] || $stdout
+          ::RSpec.configuration.add_formatter formatter, output
+          # Don't want to mess up the JSON parsing with INFO and DEBUG messages to stdout, so send it to stderr
+          Pact.configuration.output_stream = Pact.configuration.error_stream if !options[:out]
         else
           # Sometimes the formatter set in the cli.rb get set with an output of StringIO.. don't know why
           formatter_class = Pact::RSpec.formatter_class
@@ -148,7 +148,7 @@ module Pact
 
         ::RSpec.configuration.full_backtrace = @options[:full_backtrace]
 
-        ::RSpec.configuration.failure_color = :yellow if @options[:ignore_failures]
+        ::RSpec.configuration.failure_color = :yellow if pending_mode?
       end
 
       def ordered_pact_json(pact_json)
@@ -159,12 +159,20 @@ module Pact
         consumer_contract.to_json
       end
 
+      def all_pacts_pending?
+        pact_urls.all?{ | pact_url| pact_url.metadata[:pending] }
+      end
+
       def class_exists? name
         Kernel.const_get name
       rescue NameError
         false
       end
 
+      def pending_mode?
+        (all_pacts_pending? || options[:ignore_failures])
+      end
+
       def executing_with_ruby?
         ENV['PACT_EXECUTING_LANGUAGE'] == 'ruby'
       end

data/lib/pact/provider/pact_uri.rb

@@ -1,17 +1,19 @@
 module Pact
   module Provider
     class PactURI
-      attr_reader :uri, :options
+      attr_reader :uri, :options, :metadata
 
-      def initialize (uri, options={})
+      def initialize (uri, options = nil, metadata = nil)
         @uri = uri
-        @options = options
+        @options = options || {}
+        @metadata = metadata || {} # make sure it's not nil if nil is passed in
       end
 
       def == other
         other.is_a?(PactURI) &&
           uri == other.uri &&
-          options == other.options
+          options == other.options &&
+          metadata == other.metadata
       end
 
       def basic_auth?

data/lib/pact/provider/request.rb

@@ -54,7 +54,7 @@ module Pact
         end
 
         def rack_request_header_for header
-          with_http_prefix(header.to_s.upcase).gsub('-', '_')
+          with_http_prefix(header.to_s.upcase).tr('-', '_')
         end
 
         def rack_request_value_for value

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

@@ -6,13 +6,13 @@ require 'pact/provider/help/prompt_text'
 module Pact
   module Provider
     module RSpec
-
       class Formatter < ::RSpec::Core::Formatters::DocumentationFormatter
 
         class NilFormatter < ::RSpec::Core::Formatters::BaseFormatter
           Pact::RSpec.with_rspec_3 do
             ::RSpec::Core::Formatters.register self, :start, :example_group_started, :close
           end
+
           def dump_summary(summary)
           end
         end

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

@@ -0,0 +1,98 @@
+require 'rspec/core/formatters/json_formatter'
+
+module Pact
+  module Provider
+    module RSpec
+      class JsonFormatter < ::RSpec::Core::Formatters::JsonFormatter
+        ::RSpec::Core::Formatters.register self, :message, :dump_summary, :dump_profile, :stop, :seed, :close
+
+        def dump_summary(summary)
+          super(create_custom_summary(summary))
+          output_hash[:summary][:pacts] = pacts(summary)
+        end
+
+        def format_example(example)
+          {
+            :id => example.id,
+            :interaction_index => example.metadata[:pact_interaction].index,
+            :description => example.description,
+            :full_description => example.full_description,
+            :status => calculate_status(example),
+            :file_path => example.metadata[:file_path],
+            :line_number  => example.metadata[:line_number],
+            :run_time => example.execution_result.run_time,
+            :mismatches => extract_differences(example),
+            :pact_url => example.metadata[:pact_uri].uri
+          }
+        end
+
+        def stop(notification)
+          output_hash[:examples] = notification.examples.map do |example|
+            format_example(example).tap do |hash|
+              e = example.exception
+              # No point providing a backtrace for a mismatch, too much noise
+              if e && ! e.is_a?(::RSpec::Expectations::ExpectationNotMetError)
+                hash[:exception] =  {
+                  :class => e.class.name,
+                  :message => e.message,
+                  :backtrace => e.backtrace,
+                }
+              end
+            end
+          end
+        end
+
+        def calculate_status(example)
+          if example.execution_result.status == :failed && example.metadata[:pact_ignore_failures]
+            'pending'
+          else
+            example.execution_result.status.to_s
+          end
+        end
+
+        # There will most likely be only one pact associated with this RSpec execution, because
+        # the most likely user of this formatter is the Go implementation that parses the JSON
+        # and builds Go tests from them.
+        # If the JSON formatter is used by someone else and they have multiple pacts, all the notices
+        # for the pacts will be mushed together in one collection, so it will be hard to know which notice
+        # belongs to which pact.
+        def pacts(summary)
+          unique_pact_metadatas(summary).collect do | example_metadata |
+            pact_uri = example_metadata[:pact_uri]
+            notices = (pact_uri.metadata[:notices] && pact_uri.metadata[:notices].before_verification_notices) || []
+            {
+              notices: notices,
+              url: pact_uri.uri,
+              consumer_name: example_metadata[:pact_consumer_contract].consumer.name,
+              provider_name: example_metadata[:pact_consumer_contract].provider.name,
+              short_description: pact_uri.metadata[:short_description]
+            }
+          end
+        end
+
+        def unique_pact_metadatas(summary)
+          summary.examples.collect(&:metadata).group_by{ | metadata | metadata[:pact_uri].uri }.values.collect(&:first)
+        end
+
+        def create_custom_summary(summary)
+          ::RSpec::Core::Notifications::SummaryNotification.new(
+            summary.duration,
+            summary.examples,
+            summary.examples.select{ | example | example.execution_result.status == :failed && !example.metadata[:pact_ignore_failures] },
+            summary.examples.select{ | example | example.execution_result.status == :failed && example.metadata[:pact_ignore_failures] },
+            summary.load_time,
+            summary.errors_outside_of_examples_count
+          )
+        end
+
+        def extract_differences(example)
+          if example.metadata[:pact_diff]
+            Pact::Matchers::ExtractDiffMessages.call(example.metadata[:pact_diff]).to_a
+          else
+            []
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -66,7 +66,7 @@ module Pact
             if example.metadata[:pact_diff]
               hash[:differences] = Pact::Matchers::ExtractDiffMessages.call(example.metadata[:pact_diff])
                                     .to_a
-                                    .collect{ | description | {description: description} }
+                                    .collect{ | description | { description: description } }
             end
           end
         end

data/lib/pact/provider/rspec.rb

@@ -17,16 +17,24 @@ module Pact
       end
 
       module ClassMethods
+        EMPTY_ARRAY = [].freeze
 
         include ::RSpec::Core::DSL
 
-        def honour_pactfile pact_uri, pact_json, options
-          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?
+        def honour_pactfile pact_source, pact_json, options
+          pact_uri = pact_source.uri
+          Pact.configuration.output_stream.puts "INFO: Reading pact at #{pact_uri}"
+          if pact_uri.metadata[:notices]
+            pact_uri.metadata[:notices].before_verification_notices_text.each do | text |
+              Pact.configuration.output_stream.puts("DEBUG: #{text}")
+            end
+          end
+
+          Pact.configuration.output_stream.puts "DEBUG: Filtering interactions by: #{options[:criteria]}" if options[:criteria] && options[:criteria].any?
           consumer_contract = Pact::ConsumerContract.from_json(pact_json)
-          ::RSpec.describe "Verifying a #{pact_description} between #{consumer_contract.consumer.name} and #{consumer_contract.provider.name}", pactfile_uri: pact_uri do
-            honour_consumer_contract consumer_contract, options.merge(pact_json: pact_json, pact_uri: pact_uri)
+          suffix = pact_uri.metadata[:pending] ? " [PENDING]": ""
+          ::RSpec.describe "Verifying a pact between #{consumer_contract.consumer.name} and #{consumer_contract.provider.name}#{suffix}", pactfile_uri: pact_uri do
+            honour_consumer_contract consumer_contract, options.merge(pact_json: pact_json, pact_uri: pact_uri, pact_source: pact_source, consumer_contract: consumer_contract)
           end
         end
 
@@ -74,7 +82,9 @@ module Pact
             pact_interaction: interaction,
             pact_interaction_example_description: interaction_description_for_rerun_command(interaction),
             pact_uri: options[:pact_uri],
-            pact_ignore_failures: options[:ignore_failures]
+            pact_source: options[:pact_source],
+            pact_ignore_failures: options[:pact_uri].metadata[:pending] || options[:ignore_failures],
+            pact_consumer_contract: options[:consumer_contract]
           }
 
           describe description_for(interaction), metadata do

data/lib/pact/provider/test_methods.rb

@@ -46,7 +46,7 @@ module Pact
       def tear_down_provider_states provider_states, consumer, options = {}
         # If there are no provider state, execute with an nil state to ensure global and base states are executed
         Pact.configuration.provider_state_tear_down.call(nil, consumer, options) if provider_states.nil? || provider_states.empty?
-        provider_states.reverse.each do | provider_state |
+        provider_states.reverse_each do | provider_state |
           Pact.configuration.provider_state_tear_down.call(provider_state.name, consumer, options.merge(params: provider_state.params))
         end
       end

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

@@ -33,6 +33,9 @@ module Pact
           if can_publish_verification_results?
             tag_versions_if_configured
             publish_verification_results
+            true
+          else
+            false
           end
         end
 

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

@@ -17,7 +17,12 @@ module Pact
 
         def call
           verification_results.collect do | (pact_source, verification_result) |
-            Publish.call(pact_source, verification_result)
+            published = false
+            begin
+              published = Publish.call(pact_source, verification_result)
+            ensure
+              print_after_verification_notices(pact_source, verification_result, published)
+            end
           end
         end
 
@@ -29,6 +34,14 @@ module Pact
           end
         end
 
+        def print_after_verification_notices(pact_source, verification_result, published)
+          if pact_source.uri.metadata[:notices]
+            pact_source.uri.metadata[:notices].after_verification_notices_text(verification_result.success, published).each do | text |
+              Pact.configuration.output_stream.puts "DEBUG: #{text}"
+            end
+          end
+        end
+
         attr_reader :pact_sources, :test_results_hash
       end
     end

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

@@ -4,6 +4,7 @@ module Pact
   module Provider
     module VerificationResults
       class VerificationResult
+        attr_reader :success, :provider_application_version, :test_results_hash
 
         def initialize publishable, success, provider_application_version, test_results_hash
           @publishable = publishable
@@ -31,10 +32,6 @@ module Pact
         def to_s
           "[success: #{success}, providerApplicationVersion: #{provider_application_version}]"
         end
-
-        private
-
-        attr_reader :success, :provider_application_version, :test_results_hash
       end
     end
   end

data/lib/pact/provider/world.rb

@@ -43,7 +43,7 @@ module Pact
       end
 
       def pact_uris_from_pact_uri_sources
-        pact_uri_sources.collect{| pact_uri_source| pact_uri_source.call }.flatten
+        pact_uri_sources.collect(&:call).flatten
       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.41.2"
+  VERSION = "1.48.0"
 end