pact-mock_service 3.5.0 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '07408e9dcc7fd09a8e3e9f99b818e9bf7c49a7b8dbc72b3a3e73b2c0d17086ef'
-  data.tar.gz: 9724d49997cce5add29605eae25ec3ed81f7ca3fea3c1eebb6e7a682e481d119
+  metadata.gz: 8c7e28f243ac5e4528b791612d1a98b2d06009dbba1a3b9d1bd88c847cc7f002
+  data.tar.gz: 5239ffe47d71cb551d1b0495005ece64067b1eb333c6e049fbfcc6407e948c3d
 SHA512:
-  metadata.gz: 930ed339b550585517905bec02d6bee7c2f2f32892303934ceab41612f6c499d86730588d48b3c90fb5fd248baa1ad612c48d9a8d49e6ea5c8228f08a010cd0a
-  data.tar.gz: 8615335a96895ac305a554632c5ddf28aca9c73b8ddd9a6c9bcaf23888d6b832e43034993abc40dbf27c93e2a7c868746c54db8e61d153accc4a83d06141ddfe
+  metadata.gz: cdc60fad28f0dfee64ac561b1f6612d9fd3e56648c4f443ea858931891b3f1712ee3e454911b38a5a4559a85fcf47729cc060d5cbafeab1d4e0f249f6885bd75
+  data.tar.gz: c5edb3924ba802afd9dc858b808a261a28fce40a9afc9cc39f16f391499381f2af3b48038921678d15e9d7e0fa35cf87fd0602cd2f20aaef8f1a669c98fab6cb

data/CHANGELOG.md

@@ -1,3 +1,43 @@
+<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)
+
+
+#### Bug Fixes
+
+*  fix Ruby 2.7 kwargs warning (#122)	 ([4a46c21](/../../commit/4a46c21))
+
+
+<a name="v3.6.0"></a>
+### v3.6.0 (2020-03-14)
+
+
+#### Features
+
+* add 'Access-Control-Allow-Headers' = true to cors response headers (#121)	 ([61bd9d1](/../../commit/61bd9d1))
+
+
 <a name="v3.5.0"></a>
 ### v3.5.0 (2020-01-17)
 

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/cors_origin_header_middleware.rb

@@ -23,7 +23,8 @@ module Pact
       private
 
       def add_cors_header env, response
-        [response[0], response[1].merge('Access-Control-Allow-Origin' => env.fetch('HTTP_ORIGIN','*')), response[2]]
+        cors_headers = { 'Access-Control-Allow-Origin' => env.fetch('HTTP_ORIGIN','*'), 'Access-Control-Allow-Credentials' => 'true'}
+        [response[0], response[1].merge(cors_headers), response[2]]
       end
     end
   end

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

@@ -67,7 +67,7 @@ module Pact
 
     def run_default_server(app, port)
       require 'rack/handler/webrick'
-      Rack::Handler::WEBrick.run(app, webrick_opts) do |server|
+      Rack::Handler::WEBrick.run(app, **webrick_opts) do |server|
         @port = server[:Port]
       end
     end

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/control_server/run.rb

@@ -24,7 +24,7 @@ module Pact
           # server, and can't shut it down. So, keep a manual reference to the Webrick server, and
           # shut it down directly rather than use Rack::Handler::WEBrick.shutdown
           # Ruby!
-          Rack::Handler::WEBrick.run(control_server, webbrick_opts) do | server |
+          Rack::Handler::WEBrick.run(control_server, **webbrick_opts) do | server |
             @webrick_server = server
           end
         end

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/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/run.rb

@@ -25,7 +25,7 @@ module Pact
 
         require_monkeypatch
 
-        Rack::Handler::WEBrick.run(mock_service, webbrick_opts)
+        Rack::Handler::WEBrick.run(mock_service, **webbrick_opts)
       end
 
       private

data/lib/pact/mock_service/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module MockService
-    VERSION = "3.5.0"
+    VERSION = "3.8.0"
   end
 end

data/lib/pact/stub_service/cli.rb

@@ -29,7 +29,7 @@ module Pact
       method_option :log, aliases: "-l", desc: "File to which to log output"
       method_option :broker_username, aliases: "-n", desc: "Pact Broker basic auth username", :required => false
       method_option :broker_password, aliases: "-p", desc: "Pact Broker basic auth password", :required => false
-      method_option :broker_token, aliases: "-k", desc: "Pact Broker bearer token", :required => false
+      method_option :broker_token, aliases: "-k", desc: "Pact Broker bearer token (can also be set using the PACT_BROKER_TOKEN environment variable)", :required => false
       method_option :log_level, desc: "Log level. Options are DEBUG INFO WARN ERROR", default: "DEBUG"
       method_option :cors, aliases: "-o", desc: "Support browser security in tests by responding to OPTIONS requests and adding CORS headers to mocked responses"
       method_option :ssl, desc: "Use a self-signed SSL cert to run the service over HTTPS", type: :boolean, default: false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-mock_service
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.8.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-17 00:00:00.000000000 Z
+date: 2021-02-25 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.11
 signing_key: 
 specification_version: 4
 summary: Provides a mock service for use with Pact