pact-mock_service 2.1.1.pre.alpha.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5693645528ece7ef91958e2598f64bba38215104
-  data.tar.gz: 3a57c015eb730e45150a23a0b63b818461e61cbc
+  metadata.gz: 0cf900a12d4f91a4ff30a3e9f524f989ffedca18
+  data.tar.gz: ac91a2457b5d83c349c70663682dfae00e22af08
 SHA512:
-  metadata.gz: e64fe9e5ed774d2bef6f2a2b8746b5dbb9f6e46ff586ebc37957c0bd9719444b31972dbb5aaf43b52046b85752bd0d2cc628102233d486387a97d07d26a362f1
-  data.tar.gz: 9713fb5b520bcff76a6e45aafb88dd17835e311a907e88288f4a3b6502c702a287af7cf6acb9af8b7f670371e8000f33aaed214db7d57555bf753bfa79936046
+  metadata.gz: 296f813db0e501057558d0cdb241b56fba89144be5822f2aac010b9cfbdabf960ae644a4a508eb6ae37192b042901f3180a093a210e7c3372ee20ba3db487598
+  data.tar.gz: fbc2b07d41210eaf4fafe758e6135c9ca41bfe9038a5d8f327eb5dd86ef6fb9a89d81d82f0a4caaa8a0fbf6a1c46f2b1c68ce2efc7e0444f3792631a3cf57c0a

data/CHANGELOG.md

@@ -2,6 +2,9 @@ Do this to generate your change history
 
   git log --pretty=format:'  * %h - %s (%an, %ad)' vX.Y.Z..HEAD
 
+### 2.2.0 (2017-09-30)
+* 3949e3d - feat(cli): add --unique-pact-file-names option (Beth Skurrie, Thu Sep 28 11:16:22 2017 +1000)
+
 ### 2.1.0 (12 May 2017)
 * 5b89d95 - Updated location of pact specification version in pact to metadata.pactSpecification.version. As per issue #137 (Beth Skurrie, Fri May 12 11:03:54 2017 +1000)
 * b85ad94 - Update mock service interaction decorator to use providerState between the consumer DSL and the mock service, just to avoid any further confusion! (Beth Skurrie, Fri May 12 08:41:56 2017 +1000)

data/Gemfile

@@ -5,4 +5,4 @@ gemspec
 
 if ENV['X_PACT_DEVELOPMENT']
   gem 'pact-support', path: '../pact-support'
-end
+end

data/lib/pact/consumer_contract/consumer_contract_writer.rb

@@ -129,7 +129,7 @@ module Pact
 
     def pactfile_path
       raise 'You must specify a consumer and provider name' unless (consumer_name && provider_name)
-      file_path consumer_name, provider_name, pact_dir
+      file_path consumer_name, provider_name, pact_dir, unique: consumer_contract_details[:unique_pact_file_names]
     end
 
     def pact_dir

data/lib/pact/mock_service/cli.rb

@@ -5,7 +5,6 @@ require 'fileutils'
 require 'pact/mock_service/server/wait_for_server_up'
 require 'pact/mock_service/cli/pidfile'
 require 'socket'
-require 'rake/file_utils'
 
 module Pact
   module MockService
@@ -20,6 +19,7 @@ module Pact
       method_option :sslkey, desc: "Specify the path to the SSL key to use when running the service over HTTPS"
       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 :pact_dir, aliases: "-d", desc: "Directory to which the pacts will be written"
+      method_option :unique_pact_file_names, aliases: "-u", desc: "Set to true when running multiple mock service instances in parallel for the same consumer/provider pair", type: :boolean, default: false
       method_option :pact_specification_version, aliases: "-i", desc: "The pact specification version to use when writing the pact", default: '1'
       method_option :consumer, desc: "Consumer name"
       method_option :provider, desc: "Provider name"
@@ -34,6 +34,7 @@ module Pact
       method_option :host, aliases: "-h", desc: "Host on which to bind the service", default: 'localhost'
       method_option :log_dir, aliases: "-l", desc: "File to which to log output"
       method_option :pact_dir, aliases: "-d", desc: "Directory to which the pacts will be written"
+      method_option :unique_pact_file_names, aliases: "-u", desc: "Set to true when running multiple mock service instances in parallel for the same consumer/provider pair", type: :boolean, default: false
       method_option :pact_specification_version, aliases: "-i", desc: "The pact specification version to use when writing the pact", default: '1'
       method_option :ssl, desc: "Use a self-signed SSL cert to run the service over HTTPS", type: :boolean, default: false
       method_option :sslcert, desc: "Specify the path to the SSL cert to use when running the service over HTTPS"
