pact 1.41.2 → 1.44.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 682d57626c30c4ce3f4e83038a3e5ff54d0f4878
-  data.tar.gz: 7eb5834ea442abebf6e8739a5a2746514560fdc8
+SHA256:
+  metadata.gz: 4377cccb8581a6f7215bf6f451bf97ac5b32d9d2a2c1f0a1fd05925ae5dd2f83
+  data.tar.gz: e4b78191ae99e50678b1034843168edc125b1ba1a4fb2686bc25e50609b0c4dc
 SHA512:
-  metadata.gz: 369f376d001db7fac67ed5fce394dd0672c735de178c4c940b67082e7f36e7b8f43e18f2eb91d93403c969a1c26a995c229331f14780563e18b957456951b814
-  data.tar.gz: db56fdd2c74f3cba9dd6b1e3ec7983eb50a46888f2c6ea7a9a70f2153738be1bbd6a53894a433d70d8f8dd4329b3526334b31c825cc7bcf75d4072e962f4f506
+  metadata.gz: cb2ae0b2b047c760b8336401fe4c82e01df60f2f3b8c3ec8cc217b99f443269713fc7f57d425e684a4b6e59a90ce17664a1eff08653eb9d440805ebb2873e27e
+  data.tar.gz: 5aceeb5ae1f627fa20635cd0d1bb6d6fcc6774df37ca9bb7d083cd4b72a7ac724c55b2c96258ee11d75ab11625fb720a023974c407c1c289afe6d106abe02192

data/CHANGELOG.md

