pact-mock_service 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5608731e44a840bffd2027c74f46063358559524
-  data.tar.gz: 010ace178b9dbf2a13ae9958980052aa5d9fe311
+  metadata.gz: b2fe31dd5077800edd5307e100979a92d3056eb9
+  data.tar.gz: cae8ad2a915922e11bab37deb7e38dbc6a467314
 SHA512:
-  metadata.gz: f0907e1d76e88a74d3826c1eba4615675a12bd7e1f5ae4e8e1ce2c083cda257d0fd9f3cb33e1ee137174ad8ba1bf62363a040a887afbb20f01ab9668a8708aff
-  data.tar.gz: 32ad9969e394768166b7aa66f7b4b447c4e35dea5c12666309a691597aff027d67d2314e2d4e7e9659cee00b01654ea4b4c091ccff8db25fbfd130799731a27f
+  metadata.gz: 8156beaceb8f03bc993d9510455fc194fe7dc60705521621cf016b660f73ef1a58cde961f322fcde32f76c02745800523a824b345a2e4ccda3f1dc90c564c7c6
+  data.tar.gz: 50b3011a79bd77eb5f905433ec9e78b31450925acbb79da724e6630ae65da005920be792b90c4c243da26c07354f2055920bb2102d3c9542dadbf25772cf1d9f

data/CHANGELOG.md

@@ -2,6 +2,20 @@ Do this to generate your change history
 
   git log --pretty=format:'  * %h - %s (%an, %ad)' vX.Y.Z..HEAD
 
+### 0.8.2 (19 April 2016)
+* e392333 - Merge pull request #45 from aaronrenner/ar-fix-almost-duplicate-error-web-response (Beth Skurrie, Tue Apr 19 09:53:01 2016 +1000)
+* 6fbcce2 - Fixed invalid Rack response on AlmostDuplicateInteractionError (Aaron Renner, Mon Apr 18 14:08:19 2016 -0600)
+* 2cdce52 - Merge pull request #44 from sebdiem/sebdiem/add_host_option (Sergei Matheson, Tue Mar 29 09:23:35 2016 +1100)
+* a76a321 - add host option for control server (Sébastien Diemer, Sun Mar 27 23:25:19 2016 +0200)
+* aadbb8d - Merge pull request #43 from taiki45/find-available-port-option (Sergei Matheson, Mon Mar 21 09:35:40 2016 +1100)
+* 98c9233 - remove --pact-dir from the windows bat file #41 (Ron Holshausen, Fri Mar 18 11:42:22 2016 +1100)
+* f4c2fa5 - Fix timing issue on server test (Taiki Ono, Thu Mar 17 17:24:22 2016 +0900)
+* 0655161 - Format code (Taiki Ono, Thu Mar 17 00:19:45 2016 +0900)
+* fbea6d4 - Support find_available_port option (Taiki Ono, Wed Mar 16 19:12:36 2016 +0900)
+* e72b0cd - WEBrick expects port as Integer (Taiki Ono, Wed Feb 24 19:16:57 2016 +0900)
+* 9580c41 - Merge pull request #42 from taiki45/update-travis-ci-setting (Sergei Matheson, Wed Mar 16 19:59:08 2016 +1100)
+* 01b90e0 - Update Travis CI setting with new Rubies (Taiki Ono, Sun Mar 13 21:19:43 2016 +0900)
+
 
 ### 0.8.1 (25 February 2016)
 * ffa37f8 - Merge pull request #40 from taiki45/add-option-not-to-write-pact-file (Beth Skurrie, Thu Feb 25 09:33:30 2016 +1100)

data/lib/pact/consumer/server.rb

@@ -70,10 +70,13 @@ module Pact
 
     def run_default_server(app, port)
       require 'rack/handler/webrick'
-      Rack::Handler::WEBrick.run(app, webrick_opts)
+      Rack::Handler::WEBrick.run(app, webrick_opts) do |server|
+        @port = server[:Port]
+      end
     end
 
     def get_identity
+      return false unless @port
       http = Net::HTTP.new host, @port
       if options[:ssl]
         http.use_ssl = true
@@ -83,33 +86,25 @@ module Pact
     end
 
     def webrick_opts
-      opts = {:Port => port, :AccessLog => [], :Logger => WEBrick::Log::new(nil, 0)}
+      opts = {Port: port.nil? ? 0 : port, AccessLog: [], Logger: WEBrick::Log::new(nil, 0)}
       opts.merge!(ssl_opts) if options[:ssl]
       opts
     end
 
     def ssl_opts
-      {
-        :SSLEnable => true,
-        :SSLCertName => [ %w[CN localhost] ]
-      }
+      { SSLEnable: true, SSLCertName: [ %w[CN localhost] ] }
     end
 
     def boot
       unless responsive?
-        Pact::Server.ports[@app.object_id] = @port
-
-        @server_thread = Thread.new do
-          run_default_server(@middleware, @port)
-        end
-
+        @server_thread = Thread.new { run_default_server(@middleware, @port) }
         Timeout.timeout(60) { @server_thread.join(0.1) until responsive? }
       end
     rescue Timeout::Error
       raise "Rack application timed out during boot"
     else
+      Pact::Server.ports[@app.object_id] = @port
       self
     end
-
   end
 end

data/lib/pact/mock_service/app_manager.rb

