stub_server 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 58a7b20389059c4240beb2c6b86528fde3a5ce8a
-  data.tar.gz: 505257acb6a2c64044826aa221d475126bf2bb66
+SHA256:
+  metadata.gz: 155a93e95326f0252760f49f230476e65edd675204748b2860c3da17b2455a85
+  data.tar.gz: 67f52eb9bd2afb995b0e13864c6b91a45848628d18c89db2328b4236e170879d
 SHA512:
-  metadata.gz: ad16c50a613b9ef98ef7b1f6ab1cbe3a2a5dac5013fe8102e2eece17db68c1fac4fa137c72152ce06d9c29b8b70e8764c8efd584e3f3602118fa3fcb48e4a69b
-  data.tar.gz: 58a32d391e31c2d89da28a9ab3860f08787dca21fe7bc90691078a78937e5d5c450ac294af0411700d4fa4d103a8d6be51f8f2502d4ffcbcdf2b408fdad1e9d5
+  metadata.gz: e544936dcb928d37fe10e9aa5ec5810a9c2f67e2978a64659d948d4fa19ff81f469d86bfee1f2a4070eb11481fca1020ad3d8f1e6dd6b052380b8401f286e785
+  data.tar.gz: '0438ec13914e39e7632e7d4a60c30258425587460d0614a8396e13c6f119f825a68580c97ceffc1464b95ab1cbf604cfbdc0d9940cef667db0fe8a6c835031a5'

data/lib/stub_server.rb

@@ -18,10 +18,12 @@ class StubServer
     @json = json
     @webrick = webrick
     @started = false
+    @server = nil
+    @thread = nil
   end
 
   def boot
-    Thread.new do
+    @thread = Thread.new do
       options = {
         Port: @port,
         Logger: WEBrick::Log.new("/dev/null"),
@@ -65,6 +67,17 @@ class StubServer
   end
 
   def shutdown
-    @server.shutdown if @server
+    @server&.shutdown
+    @thread.join # need to wait here and cannot simpliy kill or webbrick keeps running
+
+    # TimeoutHandler keeps running forever which breaks tests that assert no extra threads
+    # we should only stop it if it is empty, otherwise we are still waiting for other servers
+    # ideally we'd use WEBrick::Utils::TimeoutHandler::TimeoutMutex.synchronize to avoid race conditions,
+    # but that is also used in .terminate and would lead to deadlocks ...
+    # TODO: open ruby issue for race-condition free terminate_if_empty
+    return if RUBY_VERSION < "2.4.0"
+    if WEBrick::Utils::TimeoutHandler.instance.instance_variable_get(:@timeout_info).empty?
+      WEBrick::Utils::TimeoutHandler.terminate
+    end
   end
 end

data/lib/stub_server/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 class StubServer
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stub_server
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-05 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -45,7 +45,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Boot up a real server to serve testing replies