pact-mock_service 3.6.1 → 3.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ade883b71cfce9d1a04b2bc298b16c1642add7c2f99036e30cfc89ea233cf175
-  data.tar.gz: 88877d1b503a1e2e979728fe574be6e830d73d43478ffcf28db89b66e933b23a
+  metadata.gz: 27e87ccc6396fefe1efbf08fdec3565431f999d0baece2f465f3c60c93af5887
+  data.tar.gz: c6b4c99af70294e44082cec35e1b94e7626cf2a90f491804294120bcde2c6ae6
 SHA512:
-  metadata.gz: dcc334183c2b5a48c0e9c7327e5237ffb3d39fd855dbfcc4fd2fbf702c664e3e9360b045e9a978dd3bfa5ab029a631c44dfa25c5cc40c7428fe0a77c61ec9ac2
-  data.tar.gz: e5f927ec62a5b336581d3323f844e976e00436117ee4e6899dfaadb98c6b97e87d432e3e147d0d47f49ec7f12681625249c4589a4a0fc4f239dc46cc2341e965
+  metadata.gz: 84a2589c7758219995e685dcb817b839540a502b38364795a81579245dc3b9f3baf3517e06705580c29a714493be009618c5c7ab2d356b389db0d20d46061f84
+  data.tar.gz: 2c0261cd92e97aadda278032f0098912f9d088e835dac58912fa96ad028613c01d1f423378d5b9cbde7c6d20b772e70ab93a997c5b5b7203974248f97f734d0e

data/CHANGELOG.md

