pact-support 1.21.7 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a1d8408789e443f4f23362177536a1277752c6aa454d5efddf506577bd2f722
-  data.tar.gz: b7efcdbb52294fc754c8d73bb21c556eb120fa3ea32ca23c4deb8c13252b4b5b
+  metadata.gz: 98d34d97e45da900f702aa3eaf63f1939bbe11acf73b58d314bf6f52435d6bf7
+  data.tar.gz: d40f883a5dff594d37eaf2f16144009456ff714ff9e0de2e0960fdd352a70613
 SHA512:
-  metadata.gz: cadfe471bebe7b2fdd4c8235e3d81a2f43662b8cb796d621cb8ca5392264d2d4733dd32d59203610a0413241434ae9201f97e70837386515aa24bf5b9092650b
-  data.tar.gz: 33d1dd99bf19f44b2fe63b218f88d13a6075fe31c39d83957fbcb36bbf07706f4bea40dca41fd2b0a8d1fc7e330b2686dedeac6eba4233a2ea25ba7070ef179a
+  metadata.gz: e354664620c36e5140046d6962db6101020ff1a1cf04e3add59bd2270bc029536e01bbe02fbcec38c79adb66e011d4428ea76d6de70ee709aaad1e9a3d211fa3
+  data.tar.gz: 9dfe86f4b977b410251325356963b8de961d3061855f08b9a550f6d9503ca4bee8cf8bc8bb4621e92b0d698db0f2f5639d99b1bd4d26a0c02d9c247c4c310659

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="v2.0.0"></a>
+### v2.0.0 (2026-09-12)
+
+#### Bug Fixes
+
+* **deps**
+  * bump json dep	 ([7cd5e81](/../../commit/7cd5e81))
+
+* move pact/rspec to pact/support/rspec	 ([4745275](/../../commit/4745275))
+
 <a name="v1.21.7"></a>
 ### v1.21.7 (2026-07-21)
 

data/lib/pact/consumer_contract/file_name.rb

@@ -7,7 +7,7 @@ module Pact
       "#{filenamify(consumer_name)}-#{filenamify(provider_name)}#{pid}.json"
     end
 
-    def file_path consumer_name, provider_name, pact_dir = Pact.configuration.pact_dir, options = {}
+    def file_path consumer_name, provider_name, pact_dir = Pact::Support.configuration.pact_dir, options = {}
       File.join(windows_safe(pact_dir), file_name(consumer_name, provider_name, options))
     end
 

data/lib/pact/consumer_contract/http_consumer_contract_parser.rb

@@ -10,7 +10,7 @@ module Pact
       options = { pact_specification_version: v }
 
       if v.after? 3
-        Pact.configuration.error_stream.puts "WARN: This code only knows how to parse v3 pacts, attempting to parse v#{options[:pact_specification_version]} pact using v3 code."
+        Pact::Support.configuration.error_stream.puts "WARN: This code only knows how to parse v3 pacts, attempting to parse v#{options[:pact_specification_version]} pact using v3 code."
       end
 
       interactions = hash[:interactions].each_with_index.collect { |hash, index| Interaction.from_hash({ index: index }.merge(hash), options) }

data/lib/pact/consumer_contract/interaction_v3_parser.rb

@@ -17,7 +17,7 @@ module Pact
       provider_states = parse_provider_states(hash['providerStates'])
       provider_state = provider_states.any? ? provider_states.first.name : nil
       if provider_states && provider_states.size > 1