@@ -1,3 +1,79 @@
+<a name="v1.44.1"></a>
+### v1.44.1 (2020-01-20)
+
+
+#### Bug Fixes
+
+* print notices from 'pacts for verification' response to indicate why pacts are included an/or pending	 ([b107348](/../../commit/b107348))
+
+
+<a name="v1.44.0"></a>
+### v1.44.0 (2020-01-16)
+
+
+#### Features
+
+* **message pact**
+  * add DSL for configuring Message Pact verifications	 ([a5181b6](/../../commit/a5181b6))
+
+
+<a name="v1.43.1"></a>
+### v1.43.1 (2020-01-11)
+
+
+#### Bug Fixes
+
+* use configured credentials when fetching the diff with previous version	 ([b9deb09](/../../commit/b9deb09))
+* use URI.open instead of Kernel.open	 ([7b3ea81](/../../commit/7b3ea81))
+
+
+<a name="v1.43.0"></a>
+### v1.43.0 (2020-01-11)
+
+
+#### Features
+
+* **verify**
+  * allow includePendingStatus to be specified when fetching pacts	 ([1f5fc9c](/../../commit/1f5fc9c))
+
+
+<a name="v1.42.3"></a>
+### v1.42.3 (2019-11-15)
+
+
+#### Bug Fixes
+
+* **verify**
+  * exit with status 0 if all pacts are in pending state	 ([2f7110b](/../../commit/2f7110b))
+
+
+<a name="v1.42.2"></a>
+### v1.42.2 (2019-11-09)
+
+
+#### Bug Fixes
+
+* remove missed &.	 ([be700d8](/../../commit/be700d8))
+
+
+<a name="v1.42.1"></a>
+### v1.42.1 (2019-11-09)
+
+
+#### Bug Fixes
+
+* can't use safe navigation operator because of Ruby 2.2 in Travelling Ruby for the pact-ruby-standalone	 ([3068ceb](/../../commit/3068ceb))
+
+
+<a name="v1.42.0"></a>
+### v1.42.0 (2019-09-26)
+
+
+#### Features
+
+* use new 'pacts for verification' endpoint to retrieve pacts (#199)	 ([55bb935](/../../commit/55bb935))
+
+
 <a name="v1.41.2"></a>
 ### v1.41.2 (2019-09-10)
 

data/lib/pact/cli/run_pact_verification.rb

@@ -44,15 +44,17 @@ module Pact
       end
 
       def run_specs
-        exit_code = if options[:pact_uri]
-          run_with_pact_uri
+        exit_code = if options[:pact_uri].is_a?(String)
+          run_with_pact_url_string
+        elsif options[:pact_uri]
+          run_with_pact_uri_object # from pact-provider-verifier
         else
-          run_with_configured_pacts
+          run_with_configured_pacts_from_pact_helper
         end
         exit exit_code
       end
 
-      def run_with_pact_uri
+      def run_with_pact_url_string
         pact_repository_uri_options = {}
         pact_repository_uri_options[:username] = options[:pact_broker_username] if options[:pact_broker_username]
         pact_repository_uri_options[:password] = options[:pact_broker_password] if options[:pact_broker_password]
@@ -61,7 +63,11 @@ module Pact
         Pact::Provider::PactSpecRunner.new([pact_uri], pact_spec_options).run
       end
 
-      def run_with_configured_pacts
+      def run_with_pact_uri_object
+        Pact::Provider::PactSpecRunner.new([options[:pact_uri]], pact_spec_options).run
+      end
+
+      def run_with_configured_pacts_from_pact_helper
         pact_urls = Pact.provider_world.pact_urls
         raise "Please configure a pact to verify" if pact_urls.empty?
         Pact::Provider::PactSpecRunner.new(pact_urls, pact_spec_options).run

data/lib/pact/consumer/configuration/dsl.rb

@@ -1,7 +1,6 @@
 require 'pact/consumer/configuration/service_consumer'
 
 module Pact
-
   module Consumer
     module DSL
       def service_consumer name, &block

data/lib/pact/consumer/spec_hooks.rb

@@ -29,7 +29,7 @@ module Pact
 
       def after_suite
         if Pact.consumer_world.any_pact_examples_ran?
-          Pact.consumer_world.consumer_contract_builders.each { | c | c.write_pact }
+          Pact.consumer_world.consumer_contract_builders.each(&:write_pact)
           Pact::Doc::Generate.call
           Pact::MockService::AppManager.instance.kill_all
           Pact::MockService::AppManager.instance.clear_all
@@ -37,4 +37,4 @@ module Pact
       end
     end
   end
-end
+end

data/lib/pact/doc/sort_interactions.rb

@@ -3,7 +3,7 @@ module Pact
     class SortInteractions
 
       def self.call interactions
-        interactions.sort{|a, b| sortable_id(a) <=> sortable_id(b)}
+        interactions.sort_by { |interaction| sortable_id(interaction) }
       end
 
       private
@@ -11,7 +11,6 @@ module Pact
       def self.sortable_id interaction
         "#{interaction.description.downcase} #{interaction.response.status} #{(interaction.provider_state || '').downcase}"
       end
-
     end
   end
-end
+end

data/lib/pact/hal/http_client.rb

@@ -1,6 +1,7 @@
 require 'pact/retry'
 require 'pact/hal/authorization_header_redactor'
 require 'net/http'
+require 'rack'
 
 module Pact
   module Hal
@@ -15,9 +16,11 @@ module Pact
       end
 
       def get href, params = {}, headers = {}
-        query = params.collect{ |(key, value)| "#{CGI::escape(key)}=#{CGI::escape(value)}" }.join("&")
         uri = URI(href)
-        uri.query = query
+        if params && params.any?
+          existing_params = Rack::Utils.parse_nested_query(uri.query)
+          uri.query = Rack::Utils.build_nested_query(existing_params.merge(params))
+        end
         perform_request(create_request(uri, 'Get', nil, headers), uri)
       end
 
@@ -33,12 +36,9 @@ module Pact
 
       def create_request uri, http_method, body = nil, headers = {}
         request = Net::HTTP.const_get(http_method).new(uri.request_uri)
-        request['Content-Type'] = "application/json" if ['Post', 'Put', 'Patch'].include?(http_method)
-        request['Accept'] = "application/hal+json"
         headers.each do | key, value |
           request[key] = value
         end
-
         request.body = body if body
         request.basic_auth username, password if username
         request['Authorization'] = "Bearer #{token}" if token
@@ -82,6 +82,10 @@ module Pact
         def success?
           __getobj__().code.start_with?("2")
         end
+
+        def json?
+          self['content-type'] && self['content-type'] =~ /json/
+        end
       end
     end
   end

data/lib/pact/hal/link.rb

@@ -6,6 +6,15 @@ module Pact
     class Link
       attr_reader :request_method, :href
 
+      DEFAULT_GET_HEADERS = {
+        "Accept" => "application/hal+json"
+      }.freeze
+
+      DEFAULT_POST_HEADERS = {
+        "Accept" => "application/hal+json",
+        "Content-Type" => "application/json"
+      }.freeze
+
       def initialize(attrs, http_client)
         @attrs = attrs
         @request_method = attrs.fetch(:method, :get).to_sym
@@ -14,14 +23,14 @@ module Pact
       end
 
       def run(payload = nil)
-        response = case request_method
-          when :get
-            get(payload)
-          when :put
-            put(payload)
-          when :post
-            post(payload)
-          end
+        case request_method
+        when :get
+          get(payload)
+        when :put
+          put(payload)
+        when :post
+          post(payload)
+        end
       end
 
       def title_or_name
@@ -37,29 +46,57 @@ module Pact
       end
 
       def get(payload = {}, headers = {})
-        wrap_response(href, @http_client.get(href, payload, headers))
+        wrap_response(href, @http_client.get(href, payload, DEFAULT_GET_HEADERS.merge(headers)))
+      end
+
+      def get!(*args)
+        get(*args).assert_success!
       end
 
       def put(payload = nil, headers = {})
-        wrap_response(href, @http_client.put(href, payload ? payload.to_json : nil, headers))
+        wrap_response(href, @http_client.put(href, payload ? payload.to_json : nil, DEFAULT_POST_HEADERS.merge(headers)))
       end
 
       def post(payload = nil, headers = {})
-        wrap_response(href, @http_client.post(href, payload ? payload.to_json : nil, headers))
+        wrap_response(href, @http_client.post(href, payload ? payload.to_json : nil, DEFAULT_POST_HEADERS.merge(headers)))
+      end
+
+      def post!(payload = nil, headers = {})
+        post(payload, headers).assert_success!
       end
 
       def expand(params)
         expanded_url = expand_url(params, href)
         new_attrs = @attrs.merge('href' => expanded_url)
-        Link.new(new_attrs, @http_client)
+        Link.new(new_attrs, http_client)
+      end
+
+      def with_query(query)
+        if query && query.any?
+          uri = URI(href)
+          existing_query_params = Rack::Utils.parse_nested_query(uri.query)
+          uri.query = Rack::Utils.build_nested_query(existing_query_params.merge(query))
+          new_attrs = attrs.merge('href' => uri.to_s)
+          Link.new(new_attrs, http_client)
+        else
+          self
+        end
       end
 
       private
 
+      attr_reader :attrs, :http_client
+
       def wrap_response(href, http_response)
         require 'pact/hal/entity' # avoid circular reference
+        require 'pact/hal/non_json_entity'
+
         if http_response.success?
-          Entity.new(href, http_response.body, @http_client, http_response)
+          if http_response.json?
+            Entity.new(href, http_response.body, @http_client, http_response)
+          else
+            NonJsonEntity.new(href, http_response.raw_body, @http_client, http_response)
+          end
         else
           ErrorEntity.new(href, http_response.raw_body, @http_client, http_response)
         end

data/lib/pact/hal/non_json_entity.rb

@@ -0,0 +1,28 @@
+module Pact
+  module Hal
+    class NonJsonEntity
+      def initialize(href, body, http_client, response = nil)
+        @href = href
+        @body = body
+        @client = http_client
+        @response = response
+      end
+
+      def success?
+        true
+      end
+
+      def response
+        @response
+      end
+
+      def body
+        @body
+      end
+
+      def assert_success!
+        self
+      end
+    end
+  end
+end

data/lib/pact/pact_broker/fetch_pact_uris_for_verification.rb

@@ -0,0 +1,95 @@
+require 'pact/hal/entity'
+require 'pact/hal/http_client'
+require 'pact/provider/pact_uri'
+require 'pact/errors'
+require 'pact/pact_broker/fetch_pacts'
+
+module Pact
+  module PactBroker
+    class FetchPactURIsForVerification
+      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
+      PACTS = 'pacts'.freeze
+      HREF = 'href'.freeze
+      LINKS = '_links'.freeze
+      SELF = 'self'.freeze
+      EMBEDDED = '_embedded'.freeze
+
+      def initialize(provider, consumer_version_selectors, provider_version_tags, broker_base_url, http_client_options, options = {})
+        @provider = provider
+        @consumer_version_selectors = consumer_version_selectors || []
+        @provider_version_tags = provider_version_tags || []
+        @http_client_options = http_client_options
+        @broker_base_url = broker_base_url
+        @http_client = Pact::Hal::HttpClient.new(http_client_options)
+        @options = options
+      end
+
+      def self.call(provider, consumer_version_selectors, provider_version_tags, broker_base_url, http_client_options, options = {})
+        new(provider, consumer_version_selectors, provider_version_tags, broker_base_url, http_client_options, options).call
+      end
+
+      def call
+        if index.can?(PACTS_FOR_VERIFICATION_RELATION)
+          log_message
+          pacts_for_verification
+        else
+          # Fall back to old method of fetching pacts
+          consumer_version_tags = consumer_version_selectors.collect{ | selector | selector[:tag] }
+          FetchPacts.call(provider, consumer_version_tags, broker_base_url, http_client_options)
+        end
+      end
+
+      private
+
+      def index
+        @index_entity ||= Pact::Hal::Link.new({ "href" => broker_base_url }, http_client).get.assert_success!
+      end
+
+      def pacts_for_verification
+        pacts_for_verification_entity.response.body[EMBEDDED][PACTS].collect do | pact |
+          metadata = {
+            pending: pact["verificationProperties"]["pending"],
+            notices: extract_notices(pact)
+          }
+          Pact::Provider::PactURI.new(pact[LINKS][SELF][HREF], http_client_options, metadata)
+        end
+      end
+
+      def pacts_for_verification_entity
+        index
+          ._link(PACTS_FOR_VERIFICATION_RELATION)
+          .expand(provider: provider)
+          .post!(query)
+      end
+
+      def query
+        q = {}
+        q["includePendingStatus"] = true if options[:include_pending_status]
+        q["consumerVersionSelectors"] = consumer_version_selectors if consumer_version_selectors.any?
+        q["providerVersionTags"] = provider_version_tags if provider_version_tags.any?
+        q
+      end
+
+      def extract_notices(pact)
+        (pact["verificationProperties"]["notices"] || []).collect{ |notice| notice["text"] }.compact
+      end
+
+      def log_message
+        latest = consumer_version_selectors.any? ? "" : "latest "
+        message = "INFO: Fetching #{latest}pacts for #{provider} from #{broker_base_url}"
+        if consumer_version_selectors.any?
+          desc = consumer_version_selectors.collect do |selector|
+            all_or_latest = selector[:all] ? "all" : "latest"
+            # TODO support fallback
+            name = selector[:fallback] ? "#{selector[:tag]} (or #{selector[:fallback]} if not found)" : selector[:tag]
+            "#{all_or_latest} #{name}"
+          end.join(", ")
+          message << " for tags: #{desc}"
+        end
+        Pact.configuration.output_stream.puts message
+      end
+    end
+  end
+end

data/lib/pact/pact_broker.rb

@@ -1,19 +1,25 @@
 require 'pact/pact_broker/fetch_pacts'
-require 'pact/pact_broker/fetch_pending_pacts'
+require 'pact/pact_broker/fetch_pact_uris_for_verification'
+require 'pact/provider/pact_uri'
 
 #
-# @public Use by Pact Provider Verifier
+# @public Used by Pact Provider Verifier
 #
 module Pact
   module PactBroker
     extend self
 
+    # Keep for backwards compatibility with pact-provider-verifier < 1.23.1
     def fetch_pact_uris *args
       Pact::PactBroker::FetchPacts.call(*args).collect(&:uri)
     end
 
-    def fetch_pending_pact_uris *args
-      Pact::PactBroker::FetchPendingPacts.call(*args).collect(&:uri)
+    def fetch_pact_uris_for_verification *args
+      Pact::PactBroker::FetchPactURIsForVerification.call(*args)
+    end
+
+    def build_pact_uri(*args)
+      Pact::Provider::PactURI.new(*args)
     end
   end
 end

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

@@ -1,4 +1,5 @@
 require 'pact/provider/configuration/service_provider_dsl'
+require 'pact/provider/configuration/message_provider_dsl'
 
 module Pact
 
@@ -8,6 +9,10 @@ module Pact
       def service_provider name, &block
         Configuration::ServiceProviderDSL.build(name, &block)
       end
+
+      def message_provider name, &block
+        Configuration::MessageProviderDSL.build(name, &block)
+      end
     end
   end
-end
+end

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

@@ -0,0 +1,32 @@
+require 'pact/provider/configuration/service_provider_dsl'
+
+module Pact
+  module Provider
+    module Configuration
+      class MessageProviderDSL < ServiceProviderDSL
+        class RackToMessageAdapter
+          def initialize(message_builder)
+            @message_builder = message_builder
+          end
+
+          def call(env)
+            request_body_json = JSON.parse(env['rack.input'].read)
+            contents = @message_builder.call(request_body_json['description'])
+            [200, {"Content-Type" => "application/json"}, [{ contents: contents }.to_json]]
+          end
+        end
+
+        def initialize name
+          super
+          @mapper_block = lambda { |args|  }
+        end
+
+        dsl do
+          def builder &block
+            self.app_block = lambda { RackToMessageAdapter.new(block)  }
+          end
+        end
+      end
+    end
+  end
+end

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,4 +1,6 @@
 require 'pact/consumer_contract/pact_file'
+require 'pact/hal/http_client'
+require 'pact/hal/entity'
 
 module Pact
   module Provider
@@ -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.merge(verbose: true))
+        Pact::Hal::Entity.new(uri, pact_hash, http_client)
+      end
     end
   end
 end

