pact 1.57.0 → 1.66.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f5bff8179ed3588a9363fd864b36527a51672bc2f0812778e188f60571975c1
-  data.tar.gz: 8bec6ad8f69b8a60836256c261f32c288624ae1a876e452acedfc62daeffebc8
+  metadata.gz: 26cc958a02d05dd977adaee8c952de9392fcb06188c75564e4f9d261821ae6d8
+  data.tar.gz: f73fef0a466d12221bee83f0695ecf9f2cfbdbcb92c83f2706449025b78d9408
 SHA512:
-  metadata.gz: a0638972bc29d64815a6d29fbd46a88092eb0d748e21f0da41cde9e485c63fa1158cbf03d9b4d638d273b1caff78470d07d40377be176804fab62e96aecce043
-  data.tar.gz: 9161da6d7c9490db14c7472ca54e0c8a0d7a8fdad65f033694a31db8d80097f3a343098fc41f4c12fb59f12a3ae5a36f2b5503ade581eeb1f9c0f8fb66e74920
+  metadata.gz: e7ed964f7532f0baa701aead43ac24fa10e40b4503b8da7b637ce8e41ffdc263141689a042d01bd37a20cd0d6ca703c9bee1d645fd76424583b63c151b35e644
+  data.tar.gz: d8decbbd6cc63282600dc90f07c79e83db40f6d79181c2afd03bcc325567daad0213b6f36817ae3248876a9e25a04da14d8ee7f1b3a82240f19a9146f91d6df9

data/CHANGELOG.md

@@ -1,3 +1,141 @@
+<a name="v1.66.1"></a>
+### v1.66.1 (2025-01-20)
+
+#### Bug Fixes
+
+* HTTP_HOST headers for sinatra 4.x	 ([173bfb7](/../../commit/173bfb7))
+
+<a name="v1.66.0"></a>
+### v1.66.0 (2024-11-29)
+
+#### Features
+
+* **generators**
+  * Add more generators as per spec	 ([f55adf1](/../../commit/f55adf1))
+  * Pass context and add ProviderState generator	 ([7a1cf3b](/../../commit/7a1cf3b))
+
+#### Bug Fixes
+
+* add HTTPS_HOST header if invoking a Sinatra app	 ([ed44189](/../../commit/ed44189))
+* example/animal-service/Gemfile to reduce vulnerabilities	 ([981ebee](/../../commit/981ebee))
+
+<a name="v1.65.3"></a>
+### v1.65.3 (2024-10-23)
+
+#### Bug Fixes
+
+* **test**
+  * explicitly require ostruct as non stdlib in ruby 3.5.x	 ([c9a8525](/../../commit/c9a8525))
+
+<a name="v1.65.2"></a>
+### v1.65.2 (2024-09-26)
+
+<a name="v1.65.1"></a>
+### v1.65.1 (2024-08-08)
+
+#### Bug Fixes
+
+* set color codes even on dumb terms (prev behaviour)	 ([4f01bc9](/../../commit/4f01bc9))
+* use .empty? in handling_no_pacts_found	 ([43bce74](/../../commit/43bce74))
+
+<a name="v1.65.0"></a>
+### v1.65.0 (2024-08-06)
+
+#### Features
+
+* support app_version_branch in MessageProviderDSL	 ([1653128](/../../commit/1653128))
+* allow setting fail_if_no_pacts_found in honours_pacts_from_pact_broker	 ([f0f142e](/../../commit/f0f142e))
+
+#### Bug Fixes
+
+* handle case in no_pacts_found - undefined method empty? for nil	 ([0145d2d](/../../commit/0145d2d))
+* remove unused ConsumerContractBuilder contract_details accessor	 ([fb5488e](/../../commit/fb5488e))
+* example/animal-service/Gemfile to reduce vulnerabilities	 ([2bbefe2](/../../commit/2bbefe2))
+* example/zoo-app/Gemfile to reduce vulnerabilities	 ([e10f914](/../../commit/e10f914))
+* example/animal-service/Gemfile to reduce vulnerabilities	 ([7560918](/../../commit/7560918))
+* example/zoo-app/Gemfile to reduce vulnerabilities	 ([b4cbe85](/../../commit/b4cbe85))
+* example/animal-service/Gemfile to reduce vulnerabilities	 ([4028087](/../../commit/4028087))
+* ConsumerContractBuilder exposing incorrect field	 ([c805c3e](/../../commit/c805c3e))
+
+* **test**
+  * alias Rack/Rackup WEBrick handler in x509 test for backwards compat	 ([cc77498](/../../commit/cc77498))
+
+<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)
+
+#### 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)
+
+#### Features
+
+* support publishing verification results with a version branch	 ([da2facf](/../../commit/da2facf))
+
+#### Bug Fixes
+
+* gracefully handle display of username that causes InvalidComponentError to be raised when composing a URI	 ([cecb98f](/../../commit/cecb98f))
+
 <a name="v1.57.0"></a>
 ### v1.57.0 (2021-01-27)
 

