stub_server 0.2.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 58a7b20389059c4240beb2c6b86528fde3a5ce8a
-  data.tar.gz: 505257acb6a2c64044826aa221d475126bf2bb66
+SHA256:
+  metadata.gz: 05ae6e405bf5a0cba95079404c91d8d6d2c9ce3db5c7b8945152317784ac557e
+  data.tar.gz: 63ffb7d7b3ecfd68efb46afc7bc3b057c44330cd7d90efe314c3ba1abd43b1d1
 SHA512:
-  metadata.gz: ad16c50a613b9ef98ef7b1f6ab1cbe3a2a5dac5013fe8102e2eece17db68c1fac4fa137c72152ce06d9c29b8b70e8764c8efd584e3f3602118fa3fcb48e4a69b
-  data.tar.gz: 58a32d391e31c2d89da28a9ab3860f08787dca21fe7bc90691078a78937e5d5c450ac294af0411700d4fa4d103a8d6be51f8f2502d4ffcbcdf2b408fdad1e9d5
+  metadata.gz: 740f2b4d866208cb25d9327bd1641709383212532fd826de9821f5c136b5a7f103447780337c51bc93974308c856db9f5e76e3840c05c3d243144510af2679a1
+  data.tar.gz: b14b9380693882907c8c56dc5aeb5ad5bbb179c464d6d4fc6315a1d083c4e3ce372b9495d0e69e9f967440f2f73424d40bc4a79f217d1cb28e05b8f0b031aa61

data/lib/stub_server/version.rb

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

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"),
@@ -45,7 +47,7 @@ class StubServer
 
       options.merge!(@webrick)
 
-      Rack::Handler::WEBrick.run(self, options) { |s| @server = s }
+      Rack::Handler::WEBrick.run(self, **options) { |s| @server = s }
     end
   end
 
@@ -57,7 +59,7 @@ class StubServer
     path = env.fetch("PATH_INFO")
     code, headers, body = @replies[path]
     unless code
-      warn "StubServer: Missing reply for path #{path}" # some clients does not show current url when failing
+      warn "StubServer #{@port}: Missing reply for path #{path}" # some clients does not show current url when failing
       raise
     end
     body = [body.to_json] if @json
@@ -65,6 +67,16 @@ 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
+    if WEBrick::Utils::TimeoutHandler.instance.instance_variable_get(:@timeout_info).empty?
+      WEBrick::Utils::TimeoutHandler.terminate
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stub_server
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-05 00:00:00.000000000 Z
+date: 2021-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: michael@grosser.it
 executables: []
@@ -45,15 +59,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.2.16
 signing_key: 
 specification_version: 4
 summary: Boot up a real server to serve testing replies