pact-mock_service 3.10.0 → 3.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d16d00c403d1d26138138585d3d47c523d07c22d68e86bbe03281cb365602045
-  data.tar.gz: 8de64b754a090f75feec4ba1da30cf63647ee8e9d0bab378ddcab461427bb4d9
+  metadata.gz: 35208bed4d9b93717ba8b35a08aa6f2e56782ea293545592f27083c5c1bbf2e7
+  data.tar.gz: 005f131effb1f86c89e019b897d6c639c2b415e82a2abbd952d857c7bba3159f
 SHA512:
-  metadata.gz: 945a1bff98624e8274039efd472e1e58a3882f60ab4ac95c8c3c374ec3a213c2e0b877bfa0b3b025f8aed1aa5af78bcd5bb77f7e3e91e6494f71df9d104231eb
-  data.tar.gz: c4594ee0cc987482f35b92e460116e1a48c52f743850850bd3b949e3a070b53fdf008f833cb0adc837ea886633ee496126c0419ec5b6ace83f57e90c6fcd3762
+  metadata.gz: 42fbfc013b5b85714fc7708aae97ff6fdc2df21c9fe8f9ad12ade37a7663811ba0e8930243c9cc501eab8cd8dc8a3bcc5677435d58b80aae092ab183a1f4a045
+  data.tar.gz: 63453f0a70730d551afad689e26a2387d1d5f8c9b51b6d145f415c858e695fb3c6620143d956a97d3854818c09b5eac43682d75646ffcbc80fa367c983770afc

data/CHANGELOG.md

@@ -1,3 +1,28 @@
+<a name="v3.11.2"></a>
+### v3.11.2 (2023-05-18)
+
+#### Bug Fixes
+
+* use native lockfile, rather than ruby gem, tested on ruby 3.3.0-dev	 ([9a51a01](/../../commit/9a51a01))
+
+<a name="v3.11.1"></a>
+### v3.11.1 (2023-05-05)
+
+#### Bug Fixes
+
+* set args via ** for diff_formatter.call	 ([96a00a9](/../../commit/96a00a9))
+
+<a name="v3.11.0"></a>
+### v3.11.0 (2022-08-17)
+
+#### Features
+
+* only print metrics warning once per thread	 ([1ae43da](/../../commit/1ae43da))
+
+#### Bug Fixes
+
+* fix ruby `circular require` warning (#136)	 ([615e59c](/../../commit/615e59c))
+
 <a name="v3.10.0"></a>
 ### v3.10.0 (2022-02-21)
 

data/README.md

@@ -130,7 +130,7 @@ Description:
 
 See [CONTRIBUTING.md](/CONTRIBUTING.md)
 
-[pact]: https://github.com/realestate-com-au/pact
+[pact]: https://github.com/pact-foundation/pact-ruby
 [executables]: https://github.com/pact-foundation/pact-ruby-standalone/releases
 [pact-dev]: https://groups.google.com/forum/#!forum/pact-dev
 [wiki]: https://github.com/pact-foundation/pact-mock_service/wiki

data/lib/pact/consumer_contract/consumer_contract_writer.rb

@@ -5,7 +5,6 @@ require 'pact/consumer_contract/pact_file'
 require 'pact/consumer_contract/consumer_contract_decorator'
 require 'pact/shared/active_support_support'
 require 'fileutils'
-require 'filelock'
 
 module Pact
 
@@ -60,8 +59,10 @@ module Pact
     def update_pactfile
       logger.info log_message
       FileUtils.mkdir_p File.dirname(pactfile_path)
-      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
+      # must be read after obtaining the lock, and must be read from the yielded file object, otherwise windows freaks out
+      # https://apidock.com/ruby/File/flock
+      File.open(pactfile_path, File::RDWR|File::CREAT, 0644) {|pact_file|
+        pact_file.flock(File::LOCK_EX)
         @existing_contents = pact_file.read
         new_contents = pact_json
         pact_file.rewind
@@ -69,7 +70,7 @@ module Pact
         pact_file.write new_contents
         pact_file.flush
         pact_file.truncate(pact_file.pos)
-      end
+      }
     end
 
     def pact_json

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

@@ -56,7 +56,7 @@ module Pact
           def to_s
             [
               "Diff with interaction: #{candidate_interaction.description_with_provider_state_quoted}",
-              diff_formatter.call(diff, {colour: false})
+              diff_formatter.call(diff, **{colour: false})
             ].join("\n")
           end
 

data/lib/pact/mock_service/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module MockService
-    VERSION = "3.10.0"
+    VERSION = "3.11.2"
   end
 end

data/lib/pact/support/metrics.rb

@@ -1,7 +1,6 @@
 require 'securerandom'
 require 'digest'
 require 'socket'
-require 'pact/support/metrics'
 require 'pact/mock_service/version'
 require 'net/http'
 
@@ -10,17 +9,21 @@ module Pact
     class Metrics
 
       def self.report_metric(event, category, action, value = 1)
+        do_once_per_thread(:pact_metrics_message_shown) do
+          if track_events?
+            Pact.configuration.output_stream.puts "mock WARN: Please note: we are tracking events anonymously to gather important usage statistics like Pact-Ruby version and operating system. To disable tracking, set the 'PACT_DO_NOT_TRACK' environment variable to 'true'."
+          end
+        end
+
         in_thread do
           begin
             if track_events?
-                Pact.configuration.output_stream.puts "WARN: Please note: we are tracking events anonymously to gather important usage statistics like Pact-Ruby version and operating system. To disable tracking, set the 'PACT_DO_NOT_TRACK' environment variable to 'true'."
-
-                uri = URI('https://www.google-analytics.com/collect')
-                req = Net::HTTP::Post.new(uri)
-                req.set_form_data(create_tracking_event(event, category, action, value))
+              uri = URI('https://www.google-analytics.com/collect')
+              req = Net::HTTP::Post.new(uri)
+              req.set_form_data(create_tracking_event(event, category, action, value))
 
-                Net::HTTP.start(uri.hostname, uri.port, read_timeout:2, open_timeout:2, :use_ssl => true  ) do |http|
-                  http.request(req)
+              Net::HTTP.start(uri.hostname, uri.port, read_timeout:2, open_timeout:2, :use_ssl => true  ) do |http|
+                http.request(req)
               end
             end
           rescue StandardError => e
@@ -43,6 +46,16 @@ module Pact
         end
       end
 
+      # Not super safe to use the thread, but it's good enough for this usecase
+      def self.do_once_per_thread(key)
+        result = nil
+        if !Thread.current[key]
+          result = yield
+        end
+        Thread.current[key] = true
+        result
+      end
+
       def self.create_tracking_event(event, category, action, value)
         {
           "v" => 1,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-mock_service
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.11.2
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-21 00:00:00.000000000 Z
+date: 2023-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -96,28 +96,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: term-ansicolor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: pact-support
   requirement: !ruby/object:Gem::Requirement
@@ -138,20 +124,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.16.4
-- !ruby/object:Gem::Dependency
-  name: filelock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -220,14 +192,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -412,7 +384,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: Provides a mock service for use with Pact