pact-mock_service 3.7.0 → 3.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c3129a847616f140d536b6123ab116f691ca5cfd4ded15918d481896a48349f
-  data.tar.gz: ddd7f7761c5f0e49e553047387a0bb90a909de764d317c0dd78ebb1935461656
+  metadata.gz: d16d00c403d1d26138138585d3d47c523d07c22d68e86bbe03281cb365602045
+  data.tar.gz: 8de64b754a090f75feec4ba1da30cf63647ee8e9d0bab378ddcab461427bb4d9
 SHA512:
-  metadata.gz: 1dc4daeac63353379b94f0a4ba9be811b14cf90d14c37de74d6922aecfc765407270df3cc843907817a54570415f72a26d4fac17f9fd726d0aede35e5fb47168
-  data.tar.gz: 5c311e4d4cd99f18aca430e0cfd7d1f9255eec52145843edc84da8c8d72eb39a86ea66aa4fd2c572a7581548bbcf1f4620ca6e75d641f2431afd3ac04f5d553d
+  metadata.gz: 945a1bff98624e8274039efd472e1e58a3882f60ab4ac95c8c3c374ec3a213c2e0b877bfa0b3b025f8aed1aa5af78bcd5bb77f7e3e91e6494f71df9d104231eb
+  data.tar.gz: c4594ee0cc987482f35b92e460116e1a48c52f743850850bd3b949e3a070b53fdf008f833cb0adc837ea886633ee496126c0419ec5b6ace83f57e90c6fcd3762

data/CHANGELOG.md

@@ -1,3 +1,31 @@
+<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)
+
+#### Bug Fixes
+
+* check for nil body rather than falsey body when determining how to render mocked response Fixes: https://github.com/pact-foundation/pact-mock_service/issues/99	 ([d26e520](/../../commit/d26e520))
+
+<a name="v3.9.0"></a>
+### v3.9.0 (2021-05-17)
+
+#### Features
+
+* pass host into WEBrick options to allow configuration (#128)	 ([ec234a4](/../../commit/ec234a4))
+
+<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)
 

data/lib/pact/consumer/server.rb

@@ -83,7 +83,7 @@ module Pact
     end
 
     def webrick_opts
-      opts = { Port: port.nil? ? 0 : port, AccessLog: [], Logger: WEBrick::Log::new(nil, 0) }
+      opts = { Host: host.nil? ? 'localhost' : host, Port: port.nil? ? 0 : port, AccessLog: [], Logger: WEBrick::Log::new(nil, 0) }
       opts.merge!({
         :SSLCertificate => OpenSSL::X509::Certificate.new(File.open(options[:sslcert]).read) }) if options[:sslcert]
       opts.merge!({

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

@@ -182,7 +182,7 @@ module Pact
         end
 
         def self.render_body body
-          return '' unless body
+          return '' if body.nil?
           body.kind_of?(String) ? body.force_encoding('utf-8') : body.to_json
         end
       end

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

@@ -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.7.0"
+    VERSION = "3.10.0"
   end
 end

data/lib/pact/support/metrics.rb

@@ -0,0 +1,85 @@
+require 'securerandom'
+require 'digest'
+require 'socket'
+require 'pact/support/metrics'
+require 'pact/mock_service/version'
+require 'net/http'
+
+module Pact
+  module Support
+    class Metrics
+
+      def self.report_metric(event, category, action, value = 1)
+        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))
+
+                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
+
+      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.7.0
+  version: 3.10.0
 platform: ruby
 authors:
 - James Fraser
@@ -9,10 +9,10 @@ authors:
 - Brent Snook
 - Ronald Holshausen
 - Beth Skurrie
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-13 00:00:00.000000000 Z
+date: 2022-02-21 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.1.4
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Provides a mock service for use with Pact
 test_files: []