rspec-httpd 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c71c6a8e039811020f1c135751a4068adafb8f9e6992833fe2449661060146ce
-  data.tar.gz: 2875628708bf20325ce4323dde9d253f9955493f2e8af2c65828a2054481d421
+  metadata.gz: 39e7f534f32be091cf91b9a86482a7f6ad77edb2f23f900135e5c3b39f10e390
+  data.tar.gz: b8c93f5a2f115ed3095bd474bc9a2c63fac4a3324a7c04930b4b0b87b6e9e51e
 SHA512:
-  metadata.gz: b262a9cbcb738a6956c32bafee8b2ab234cee9d8cf1fe218c2006b6d8e19b8b22311f2201253d49b875a9ade93b6da1a529e456db522039c4441e93e583bf9d9
-  data.tar.gz: b834501793639f9c49ff836d7eb1d25f0b170743bfe3c98186f7219fcd0f30705e97e2ffd331aad25fac55dccee6abdd66384a1598479e5d504fa90f85e187b5
+  metadata.gz: 724693c35daa22840ff5a3871ac39fbecad5fdb22a38621e8e704b647683f28c953cdffe454a33a3b86434e6f8b2968528067e7b10c1008bac7b67bd537755f5
+  data.tar.gz: 28f7cf7303b11c67ebde228ec1a323f4ad88cca6891c6d46881b2fbebaeeed844f5cae2b3cd227dd1f4680e6ac85e8f7cbd36c71e86ff13c4f8dcf114d8665f7

data/VERSION

@@ -1 +1 @@
-0.0.14
+0.0.15

data/lib/rspec/httpd/client.rb

@@ -1,6 +1,34 @@
 require "net/http"
 require "json"
 
+class Net::HTTPResponse
+  def headers
+    @headers ||= HeadersHash.new(self)
+  end
+
+  class HeadersHash < Hash
+    def initialize(response)
+      response.each_header do |k, v|
+        case self[k]
+        when Array then self[k].concat v
+        when nil   then self[k] = v
+        else            self[k].concat(v)
+        end
+      end
+    end
+
+    def [](key)
+      super key.downcase
+    end
+
+    private
+
+    def []=(key, value)
+      super key.downcase, value
+    end
+  end
+end
+
 module RSpec::Httpd
   class Client
     # host and port. Set at initialization
@@ -19,11 +47,6 @@ module RSpec::Httpd
       Integer(response.code)
     end
 
-    # returns the headers of the latest response
-    def headers
-      @headers ||= HeadersHash.new(response)
-    end
-
     # returns the parsed response of the latest request
     def result
       @result ||= ResponseParser.parse(response)
@@ -85,28 +108,6 @@ module RSpec::Httpd
       end
     end
 
-    class HeadersHash < Hash
-      def initialize(response)
-        response.each_header do |k, v|
-          case self[k]
-          when Array then self[k].concat v
-          when nil   then self[k] = v
-          else            self[k].concat(v)
-          end
-        end
-      end
-
-      def [](key)
-        super key.downcase
-      end
-
-      private
-
-      def []=(key, value)
-        super key.downcase, value
-      end
-    end
-
     module ResponseParser
       def self.parse(response)
         return nil if response.body.nil?

data/lib/rspec/httpd/server.rb

@@ -22,18 +22,36 @@ module RSpec::Httpd
 
     def do_start(host, port, command)
       logger = RSpec::Httpd.logger
+
+      if port_open?(host, port)
+        logger.error "A process is already running on #{host}:#{port}"
+        exit 2
+      end
+
       logger.debug "Starting server: #{command}"
 
-      pid = spawn(command)
+      # start child process in a separate process group. at exit we'll
+      # kill the entire process group. This helps if the started process
+      # spawns another child again.
+      pid = spawn(command, pgroup: true)
+      pgid = Process.getpgid(pid)
 
       at_exit do
         begin
-          logger.debug "Stopping server at pid #{pid}: #{command}"
-          Process.kill("KILL", pid)
+          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
+
         logger.warn "Cannot stop server at pid #{pid}: #{command}" if port_open?(host, port)
         exit 0
       end

metadata

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