pact 1.62.0 → 1.64.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b4004f1a6eed7b4222d8f6f4bd72eb568c75fd198ab77ee663b6aab918ea907
-  data.tar.gz: f6cc541f1416275a0cea5b0819d20f58e6b27d8ca10e8f708b0d44d382b88461
+  metadata.gz: 174a9376cd442f1edd545cd006e1b15f07804077bb91060678e224d1717c6a5b
+  data.tar.gz: 4b5d1a84949fbad2dedeb1233626ef649ac4352840a204ea20c6496d3c0c0493
 SHA512:
-  metadata.gz: 31ce201c07203749e19cb6ca6d1088ef69f1119686119519ab5e15faddda38f80f2846b782efb2e7cb4c3e26bb9df529e45fcc1350df2be63819fbfde50c54e5
-  data.tar.gz: 3fa2538f3f8472759eafcd12b8ef829141f343e5cdab8c83ba27bd4f4f1ca0eee1e960fb2467333b17da30a29c8bc849427178c5dc7566e2c94d948cd109a96e
+  metadata.gz: 957b95b85b59906f1a59bb23fe2b85674c1574171a0880a508df9c6413bc7fe3f2b54fc3fe766eab3fdd8f18e68eaabf4efda43da50df01c66ebe2e9a0f19111
+  data.tar.gz: 6a34522651d931773d8ee92565ffd5173fd3f2cd99ba1211d25985da499b62d993a5b62b87257afb11a759cf691aa7702efe9e1773d11165794980d1301138e1

data/CHANGELOG.md

