pact-mock_service 3.4.0 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e2f124e5c5dcc30b7da04339d08060ebff78da1ea42124b70e38bb8dc9640e2
-  data.tar.gz: d3bd8504db25fe694049c4781afa05475ec685650be7f95a731b89a3cdb7e86e
+  metadata.gz: 9c3129a847616f140d536b6123ab116f691ca5cfd4ded15918d481896a48349f
+  data.tar.gz: ddd7f7761c5f0e49e553047387a0bb90a909de764d317c0dd78ebb1935461656
 SHA512:
-  metadata.gz: 4ddbe4e7896061f66dde24509fe19530cf2a3da38f74d1bf1c87631c383c73a774cec603cc4df2d4b8c1a9d3d5189fc2ab04ce4dec53eb61cb47c5c0c6648dfa
-  data.tar.gz: 322eb829df216e995d2d763260f81b87ee302696fa1195b9f6a6a14208d44de346b26e08d626c62ac511ddd696a941dc7bfe2942e3b0aa36a2b54727acce80a9
+  metadata.gz: 1dc4daeac63353379b94f0a4ba9be811b14cf90d14c37de74d6922aecfc765407270df3cc843907817a54570415f72a26d4fac17f9fd726d0aede35e5fb47168
+  data.tar.gz: 5c311e4d4cd99f18aca430e0cfd7d1f9255eec52145843edc84da8c8d72eb39a86ea66aa4fd2c572a7581548bbcf1f4620ca6e75d641f2431afd3ac04f5d553d

data/CHANGELOG.md

@@ -1,3 +1,45 @@
+<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)
+
+
+#### Features
+
+* add token, username and password options to stub service (#118)	 ([76236d8](/../../commit/76236d8))
+
+
 <a name="v3.3.1"></a>
 ### v3.3.1 (2020-01-16)
 

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

@@ -17,6 +17,7 @@ module Pact
     class App
       def initialize options = {}
         logger = Logger.from_options(options)
+        @options = options
         stubbing = options[:stub_pactfile_paths] && options[:stub_pactfile_paths].any?
         @name = options.fetch(:name, "MockService")
         @session = Session.new(options.merge(logger: logger, warn_on_too_many_interactions: !stubbing))
@@ -40,7 +41,7 @@ module Pact
       def setup_stub stub_pactfile_paths
         interactions = stub_pactfile_paths.collect do | pactfile_path |
           $stdout.puts "INFO: Loading interactions from #{pactfile_path}"
-          hash_interactions = JSON.parse(Pact::PactFile.read(pactfile_path))['interactions']
+          hash_interactions = JSON.parse(Pact::PactFile.read(pactfile_path, pactfile_options))['interactions']
           hash_interactions.collect { | hash | Interaction.from_hash(hash) }
         end.flatten
         @session.set_expected_interactions interactions
@@ -57,6 +58,20 @@ module Pact
       def to_s
         "#{@name} #{super.to_s}"
       end
+
+      private
+
+      def pactfile_options
+        {
+          :token => broker_token,
+          :username => @options[:broker_username],
+          :password => @options[:broker_password],
+        }
+      end
+
+      def broker_token
+        @options[:broker_token] || ENV['PACT_BROKER_TOKEN']
+      end
     end
 
     # Can't write to a file in a TRAP, might deadlock

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/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
@@ -58,6 +58,9 @@ module Pact
           unique_pact_file_names: options[:unique_pact_file_names],
           consumer: options[:consumer],
           provider: options[:provider],
+          broker_token: options[:broker_token],
+          broker_username: options[:broker_username],
+          broker_password: options[:broker_password],
           cors_enabled: options[:cors],
           pact_specification_version: options[:pact_specification_version] || Pact::SpecificationVersion::NIL_VERSION.to_s,
           pactfile_write_mode: options[:pact_file_write_mode],

data/lib/pact/mock_service/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module MockService
-    VERSION = "3.4.0"
+    VERSION = "3.7.0"
   end
 end

data/lib/pact/stub_service/cli.rb

@@ -27,6 +27,9 @@ module Pact
       method_option :port, aliases: "-p", desc: "Port on which to run the service"
       method_option :host, aliases: "-h", desc: "Host on which to bind the service", default: 'localhost'
       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 (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.4.0
+  version: 3.7.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-16 00:00:00.000000000 Z
+date: 2020-11-13 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.1.4
 signing_key: 
 specification_version: 4
 summary: Provides a mock service for use with Pact