From e8b6ada7222611c31d1d25298c64cf79b46c2f5b Mon Sep 17 00:00:00 2001
From: Benjamin Jacobs <benjaminpjacobs@gmail.com>
Date: Thu, 3 Mar 2022 19:42:44 -0700
Subject: [PATCH] feat: replace term-ansicolor with rainbow

Because of potential for namespace clashes with the word "Term"
---
 lib/pact/matchers/embedded_diff_formatter.rb           | 6 ++----
 lib/tasks/pact.rake                                    | 4 ++--
 pact-support.gemspec                                   | 2 +-
 spec/lib/pact/matchers/embedded_diff_formatter_spec.rb | 4 ++--
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/lib/pact/matchers/embedded_diff_formatter.rb b/lib/pact/matchers/embedded_diff_formatter.rb
index a644d25..5bb4c8d 100644
--- a/lib/pact/matchers/embedded_diff_formatter.rb
+++ b/lib/pact/matchers/embedded_diff_formatter.rb
@@ -1,13 +1,11 @@
 require 'pact/shared/active_support_support'
-require 'term/ansicolor'
+require 'rainbow'
 
 module Pact
   module Matchers
     class EmbeddedDiffFormatter
 
       include Pact::ActiveSupportSupport
-      C = ::Term::ANSIColor
-
 
       EXPECTED = /"EXPECTED([A-Z_]*)":/
 
@@ -53,7 +51,7 @@ def colourise line
       end
 
       def coloured_key match, colour
-        '"' + C.color(colour, match.downcase.gsub(/^"|":$/,'')) + '":'
+        '"' + Rainbow(match.downcase.gsub(/^"|":$/,'')).send(colour) + '":'
       end
 
     end
diff --git a/lib/tasks/pact.rake b/lib/tasks/pact.rake
index 7fde2fd..0b463eb 100644
--- a/lib/tasks/pact.rake
+++ b/lib/tasks/pact.rake
@@ -15,12 +15,12 @@ namespace :pact do
 
   desc "Verifies the pact at the given URI against this service provider."
   task 'verify:at', :pact_uri do | t, args |
-    require 'term/ansicolor'
+    require 'rainbow'
     require 'pact/tasks/task_helper'
 
     include Pact::TaskHelper
 
-    abort(::Term::ANSIColor.red("Please provide a pact URI. eg. rake pact:verify:at[../my-consumer/spec/pacts/my_consumer-my_provider.json]")) unless args[:pact_uri]
+    abort(Rainbow("Please provide a pact URI. eg. rake pact:verify:at[../my-consumer/spec/pacts/my_consumer-my_provider.json]").red) unless args[:pact_uri]
     handle_verification_failure do
       execute_pact_verify args[:pact_uri]
     end
diff --git a/pact-support.gemspec b/pact-support.gemspec
index 92b6628..60afec4 100644
--- a/pact-support.gemspec
+++ b/pact-support.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files lib CHANGELOG.md LICENSE.txt README.md`.split($RS)
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "term-ansicolor", "~> 1.0"
+  spec.add_runtime_dependency "rainbow", "~> 3.1.1"
   spec.add_runtime_dependency "awesome_print", "~> 1.9"
   spec.add_runtime_dependency "diff-lcs", "~> 1.4"
   spec.add_runtime_dependency "expgen", "~> 0.1"
diff --git a/spec/lib/pact/matchers/embedded_diff_formatter_spec.rb b/spec/lib/pact/matchers/embedded_diff_formatter_spec.rb
index 418fdbe..377f6ff 100644
--- a/spec/lib/pact/matchers/embedded_diff_formatter_spec.rb
+++ b/spec/lib/pact/matchers/embedded_diff_formatter_spec.rb
@@ -17,8 +17,8 @@ module Matchers
       subject { EmbeddedDiffFormatter.call(diff, options) }
 
       let(:options) { { colour: colour }}
-      let(:expected_coloured) { '"' + ::Term::ANSIColor.red("expected_type") + '":'}
-      let(:actual_coloured) { '"' + ::Term::ANSIColor.green("actual_type") + '":'}
+      let(:expected_coloured) { '"' + Rainbow("expected_type").red + '":'}
+      let(:actual_coloured) { '"' + Rainbow("actual_type").green + '":'}
 
       describe ".call" do