@@ -1,3 +1,39 @@
+<a name="v3.9.1"></a>
+### v3.9.1 (2021-06-03)
+
+#### Bug Fixes
+
+* check for nil body rather than falsey body when determining how to render mocked response Fixes: https://github.com/pact-foundation/pact-mock_service/issues/99	 ([d26e520](/../../commit/d26e520))
+
+<a name="v3.9.0"></a>
+### v3.9.0 (2021-05-17)
+
+#### Features
+
+* pass host into WEBrick options to allow configuration (#128)	 ([ec234a4](/../../commit/ec234a4))
+
+<a name="v3.8.0"></a>
+### v3.8.0 (2021-02-25)
+
+#### Features
+
+* include interaction diffs in verification response	 ([6306693](/../../commit/6306693))
+
+<a name="v3.7.0"></a>
+### v3.7.0 (2020-11-13)
+
+#### Features
+
+* use Pact::Query.parse_string to parse query string	 ([6cd0733](/../../commit/6cd0733))
+* do not require files until command is executing	 ([ad54d0b](/../../commit/ad54d0b))
+
+<a name="v3.6.2"></a>
+### v3.6.2 (2020-08-10)
+
+#### Bug Fixes
+
+* update thor dependency (#124)	 ([54b3f85](/../../commit/54b3f85))
+
 <a name="v3.6.1"></a>
 ### v3.6.1 (2020-04-22)
 

data/README.md

@@ -1,7 +1,7 @@
 
 # Pact Mock and Stub Service
 
-[![Build Status](https://travis-ci.org/pact-foundation/pact-mock_service.svg?branch=master)](https://travis-ci.org/pact-foundation/pact-mock_service)
+[![Build Status](https://travis-ci.com/pact-foundation/pact-mock_service.svg?branch=master)](https://travis-ci.com/pact-foundation/pact-mock_service)
 
 This codebase provides the HTTP mock and stub service used by implementations of [Pact][pact]. It is packaged as a gem, and as a standalone executable for Mac OSX and Linux and Windows.
 

data/lib/pact/consumer/mock_service/rack_request_helper.rb

@@ -1,4 +1,6 @@
 require 'cgi/core'
+require 'pact/consumer_contract/query'
+
 module Pact
   module Consumer
 
@@ -11,7 +13,7 @@ module Pact
       }
 
       def params_hash env
-        CGI::parse env["QUERY_STRING"]
+        Pact::Query.parse_string(env["QUERY_STRING"])
       end
 
       def request_as_hash_from env

data/lib/pact/consumer/server.rb

@@ -83,7 +83,7 @@ module Pact
     end
 
     def webrick_opts
-      opts = { Port: port.nil? ? 0 : port, AccessLog: [], Logger: WEBrick::Log::new(nil, 0) }
+      opts = { Host: host.nil? ? 'localhost' : host, Port: port.nil? ? 0 : port, AccessLog: [], Logger: WEBrick::Log::new(nil, 0) }
       opts.merge!({
         :SSLCertificate => OpenSSL::X509::Certificate.new(File.open(options[:sslcert]).read) }) if options[:sslcert]
       opts.merge!({

data/lib/pact/mock_service/cli.rb

@@ -1,14 +1,11 @@
 require 'thor'
-require 'webrick/https'
-require 'rack/handler/webrick'
-require 'fileutils'
-require 'pact/mock_service/server/wait_for_server_up'
-require 'pact/mock_service/cli/pidfile'
-require 'socket'
 
 module Pact
   module MockService
     class CLI < Thor
+      def self.exit_on_failure? # Thor 1.0 deprecation guard
+        false
+      end
 
       PACT_FILE_WRITE_MODE_DESC = "`overwrite` or `merge`. Use `merge` when running multiple mock service instances in parallel for the same consumer/provider pair." +
       " Ensure the pact file is deleted before running tests when using this option so that interactions deleted from the code are not maintained in the file."
@@ -30,6 +27,7 @@ module Pact
       method_option :monkeypatch, hide: true
 
       def service
+        require_common_dependencies
         require 'pact/mock_service/run'
         Run.(options)
       end
@@ -48,6 +46,7 @@ module Pact
       method_option :sslkey, desc: "Specify the path to the SSL key to use when running the service over HTTPS"
 
       def control
+        require_common_dependencies
         require 'pact/mock_service/control_server/run'
         ControlServer::Run.(options)
       end
@@ -70,6 +69,7 @@ module Pact
       method_option :monkeypatch, hide: true
 
       def start
+        require_common_dependencies
         start_server(mock_service_pidfile) do
           service
         end
@@ -80,6 +80,7 @@ module Pact
       method_option :pid_dir, desc: "PID dir, defaults to tmp/pids", default: "tmp/pids"
 
       def stop
+        require_common_dependencies
         mock_service_pidfile.kill_process
       end
 
@@ -100,6 +101,7 @@ module Pact
       method_option :sslkey, desc: "Specify the path to the SSL key to use when running the service over HTTPS"
 
       def restart
+        require_common_dependencies
         restart_server(mock_service_pidfile) do
           service
         end
@@ -120,6 +122,7 @@ module Pact
       method_option :pact_dir, aliases: "-d", desc: "Directory to which the pacts will be written", default: "."
 
       def control_start
+        require_common_dependencies
         start_server(control_server_pidfile) do
           control
         end
@@ -130,6 +133,7 @@ module Pact
       method_option :pid_dir, desc: "PID dir, defaults to tmp/pids", default: "tmp/pids"
 
       def control_stop
+        require_common_dependencies
         control_server_pidfile.kill_process
       end
 
@@ -148,6 +152,7 @@ module Pact
       method_option :sslkey, desc: "Specify the path to the SSL key to use when running the service over HTTPS"
 
       def control_restart
+        require_common_dependencies
         restart_server(control_server_pidfile) do
           control
         end
@@ -164,6 +169,15 @@ module Pact
 
       no_commands do
 
+        def require_common_dependencies
+          require 'webrick/https'
+          require 'rack/handler/webrick'
+          require 'fileutils'
+          require 'pact/mock_service/server/wait_for_server_up'
+          require 'pact/mock_service/cli/pidfile'
+          require 'socket'
+        end
+
         def control_server_pidfile
           Pidfile.new(pid_dir: options[:pid_dir], name: control_pidfile_name)
         end

data/lib/pact/mock_service/cli/custom_thor.rb

@@ -11,6 +11,9 @@ module Pact
       # `script --help` to display the help for the default task instead of the command list
       #
       class CustomThor < ::Thor
+        def self.exit_on_failure? # Thor 1.0 deprecation guard
+          false
+        end
 
         no_commands do
           def self.start given_args = ARGV, config = {}

data/lib/pact/mock_service/cli/pidfile.rb

@@ -3,9 +3,11 @@ require 'fileutils'
 module Pact
   module MockService
     class CLI < Thor
+      def self.exit_on_failure? # Thor 1.0 deprecation guard
+        false
+      end
 
       class Pidfile
-
         attr_accessor :pid_dir, :name, :pid
 
         def initialize options

data/lib/pact/mock_service/interactions/verification.rb

@@ -38,6 +38,10 @@ module Pact
           expected_interactions - actual_interactions.matched_interactions - @actual_interactions.interaction_mismatches.collect(&:candidate_interactions).flatten
         end
 
+        def interaction_mismatches
+          actual_interactions.interaction_mismatches
+        end
+
         private
 
         attr_reader :expected_interactions, :actual_interactions

data/lib/pact/mock_service/request_handlers/interaction_replay.rb

@@ -182,7 +182,7 @@ module Pact
         end
 
         def self.render_body body
-          return '' unless body
+          return '' if body.nil?
           body.kind_of?(String) ? body.force_encoding('utf-8') : body.to_json
         end
       end

data/lib/pact/mock_service/request_handlers/verification_get.rb

@@ -52,7 +52,7 @@ module Pact
           def to_s
             titles_and_summaries.collect do | title, summaries |
               "#{title}:\n\t#{summaries.join("\n\t")}\n\n" if summaries.any?
-            end.compact.join
+            end.compact.join + verification.interaction_mismatches.collect(&:to_s).join("\n\n") + "\n"
 
           end
 

data/lib/pact/mock_service/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module MockService
-    VERSION = "3.6.1"
+    VERSION = "3.9.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-mock_service
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.9.1
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-21 00:00:00.000000000 Z
+date: 2021-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -60,16 +60,22 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.19'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.19'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -118,20 +124,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.16'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.16.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.16'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.16.4
 - !ruby/object:Gem::Dependency
   name: filelock
   requirement: !ruby/object:Gem::Requirement
@@ -166,14 +172,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: '13.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: '13.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -399,8 +411,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.2.19
 signing_key: 
 specification_version: 4
 summary: Provides a mock service for use with Pact