data/lib/pact/provider/pact_spec_runner.rb

@@ -80,7 +80,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 +91,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
+        (all_pacts_pending? || options[:ignore_failures]) ? 0 : exit_code
       end
 
       def rspec_runner_options
@@ -159,6 +159,10 @@ 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

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.rb

@@ -17,15 +17,19 @@ 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?
+          Pact.configuration.output_stream.puts "INFO: Reading pact at #{pact_uri}"
+          (pact_uri.metadata[:notices] || EMPTY_ARRAY).each do | notice |
+            Pact.configuration.output_stream.puts("DEBUG: #{notice}")
+          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
+          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)
           end
         end
@@ -74,7 +78,7 @@ 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_ignore_failures: options[:pact_uri].metadata[:pending] || options[:ignore_failures]
           }
 
           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/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.44.1"
 end

data/pact.gemspec

@@ -1,5 +1,4 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'pact/version'
 
@@ -15,31 +14,30 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 2.0'
 
   gem.files         = `git ls-files bin lib pact.gemspec CHANGELOG.md LICENSE.txt`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
   gem.license       = 'MIT'
 
   gem.metadata = {
+    'changelog_uri'     => 'https://github.com/pact-foundation/pact-ruby/blob/master/CHANGELOG.md',
     'source_code_uri'   => 'https://github.com/pact-foundation/pact-ruby',
     'bug_tracker_uri'   => 'https://github.com/pact-foundation/pact-ruby/issues',
     'documentation_uri' => 'https://github.com/pact-foundation/pact-ruby/blob/master/README.md'
   }
 