@@ -54,13 +55,16 @@ module Pact
       method_option :sslkey, desc: "Specify the path to the SSL key to use when running the service over HTTPS"
       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 :pact_dir, aliases: "-d", desc: "Directory to which the pacts will be written"
+      method_option :unique_pact_file_names, aliases: "-u", desc: "Set to true when running multiple mock service instances in parallel for the same consumer/provider pair", type: :boolean, default: false
       method_option :pact_specification_version, aliases: "-i", desc: "The pact specification version to use when writing the pact", default: '1'
       method_option :consumer, desc: "Consumer name"
       method_option :provider, desc: "Provider name"
       method_option :pid_dir, desc: "PID dir", default: 'tmp/pids'
 
       def start
-        spawn_mock_service
+        start_server(mock_service_pidfile) do
+          service
+        end
       end
 
       desc 'stop', "Stop a Pact mock service"
@@ -80,6 +84,7 @@ module Pact
       method_option :sslkey, desc: "Specify the path to the SSL key to use when running the service over HTTPS"
       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 :pact_dir, aliases: "-d", desc: "Directory to which the pacts will be written"
+      method_option :unique_pact_file_names, aliases: "-u", desc: "Set to true when running multiple mock service instances in parallel for the same consumer/provider pair", type: :boolean, default: false
       method_option :pact_specification_version, aliases: "-i", desc: "The pact specification version to use when writing the pact", default: '1'
       method_option :consumer, desc: "Consumer name"
       method_option :provider, desc: "Provider name"
@@ -99,6 +104,7 @@ module Pact
       method_option :sslkey, desc: "Specify the path to the SSL key to use when running the service over HTTPS"
       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 :pact_dir, aliases: "-d", desc: "Directory to which the pacts will be written", default: "."
+      method_option :unique_pact_file_names, aliases: "-u", desc: "Set to true when running multiple mock service instances in parallel for the same consumer/provider pair", type: :boolean, default: false
       method_option :pact_specification_version, aliases: "-i", desc: "The pact specification version to use when writing the pact", default: '1'
       method_option :pid_dir, desc: "PID dir", default: "tmp/pids"
 
@@ -124,6 +130,7 @@ module Pact
       method_option :sslkey, desc: "Specify the path to the SSL key to use when running the service over HTTPS"
       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 :pact_dir, aliases: "-d", desc: "Directory to which the pacts will be written", default: "."
+      method_option :unique_pact_file_names, aliases: "-u", desc: "Set to true when running multiple mock service instances in parallel for the same consumer/provider pair", type: :boolean, default: false
       method_option :pact_specification_version, aliases: "-i", desc: "The pact specification version to use when writing the pact", default: '1'
       method_option :pid_dir, desc: "PID dir", default: "tmp/pids"
 
@@ -173,34 +180,6 @@ module Pact
             yield
           end
         end
-
-        def spawn_mock_service
-          require 'pact/mock_service/server/windows_safe_spawn'
-          pidfile = mock_service_pidfile
-          Pact::MockService::Server::WindowsSafeSpawn.(service_spawn_command, pidfile, options[:port], options[:ssl])
-        end
-
-        def service_spawn_command
-          command = []
-          if ENV['PACT_STANDALONE_WRAPPER_PATH']
-            command << ENV['PACT_STANDALONE_WRAPPER_PATH']
-          else
-            command << FileUtils::RUBY
-            command << "-S #{$0}"
-          end
-          command << "service"
-          command += build_service_options
-          command.join(" ")
-        end
-
-        def service_switch_names
-          Pact::MockService::CLI.commands['service'].options.values.each_with_object({}){| option, hash| hash[option.human_name] = option.switch_name }
-        end
-
-        def build_service_options
-          switch_names = service_switch_names
-          options.collect{ |key, value| "#{switch_names[key]} #{value}" if switch_names[key] }.compact
-        end
       end
     end
   end

data/lib/pact/mock_service/cli/pidfile.rb

@@ -1,5 +1,4 @@
 require 'fileutils'
-require 'pact/mock_service/os'
 
 module Pact
   module MockService
@@ -74,13 +73,14 @@ module Pact
             sleep sleep_time
             tries += 1
           end
-          raise "Process #{pid_from_file} not stopped after #{100 * sleep_time} seconds." if process_running?
+          raise "Process #{pid_from_file} not stopped after {100 * sleep_time} seconds." if process_running?
         end
 
         def kill_process
           if file_exists?
             begin
-              windows? ? windows_kill : kill_2
+              `ps -ef | grep pact`
+              Process.kill 2, pid_from_file
               waitpid
               delete
             rescue Errno::ESRCH
