pact-support 1.16.9 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46ec9f6e6642bfc067b5327994f844ecd15afaa81ab23b9c4fc4fa55ceae83fe
-  data.tar.gz: ef772e9256e18df3164c834aa55e21fb7742484a19fbc9dccdc17b11fc391d7d
+  metadata.gz: b14c4782f4f8ac5c6a2695b3328b8605a51af770e463ac55a3df41843b976677
+  data.tar.gz: 683323b4a276240ecfe2dc7cb650b0b232008f5904f9f59df071b5fe5e2ee291
 SHA512:
-  metadata.gz: 0a6f386eb4fcb8f3b49832e58564ed56e4a1e56a8da6ecea776f211ee0850a78ba9adb6677571053d943ef717204f17b513a2347bfcd43757a03ce2018a35d94
-  data.tar.gz: 60d0cbcc25b2b10937c2bea9501ae540b0a5aaf7946676414ea01da95829ef36a2c0f19a558883367631cb894bf9ccbcce32200d09f8a907050b763b731bf68b
+  metadata.gz: 80825eb6afa2d2684c54e1805aaa2b19c14200ff516d72654a48ab5ee5b0df11ede5fb6a4cdd0761687e52489936c6b61bcaa8ecfbbc0b271957f5b9f46ae3f0
+  data.tar.gz: cebfe89b260425ca88e91a3594a4d84037444a0f3f490b0042d9991543a0afbdce7ea19c1ef94f241e64dd7648f07877ec61e8984a493673b080aef4752b957f

data/CHANGELOG.md