@@ -2,12 +2,10 @@ require 'thwait'
 
 require 'net/http'
 require 'uri'
-require 'find_a_port'
 require 'pact/logging'
 require 'pact/consumer/server'
 require 'singleton'
 require 'pact/mock_service/app'
-require 'find_a_port'
 
 module Pact
   module MockService
@@ -22,20 +20,29 @@ module Pact
         @app_registrations = []
       end
 
-      def register_mock_service_for name, url, options = {}
+      def register_mock_service_for(name, url, options = {})
         uri = URI(url)
         raise "Currently only http is supported" unless uri.scheme == 'http'
         raise "Currently only services on localhost are supported" unless uri.host == 'localhost'
+        uri.port = nil if options[:find_available_port]
 
-        register(Pact::MockService.new(log_file: create_log_file(name), name: name, pact_dir: pact_dir, pact_specification_version: options[:pact_specification_version]), uri.port)
+        app = Pact::MockService.new(
+          name: name,
+          log_file: create_log_file(name),
+          pact_dir: pact_dir,
+          pact_specification_version: options[:pact_specification_version]
+        )
+        register(app, uri.port)
       end
 
-      def register(app, port = FindAPort.available_port)
-        existing = existing_app_on_port port
-        raise "Port #{port} is already being used by #{existing}" if existing and not existing == app
-        app_registration = register_app app, port
-        app_registration.spawn if @apps_spawned
-        port
+      def register(app, port = nil)
+        if port
+          existing = existing_app_on_port(port)
+          raise "Port #{port} is already being used by #{existing}" if existing and not existing == app
+        end
+        app_registration = register_app(app, port)
+        app_registration.spawn
+        app_registration.port
       end
 
       def ports_of_mock_services
@@ -63,12 +70,12 @@ module Pact
 
       private
 
-      def existing_app_on_port port
-        app_registration = registration_on_port port
+      def existing_app_on_port(port)
+        app_registration = registration_on_port(port)
         app_registration ? app_registration.app : nil
       end
 
-      def registration_on_port port
+      def registration_on_port(port)
         @app_registrations.find { |app_registration| app_registration.port == port }
       end
 
@@ -76,18 +83,18 @@ module Pact
         Pact.configuration.pact_dir
       end
 
-      def create_log_file service_name
-        FileUtils::mkdir_p Pact.configuration.log_dir
+      def create_log_file(service_name)
+        FileUtils::mkdir_p(Pact.configuration.log_dir)
         log = File.open(log_file_path(service_name), 'w')
         log.sync = true
         log
       end
 
-      def log_file_path service_name
+      def log_file_path(service_name)
         File.join(Pact.configuration.log_dir, "#{log_file_name(service_name)}.log")
       end
 
-      def log_file_name service_name
+      def log_file_name(service_name)
         lower_case_name = service_name.downcase.gsub(/\s+/, '_')
         if lower_case_name.include?('_service')
           lower_case_name.gsub('_service', '_mock_service')
@@ -100,8 +107,8 @@ module Pact
         @app_registrations
       end
 
-      def register_app app, port
-        app_registration = AppRegistration.new :app => app, :port => port
+      def register_app(app, port)
+        app_registration = AppRegistration.new(app: app, port: port)
         app_registrations << app_registration
         app_registration
       end
@@ -109,10 +116,9 @@ module Pact
 
     class AppRegistration
       include Pact::Logging
-      attr_accessor :port
-      attr_accessor :app
+      attr_accessor :port, :app
 
-      def initialize opts
+      def initialize(opts)
         @max_wait = 10
         @port = opts[:port]
         @app = opts[:app]
@@ -133,7 +139,7 @@ module Pact
       end
 
       def is_a_mock_service?
-        app.is_a? Pact::MockService::App
+        app.is_a?(Pact::MockService::App)
       end
 
       def to_s
@@ -143,6 +149,7 @@ module Pact
       def spawn
         logger.info "Starting app #{self}..."
         @server = Pact::Server.new(app, port).boot
+        @port = @server.port
         @spawned = true
         logger.info "Started on port #{port}"
       end

data/lib/pact/mock_service/cli.rb

@@ -28,6 +28,7 @@ module Pact
 
       desc 'control', "Run a Pact mock service control server."
       method_option :port, aliases: "-p", desc: "Port on which to run the service"
+      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 :pact_specification_version, aliases: "-i", desc: "The pact specification version to use when writing the pact", default: '1'

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

@@ -59,6 +59,7 @@ module Pact
         def webbrick_opts
           {
             :Port => options[:port],
+            :Host => options[:host],
             :AccessLog => []
           }
         end

data/lib/pact/mock_service/request_handlers/interactions_put.rb

@@ -28,7 +28,7 @@ module Pact
             session.set_expected_interactions interactions
             [200, {}, ['Set interactions']]
           rescue AlmostDuplicateInteractionError => e
-            [500, {}, e.message]
+            [500, {}, [e.message]]
           end
         end
 

data/lib/pact/mock_service/run.rb

@@ -83,7 +83,7 @@ module Pact
       end
 
       def port
-        @port ||= options[:port] || FindAPort.available_port
+        @port ||= (options[:port] || FindAPort.available_port).to_i
       end
 
       def host

data/lib/pact/mock_service/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module MockService
-    VERSION = "0.8.1"
+    VERSION = "0.8.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-mock_service
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -331,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Provides a mock service for use with Pact