-        Pact.configuration.error_stream.puts("WARN: Currently only 1 provider state is supported. Ignoring ")
+        Pact::Support.configuration.error_stream.puts("WARN: Currently only 1 provider state is supported. Ignoring ")
       end
       metadata = parse_metadata(hash['metadata'])
       Interaction.new(symbolize_keys(hash).merge(request: request,

data/lib/pact/consumer_contract/pact_file.rb

@@ -1,5 +1,5 @@
 require "net/http"
-require "pact/configuration"
+require "pact/support/configuration"
 require "pact/http/authorization_header_redactor"
 
 module Pact
@@ -33,8 +33,8 @@ module Pact
     end
 
     def save_pactfile_to_tmp pact, name
-      ::FileUtils.mkdir_p Pact.configuration.tmp_dir
-      ::File.open(Pact.configuration.tmp_dir + "/#{name}", "w") { |file|  file << pact}
+      ::FileUtils.mkdir_p Pact::Support.configuration.tmp_dir
+      ::File.open(Pact::Support.configuration.tmp_dir + "/#{name}", "w") { |file|  file << pact}
     rescue Errno::EROFS
       # do nothing, probably on RunKit
     end
@@ -108,7 +108,7 @@ 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'] != ''
-      http.set_debug_output(Pact::Http::AuthorizationHeaderRedactor.new(Pact.configuration.output_stream)) if verbose?(options)
+      http.set_debug_output(Pact::Http::AuthorizationHeaderRedactor.new(Pact::Support.configuration.output_stream)) if verbose?(options)
 
       if x509_certificate?
         http.cert = OpenSSL::X509::Certificate.new(x509_client_cert_file)
@@ -117,7 +117,7 @@ module Pact
 
       if disable_ssl_verification?
         if verbose?(options)
-          Pact.configuration.output_stream.puts("SSL verification is disabled")
+          Pact::Support.configuration.output_stream.puts("SSL verification is disabled")
         end
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end

data/lib/pact/consumer_contract/query_hash.rb

@@ -43,7 +43,7 @@ module Pact
     # other will always be a QueryString, not a QueryHash, as it will have ben created
     # from the actual query string.
     def difference(other)
-      require 'pact/matchers' # avoid recursive loop between this file, pact/reification and pact/matchers
+      require 'pact/support/matchers' # avoid recursive loop between this file, pact/reification and pact/matchers
 
       if any_key_contains_square_brackets?
         other_query_hash_non_nested = Query.parse_string_as_non_nested_query(other.query)

data/lib/pact/consumer_contract/query_string.rb

@@ -26,7 +26,7 @@ module Pact
     end
 
     def difference(other)
-      require 'pact/matchers' # avoid recursive loop between this file and pact/matchers
+      require 'pact/support/matchers' # avoid recursive loop between this file and pact/matchers
       Pact::Matchers.diff(query, other.query)
     end
 

data/lib/pact/consumer_contract/request.rb

@@ -31,14 +31,14 @@ module Pact
       end
 
       def matches_route? actual_request
-        require 'pact/matchers' # avoid recusive loop between pact/reification, pact/matchers and this file
+        require 'pact/support/matchers' # avoid recusive loop between pact/reification, pact/matchers and this file
         route = {:method => method.upcase, :path => path}
         other_route = {:method => actual_request.method.upcase, :path => actual_request.path}
         Pact::Matchers.diff(route, other_route).empty?
       end
 
       def difference(actual_request)
-        require 'pact/matchers' # avoid recusive loop between pact/reification, pact/matchers and this file
+        require 'pact/support/matchers' # avoid recusive loop between pact/reification, pact/matchers and this file
         request_diff = Pact::Matchers.diff(to_hash_without_body_or_query, actual_request.to_hash_without_body_or_query)
         request_diff.merge!(query_diff(actual_request.query))
         request_diff.merge!(body_diff(actual_request.body))
@@ -78,7 +78,7 @@ module Pact
       end
 
       def body_differ
-        Pact.configuration.body_differ_for_content_type content_type
+        Pact::Support.configuration.body_differ_for_content_type content_type
       end
     end
   end

data/lib/pact/logging.rb

@@ -1,5 +1,5 @@
 require 'logger'
-require 'pact/configuration'
+require 'pact/support/configuration'
 
 module Pact
   module Logging
@@ -8,7 +8,7 @@ module Pact
     end
 
     def logger
-      Pact.configuration.logger
+      Pact::Support.configuration.logger
     end
   end
 end

data/lib/pact/matchers/embedded_diff_formatter.rb

@@ -18,7 +18,7 @@ module Pact
         @colour = options.fetch(:colour, false)
       end
 
-      def self.call diff, options = {colour: Pact.configuration.color_enabled}
+      def self.call diff, options = {colour: Pact::Support.configuration.color_enabled}
         new(diff, options).call
       end
 

data/lib/pact/matchers/matchers.rb

@@ -1,4 +1,4 @@
-require 'pact/configuration'
+require 'pact/support/configuration'
 require 'pact/term'
 require 'pact/something_like'
 require 'pact/array_like'
@@ -42,7 +42,7 @@ module Pact
     private
 
     def configurable_options
-      { treat_all_number_classes_as_equivalent: Pact.configuration.treat_all_number_classes_as_equivalent }
+      { treat_all_number_classes_as_equivalent: Pact::Support.configuration.treat_all_number_classes_as_equivalent }
     end
 
     def calculate_diff expected, actual, opts = {}

data/lib/pact/matchers/unix_diff_formatter.rb

@@ -21,9 +21,9 @@ module Pact
       end
 
       def self.call diff, options = {}
-        # require stops circular dependency from pact/configuration <-> pact/matchers/unix_diff_formatter
-        require 'pact/configuration'
-        default_options = {colour: Pact.configuration.color_enabled}
+        # require stops circular dependency from pact/support/configuration <-> pact/matchers/unix_diff_formatter
+        require 'pact/support/configuration'
+        default_options = {colour: Pact::Support.configuration.color_enabled}
         new(diff, default_options.merge(options)).call
       end
 

data/lib/pact/matching_rules/merge.rb

@@ -74,7 +74,7 @@ module Pact
 
       def warn_when_not_one_example_item array, path
         unless array.size == 1
-          Pact.configuration.error_stream.puts "WARN: Only the first item will be used to match the items in the array at #{path}"
+          Pact::Support.configuration.error_stream.puts "WARN: Only the first item will be used to match the items in the array at #{path}"
         end
       end
 

data/lib/pact/matching_rules/v3/merge.rb

@@ -76,7 +76,7 @@ module Pact
 
         def warn_when_not_one_example_item array, path
           unless array.size == 1
-            Pact.configuration.error_stream.puts "WARN: Only the first item will be used to match the items in the array at #{path}"
+            Pact::Support.configuration.error_stream.puts "WARN: Only the first item will be used to match the items in the array at #{path}"
           end
         end
 

data/lib/pact/shared/active_support_support.rb

@@ -42,7 +42,7 @@ module Pact
     # Oh ActiveSupport, why....
     def fix_json_formatting json
       if json =~ /\{".*?":"/
-        json = JSON.pretty_generate(JSON.parse(json, create_additions: false))
+        json = JSON.pretty_generate(JSON.parse(json))
       else
         json
       end
@@ -57,8 +57,8 @@ module Pact
       thing.instance_variables.each do | iv_name |
         iv = thing.instance_variable_get(iv_name)
         if iv.is_a?(Regexp)
-          require 'pact/configuration'
-          Pact.configuration.error_stream.puts("WARN: Instance variable #{iv_name} for class #{thing.class.name} is a Regexp and isn't been serialized properly. Please raise an issue at https://github.com/pact-foundation/pact-support/issues/new.")
+          require 'pact/support/configuration'
+          Pact::Support.configuration.error_stream.puts("WARN: Instance variable #{iv_name} for class #{thing.class.name} is a Regexp and isn't been serialized properly. Please raise an issue at https://github.com/pact-foundation/pact-support/issues/new.")
         end
       end
     end

data/lib/pact/shared/form_differ.rb

@@ -4,7 +4,7 @@ module Pact
   class FormDiffer
 
     def self.call expected, actual, options = {}
-      require 'pact/matchers' # avoid recursive loop between this file and pact/matchers
+      require 'pact/support/matchers' # avoid recursive loop between this file and pact/matchers
       ::Pact::Matchers.diff to_hash(expected), to_hash(actual), options
     end
 

data/lib/pact/shared/json_differ.rb

@@ -3,7 +3,7 @@ module Pact
 
     # Delegates to https://github.com/pact-foundation/pact-support/blob/master/lib/pact/matchers/matchers.rb#L25
     def self.call expected, actual, options = {}
-      require 'pact/matchers' # avoid recursive loop between this file and pact/matchers
+      require 'pact/support/matchers' # avoid recursive loop between this file and pact/matchers
       ::Pact::Matchers.diff expected, actual, options
     end
   end

data/lib/pact/shared/multipart_form_differ.rb

@@ -4,7 +4,7 @@ require 'pact/shared/text_differ'
 module Pact
   class MultipartFormDiffer
     def self.call expected, actual, options = {}
-      require 'pact/matchers' # avoid recursive loop between this file and pact/matchers
+      require 'pact/support/matchers' # avoid recursive loop between this file and pact/matchers
       expected_boundary = expected.split.first
       actual_boundary = actual.split.first
       actual_with_hardcoded_boundary = actual.gsub(actual_boundary, expected_boundary)

data/lib/pact/shared/text_differ.rb

@@ -3,7 +3,7 @@ module Pact
   class TextDiffer
 
     def self.call expected, actual, options = {}
-      require 'pact/matchers' # avoid recursive loop between this file and pact/matchers
+      require 'pact/support/matchers' # avoid recursive loop between this file and pact/matchers
       ::Pact::Matchers.diff expected, actual, options
     end
 

data/lib/pact/support/configuration.rb

@@ -0,0 +1,198 @@
+require 'pact/matchers/embedded_diff_formatter'
+require 'pact/matchers/unix_diff_formatter'
+require 'pact/matchers/list_diff_formatter'
+require 'pact/matchers/multipart_form_diff_formatter'
+require 'pact/shared/json_differ'
+require 'pact/shared/text_differ'
+require 'pact/shared/form_differ'
+require 'pact/shared/multipart_form_differ'
+require 'rainbow'
+
+
+module Pact
+  module Support
+
+    class Configuration
+
+      DIFF_FORMATTERS = {
+        :embedded => Pact::Matchers::EmbeddedDiffFormatter,
+        :unix => Pact::Matchers::UnixDiffFormatter,
+        :list => Pact::Matchers::ListDiffFormatter
+      }
+
+
+      class NilMatcher
+        def self.=~ other
+          other == nil ? 0 : nil
+        end
+      end
+
+      DIFF_FORMATTER_REGISTRATIONS = [
+        [/multipart\/form-data/, Pact::Matchers::MultipartFormDiffFormatter],
+        [/.*/, Pact::Matchers::UnixDiffFormatter],
+        [NilMatcher, Pact::Matchers::UnixDiffFormatter]
+      ]
+
+      DIFFERS = [
+        [/json/, Pact::JsonDiffer],
+        [/application\/x\-www\-form\-urlencoded/, Pact::FormDiffer],
+        [/multipart\/form-data/, Pact::MultipartFormDiffer],
+        [NilMatcher, Pact::TextDiffer],
+        [/.*/, Pact::TextDiffer]
+      ]
+
+
+      DEFAULT_DIFFER = Pact::TextDiffer
+
+      attr_accessor :pact_dir
+      attr_accessor :log_dir
+      attr_accessor :tmp_dir
+
+      attr_writer :logger
+
+      attr_accessor :error_stream
+      attr_accessor :output_stream
+      attr_accessor :pactfile_write_order
+      attr_accessor :treat_all_number_classes_as_equivalent # when using type based matching
+
+      def self.default_configuration
+        c = Configuration.new
+        c.pact_dir = File.expand_path('./spec/pacts')
+        c.tmp_dir = File.expand_path('./tmp/pacts')
+        c.log_dir = default_log_dir
+
+        c.output_stream = $stdout
+        c.error_stream = $stderr
+        c.pactfile_write_order = :chronological
+        c.treat_all_number_classes_as_equivalent = true
+
+        c
+      end
+
+      def initialize
+        @differ_registrations = []
+        @diff_formatter_registrations = []
+      end
+
+      def logger
+        @logger ||= create_logger
+      end
+
+      # Should this be deprecated in favour of register_diff_formatter???
+      def diff_formatter= diff_formatter
+        register_diff_formatter(/.*/, diff_formatter)
+        register_diff_formatter(nil, diff_formatter)
+      end
+
+      def register_diff_formatter content_type, diff_formatter
+        key = content_type_regexp_for content_type
+        @diff_formatter_registrations << [key, diff_formatter_for(diff_formatter)]
+      end
+
+      def diff_formatter_for_content_type content_type
+        diff_formatter_registrations.find{ | registration | registration.first =~ content_type }.last
+      end
+
+      def register_body_differ content_type, differ
+        key = content_type_regexp_for content_type
+        validate_differ differ
+        @differ_registrations << [key, differ]
+      end
+
+      def body_differ_for_content_type content_type
+        differ_registrations
+          .find{ | registration | registration.first =~ content_type }
+          .tap do |it|
+            if content_type.nil? && it.last == Pact::TextDiffer
+              error_stream.puts "WARN: No content type found, performing text diff on body"
+              logger.warn "No content type found, performing text diff on body"
+            end
+          end.last
+      end
+
+      def log_path
+        log_dir + "/pact.log"
+      end
+
+      def color_enabled
+        # Can't use ||= when the variable might be false, it will execute the expression if it's false
+        color_enabled = defined?(@color_enabled) ? @color_enabled : true
+        Rainbow.enabled = true if color_enabled
+        color_enabled
+      end
+
+      def color_enabled= color_enabled
+        @color_enabled = color_enabled
+      end
+
+      private
+
+      def diff_formatter_for input
+        if DIFF_FORMATTERS[input]
+          DIFF_FORMATTERS[input]
+        elsif input.respond_to?(:call)
+          input
+        else
+          raise "Pact diff_formatter needs to respond to call, or be in the preconfigured list: #{DIFF_FORMATTERS.keys}"
+        end
+      end
+
+      def validate_differ differ
+        if !differ.respond_to?(:call)
+          raise "Pact::Support.configuration.register_body_differ expects a differ that is a lamda or a class/object that responds to call."
+        end
+      end
+
+      def content_type_regexp_for content_type
+        case content_type
+        when String then Regexp.new(/^#{Regexp.escape(content_type)}$/)
+        when Regexp then content_type
+        when nil then NilMatcher
+        else
+          raise "Invalid content type used to register a differ (#{content_type.inspect}). Please use a Regexp or a String."
+        end
+      end
+
+      def differ_registrations
+        @differ_registrations + DIFFERS
+      end
+
+      def diff_formatter_registrations
+        @diff_formatter_registrations + DIFF_FORMATTER_REGISTRATIONS
+      end
+
+      def self.default_log_dir
+        File.expand_path("./log")
+      end
+
+      #Would love a better way of determining this! It sure won't work on windows.
+      def is_rake_running?
+        `ps -ef | grep rake | grep #{Process.ppid} | grep -v 'grep'`.size > 0
+      end
+
+      def create_logger
+        FileUtils::mkdir_p log_dir
+        logger = ::Logger.new(log_path)
+        logger.level = ::Logger::DEBUG
+        logger
+      rescue Errno::EROFS
+        # So we can run on RunKit
+        logger = ::Logger.new($stdout)
+        logger.level = ::Logger::DEBUG
+        logger
+      end
+    end
+
+    def self.configuration
+      @configuration ||= Configuration.default_configuration
+    end
+
+    def self.configure
+      yield configuration
+    end
+
+    def self.clear_configuration
+      @configuration = nil
+    end
+  end
+end

data/lib/pact/{generators.rb → support/generators.rb}

@@ -13,6 +13,7 @@ require 'jsonpath'
 require 'pact/matching_rules/v3/extract'
 
 module Pact
+  module Support
     class Generators
       def self.add_generator(generator)
         generators.unshift(generator)
@@ -60,4 +61,5 @@ module Pact
       add_generator(Generator::Time.new)
       add_generator(Generator::Uuid.new)
     end
+  end
 end

data/lib/pact/support/rspec.rb

@@ -0,0 +1,54 @@
+# This is horrible, must work out a better way of doing this
+module Pact
+  module Support
+    module RSpec
+
+      def self.color_enabled?
+        if ::RSpec.configuration.respond_to?(:color_enabled?)
+          ::RSpec.configuration.color_enabled?(::RSpec.configuration.output_stream)
+        else
+          ::RSpec.configuration.color_enabled?
+        end
+      end
+
+      def self.formatter_class
+        if ::RSpec::Core::Formatters.respond_to?(:register)
+          require 'pact/provider/rspec/formatter_rspec_3'
+          Pact::Provider::RSpec::Formatter
+        else
+          require 'pact/provider/rspec/formatter_rspec_2'
+          Pact::Provider::RSpec::Formatter2
+        end
+      end
+
+      def self.full_description example
+        example.respond_to?(:full_description) ? example.full_description : example.example.full_description
+      end
+
+      def self.runner_defined?
+        defined?(::RSpec::Core::Runner)
+      end
+
+      def self.is_rspec_3
+        defined?(::RSpec) && ::RSpec::Core::Formatters.respond_to?(:register)
+      end
+
+      def self.is_rspec_2
+        defined?(::RSpec) && !is_rspec_3
+      end
+
+      def self.with_rspec_3
+        if is_rspec_3
+          yield
+        end
+      end
+
+      def self.with_rspec_2
+        if is_rspec_2
+          yield
+        end
+      end
+    end
+
+  end
+end

data/lib/pact/support/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Support
-    VERSION = "1.21.7"
+    VERSION = "2.0.0"
   end
 end

data/lib/pact/support.rb

@@ -1,10 +1,10 @@
 require 'pact/support/version'
 require 'pact/consumer_contract'
-require 'pact/matchers'
+require 'pact/support/matchers'
 require 'pact/logging'
 require 'pact/term'
 require 'pact/helpers'
-require 'pact/configuration'
+require 'pact/support/configuration'
 require 'pact/reification'
 
 module Pact

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-support
 version: !ruby/object:Gem::Version
-  version: 1.21.7
+  version: 2.0.0
 platform: ruby
 authors:
 - James Fraser
@@ -83,6 +83,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.19.9
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.19.9
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: jsonpath
   requirement: !ruby/object:Gem::Requirement
@@ -327,7 +347,6 @@ files:
 - LICENSE.txt
 - README.md
 - lib/pact/array_like.rb
-- lib/pact/configuration.rb
 - lib/pact/consumer/request.rb
 - lib/pact/consumer_contract.rb
 - lib/pact/consumer_contract/consumer_contract.rb
@@ -360,11 +379,9 @@ files:
 - lib/pact/generator/regex.rb
 - lib/pact/generator/time.rb
 - lib/pact/generator/uuid.rb
-- lib/pact/generators.rb
 - lib/pact/helpers.rb
 - lib/pact/http/authorization_header_redactor.rb
 - lib/pact/logging.rb
-- lib/pact/matchers.rb
 - lib/pact/matchers/actual_type.rb
 - lib/pact/matchers/base_difference.rb
 - lib/pact/matchers/differ.rb
@@ -390,7 +407,6 @@ files:
 - lib/pact/matching_rules/v3/extract.rb
 - lib/pact/matching_rules/v3/merge.rb
 - lib/pact/reification.rb
-- lib/pact/rspec.rb
 - lib/pact/shared/active_support_support.rb
 - lib/pact/shared/dsl.rb
 - lib/pact/shared/form_differ.rb
@@ -404,6 +420,10 @@ files:
 - lib/pact/something_like.rb
 - lib/pact/specification_version.rb
 - lib/pact/support.rb
+- lib/pact/support/configuration.rb
+- lib/pact/support/generators.rb
+- lib/pact/support/matchers.rb
+- lib/pact/support/rspec.rb
 - lib/pact/support/version.rb
 - lib/pact/symbolize_keys.rb
 - lib/pact/term.rb
@@ -426,7 +446,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Shared code for Pact gems
 test_files: []

data/lib/pact/configuration.rb

@@ -1,196 +0,0 @@
-require 'pact/matchers/embedded_diff_formatter'
-require 'pact/matchers/unix_diff_formatter'
-require 'pact/matchers/list_diff_formatter'
-require 'pact/matchers/multipart_form_diff_formatter'
-require 'pact/shared/json_differ'
-require 'pact/shared/text_differ'
-require 'pact/shared/form_differ'
-require 'pact/shared/multipart_form_differ'
-require 'rainbow'
-
-
-module Pact
-
-  class Configuration
-
-    DIFF_FORMATTERS = {
-      :embedded => Pact::Matchers::EmbeddedDiffFormatter,
-      :unix => Pact::Matchers::UnixDiffFormatter,
-      :list => Pact::Matchers::ListDiffFormatter
-    }
-
-
-    class NilMatcher
-      def self.=~ other
-        other == nil ? 0 : nil
-      end
-    end
-
-    DIFF_FORMATTER_REGISTRATIONS = [
-      [/multipart\/form-data/, Pact::Matchers::MultipartFormDiffFormatter],
-      [/.*/, Pact::Matchers::UnixDiffFormatter],
-      [NilMatcher, Pact::Matchers::UnixDiffFormatter]
-    ]
-
-    DIFFERS = [
-      [/json/, Pact::JsonDiffer],
-      [/application\/x\-www\-form\-urlencoded/, Pact::FormDiffer],
-      [/multipart\/form-data/, Pact::MultipartFormDiffer],
-      [NilMatcher, Pact::TextDiffer],
-      [/.*/, Pact::TextDiffer]
-    ]
-
-
-    DEFAULT_DIFFER = Pact::TextDiffer
-
-    attr_accessor :pact_dir
-    attr_accessor :log_dir
-    attr_accessor :tmp_dir
-
-    attr_writer :logger
-
-    attr_accessor :error_stream
-    attr_accessor :output_stream
-    attr_accessor :pactfile_write_order
-    attr_accessor :treat_all_number_classes_as_equivalent # when using type based matching
-
-    def self.default_configuration
-      c = Configuration.new
-      c.pact_dir = File.expand_path('./spec/pacts')
-      c.tmp_dir = File.expand_path('./tmp/pacts')
-      c.log_dir = default_log_dir
-
-      c.output_stream = $stdout
-      c.error_stream = $stderr
-      c.pactfile_write_order = :chronological
-      c.treat_all_number_classes_as_equivalent = true
-
-      c
-    end
-
-    def initialize
-      @differ_registrations = []
-      @diff_formatter_registrations = []
-    end
-
-    def logger
-      @logger ||= create_logger
-    end
-
-    # Should this be deprecated in favour of register_diff_formatter???
-    def diff_formatter= diff_formatter
-      register_diff_formatter(/.*/, diff_formatter)
-      register_diff_formatter(nil, diff_formatter)
-    end
-
-    def register_diff_formatter content_type, diff_formatter
-      key = content_type_regexp_for content_type
-      @diff_formatter_registrations << [key, diff_formatter_for(diff_formatter)]
-    end
-
-    def diff_formatter_for_content_type content_type
-      diff_formatter_registrations.find{ | registration | registration.first =~ content_type }.last
-    end
-
-    def register_body_differ content_type, differ
-      key = content_type_regexp_for content_type
-      validate_differ differ
-      @differ_registrations << [key, differ]
-    end
-
-    def body_differ_for_content_type content_type
-      differ_registrations
-        .find{ | registration | registration.first =~ content_type }
-        .tap do |it|
-          if content_type.nil? && it.last == Pact::TextDiffer
-            error_stream.puts "WARN: No content type found, performing text diff on body"
-            logger.warn "No content type found, performing text diff on body"
-          end
-        end.last
-    end
-
-    def log_path
-      log_dir + "/pact.log"
-    end
-
-    def color_enabled
-      # Can't use ||= when the variable might be false, it will execute the expression if it's false
-      color_enabled = defined?(@color_enabled) ? @color_enabled : true
-      Rainbow.enabled = true if color_enabled
-      color_enabled
-    end
-
-    def color_enabled= color_enabled
-      @color_enabled = color_enabled
-    end
-
-    private
-
-    def diff_formatter_for input
-      if DIFF_FORMATTERS[input]
-        DIFF_FORMATTERS[input]
-      elsif input.respond_to?(:call)
-        input
-      else
-        raise "Pact diff_formatter needs to respond to call, or be in the preconfigured list: #{DIFF_FORMATTERS.keys}"
-      end
-    end
-
-    def validate_differ differ
-      if !differ.respond_to?(:call)
-        raise "Pact.configuration.register_body_differ expects a differ that is a lamda or a class/object that responds to call."
-      end
-    end
-
-    def content_type_regexp_for content_type
-      case content_type
-      when String then Regexp.new(/^#{Regexp.escape(content_type)}$/)
-      when Regexp then content_type
-      when nil then NilMatcher
-      else
-        raise "Invalid content type used to register a differ (#{content_type.inspect}). Please use a Regexp or a String."
-      end
-    end
-
-    def differ_registrations
-      @differ_registrations + DIFFERS
-    end
-
-    def diff_formatter_registrations
-      @diff_formatter_registrations + DIFF_FORMATTER_REGISTRATIONS
-    end
-
-    def self.default_log_dir
-      File.expand_path("./log")
-    end
-
-    #Would love a better way of determining this! It sure won't work on windows.
-    def is_rake_running?
-      `ps -ef | grep rake | grep #{Process.ppid} | grep -v 'grep'`.size > 0
-    end
-
-    def create_logger
-      FileUtils::mkdir_p log_dir
-      logger = ::Logger.new(log_path)
-      logger.level = ::Logger::DEBUG
-      logger
-    rescue Errno::EROFS
-      # So we can run on RunKit
-      logger = ::Logger.new($stdout)
-      logger.level = ::Logger::DEBUG
-      logger
-    end
-  end
-
-  def self.configuration
-    @configuration ||= Configuration.default_configuration
-  end
-
-  def self.configure
-    yield configuration
-  end
-
-  def self.clear_configuration
-    @configuration = nil
-  end
-end

data/lib/pact/rspec.rb

@@ -1,51 +0,0 @@
-# This is horrible, must work out a better way of doing this
-module Pact
-  module RSpec
-
-    def self.color_enabled?
-      if ::RSpec.configuration.respond_to?(:color_enabled?)
-        ::RSpec.configuration.color_enabled?(::RSpec.configuration.output_stream)
-      else
-        ::RSpec.configuration.color_enabled?
-      end
-    end
-
-    def self.formatter_class
-      if ::RSpec::Core::Formatters.respond_to?(:register)
-        require 'pact/provider/rspec/formatter_rspec_3'
-        Pact::Provider::RSpec::Formatter
-      else
-        require 'pact/provider/rspec/formatter_rspec_2'
-        Pact::Provider::RSpec::Formatter2
-      end
-    end
-
-    def self.full_description example
-      example.respond_to?(:full_description) ? example.full_description : example.example.full_description
-    end
-
-    def self.runner_defined?
-      defined?(::RSpec::Core::Runner)
-    end
-
-    def self.is_rspec_3
-      defined?(::RSpec) && ::RSpec::Core::Formatters.respond_to?(:register)
-    end
-
-    def self.is_rspec_2
-      defined?(::RSpec) && !is_rspec_3
-    end
-
-    def self.with_rspec_3
-      if is_rspec_3
-        yield
-      end
-    end
-
-    def self.with_rspec_2
-      if is_rspec_2
-        yield
-      end
-    end
-  end
-end