@@ -1,3 +1,36 @@
+<a name="v1.64.0"></a>
+### v1.64.0 (2023-11-09)
+
+#### Features
+
+* support x509 certs in HTTP Client (#298)	 ([3ed5680](/../../commit/3ed5680))
+
+* **CI**
+  * use setup-ruby's bundle installer and cache (#275)	 ([f5621b6](/../../commit/f5621b6))
+
+#### Bug Fixes
+
+* assert provider retrieved successfully before using link	 ([0af0691](/../../commit/0af0691))
+* update call to Rack::Builder.parse_file for rack 3	 ([652047c](/../../commit/652047c))
+* example/zoo-app/Gemfile to reduce vulnerabilities	 ([b4ca8cb](/../../commit/b4ca8cb))
+* example/animal-service/Gemfile to reduce vulnerabilities	 ([7ad2073](/../../commit/7ad2073))
+* example/zoo-app/Gemfile to reduce vulnerabilities	 ([dd417fd](/../../commit/dd417fd))
+* example/animal-service/Gemfile to reduce vulnerabilities (#281)	 ([4ea07cd](/../../commit/4ea07cd))
+
+<a name="v1.63.0"></a>
+### v1.63.0 (2022-09-28)
+
+#### Features
+
+* relax rack-test dependency to allow version 2 (#270)	 ([a619deb](/../../commit/a619deb))
+* only print metrics warning once per thread	 ([91da38f](/../../commit/91da38f))
+* provide configuration for build url to be published in verification results (#252)	 ([ce1c9bc](/../../commit/ce1c9bc))
+
+#### Bug Fixes
+
+* example/animal-service/Gemfile to reduce vulnerabilities (#263)	 ([8f3b732](/../../commit/8f3b732))
+* Fixup ruby warnings (#262)	 ([3640593](/../../commit/3640593))
+
 <a name="v1.62.0"></a>
 ### v1.62.0 (2022-02-21)
 

data/lib/pact/hal/entity.rb

@@ -23,6 +23,10 @@ module Pact
         _link(key).get(*args)
       end
 
+      def get!(key, *args)
+        _link(key).get!(*args)
+      end
+
       def post(key, *args)
         _link(key).post(*args)
       end

data/lib/pact/hal/http_client.rb

@@ -53,6 +53,12 @@ module Pact
           http.use_ssl = (uri.scheme == 'https')
           http.ca_file = ENV['SSL_CERT_FILE'] if ENV['SSL_CERT_FILE'] && ENV['SSL_CERT_FILE'] != ''
           http.ca_path = ENV['SSL_CERT_DIR'] if ENV['SSL_CERT_DIR'] && ENV['SSL_CERT_DIR'] != ''
+
+          if x509_certificate?
+            http.cert = OpenSSL::X509::Certificate.new(x509_client_cert_file)
+            http.key = OpenSSL::PKey::RSA.new(x509_client_key_file)
+          end
+
           if disable_ssl_verification?
             if verbose?
               Pact.configuration.output_stream.puts("SSL verification is disabled")
@@ -74,6 +80,19 @@ module Pact
         verbose || ENV['VERBOSE'] == 'true'
       end
 
+      def x509_certificate?
+        ENV['X509_CLIENT_CERT_FILE'] && ENV['X509_CLIENT_CERT_FILE'] != '' &&
+          ENV['X509_CLIENT_KEY_FILE'] && ENV['X509_CLIENT_KEY_FILE'] != ''
+      end
+
+      def x509_client_cert_file
+        File.read(ENV['X509_CLIENT_CERT_FILE'])
+      end
+
+      def x509_client_key_file
+        File.read(ENV['X509_CLIENT_KEY_FILE'])
+      end
+
       def disable_ssl_verification?
         ENV['PACT_DISABLE_SSL_VERIFICATION'] == 'true' || ENV['PACT_BROKER_DISABLE_SSL_VERIFICATION'] == 'true'
       end

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

@@ -46,7 +46,7 @@ module Pact
           end
 
           def honours_pacts_from_pact_broker &block
-            create_pact_verification_from_broker &block
+            create_pact_verification_from_broker(&block)
           end
 
           def builder &block

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

@@ -4,14 +4,15 @@ module Pact
       class ServiceProviderConfig
 
         attr_accessor :application_version
-        attr_reader :branch
+        attr_reader :branch, :build_url
 
-        def initialize application_version, branch, tags, publish_verification_results, &app_block
+        def initialize application_version, branch, tags, publish_verification_results, build_url, &app_block
           @application_version = application_version
           @branch = branch
           @tags = [*tags]
           @publish_verification_results = publish_verification_results
           @app_block = app_block
+          @build_url = build_url
         end
 
         def app

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

@@ -15,13 +15,19 @@ module Pact
 
         extend Pact::DSL
 
-        attr_accessor :name, :app_block, :application_version, :branch, :tags, :publish_verification_results
+        attr_accessor :name, :app_block, :application_version, :branch, :tags, :publish_verification_results, :build_url
 
         CONFIG_RU_APP = lambda {
           unless File.exist? Pact.configuration.config_ru_path
             raise "Could not find config.ru file at #{Pact.configuration.config_ru_path} Please configure the service provider app or create a config.ru file in the root directory of the project. See https://github.com/pact-foundation/pact-ruby/wiki/Verifying-pacts for more information."
           end
-          Rack::Builder.parse_file(Pact.configuration.config_ru_path).first
+          result = Rack::Builder.parse_file(Pact.configuration.config_ru_path)
+
+          if result.respond_to?(:first) # rack 2
+            result.first
+          else # rack 3
+            result
+          end
         }
 
         def initialize name
@@ -48,6 +54,10 @@ module Pact
             self.branch = branch
           end
 
+          def build_url build_url
+            self.build_url = build_url
+          end
+
           def publish_verification_results publish_verification_results
             self.publish_verification_results = publish_verification_results
             Pact::RSpec.with_rspec_2 do
@@ -60,7 +70,7 @@ module Pact
           end
 
           def honours_pacts_from_pact_broker &block
-            create_pact_verification_from_broker &block
+            create_pact_verification_from_broker(&block)
           end
         end
 
@@ -89,7 +99,7 @@ module Pact
         end
 
         def create_service_provider
-          Pact.configuration.provider = ServiceProviderConfig.new(application_version, branch, tags, publish_verification_results, &@app_block)
+          Pact.configuration.provider = ServiceProviderConfig.new(application_version, branch, tags, publish_verification_results, build_url, &@app_block)
         end
       end
     end

data/lib/pact/provider/pact_uri.rb

@@ -3,7 +3,7 @@ module Pact
     class PactURI
       attr_reader :uri, :options, :metadata
 
-      def initialize (uri, options = nil, metadata = nil)
+      def initialize(uri, options = nil, metadata = nil)
         @uri = uri
         @options = options || {}
         @metadata = metadata || {} # make sure it's not nil if nil is passed in

data/lib/pact/provider/state/provider_state.rb

@@ -12,11 +12,11 @@ module Pact
       end
 
       def set_up &block
-        ProviderStates.base_provider_state.register.register_set_up &block
+        ProviderStates.base_provider_state.register.register_set_up(&block)
       end
 
       def tear_down &block
-        ProviderStates.base_provider_state.register_tear_down &block
+        ProviderStates.base_provider_state.register_tear_down(&block)
       end
 
       def provider_states_for name, &block
@@ -60,7 +60,7 @@ module Pact
       end
 
       def self.namespaced_name name, options = {}
-        fullname = options[:for] ? "#{options[:for]}.#{name}" : name
+        options[:for] ? "#{options[:for]}.#{name}" : name
       end
     end
 
@@ -81,11 +81,11 @@ module Pact
 
       dsl do
         def set_up &block
-          self.register_set_up &block
+          self.register_set_up(&block)
         end
 
         def tear_down &block
-          self.register_tear_down &block
+          self.register_tear_down(&block)
         end
 
         def no_op

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

@@ -14,7 +14,13 @@ module Pact
         end
 
         def call
-          VerificationResult.new(publishable?, !any_failures?, Pact.configuration.provider.application_version, test_results_hash_for_pact_uri)
+          VerificationResult.new(
+            publishable?,
+            !any_failures?,
+            Pact.configuration.provider.application_version,
+            test_results_hash_for_pact_uri,
+            Pact.configuration.provider.build_url
+          )
         end
 
         private

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

@@ -135,7 +135,7 @@ module Pact
         end
 
         def provider_entity
-          @provider_entity ||= pact_entity.get(PROVIDER_RELATION)
+          @provider_entity ||= pact_entity.get!(PROVIDER_RELATION)
         end
       end
     end

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

@@ -6,11 +6,12 @@ module Pact
       class VerificationResult
         attr_reader :success, :provider_application_version, :test_results_hash
 
-        def initialize publishable, success, provider_application_version, test_results_hash
+        def initialize publishable, success, provider_application_version, test_results_hash, build_url
           @publishable = publishable
           @success = success
           @provider_application_version = provider_application_version
           @test_results_hash = test_results_hash
+          @build_url = build_url
         end
 
         def publishable?
@@ -25,7 +26,8 @@ module Pact
           {
             success: success,
             providerApplicationVersion: provider_application_version,
-            testResults: test_results_hash
+            testResults: test_results_hash,
+            buildUrl: @build_url
           }.to_json(options)
         end
 

data/lib/pact/utils/metrics.rb

@@ -9,13 +9,17 @@ module Pact
     class Metrics
 
       def self.report_metric(event, category, action, value = 1)
+        do_once_per_thread(:pact_metrics_message_shown) do
+          if track_events?
+            Pact.configuration.output_stream.puts "pact WARN: Please note: we are tracking events anonymously to gather important usage statistics like Pact-Ruby version
+              and operating system. To disable tracking, set the 'PACT_DO_NOT_TRACK' environment
+              variable to 'true'."
+          end
+        end
+
         in_thread do
           begin
             if track_events?
-              Pact.configuration.output_stream.puts "WARN: Please note: we are tracking events anonymously to gather important usage statistics like Pact-Ruby version
-                and operating system. To disable tracking, set the 'PACT_DO_NOT_TRACK' environment
-                variable to 'true'."
-
               uri = URI('https://www.google-analytics.com/collect')
               req = Net::HTTP::Post.new(uri)
               req.set_form_data(create_tracking_event(event, category, action, value))
@@ -31,6 +35,7 @@ module Pact
       end
 
       private
+
       def self.handle_error e
         if ENV['PACT_METRICS_DEBUG'] == 'true'
           Pact.configuration.output_stream.puts("DEBUG: #{e.inspect}\n" + e.backtrace.join("\n"))
@@ -43,6 +48,16 @@ module Pact
         end
       end
 
+      # not super safe to use the thread, but it's good enough for this usecase
+      def self.do_once_per_thread(key)
+        result = nil
+        if !Thread.current[key]
+          result = yield
+        end
+        Thread.current[key] = true
+        result
+      end
+
       def self.create_tracking_event(event, category, action, value)
         {
           "v" => 1,

data/lib/pact/version.rb

@@ -1,4 +1,4 @@
 # Remember to bump pact-provider-proxy when this changes major version
 module Pact
-  VERSION = "1.62.0"
+  VERSION = "1.64.0"
 end

data/pact.gemspec

@@ -27,20 +27,20 @@ Gem::Specification.new do |gem|
   }
 
   gem.add_runtime_dependency 'rspec', '~> 3.0'
-  gem.add_runtime_dependency 'rack-test', '>= 0.6.3', '< 2.0.0'
+  gem.add_runtime_dependency 'rack-test', '>= 0.6.3', '< 3.0.0'
   gem.add_runtime_dependency 'thor', '>= 0.20', '< 2.0'
-  gem.add_runtime_dependency 'webrick', '~> 1.3'
-  gem.add_runtime_dependency 'term-ansicolor', '~> 1.0'
+  gem.add_runtime_dependency 'webrick', '~> 1.8'
+  gem.add_runtime_dependency 'term-ansicolor', '~> 1.7'
 
   gem.add_runtime_dependency 'pact-support', '~> 1.16', '>= 1.16.9'
   gem.add_runtime_dependency 'pact-mock_service', '~> 3.0', '>= 3.3.1'
 
   gem.add_development_dependency 'rake', '~> 13.0'
   gem.add_development_dependency 'webmock', '~> 3.0'
-  gem.add_development_dependency 'fakefs', '0.5' # 0.6.0 blows up
-  gem.add_development_dependency 'hashie', '~> 2.0'
-  gem.add_development_dependency 'activesupport', '~> 5.2'
-  gem.add_development_dependency 'faraday', '~> 0.13'
+  gem.add_development_dependency 'fakefs', '2.4' # 0.6.0 blows up
+  gem.add_development_dependency 'hashie', '~> 5.0'
+  gem.add_development_dependency 'faraday', '~>1.0', '<3.0'
+  gem.add_development_dependency 'faraday-multipart', '~> 1.0'
   gem.add_development_dependency 'conventional-changelog', '~> 1.3'
   gem.add_development_dependency 'bump', '~> 0.5'
   gem.add_development_dependency 'pact-message', '~> 0.8'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.62.0
+  version: 1.64.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-21 00:00:00.000000000 Z
+date: 2023-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -37,7 +37,7 @@ dependencies:
         version: 0.6.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -47,7 +47,7 @@ dependencies:
         version: 0.6.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -74,28 +74,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: pact-support
   requirement: !ruby/object:Gem::Requirement
@@ -170,56 +170,62 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: faraday-multipart
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: conventional-changelog
   requirement: !ruby/object:Gem::Requirement
@@ -413,7 +419,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.1
 signing_key:
 specification_version: 4
 summary: Enables consumer driven contract testing, providing a mock service and DSL