pact 1.65.0 → 1.65.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24b61e9c910570243bd6054ebc23bf968f5bd20a308ab887184d0860c2b2018d
-  data.tar.gz: 62ba67e2a1ff00b591da39accfe05010d2836f5aa386df0129aa9df786b89156
+  metadata.gz: 57a260592020f08f9b82face34aaa4c8144998f6961a875bb35f47af45d20712
+  data.tar.gz: '03583661eab424c19a9bf429d53ae58cee5d325014f66ca54cbdc087d8e5d74d'
 SHA512:
-  metadata.gz: b473ff4c78e3310449e8cae9a78bc379c36d20c6b646d3d587d83652598e32cae6f12ec50ad84623a1349655bbb841f7dc79aa8c0784dc79b53306f006ddc990
-  data.tar.gz: 91464395e4565d96df5025b998caa1e42a9ba71d9a72bfa0220dad95745bf3cc7d911f22171a1957d01a40a06c7042b9d53d49f75206ef757457227db5931260
+  metadata.gz: 35e9d39793ff8c09933c659a7361727afd4255d143501d981909f10461bbf9042635ba9ca307e148949aee77bf8b92e09456eb1b094646fda309842cf3bf8c5b
+  data.tar.gz: '03952e5c2c95ec5e1958914b6c9f8c723257ff3f0a083d44270ef2ccc1b1248b0a24599ccbf4927cc16eb176241cd8f3597863ac46d9fc4d20e1e34c6c9134ee'

data/CHANGELOG.md

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

data/lib/pact/pact_broker/fetch_pact_uris_for_verification.rb

@@ -101,8 +101,8 @@ module Pact
 
       def handling_no_pacts_found
         pacts_found = yield
-        raise "No pacts found to verify" if pacts_found.blank? && options[:fail_if_no_pacts_found] != false
-        if pacts_found.blank? && options[:fail_if_no_pacts_found] == false
+        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

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

data/lib/pact/provider/print_missing_provider_states.rb

@@ -1,11 +1,9 @@
-require 'term/ansicolor'
+require 'rainbow'
 
 module Pact
   module Provider
     class PrintMissingProviderStates
 
-      C = ::Term::ANSIColor
-
       # Hash of consumer names to array of names of missing provider states
       def self.call missing_provider_states, output
         if missing_provider_states.any?
@@ -15,8 +13,8 @@ module Pact
 
       def self.colorize string
         lines = string.split("\n")
-        first_line = C.cyan(C.underline(lines[0]))
-        other_lines = C.cyan(lines[1..-1].join("\n"))
+        first_line = Rainbow(lines[0]).cyan.underline
+        other_lines = Rainbow(lines[1..-1].join("\n")).cyan
         first_line + "\n" + other_lines
       end
 

data/lib/pact/provider/rspec/formatter_rspec_2.rb

@@ -1,6 +1,6 @@
 require 'pact/provider/print_missing_provider_states'
 require 'rspec/core/formatters/documentation_formatter'
-require 'term/ansicolor'
+require 'rainbow'
 require 'pact/provider/help/prompt_text'
 
 module Pact
@@ -13,8 +13,6 @@ module Pact
           end
         end
 
-        C = ::Term::ANSIColor
-
         def dump_commands_to_rerun_failed_examples
           return if failed_examples.empty?
 

data/lib/pact/provider/rspec/formatter_rspec_3.rb

@@ -1,6 +1,6 @@
 require 'pact/provider/print_missing_provider_states'
 require 'rspec/core/formatters'
-require 'term/ansicolor'
+require 'rainbow'
 require 'pact/provider/help/prompt_text'
 
 module Pact
@@ -22,8 +22,6 @@ module Pact
                                     :example_passed, :example_pending, :example_failed
         end
 
-        C = ::Term::ANSIColor
-
         def example_group_started(notification)
           # This is the metadata on the top level "Verifying a pact between X and Y" describe block
           if @group_level == 0

data/lib/pact/provider/rspec/pact_broker_formatter.rb

@@ -1,6 +1,6 @@
 require 'rspec/core/formatters'
 require 'pact/provider/verification_results/publish_all'
-require 'term/ansicolor'
+require 'rainbow'
 require 'pact/matchers/extract_diff_messages'
 
 module Pact
@@ -43,7 +43,7 @@ module Pact
             if example.exception
               hash[:exception] =  {
                 class: example.exception.class.name,
-                message: ::Term::ANSIColor.uncolor(example.exception.message)
+                message: "\e[0m#{example.exception.message}"
               }
             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.65.0"
+  VERSION = "1.65.2"
 end

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

data/pact.gemspec

@@ -29,8 +29,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'rspec', '~> 3.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.8'
-  gem.add_runtime_dependency 'term-ansicolor', '~> 1.7'
+  gem.add_runtime_dependency "rainbow", '~> 3.1'
 
   gem.add_runtime_dependency 'pact-support', '~> 1.16', '>= 1.16.9'
   gem.add_runtime_dependency 'pact-mock_service', '~> 3.0', '>= 3.3.1'
@@ -45,4 +44,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'bump', '~> 0.5'
   gem.add_development_dependency 'pact-message', '~> 0.8'
   gem.add_development_dependency 'rspec-its', '~> 1.3'
+  gem.add_development_dependency 'webrick', '~> 1.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.65.0
+  version: 1.65.2
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-07 00:00:00.000000000 Z
+date: 2024-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -69,33 +69,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: webrick
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: term-ansicolor
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: pact-support
   requirement: !ruby/object:Gem::Requirement
@@ -282,6 +268,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 description: Enables consumer driven contract testing, providing a mock service and
   DSL for the consumer project, and interaction playback and verification for the
   service provider project.
@@ -419,7 +419,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.17
+rubygems_version: 3.5.20
 signing_key:
 specification_version: 4
 summary: Enables consumer driven contract testing, providing a mock service and DSL