@@ -1,3 +1,43 @@
+<a name="v1.19.0"></a>
+### v1.19.0 (2022-11-15)
+
+#### Features
+
+* **generators**
+  * add generators to a consumer contract request (#97)	 ([fbce4cb](/../../commit/fbce4cb))
+
+<a name="v1.18.1"></a>
+### v1.18.1 (2022-08-17)
+
+#### Bug Fixes
+
+* use send to invoke remove_method when removing as_json from Regexp	 ([cb29cdd](/../../commit/cb29cdd))
+
+<a name="v1.18.0"></a>
+### v1.18.0 (2022-03-28)
+
+#### Features
+
+* replace term-ansicolor with rainbow	 ([e8b6ada](/../../commit/e8b6ada))
+
+#### Bug Fixes
+
+* Fixup ruby warnings (#96)	 ([cee7113](/../../commit/cee7113))
+
+<a name="v1.17.0"></a>
+### v1.17.0 (2021-10-01)
+
+#### Features
+
+* allow SSL verification to be disabled by setting environment variable PACT_DISABLE_SSL_VERIFICATION=true	 ([dd39c04](/../../commit/dd39c04))
+
+<a name="v1.16.10"></a>
+### v1.16.10 (2021-10-01)
+
+#### Bug Fixes
+
+* change expgen to a runtime dependency	 ([da81634](/../../commit/da81634))
+
 <a name="v1.16.9"></a>
 ### v1.16.9 (2021-09-30)
 

data/lib/pact/consumer_contract/interaction_v2_parser.rb

@@ -38,7 +38,7 @@ module Pact
       if query_is_string
         request_hash['query'] = Pact::QueryHash.new(request_hash['query'], original_query_string, Pact::Query.parsed_as_nested?(request_hash['query']))
       end
-      request = Pact::Request::Expected.from_hash(request_hash)
+      Pact::Request::Expected.from_hash(request_hash)
     end
 
     def self.parse_response response_hash, options

data/lib/pact/consumer_contract/pact_file.rb

@@ -35,7 +35,7 @@ module Pact
     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}
-    rescue Errno::EROFS => e
+    rescue Errno::EROFS
       # do nothing, probably on RunKit
     end
 
@@ -56,9 +56,9 @@ module Pact
     def get_remote_with_retry(uri_string, options)
       uri = URI(uri_string)
       if uri.userinfo
-		options[:username] = uri.user unless options[:username]
-		options[:password] = uri.password unless options[:password]
-	  end
+        options[:username] = uri.user unless options[:username]
+        options[:password] = uri.password unless options[:password]
+      end
       ((options[:retry_limit] || RETRY_LIMIT) + 1).times do |i|
         begin
           response = get_remote(uri, options)
@@ -108,7 +108,13 @@ 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 options[:verbose]
+      http.set_debug_output(Pact::Http::AuthorizationHeaderRedactor.new(Pact.configuration.output_stream)) if verbose?(options)
+      if disable_ssl_verification?
+        if verbose?(options)
+          Pact.configuration.output_stream.puts("SSL verification is disabled")
+        end
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
       http
     end
 
@@ -139,5 +145,13 @@ module Pact
     def windows_safe(uri)
       uri.start_with?("http") ? uri : uri.gsub("\\", File::SEPARATOR)
     end
+
+    def verbose?(options)
+      options[:verbose] || ENV['VERBOSE'] == 'true'
+    end
+
+    def disable_ssl_verification?
+      ENV['PACT_DISABLE_SSL_VERIFICATION'] == 'true' || ENV['PACT_BROKER_DISABLE_SSL_VERIFICATION'] == 'true'
+    end
   end
 end

data/lib/pact/consumer_contract/request.rb

@@ -6,7 +6,7 @@ module Pact
     class Expected < Pact::Request::Base
 
       DEFAULT_OPTIONS = {:allow_unexpected_keys => false}.freeze
-      attr_accessor :options #Temporary hack
+      attr_accessor :options, :generators
 
       def self.from_hash(hash)
         sym_hash = symbolize_keys hash
@@ -16,11 +16,13 @@ module Pact
         headers = sym_hash.fetch(:headers, key_not_found)
         body = sym_hash.fetch(:body, key_not_found)
         options = sym_hash.fetch(:options, {})
-        new(method, path, headers, body, query, options)
+        generators = sym_hash.fetch(:generators, {})
+        new(method, path, headers, body, query, options, generators)
       end
 
-      def initialize(method, path, headers, body, query, options = {})
+      def initialize(method, path, headers, body, query, options = {}, generators = {})
         super(method, path, headers, body, query)
+        @generators = generators
         @options = options
       end
 

data/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 @@ module Pact
       end
 
       def coloured_key match, colour
-        '"' + C.color(colour, match.downcase.gsub(/^"|":$/,'')) + '":'
+        '"' + Rainbow(match.downcase.gsub(/^"|":$/,'')).send(colour) + '":'
       end
 
     end

data/lib/pact/matching_rules/merge.rb

@@ -42,7 +42,7 @@ module Pact
       end
 
       def recurse_hash hash, path
-        recursed =  hash.each_with_object({}) do | (k, v), new_hash |
+        hash.each_with_object({}) do | (k, v), new_hash |
           new_path = path + "['#{k}']"
           new_hash[k] = recurse(v, new_path)
         end

data/lib/pact/support/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Support
-    VERSION = "1.16.9"
+    VERSION = "1.19.0"
   end
 end

data/lib/pact/term.rb

@@ -1,4 +1,5 @@
 require 'pact/shared/active_support_support'
+Regexp.send(:remove_method, :as_json) if Regexp.method_defined?(:as_json)
 require 'json/add/regexp'
 require 'pact/errors'
 

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-support
 version: !ruby/object:Gem::Version
-  version: 1.16.9
+  version: 1.19.0
 platform: ruby
 authors:
 - James Fraser
@@ -9,25 +9,25 @@ authors:
 - Brent Snook
 - Ronald Holshausen
 - Beth Skurrie
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2022-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: term-ansicolor
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -62,14 +62,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :development
+        version: '0.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -216,7 +216,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
-description: 
+description:
 email:
 - james.fraser@alumni.swinburne.edu
 - sergei.matheson@gmail.com
@@ -304,7 +304,7 @@ homepage: https://github.com/pact-foundation/pact-support
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -319,8 +319,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.28
-signing_key: 
+rubygems_version: 3.3.25
+signing_key:
 specification_version: 4
 summary: Shared code for Pact gems
 test_files: []