pact-mock_service 2.6.3 → 2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cdcb814012c42d3d775df3678b8d5c253424abd4513da41d200519c38a60525
-  data.tar.gz: 829901b8e31e9278b310df2ec9b957425b00099eab97a7f4e6d2ba057f2c8e5a
+  metadata.gz: d09a52e010b09d1a4500bf4562c446accf5b87e2ea62275040895fc707a916d3
+  data.tar.gz: a1055e74617cc213375618e71c99a7fae61b5e4c87204732c3439fba4e8c7935
 SHA512:
-  metadata.gz: 85a74f86ac93caa3edbff287b9feead78f58fd6f755ac8e5fd77a55d17086c00e8875c69f11d47e02a40e8a99be698d95f6764a6f64db5a16347e7a84b7b7027
-  data.tar.gz: 745e3aeea217cc0b48bb8aa706369e6bc0fb1d4608e521e807b583b462bb0f7b39870950d069b6617c98e26f81879999132a6ad61718a58d9c77607fe222f669
+  metadata.gz: f866bc895e0bca3870808409c1b8fed2acc31372d3bba3db16d3bba371ccad209b7a628d66e2c588a15f90eebda2d7bf0f3b35b4e33a28603cdeaceda493952c
+  data.tar.gz: 51480cd67bdc8d87e12a119133537b4bb115ff828885e5f51723383e7081106f1d7da13f5b017417d069ac14636afe85131ff549f190ce0e25428c0ccf77e0be

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+<a name="v2.6.4"></a>
+### v2.6.4 (2018-02-22)
+
+#### Features
+
+* allow output streams and consumer contract writer to be passed in to Pact::ConsumerContractWriter	 ([1856f21](/../../commit/1856f21))
+
+
+#### Bug Fixes
+
+* correctly handle reading locked pact file on windows	 ([2d14562](/../../commit/2d14562))
+
+
 <a name="v2.6.3"></a>
 ### v2.6.3 (2017-12-18)
 

data/README.md

@@ -16,7 +16,7 @@ The mock service provides the following endpoints:
 
 All requests to the "administration" endpoints listed above must contain the header `X-Pact-Mock-Service: true` to allow the mock service to know whether the request is an administration request or a request from the actual consumer code.
 
-As the Pact mock service can be used as a standalone executable and administered via HTTP, it can be used for testing with any language. All that is required is a library in the native language to create the HTTP calls listed above. Check out [docs.pact.io](https://docs.pact.io) for a list of implemented languages. If you are interested in creating bindings in a new langauge, and have a chat to one of us on the [pact-dev Google group][pact-dev].
+As the Pact mock service can be used as a standalone executable and administered via HTTP, it can be used for testing with any language. All that is required is a library in the native language to create the HTTP calls listed above. Check out [docs.pact.io](https://docs.pact.io) for a list of implemented languages. If you are interested in creating bindings in a new language, have a chat to one of us on the [pact-dev Google group][pact-dev].
 
 ## Installation
 
@@ -42,7 +42,7 @@ Run `pact-mock-service help` for command line options.
 
 ## Mock Service Usage
 
-Each mock service process is designed to mock only ONE provider. To mock multiple providers, you will need to start a process for each provider. The lifecycle of the a mock service instance during at test suite is as follows:
+Each mock service process is designed to mock only ONE provider. To mock multiple providers, you will need to start a process for each provider. The lifecycle of a mock service instance during a test suite execution is as follows:
 
 * _Before suite:_ start mock service
 * _Before each test:_ clear interactions from previous test

data/lib/pact/consumer_contract/consumer_contract_writer.rb

@@ -25,6 +25,9 @@ module Pact
       @pactfile_write_mode = (consumer_contract_details[:pactfile_write_mode] || :overwrite).to_sym
       @interactions = consumer_contract_details.fetch(:interactions)
       @pact_specification_version = (consumer_contract_details[:pact_specification_version] || DEFAULT_PACT_SPECIFICATION_VERSION).to_s
+      @consumer_contract_decorator_class = consumer_contract_details[:consumer_contract_decorator_class] || Pact::ConsumerContractDecorator
+      @error_stream = consumer_contract_details[:error_stream] || Pact.configuration.error_stream
+      @output_stream = consumer_contract_details[:output_stream] || Pact.configuration.output_stream
     end
 
     def consumer_contract
@@ -45,7 +48,8 @@ module Pact
 
     private
 
-    attr_reader :consumer_contract_details, :pactfile_write_mode, :interactions, :logger, :pact_specification_version
+    attr_reader :consumer_contract_details, :pactfile_write_mode, :interactions, :logger, :pact_specification_version, :consumer_contract_decorator_class
+    attr_reader :error_stream, :output_stream
 
     def update_pactfile_if_needed
       return if pactfile_write_mode == :none
@@ -56,10 +60,15 @@ module Pact
     def update_pactfile
       logger.info log_message
       FileUtils.mkdir_p File.dirname(pactfile_path)
-      Filelock pactfile_path do | file |
+      Filelock(pactfile_path) do | pact_file |
+        # must be read after obtaining the lock, and must be read from the yielded file object, otherwise windows freaks out
+        @existing_contents = pact_file.read
         new_contents = pact_json
-        file.truncate 0
-        file.write new_contents
+        pact_file.rewind
+        pact_file.truncate 0
+        pact_file.write new_contents
+        pact_file.flush
+        pact_file.truncate(pact_file.pos)
       end
     end
 
@@ -68,7 +77,7 @@ module Pact
     end
 
     def decorated_pact
-      @decorated_pact ||= Pact::ConsumerContractDecorator.new(consumer_contract, pact_specification_version: pact_specification_version)
+      @decorated_pact ||= consumer_contract_decorator_class.new(consumer_contract, pact_specification_version: pact_specification_version)
     end
 
     def interactions_for_new_consumer_contract
@@ -105,18 +114,21 @@ module Pact
       File.size(pactfile_path) != 0
     end
 
+    def existing_contents
+      @existing_contents
+    end
+
     def existing_consumer_contract
-      # This must only be read after the file has been locked
-      Pact::ConsumerContract.from_uri(pactfile_path)
+      @existing_consumer_contract ||= Pact::ConsumerContract.from_json(existing_contents)
     end
 
     def warn_and_stderr msg
-      Pact.configuration.error_stream.puts msg
+      error_stream.puts msg
       logger.warn msg
     end
 
     def info_and_puts msg
-      $stdout.puts msg
+      output_stream.puts msg
       logger.info msg
     end
 

data/lib/pact/mock_service/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module MockService
-    VERSION = "2.6.3"
+    VERSION = "2.6.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-mock_service
 version: !ruby/object:Gem::Version
-  version: 2.6.3
+  version: 2.6.4
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-18 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -398,7 +398,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Provides a mock service for use with Pact