-  gem.add_runtime_dependency 'randexp', '~> 0.1.7'
-  gem.add_runtime_dependency 'rspec', '>=2.14'
+  gem.add_runtime_dependency 'rspec', '>= 2.14'
   gem.add_runtime_dependency 'rack-test', '>= 0.6.3', '< 2.0.0'
   gem.add_runtime_dependency 'thor'
-  gem.add_runtime_dependency 'json','> 1.8.5'
   gem.add_runtime_dependency 'webrick'
   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'
+  gem.add_runtime_dependency 'pact-mock_service', '~> 3.0', '>= 3.3.1'
 
   gem.add_development_dependency 'rake', '~> 10.0.3'
   gem.add_development_dependency 'webmock', '~> 3.0'
-  #gem.add_development_dependency 'pry-byebug'
+  gem.add_development_dependency 'pry-byebug'
   gem.add_development_dependency 'fakefs', '0.5' # 0.6.0 blows up
   gem.add_development_dependency 'hashie', '~> 2.0'
   gem.add_development_dependency 'activesupport'
@@ -47,4 +45,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'appraisal', '~> 2.2'
   gem.add_development_dependency 'conventional-changelog', '~> 1.3'
   gem.add_development_dependency 'bump', '~> 0.5'
+  gem.add_development_dependency 'pact-message'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.41.2
+  version: 1.44.1
 platform: ruby
 authors:
 - James Fraser
