stub_server 0.1.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 955f6568b93ddc0eb9c8176802b6d6b3656f0efa
-  data.tar.gz: b74b997143e42a544d44b845eaba4e8e168ceb33
+SHA256:
+  metadata.gz: 9bfaeb55228fa829f8e96705257e9fc5876ad4d1457e34f059e7e667414a637a
+  data.tar.gz: 98dc6aa936d0c0dd38bd0ef684c2cd54fd80deca9bc11842f0fb85ea09273892
 SHA512:
-  metadata.gz: 78883018277395e88f966079b2c36ffb1bdce72a89d56f6f74ff7c1b39e54f8e7282322afbaa95b7114c9b25bc2f5d7740c401b044e0397ac6aadf229d412981
-  data.tar.gz: 5c4a74865266f6bc4ddfd9581d1e79609e004c6f4093b66fd994a056fa752450c5ae99b8ef27c33603c582cbe250e621e285dddfd6c01656a2c528a79a44b019
+  metadata.gz: ff17fa306dae8ae5004031578c566648e6dff274cdca5508878c258577810d3e4ab8d9cd419c35726f7093fb049fc8e9fed88099ad795f748b6becc23cc8ffdd
+  data.tar.gz: c130620e847ed59521a4bd83ff789ed6a1f1eb099c9ec22db6cb5cd47fac6e1083e96851d27c4174afa0deb773bfe1d1d8f58de2c3cb9aa3f3cef61b4f24b0be

data/lib/stub_server.rb

@@ -17,14 +17,19 @@ class StubServer
     @ssl = ssl
     @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"),
-        AccessLog: []
+        AccessLog: [],
+        DoNotReverseLookup: true, # http://stackoverflow.com/questions/1156759/webrick-is-very-slow-to-respond-how-to-speed-it-up
+        StartCallback: -> { @started = true }
       }
 
       if @ssl
@@ -42,30 +47,19 @@ 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
 
   def wait
-    Timeout.timeout(10) do
-      loop do
-        begin
-          socket = TCPSocket.new('localhost', @port)
-          socket.close if socket
-          sleep 0.1 if ENV['CI']
-          return
-        rescue Errno::ECONNREFUSED
-          nil
-        end
-      end
-    end
+    Timeout.timeout(10) { sleep 0.1 until @started }
   end
 
   def call(env)
     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
@@ -73,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.1.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stub_server
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-16 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -45,15 +45,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.4.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Boot up a real server to serve testing replies