pact 1.58.0 → 1.62.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0eccb0bdb60c799b434febc79b825448330f476eb1fd9041d85067b73afa12f
-  data.tar.gz: 552f9f3e11377b6bc4ebb0cb5a30ee5f95f5689ac7dcf0b74a59ec7688eaafac
+  metadata.gz: 7b4004f1a6eed7b4222d8f6f4bd72eb568c75fd198ab77ee663b6aab918ea907
+  data.tar.gz: f6cc541f1416275a0cea5b0819d20f58e6b27d8ca10e8f708b0d44d382b88461
 SHA512:
-  metadata.gz: ef8d1d0f38c7370d36c1643592b82f45415e18065fb1ae3cc07f63f6eb20c082c80376995e3c0388b1bd85e432ada99bc13b4c2024d66ea1f1d2a511a6efa298
-  data.tar.gz: bb42f0d27a63304df146884e152f60f8628c673db09d52c6ff979a2c1508973522cf4f09bb7cb87dea0c2139ca500c745038a0f4702b1f38e67cae6838a68292
+  metadata.gz: 31ce201c07203749e19cb6ca6d1088ef69f1119686119519ab5e15faddda38f80f2846b782efb2e7cb4c3e26bb9df529e45fcc1350df2be63819fbfde50c54e5
+  data.tar.gz: 3fa2538f3f8472759eafcd12b8ef829141f343e5cdab8c83ba27bd4f4f1ca0eee1e960fb2467333b17da30a29c8bc849427178c5dc7566e2c94d948cd109a96e

data/CHANGELOG.md