@@ -12,22 +12,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-09 00:00:00.000000000 Z
+date: 2020-01-20 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: randexp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.7
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -76,20 +62,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 1.8.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 1.8.5
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +111,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -146,6 +121,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +152,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -272,6 +264,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: pact-message
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Enables consumer driven contract testing, providing a mock service and
   DSL for the consumer project, and interaction playback and verification for the
   service provider project.
@@ -322,14 +328,16 @@ files:
 - lib/pact/hal/entity.rb
 - lib/pact/hal/http_client.rb
 - lib/pact/hal/link.rb
+- lib/pact/hal/non_json_entity.rb
 - lib/pact/pact_broker.rb
+- lib/pact/pact_broker/fetch_pact_uris_for_verification.rb
 - lib/pact/pact_broker/fetch_pacts.rb
-- lib/pact/pact_broker/fetch_pending_pacts.rb
 - lib/pact/project_root.rb
 - lib/pact/provider.rb
 - lib/pact/provider/configuration.rb
 - lib/pact/provider/configuration/configuration_extension.rb
 - lib/pact/provider/configuration/dsl.rb
+- lib/pact/provider/configuration/message_provider_dsl.rb
 - lib/pact/provider/configuration/pact_verification.rb
 - lib/pact/provider/configuration/pact_verification_from_broker.rb
 - lib/pact/provider/configuration/service_provider_config.rb