@@ -91,19 +91,6 @@ module Pact
             $stderr.puts "No PID file found at #{pidfile_path}, server probably not running. Use `ps -ef | grep pact` if you suspect the process is still running."
           end
         end
-
-        def windows?
-          Pact::MockService::OS.windows?
-        end
-
-        def kill_2
-          Process.kill 2, pid_from_file
-        end
-
-        def windows_kill
-         cmd = "taskkill /f /pid #{pid_from_file}"
-         `#{cmd}`
-        end
       end
     end
   end

data/lib/pact/mock_service/control_server/run.rb

@@ -51,6 +51,7 @@ module Pact
           {
             log_dir: options[:log_dir] || "log",
             pact_dir: options[:pact_dir] || ".",
+            unique_pact_file_names: options[:unique_pact_file_names],
             cors_enabled: options[:cors] || false,
             ssl: options[:ssl]
           }

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

@@ -12,7 +12,7 @@ module Pact
         end
 
         def to_s
-          "An interaction with same description (#{new_interaction.description.inspect}) and provider state (#{new_interaction.provider_state.inspect}) but a different #{differences} has already been used. Please use a different description or provider state."
+          "An interaction with same description (#{new_interaction.description.inspect}) and provider state (#{new_interaction.provider_state.inspect}) but a different #{differences} has already been used. Please use a different description or provider state, or hard-code any random data."
         end
 
         private

data/lib/pact/mock_service/run.rb

@@ -48,6 +48,7 @@ module Pact
       def service_options
         service_options = {
           pact_dir: options[:pact_dir],
+          unique_pact_file_names: options[:unique_pact_file_names],
           consumer: options[:consumer],
           provider: options[:provider],
           cors_enabled: options[:cors],

data/lib/pact/mock_service/session.rb

@@ -20,6 +20,7 @@ module Pact
         @verified_interactions = Interactions::VerifiedInteractions.new
         @consumer_contract_details = {
           pact_dir: options[:pact_dir],
+          unique_pact_file_names: options[:unique_pact_file_names],
           consumer: {name: options[:consumer]},
           provider: {name: options[:provider]},
           interactions: verified_interactions,

data/lib/pact/mock_service/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module MockService
-    VERSION = "2.1.1-alpha.2"
+    VERSION = "2.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-mock_service
 version: !ruby/object:Gem::Version
-  version: 2.1.1.pre.alpha.2
+  version: 2.2.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2017-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -132,14 +132,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -302,7 +302,6 @@ files:
 - lib/pact/mock_service/interactions/verification.rb
 - lib/pact/mock_service/interactions/verified_interactions.rb
 - lib/pact/mock_service/logger.rb
-- lib/pact/mock_service/os.rb
 - lib/pact/mock_service/request_decorator.rb
 - lib/pact/mock_service/request_handlers.rb
 - lib/pact/mock_service/request_handlers/base_administration_request_handler.rb
@@ -323,7 +322,6 @@ files:
 - lib/pact/mock_service/server/respawn.rb
 - lib/pact/mock_service/server/spawn.rb
 - lib/pact/mock_service/server/wait_for_server_up.rb
-- lib/pact/mock_service/server/windows_safe_spawn.rb
 - lib/pact/mock_service/session.rb
 - lib/pact/mock_service/spawn.rb
 - lib/pact/mock_service/version.rb
@@ -342,9 +340,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.12

data/lib/pact/mock_service/os.rb

@@ -1,13 +0,0 @@
-module Pact
-  module MockService
-    module OS
-
-      extend self
-
-      # Thanks RSpec
-      def windows?
-        !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
-      end
-    end
-  end
-end

data/lib/pact/mock_service/server/windows_safe_spawn.rb

@@ -1,44 +0,0 @@
-require 'pact/mock_service/server/wait_for_server_up'
-require 'pact/mock_service/os'
-
-module Pact
-  module MockService
-    module Server
-      class WindowsSafeSpawn
-
-        class PortUnavailableError < StandardError; end
-
-        def self.call command, pidfile, port, ssl = false
-          if pidfile.can_start?
-            if port_available? port
-              pid = spawn(command, spawn_options)
-              pidfile.pid = pid
-              Process.detach(pid)
-              Server::WaitForServerUp.(port, {ssl: ssl})
-              pidfile.write
-            else
-              raise PortUnavailableError.new("ERROR: Port #{port} already in use.")
-            end
-          end
-        end
-
-        def self.spawn_options
-          if Pact::MockService::OS.windows?
-            {new_pgroup: true}
-          else
-            {}
-          end
-        end
-
-        def self.port_available? port
-          server = TCPServer.new('127.0.0.1', port)
-          true
-        rescue
-          false
-        ensure
-          server.close if server
-        end
-      end
-    end
-  end
-end