pact-mock_service 3.9.1 → 3.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27e87ccc6396fefe1efbf08fdec3565431f999d0baece2f465f3c60c93af5887
-  data.tar.gz: c6b4c99af70294e44082cec35e1b94e7626cf2a90f491804294120bcde2c6ae6
+  metadata.gz: 900bf74ef5f7b348d47bf9a91d116c4f5076c41210215c40535440c255057616
+  data.tar.gz: f2a22aee36bf3586cc426851bcebd60361ba5677a2ceda9b67bc8dca578c6fdd
 SHA512:
-  metadata.gz: 84a2589c7758219995e685dcb817b839540a502b38364795a81579245dc3b9f3baf3517e06705580c29a714493be009618c5c7ab2d356b389db0d20d46061f84
-  data.tar.gz: 2c0261cd92e97aadda278032f0098912f9d088e835dac58912fa96ad028613c01d1f423378d5b9cbde7c6d20b772e70ab93a997c5b5b7203974248f97f734d0e
+  metadata.gz: 32c18b8449aa4de2710e1b73240a3ce8d0cc9a97bc65dd2593f68b6204ea929da24b8f6251ba726634e17dc44a1f23776e86706a79bb8e743bcc0506e492ae80
+  data.tar.gz: 9ac2eca533f4c35ea4a38f4f9aba3f64a71f067ec10b8d7cf6b7d48eee9b19d25c36d35d98adf049da0977d5ed965fb4fc2ff93e68629e74f049bb6092028a24

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+<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)
+
+#### Features
+
+* add telemetry	 ([db5dfa5](/../../commit/db5dfa5))
+
 <a name="v3.9.1"></a>
 ### v3.9.1 (2021-06-03)
 

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/mock_service/app_manager.rb

@@ -4,6 +4,7 @@ require 'pact/logging'
 require 'pact/consumer/server'
 require 'singleton'
 require 'pact/mock_service/app'
+require 'pact/support/metrics'
 
 module Pact
   module MockService
@@ -29,6 +30,8 @@ module Pact
           pact_dir: pact_dir,
           pact_specification_version: options.fetch(:pact_specification_version)
         )
+
+        Pact::Support::Metrics.report_metric("Pact mock server started", "ConsumerTest", "MockServerStarted")
         register(app, uri.host, uri.port)
       end
 

data/lib/pact/mock_service/run.rb

@@ -4,6 +4,7 @@ require 'pact/consumer/mock_service/set_location'
 require 'pact/mock_service/run'
 require 'pact/mock_service/server/webrick_request_monkeypatch'
 require 'pact/specification_version'
+require 'pact/support/metrics'
 
 module Pact
   module MockService
@@ -35,6 +36,7 @@ module Pact
       def mock_service
         @mock_service ||= begin
           mock_service = Pact::MockService.new(service_options)
+          Pact::Support::Metrics.report_metric("Pact mock server started", "ConsumerTest", "MockServerStarted")
           Pact::Consumer::SetLocation.new(mock_service, base_url)
         end
       end

data/lib/pact/mock_service/version.rb

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

data/lib/pact/support/metrics.rb

@@ -0,0 +1,98 @@
+require 'securerandom'
+require 'digest'
+require 'socket'
+require 'pact/mock_service/version'
+require 'net/http'
+
+module Pact
+  module Support
+    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?
+              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)
+              end
+            end
+          rescue StandardError => e
+            handle_error(e)
+          end
+        end
+      end
+
+      private
+
+      def self.handle_error e
+        if ENV['PACT_METRICS_DEBUG'] == 'true'
+          Pact.configuration.output_stream.puts("DEBUG: #{e.inspect}\n" + e.backtrace.join("\n"))
+        end
+      end
+
+      def self.in_thread
+        Thread.new do
+          yield
+        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,
+          "t" => "event",
+          "tid" => "UA-117778936-1",
+          "cid" => calculate_cid,
+          "an" => "Pact Mock Service",
+          "av" => Pact::MockService::VERSION,
+          "aid" => "pact-mock_service",
+          "aip" => 1,
+          "ds" => ENV['PACT_EXECUTING_LANGUAGE'] ? "client" : "cli",
+          "cd2" => ENV['CI'] == "true" ? "CI" : "unknown",
+          "cd3" => RUBY_PLATFORM,
+          "cd6" => ENV['PACT_EXECUTING_LANGUAGE'] || "unknown",
+          "cd7" => ENV['PACT_EXECUTING_LANGUAGE_VERSION'],
+          "el" => event,
+          "ec" => category,
+          "ea" => action,
+          "ev" => value
+        }
+      end
+
+      def self.track_events?
+        ENV['PACT_DO_NOT_TRACK'] != 'true'
+      end
+
+      def self.calculate_cid
+        if RUBY_PLATFORM.include? "windows"
+          hostname = ENV['COMPUTERNAME']
+        else
+          hostname = ENV['HOSTNAME']
+        end
+        if !hostname
+          hostname = Socket.gethostname
+        end
+        Digest::MD5.hexdigest hostname || SecureRandom.urlsafe_base64(5)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-mock_service
 version: !ruby/object:Gem::Version
-  version: 3.9.1
+  version: 3.11.0
 platform: ruby
 authors:
 - James Fraser
@@ -9,10 +9,10 @@ authors:
 - Brent Snook
 - Ronald Holshausen
 - Beth Skurrie
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-03 00:00:00.000000000 Z
+date: 2023-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -312,7 +312,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
-description: 
+description:
 email:
 - james.fraser@alumni.swinburne.edu
 - sergei.matheson@gmail.com
@@ -392,11 +392,12 @@ files:
 - lib/pact/mock_service/version.rb
 - lib/pact/stub_service/cli.rb
 - lib/pact/support/expand_file_list.rb
+- lib/pact/support/metrics.rb
 homepage: https://github.com/bethesque/pact-mock_service
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -411,8 +412,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.19
-signing_key: 
+rubygems_version: 3.4.4
+signing_key:
 specification_version: 4
 summary: Provides a mock service for use with Pact
 test_files: []