@@ -1,3 +1,35 @@
+<a name="v1.62.0"></a>
+### v1.62.0 (2022-02-21)
+
+#### Features
+
+* add telemetry (#256)	 ([4497ee9](/../../commit/4497ee9))
+
+<a name="v1.61.0"></a>
+### v1.61.0 (2021-12-16)
+
+#### Features
+
+* support description of matching_branch and matching_tag consumer version selectors	 ([8e8bb22](/../../commit/8e8bb22))
+
+#### Bug Fixes
+
+* pass through includePendingStatus to the 'pacts for verification' API when it is false	 ([f0e37a4](/../../commit/f0e37a4))
+
+<a name="v1.60.0"></a>
+### v1.60.0 (2021-10-01)
+
+#### Features
+
+* allow SSL verification to be disabled in the HAL client by setting the environment variable PACT_DISABLE_SSL_VERIFICATION=true	 ([ce07d32](/../../commit/ce07d32))
+
+<a name="v1.59.0"></a>
+### v1.59.0 (2021-09-07)
+
+#### Features
+
+* update descriptions for new consumer version selectors	 ([0471397](/../../commit/0471397))
+
 <a name="v1.58.0"></a>
 ### v1.58.0 (2021-09-01)
 

data/lib/pact/hal/http_client.rb

@@ -2,6 +2,7 @@ require 'pact/retry'
 require 'pact/hal/authorization_header_redactor'
 require 'net/http'
 require 'rack'
+require 'openssl'
 
 module Pact
   module Hal
@@ -48,10 +49,16 @@ module Pact
       def perform_request request, uri
         response = Retry.until_true do
           http = Net::HTTP.new(uri.host, uri.port, :ENV)
-          http.set_debug_output(output_stream) if verbose || ENV['VERBOSE'] == 'true'
+          http.set_debug_output(output_stream) if verbose?
           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 disable_ssl_verification?
+            if verbose?
+              Pact.configuration.output_stream.puts("SSL verification is disabled")
+            end
+            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          end
           http.start do |http|
             http.request request
           end
@@ -63,6 +70,14 @@ module Pact
         AuthorizationHeaderRedactor.new(Pact.configuration.output_stream)
       end
 
+      def verbose?
+        verbose || ENV['VERBOSE'] == 'true'
+      end
+
+      def disable_ssl_verification?
+        ENV['PACT_DISABLE_SSL_VERIFICATION'] == 'true' || ENV['PACT_BROKER_DISABLE_SSL_VERIFICATION'] == 'true'
+      end
+
       class Response < SimpleDelegator
         def body
           bod = raw_body

data/lib/pact/hash_refinements.rb

@@ -0,0 +1,17 @@
+module Pact
+  module HashRefinements
+    refine Hash do
+      def compact
+        h = {}
+        each do |key, value|
+          h[key] = value unless value == nil
+        end
+        h
+      end unless Hash.method_defined? :compact
+
+      def compact!
+        reject! {|_key, value| value == nil}
+      end unless Hash.method_defined? :compact!
+    end
+  end
+end

data/lib/pact/pact_broker/fetch_pact_uris_for_verification.rb

@@ -5,10 +5,13 @@ require 'pact/errors'
 require 'pact/pact_broker/fetch_pacts'
 require 'pact/pact_broker/notices'
 require 'pact/pact_broker/pact_selection_description'
+require "pact/hash_refinements"
 
 module Pact
   module PactBroker
     class FetchPactURIsForVerification
+      using Pact::HashRefinements
+
       include PactSelectionDescription
       attr_reader :provider, :consumer_version_selectors, :provider_version_branch, :provider_version_tags, :broker_base_url, :http_client_options, :http_client, :options
 
@@ -74,12 +77,12 @@ module Pact
 
       def query
         q = {}
-        q["includePendingStatus"] = true if options[:include_pending_status]
+        q["includePendingStatus"] = 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["providerVersionBranch"] = provider_version_branch if provider_version_branch
-        q["includeWipPactsSince"] = options[:include_wip_pacts_since] if options[:include_wip_pacts_since]
-        q
+        q["providerVersionBranch"] = provider_version_branch
+        q["includeWipPactsSince"] = options[:include_wip_pacts_since]
+        q.compact
       end
 
       def extract_notices(pact)

data/lib/pact/pact_broker/pact_selection_description.rb

@@ -5,11 +5,54 @@ module Pact
         message = "Fetching pacts for #{provider} from #{broker_base_url} with the selection criteria: "
         if consumer_version_selectors.any?
           desc = consumer_version_selectors.collect do |selector|
-            all_or_latest = !selector[:latest] ? "all for tag" : "latest for tag"
-            consumer = selector[:consumer] ? "of consumer #{selector[:consumer]}" : nil
+            desc = nil
+            if selector[:tag]
+              desc = !selector[:latest] ? "all for tag #{selector[:tag]}" : "latest for tag #{selector[:tag]}"
+              desc = "#{desc} of #{selector[:consumer]}" if selector[:consumer]
+            elsif selector[:branch]
+              desc = "latest from branch #{selector[:branch]}"
+              desc = "#{desc} of #{selector[:consumer]}" if selector[:consumer]
+            elsif selector[:mainBranch]
+              desc = "latest from main branch"
+              desc = "#{desc} of #{selector[:consumer]}" if selector[:consumer]
+            elsif selector[:deployed]
+              if selector[:environment]
+                desc = "currently deployed to #{selector[:environment]}"
+              else
+                desc = "currently deployed"
+              end
+              desc = "#{selector[:consumer]} #{desc}" if selector[:consumer]
+            elsif selector[:released]
+              if selector[:environment]
+                desc = "currently released to #{selector[:environment]}"
+              else
+                desc = "currently released"
+              end
+              desc = "#{selector[:consumer]} #{desc}" if selector[:consumer]
+            elsif selector[:deployedOrReleased]
+              if selector[:environment]
+                desc = "currently deployed or released to #{selector[:environment]}"
+              else
+                desc = "currently deployed or released"
+              end
+              desc = "#{selector[:consumer]} #{desc}" if selector[:consumer]
+            elsif selector[:environment]
+              desc = "currently in #{selector[:environment]}"
+              desc = "#{selector[:consumer]} #{desc}" if selector[:consumer]
+            elsif selector[:matchingBranch]
+              desc = "matching current branch"
+              desc = "#{desc} for #{selector[:consumer]}" if selector[:consumer]
+            elsif selector[:matchingTag]
+              desc = "matching tag"
+              desc = "#{desc} for #{selector[:consumer]}" if selector[:consumer]
+            else
+              desc = selector.to_s
+            end
+
             fallback = selector[:fallback] || selector[:fallbackTag]
-            name = fallback ? "#{selector[:tag]} (or #{fallback} if not found)" : selector[:tag]
-            [all_or_latest, name, consumer].compact.join(" ")
+            desc = "#{desc} (or #{fallback} if not found)" if fallback
+
+            desc
           end.join(", ")
           if options[:include_wip_pacts_since]
             desc = "#{desc}, work in progress pacts created after #{options[:include_wip_pacts_since]}"

data/lib/pact/provider/pact_spec_runner.rb

@@ -12,6 +12,7 @@ require 'pact/provider/rspec/pact_broker_formatter'
 require 'pact/provider/rspec/json_formatter'
 require 'pact/provider/rspec'
 require 'pact/provider/rspec/calculate_exit_code'
+require 'pact/utils/metrics'
 
 module Pact
   module Provider
@@ -130,6 +131,8 @@ module Pact
             ignore_failures: options[:ignore_failures],
             request_customizer: options[:request_customizer]
           }