data/lib/pact/cli/run_pact_verification.rb

@@ -72,7 +72,6 @@ module Pact
 
       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
       end
 

data/lib/pact/consumer/consumer_contract_builder.rb

@@ -11,7 +11,7 @@ module Pact
 
       include Pact::Logging
 
-      attr_reader :consumer_contract, :mock_service_base_url
+      attr_reader :mock_service_base_url
 
       def initialize(attributes)
         @interaction_builder = nil

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

@@ -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,22 @@ 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
+          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 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")
+            end
+            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          end
           http.start do |http|
             http.request request
           end
@@ -63,6 +76,27 @@ module Pact
         AuthorizationHeaderRedactor.new(Pact.configuration.output_stream)
       end
 
+      def verbose?
+        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
+
       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,12 +5,15 @@ 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_tags, :broker_base_url, :http_client_options, :http_client, :options
+      attr_reader :provider, :consumer_version_selectors, :provider_version_branch, :provider_version_tags, :broker_base_url, :http_client_options, :http_client, :options
 
       PACTS_FOR_VERIFICATION_RELATION = 'pb:provider-pacts-for-verification'.freeze
       PACTS_FOR_VERIFICATION_RELATION_BETA = 'beta:provider-pacts-for-verification'.freeze
@@ -20,9 +23,10 @@ module Pact
       SELF = 'self'.freeze
       EMBEDDED = '_embedded'.freeze
 
-      def initialize(provider, consumer_version_selectors, provider_version_tags, broker_base_url, http_client_options, options = {})
+      def initialize(provider, consumer_version_selectors, provider_version_branch, provider_version_tags, broker_base_url, http_client_options, options = {})
         @provider = provider
         @consumer_version_selectors = consumer_version_selectors || []
+        @provider_version_branch = provider_version_branch
         @provider_version_tags = [*provider_version_tags]
         @http_client_options = http_client_options
         @broker_base_url = broker_base_url
@@ -30,20 +34,22 @@ module Pact
         @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
+      def self.call(provider, consumer_version_selectors, provider_version_branch, provider_version_tags, broker_base_url, http_client_options, options = {})
+        new(provider, consumer_version_selectors, provider_version_branch, provider_version_tags, broker_base_url, http_client_options, options).call
       end
 
       def call
-        if index.can?(PACTS_FOR_VERIFICATION_RELATION) || index.can?(PACTS_FOR_VERIFICATION_RELATION_BETA)
-          log_message
-          pacts_for_verification
-        else
-          old_selectors = consumer_version_selectors.collect do | selector |
-            { name: selector[:tag], all: !selector[:latest], fallback: selector[:fallbackTag]}
+        handling_no_pacts_found do
+          if index.can?(PACTS_FOR_VERIFICATION_RELATION) || index.can?(PACTS_FOR_VERIFICATION_RELATION_BETA)
+            log_message
+            pacts_for_verification
+          else
+            old_selectors = consumer_version_selectors.collect do | selector |
+              { name: selector[:tag], all: !selector[:latest], fallback: selector[:fallbackTag]}
+            end
+            # Fall back to old method of fetching pacts
+            FetchPacts.call(provider, old_selectors, broker_base_url, http_client_options)
           end