@@ -381,6 +389,7 @@ homepage: https://github.com/pact-foundation/pact-ruby
 licenses:
 - MIT
 metadata:
+  changelog_uri: https://github.com/pact-foundation/pact-ruby/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/pact-foundation/pact-ruby
   bug_tracker_uri: https://github.com/pact-foundation/pact-ruby/issues
   documentation_uri: https://github.com/pact-foundation/pact-ruby/blob/master/README.md
@@ -400,7 +409,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Enables consumer driven contract testing, providing a mock service and DSL

data/lib/pact/pact_broker/fetch_pending_pacts.rb

@@ -1,58 +0,0 @@
-require 'pact/hal/entity'
-require 'pact/hal/http_client'
-require 'pact/provider/pact_uri'
-require 'pact/errors'
-
-module Pact
-  module PactBroker
-    class FetchPendingPacts
-      attr_reader :provider, :tags, :broker_base_url, :http_client_options, :http_client, :index_entity
-
-      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
-
-      def initialize(provider, broker_base_url, http_client_options)
-        @provider = provider
-        @http_client_options = http_client_options
-        @broker_base_url = broker_base_url
-        @http_client = Pact::Hal::HttpClient.new(http_client_options)
-      end
-
-      def self.call(provider, broker_base_url, http_client_options)
-        new(provider, broker_base_url, http_client_options).call
-      end
-
-      def call
-        if index.success?
-          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
-      end
-
-      private
-
-      def index
-        @index_entity ||= Pact::Hal::Link.new({ "href" => broker_base_url }, http_client).get.assert_success!
-      end
-
-      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
-          []
-        end
-      end
-
-      def get_pact_urls(link_by_provider)
-        link_by_provider.fetch(PB_PACTS, PACTS).collect do |pact|
-          Pact::Provider::PactURI.new(pact[HREF], http_client_options)
-        end
-      end
-    end
-  end
-end