+          Pact::Utils::Metrics.report_metric("Pacts verified", "ProviderTest", "Completed")
+
           honour_pactfile pact_source, ordered_pact_json(pact_source.pact_json), spec_options
         end
       end

data/lib/pact/utils/metrics.rb

@@ -0,0 +1,85 @@
+require 'securerandom'
+require 'digest'
+require 'socket'
+require 'pact/version'
+require 'net/http'
+
+module Pact
+  module Utils
+    class Metrics
+
+      def self.report_metric(event, category, action, value = 1)
+        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))
+
+              Net::HTTP.start(uri.hostname, uri.port, read_timeout:2, open_timeout:2, :use_ssl => true  ) do |http|
+                http.request(req)
+              end
+            end
+          rescue StandardError => e
+            handle_error(e)
+          end
+        end
+      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"))
+        end
+      end
+
+      def self.in_thread
+        Thread.new do
+          yield
+        end
+      end
+
+      def self.create_tracking_event(event, category, action, value)
+        {
+          "v" => 1,
+          "t" => "event",
+          "tid" => "UA-117778936-1",
+          "cid" => calculate_cid,
+          "an" => "Pact Ruby",
+          "av" => Pact::VERSION,
+          "aid" => "pact-ruby",
+          "aip" => 1,
+          "ds" => ENV['PACT_EXECUTING_LANGUAGE'] ? "client" : "cli",
+          "cd2" => ENV['CI'] == "true" ? "CI" : "unknown",
+          "cd3" => RUBY_PLATFORM,
+          "cd6" => ENV['PACT_EXECUTING_LANGUAGE'] || "unknown",
+          "cd7" => ENV['PACT_EXECUTING_LANGUAGE_VERSION'],
+          "el" => event,
+          "ec" => category,
+          "ea" => action,
+          "ev" => value
+        }
+      end
+
+      def self.track_events?
+        ENV['PACT_DO_NOT_TRACK'] != 'true'
+      end
+
+      def self.calculate_cid
+        if RUBY_PLATFORM.include? "windows"
+          hostname = ENV['COMPUTERNAME']
+        else
+          hostname = ENV['HOSTNAME']
+        end
+        if !hostname
+          hostname = Socket.gethostname
+        end
+        Digest::MD5.hexdigest hostname || SecureRandom.urlsafe_base64(5)
+      end
+    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.58.0"
+  VERSION = "1.62.0"
 end

data/pact.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'webrick', '~> 1.3'
   gem.add_runtime_dependency 'term-ansicolor', '~> 1.0'
 
-  gem.add_runtime_dependency 'pact-support', '~> 1.15'
+  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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.58.0
+  version: 1.62.0
 platform: ruby
 authors:
 - James Fraser
@@ -9,10 +9,10 @@ authors:
 - Brent Snook
 - Ronald Holshausen
 - Beth Skurrie
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-07 00:00:00.000000000 Z
+date: 2022-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -102,14 +102,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.16.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.16.9
 - !ruby/object:Gem::Dependency
   name: pact-mock_service
   requirement: !ruby/object:Gem::Requirement
@@ -321,6 +327,7 @@ files:
 - lib/pact/hal/http_client.rb
 - lib/pact/hal/link.rb
 - lib/pact/hal/non_json_entity.rb
+- lib/pact/hash_refinements.rb
 - lib/pact/pact_broker.rb
 - lib/pact/pact_broker/fetch_pact_uris_for_verification.rb
 - lib/pact/pact_broker/fetch_pacts.rb
@@ -378,6 +385,7 @@ files:
 - lib/pact/tasks/verification_task.rb
 - lib/pact/templates/help.erb
 - lib/pact/templates/provider_state.erb
+- lib/pact/utils/metrics.rb
 - lib/pact/utils/string.rb
 - lib/pact/version.rb
 - lib/tasks/pact.rake
@@ -390,7 +398,7 @@ metadata:
   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: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -405,8 +413,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.27
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Enables consumer driven contract testing, providing a mock service and DSL
   for the consumer project, and interaction playback and verification for the service