-          # Fall back to old method of fetching pacts
-          FetchPacts.call(provider, old_selectors, broker_base_url, http_client_options)
         end
       end
 
@@ -73,11 +79,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["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)
@@ -91,6 +98,15 @@ module Pact
       def log_message
         Pact.configuration.output_stream.puts "INFO: #{pact_selection_description(provider, consumer_version_selectors, options, broker_base_url)}"
       end
+
+      def handling_no_pacts_found
+        pacts_found = yield
+        raise "No pacts found to verify" if pacts_found.empty? && options[:fail_if_no_pacts_found] != false
+        if pacts_found.empty? && options[:fail_if_no_pacts_found] == false
+          Pact.configuration.output_stream.puts "WARN: No pacts found to verify & fail_if_no_pacts_found is set to false."
+        end
+        pacts_found
+      end
     end
   end
 end

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/configuration/message_provider_dsl.rb

@@ -34,6 +34,10 @@ module Pact
             self.tags = tags
           end
 
+          def app_version_branch branch
+            self.branch = branch
+          end
+
           def publish_verification_results publish_verification_results
             self.publish_verification_results = publish_verification_results
             Pact::RSpec.with_rspec_2 do
@@ -46,7 +50,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/pact_verification_from_broker.rb

@@ -15,16 +15,18 @@ 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, :_provider_version_tags, :_basic_auth_options, :_enable_pending, :_include_wip_pacts_since, :_verbose, :_consumer_version_selectors
+        attr_accessor :_provider_name, :_pact_broker_base_url, :_consumer_version_tags, :_provider_version_branch, :_provider_version_tags, :_basic_auth_options, :_enable_pending, :_include_wip_pacts_since, :_verbose, :_consumer_version_selectors, :_fail_if_no_pacts_found
 
-        def initialize(provider_name, provider_version_tags)
+        def initialize(provider_name, provider_version_branch, provider_version_tags)
           @_provider_name = provider_name
+          @_provider_version_branch = provider_version_branch
           @_provider_version_tags = provider_version_tags
           @_consumer_version_tags = []
           @_consumer_version_selectors = []
           @_enable_pending = false
           @_include_wip_pacts_since = nil
           @_verbose = false
+          @_fail_if_no_pacts_found = true # CLI defaults to false, unfortunately for consistency
         end
 
         dsl do
@@ -45,6 +47,11 @@ module Pact
             self._enable_pending = enable_pending
           end
 
+          # Underlying code defaults to true if not specified
+          def fail_if_no_pacts_found fail_if_no_pacts_found
+            self._fail_if_no_pacts_found = fail_if_no_pacts_found
+          end
+
           def include_wip_pacts_since since
             self._include_wip_pacts_since = if since.respond_to?(:xmlschema)
               since.xmlschema
@@ -69,10 +76,11 @@ module Pact
           fetch_pacts = Pact::PactBroker::FetchPactURIsForVerification.new(
             _provider_name,
             consumer_version_selectors,
+            _provider_version_branch,
             _provider_version_tags,
             _pact_broker_base_url,
             _basic_auth_options.merge(verbose: _verbose),
-            { include_pending_status: _enable_pending, include_wip_pacts_since: _include_wip_pacts_since }
+            { include_pending_status: _enable_pending, include_wip_pacts_since: _include_wip_pacts_since, fail_if_no_pacts_found: _fail_if_no_pacts_found }
           )
 
           Pact.provider_world.add_pact_uri_source fetch_pacts

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

@@ -4,12 +4,15 @@ module Pact
       class ServiceProviderConfig
 
         attr_accessor :application_version
+        attr_reader :branch, :build_url
 
-        def initialize application_version, 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, :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
@@ -44,6 +50,14 @@ module Pact
             self.tags = tags
           end
 
+          def app_version_branch branch
+            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
@@ -56,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
 
@@ -65,7 +79,7 @@ module Pact
         end
 
         def create_pact_verification_from_broker(&block)
-          PactVerificationFromBroker.build(name, tags, &block)
+          PactVerificationFromBroker.build(name, branch, tags, &block)
         end
 
         def finalize
@@ -85,7 +99,7 @@ module Pact
         end
 
         def create_service_provider
-          Pact.configuration.provider = ServiceProviderConfig.new(application_version, 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/help/console_text.rb

@@ -2,15 +2,13 @@ require 'pact/provider/help/content'
 require 'fileutils'
 require 'pact/consumer/configuration'
 require 'pact/provider/help/write'
-require 'term/ansicolor'
+require 'rainbow'
 
 module Pact
   module Provider
     module Help
       class ConsoleText
 
-        C = ::Term::ANSIColor
-
         def self.call reports_dir = Pact.configuration.reports_dir, options = {color: true}
           new(reports_dir || Pact.configuration.reports_dir, options).call
         end
@@ -46,13 +44,11 @@ module Pact
         end
 
         def error_text_coloured
-          C.red(error_text_plain)
+          Rainbow(error_text_plain).red
         end
 
         class ColorizeMarkdown
 
-          C = ::Term::ANSIColor
-
           def self.call markdown
             markdown.split("\n").collect do | line |
               if line.start_with?("# ")
@@ -66,11 +62,11 @@ module Pact
           end
 
           def self.yellow_underling string
-            C.underline(C.yellow(string))
+            Rainbow(string).yellow.underline
           end
 
           def self.green string
-            C.green(string)
+            Rainbow(string).green
           end
 
         end

data/lib/pact/provider/help/prompt_text.rb

@@ -1,5 +1,5 @@
 require 'pact/consumer/configuration'
-require 'term/ansicolor'
+require 'rainbow'
 require 'pathname'
 
 module Pact
@@ -7,8 +7,6 @@ module Pact
     module Help
       class PromptText
 
-        C = ::Term::ANSIColor
-
         def self.call reports_dir = Pact.configuration.reports_dir, options = {color: Pact.configuration.color_enabled}
           new(reports_dir, options).call
         end
@@ -31,7 +29,7 @@ module Pact
         end
 
         def prompt_text_colored
-          C.yellow(prompt_text_plain)
+          Rainbow(prompt_text_plain).yellow
         end
 
         def rake_args

data/lib/pact/provider/matchers/messages.rb

@@ -1,15 +1,13 @@
-require 'term/ansicolor'
+require 'rainbow'
 require 'pact/term'
 
 module Pact
   module Matchers
     module Messages
 
-      C = ::Term::ANSIColor
-
       def match_term_failure_message diff, actual, diff_formatter, color_enabled
         actual_string = String === actual ? actual : actual.to_json
-        maybe_coloured_string = color_enabled ? C.white(actual_string) : actual_string
+        maybe_coloured_string = color_enabled ? Rainbow(actual_string).white : actual_string
         message = "Actual: #{maybe_coloured_string}\n\n"
         formatted_diff = diff_formatter.call(diff)
         message + colorize_if_enabled(formatted_diff, color_enabled)
@@ -40,7 +38,7 @@ module Pact
           # RSpec wraps each line in the failure message with failure_color, turning it red.
           # To ensure the lines in the diff that should be white, stay white, put an
           # ANSI reset at the start of each line.
-          formatted_diff.split("\n").collect{ |line| ::Term::ANSIColor.reset + line }.join("\n")
+          formatted_diff.split("\n").collect{ |line|"\e[0m#{line}" }.join("\n")
         else
           formatted_diff
         end