rack-test_server 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2791fd8d73e918ebc3f60fab74d0f00962c42f523b1b6958ec0adc02c2a7736
-  data.tar.gz: 1c332c69e9975660dfb7098c29e84a47be10f6225b8d42201eefbfe5b96132a4
+  metadata.gz: 653b29f266cfb099925a570ce646dda069edb77aaf015c29c632621fdcc7a59e
+  data.tar.gz: 3a5d8d458454ebc735346f9718e2629371474138d5f9b99e591bc3729ec5a574
 SHA512:
-  metadata.gz: c420c29cc54f9afb3c4aea3ab866837ef0305b07ece9f96e5e8bb680e122c04d5fe119463e5a986cc2adc40e67f8403c96cb5922038b6199af810c7cf6302ba2
-  data.tar.gz: e23ddf59637e0d34a77adaa98621d8714b1c21d570eb29d1601de2fda4153bd815e0564ad0d209864edeedc68d98fdfea05d3151b4a352fb7f331d620e7407cb
+  metadata.gz: e185fe7663d9d12870dff5497fbc6cf4642e8ea8c5aec36a003040ea4525bfb45955cdad72eb47935cb78af3f4fc2bcc0ad651e5130cc3e6ecf240dda9e6d4de
+  data.tar.gz: a95c03aa4ff2f15af918b778cc97e38b62c47065076fb391344b862a9753719e2a413f7738681817ebd6c224ae8be58ec2a887031b20e6a01d919cdb5b2783c9

data/lib/rack/test_server/puma_signal_trap_interceptor.rb

@@ -0,0 +1,22 @@
+require_relative './signal_trap_interceptor'
+
+module Rack
+  class TestServer
+    module PumaSignalTrapInterceptor
+      def setup_signals
+        # Disable SIGINT handler in Puma.
+        # https://github.com/puma/puma/blob/v5.5.0/lib/puma/launcher.rb#L485
+        SignalTrapInterceptor.enable
+        super
+        SignalTrapInterceptor.disable
+      end
+    end
+  end
+end
+
+begin
+  require 'puma'
+  Puma::Launcher.prepend(Rack::TestServer::PumaSignalTrapInterceptor)
+rescue LoadError
+  # Just ignore if Puma is absent.
+end

data/lib/rack/test_server/signal_trap_interceptor.rb

@@ -0,0 +1,31 @@
+module Rack
+  class TestServer
+    module SignalTrapInterceptor
+      class << self
+        def enable
+          define_method(:trap) do |sig, &handler|
+            if sig == :INT || sig == 'SIGINT'
+              puts "[NOTE] `trap(#{sig})` is ignored called from #{caller_locations.first}"
+            else
+              super(sig, &handler)
+            end
+          end
+        end
+
+        def disable
+          remove_method(:trap)
+        end
+      end
+    end
+  end
+end
+
+require 'rack/server'
+
+# Disable SIGINT handler in Rack::Server.
+# https://github.com/rack/rack/blob/2.2.3/lib/rack/server.rb#L319
+Rack::Server.prepend(Rack::TestServer::SignalTrapInterceptor)
+
+# Mainly inteded to disable SIGINT handler in Puma.
+# https://github.com/puma/puma/blob/v5.5.0/lib/puma/launcher.rb#L485
+Signal.singleton_class.prepend(Rack::TestServer::SignalTrapInterceptor)

data/lib/rack/test_server/version.rb

@@ -2,6 +2,6 @@
 
 module Rack
   class TestServer
-    VERSION = '0.1.1'
+    VERSION = '0.1.4'
   end
 end

data/lib/rack/test_server.rb

@@ -4,6 +4,8 @@ require 'net/http'
 require 'rack'
 require 'timeout'
 require 'rack/test_server/version'
+require 'rack/test_server/puma_signal_trap_interceptor'
+require 'rack/test_server/signal_trap_interceptor'
 
 module Rack
   # An utility class for launching HTTP server with Rack::Server#start
@@ -44,7 +46,12 @@ module Rack
     #
     # @note This method will block the thread, and in most cases {#start_async} is suitable.
     def start
+      # Disable SIGINT handler in Rack::Server.
+      # https://github.com/rack/rack/blob/2.2.3/lib/rack/server.rb#L319
+      SignalTrapInterceptor.enable
       @server.start do |server|
+        SignalTrapInterceptor.disable
+
         # server can be a Puma::Launcher, Webrick::Server, Thin::Server
         # They all happen to have 'stop' method for greaceful shutdown.
         # Remember the method as Proc here for stopping server manually.
@@ -76,11 +83,7 @@ module Rack
     def ready?
       Net::HTTP.get(URI("#{base_url}/__ping"))
       true
-    rescue Errno::EADDRNOTAVAIL
-      false
-    rescue Errno::ECONNREFUSED
-      false
-    rescue Errno::EINVAL
+    rescue Errno::EADDRNOTAVAIL, Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::EINVAL
       false
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-test_server
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
 platform: ruby
 authors:
 - YusukeIwaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2022-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -124,6 +124,8 @@ files:
 - bin/console
 - bin/setup
 - lib/rack/test_server.rb
+- lib/rack/test_server/puma_signal_trap_interceptor.rb
+- lib/rack/test_server/signal_trap_interceptor.rb
 - lib/rack/test_server/version.rb
 - rack-test_server.gemspec
 homepage: https://github.com/YusukeIwaki/rack-test_server