pact 1.40.0 → 1.49.0

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.40.0"
+  VERSION = "1.49.0"
 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,30 +14,35 @@ 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.add_runtime_dependency 'randexp', '~> 0.1.7'
-  gem.add_runtime_dependency 'rspec', '>=2.14'
+  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 'rspec', '~> 3.0'
   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 'thor', '~> 0.20'
+  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'
+  gem.add_runtime_dependency 'pact-mock_service', '~> 3.0', '>= 3.3.1'
 
-  gem.add_development_dependency 'rake', '~> 10.0.3'
+  gem.add_development_dependency 'rake', '~> 10.0'
   gem.add_development_dependency 'webmock', '~> 3.0'
-  #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'
+  gem.add_development_dependency 'activesupport', '~> 5.2'
   gem.add_development_dependency 'faraday', '~> 0.13'
-  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', '~> 0.6'
+  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.40.0
+  version: 1.49.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,36 +12,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-04 00:00:00.000000000 Z
+date: 2020-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: randexp
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: '3.0'
   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
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.14'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -66,44 +52,30 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !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
+        version: '0.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.5
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   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,20 +121,23 @@ 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
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -206,16 +184,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -231,47 +209,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.13'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: conventional-changelog
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: conventional-changelog
+  name: bump
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: bump
+  name: pact-message
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 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.
@@ -318,17 +310,21 @@ files:
 - lib/pact/doc/markdown/interaction.erb
 - lib/pact/doc/markdown/interaction_renderer.rb
 - lib/pact/doc/sort_interactions.rb
+- lib/pact/hal/authorization_header_redactor.rb
 - 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/pact_broker/notices.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
@@ -352,6 +348,7 @@ files:
 - lib/pact/provider/rspec/custom_options_file
 - lib/pact/provider/rspec/formatter_rspec_2.rb
 - lib/pact/provider/rspec/formatter_rspec_3.rb
+- lib/pact/provider/rspec/json_formatter.rb
 - lib/pact/provider/rspec/matchers.rb
 - lib/pact/provider/rspec/pact_broker_formatter.rb
 - lib/pact/provider/state/provider_state.rb
@@ -379,7 +376,11 @@ files:
 homepage: https://github.com/pact-foundation/pact-ruby
 licenses:
 - MIT
-metadata: {}
+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
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -396,7 +397,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+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