rspec-httpd 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f127a5abd4a8ac754c24cd3a58360ab60e749ca847fa65d1859ca3b9a4fd5e54
-  data.tar.gz: 6b76d26b499b3e411e36efee597ca6406b1f52f82b24c5163a848b89c86712f4
+  metadata.gz: df631d1591425ab8d6221ecdf8d3e77c571d825a3bd42b875bf732414c171533
+  data.tar.gz: 1443d91ac725578992ba6506cf3cfca8b0c95a002e38e0a0aecbf95aab2f8593
 SHA512:
-  metadata.gz: fcc7057d59576c750558e3cc3bc39fc075bad75722f82f6d14a10fa73cf89b274a6a18ca3b09316f081069e826ae6987d7e790328b725616cac7b24fe46a3910
-  data.tar.gz: 1fc2cd38d2387ba5f78ab5f6cc8ed3d1ff5ea2c47f44edf5a03b6976ac7867baebe9573154ab96cbb1b66357820208f27cc0b85b083a199e766d7691ce02b24f
+  metadata.gz: 8dd5412f5b2acb94b439b7fb40874deb8add05673056e52022551b12ff53733913fcdfc8ffd43e1cc3d9db107f2786730f550090b39fc9db2afaf9fa3219283e
+  data.tar.gz: a4209b8cfedbbbd80d0d7eae762753718ce9d20431f889b955cae48abadabc5cf09892555cde3b5b7c70a942a14767e6ed93204906fa6a7b6be2e1aa8e88959a

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.7

data/lib/rspec/httpd.rb

@@ -5,6 +5,7 @@ require "expectation"
 # rubocop:disable Metrics/AbcSize
 # rubocop:disable Metrics/CyclomaticComplexity
 # rubocop:disable Metrics/PerceivedComplexity
+# rubocop:disable Metrics/MethodLength
 
 module RSpec::Httpd
 end

data/lib/rspec/httpd/server.rb

@@ -1,7 +1,5 @@
 # rubocop:disable Lint/HandleExceptions
 # rubocop:disable Metrics/AbcSize
-# rubocop:disable Metrics/CyclomaticComplexity
-# rubocop:disable Metrics/MethodLength
 
 require "socket"
 require "timeout"
@@ -70,35 +68,32 @@ module RSpec::Httpd
       pid = spawn(command, pgroup: true)
       pgid = Process.getpgid(pid)
 
+      # Install an at_exit handler. This will kill the server. The command
+      # argument is passed in for logging only.
       at_exit do
-        begin
-          logger.debug "Terminating server in pgid #{pgid}: #{command}"
-          Process.kill("TERM", -pgid)
-          sleep 0.2
-        rescue Errno::ESRCH
-        end
-
-        if port_open?(host, port)
-          begin
-            logger.debug "Killing server in pgid #{pgid}: #{command}"
-            Process.kill("KILL", -pgid)
-          rescue Errno::ESRCH, Errno::EPERM
-          end
-        end
+        kill_server "TERM", pgid, command: command, sleep: 0.2 if port_open?(host, port)
+        kill_server "KILL", pgid, command: command, sleep: 0.2 if port_open?(host, port)
 
         logger.warn "Cannot stop server at pid #{pid}: #{command}" if port_open?(host, port)
-        exit 0
       end
 
       unless wait_for_server(host: host, port: port, pid: pid, timeout: MAX_STARTUP_TIME)
         logger.error "server didn't start at http://#{host}:#{port} pid #{pid}: #{command}"
-        exit 1
+        exit! 1
       end
 
       logger.info "Started server at pid #{pid}: #{command}"
       pid
     end
 
+    def kill_server(signal, pgid, command:, sleep: nil)
+      logger.debug "Kill server in pgid #{pgid} w/#{signal}: #{command}"
+
+      Process.kill(signal, -pgid)
+      Kernel.sleep(sleep) if sleep
+    rescue Errno::ESRCH, Errno::EPERM
+    end
+
     def wait_for_server(host:, port:, pid: nil, timeout:)
       while timeout > 0
         sleep 0.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-httpd
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Enrico Thierbach