pact 1.42.2 → 1.43.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0474bd7952ce4b9a67c3a29050ea326e7e54b3e3
-  data.tar.gz: 073ab40f512ec4e1e7eae901d2b909a71585cb31
+  metadata.gz: b644026c464080ef14a4a202bbfe8106f5ece05a
+  data.tar.gz: b0fa73324f51d53bf0d51e1ec5adc1974fc20816
 SHA512:
-  metadata.gz: 0e7fb5c4c756c4121be44a68b2f087a4102abd358921860f6d0521c72b460f8c3cff6a5f8a917da04413fc9ab17c29d465087b39ee674a775b261253e5f59c70
-  data.tar.gz: bf2a07fe45465e1600abcb7a6e807046e3aa7d013be5a746d1a4a5d005e5a711997d9d7c8cf7e985c7c7ca99d90bac64b05ca67724997785cb1e94416d90944c
+  metadata.gz: 8ff57177c9bebdfa42fa14ff4a158f1a44c5eb52602c33b9d606065573fe0461649c271001676405cf09bd4da5e6e0b5a73845e797386a3199fd162a17edef13
+  data.tar.gz: c98d162e93e3c21d32eae05ec850bf2d6c42af63afb400ffa04d2813b2ce8364a91dfe0b6d06f713637d31e5913f62235d2e4dbbbfe1846ac4f2d099fd809d11

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+<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)
 

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/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
@@ -37,7 +46,7 @@ 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)
@@ -45,11 +54,15 @@ module Pact
       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)

data/lib/pact/pact_broker/fetch_pact_uris_for_verification.rb

@@ -7,7 +7,7 @@ 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
+      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
@@ -16,17 +16,18 @@ module Pact
       SELF = 'self'.freeze
       EMBEDDED = '_embedded'.freeze
 
-      def initialize(provider, consumer_version_selectors, provider_version_tags, broker_base_url, http_client_options)
+      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)
-        new(provider, consumer_version_selectors, provider_version_tags, broker_base_url, http_client_options).call
+      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
@@ -50,8 +51,7 @@ module Pact
         pacts_for_verification_entity.response.body[EMBEDDED][PACTS].collect do | pact |
           metadata = {
             pending: pact["verificationProperties"]["pending"],
-            pending_reason: pact["verificationProperties"]["pendingReason"],
-            inclusion_reason: pact["verificationProperties"]["inclusionReason"],
+            notices: extract_notices(pact)
           }
           Pact::Provider::PactURI.new(pact[LINKS][SELF][HREF], http_client_options, metadata)
         end
@@ -61,22 +61,21 @@ module Pact
         index
           ._link(PACTS_FOR_VERIFICATION_RELATION)
           .expand(provider: provider)
-          .with_query(query)
-          .get!
+          .post!(query)
       end
 
       def query
         q = {}
-        if consumer_version_selectors.any?
-          q["consumer_version_selectors"] = consumer_version_selectors
-        end
-
-        if provider_version_tags.any?
-          q["provider_version_tags"] = provider_version_tags
-        end
+        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}"

data/lib/pact/provider/pact_helper_locator.rb

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

data/lib/pact/provider/pact_spec_runner.rb

@@ -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/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

@@ -76,7 +76,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[:pact_uri].metadata[:pending]
+            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.42.2"
+  VERSION = "1.43.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,22 +14,21 @@ 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'
 
@@ -39,7 +37,7 @@ Gem::Specification.new do |gem|
 
   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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.42.2
+  version: 1.43.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,22 +12,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-09 00:00:00.000000000 Z
+date: 2020-01-11 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
@@ -174,6 +146,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
@@ -381,6 +367,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