rspec-httpd 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e96bcab8620e1f538baf7047997a4ff231114e99f7ffe3fb407d0a103338276c
-  data.tar.gz: ed027dac119e4611748d07cadbce59a56ebc8437b16e0f9d88660a561b3c83e2
+  metadata.gz: f127a5abd4a8ac754c24cd3a58360ab60e749ca847fa65d1859ca3b9a4fd5e54
+  data.tar.gz: 6b76d26b499b3e411e36efee597ca6406b1f52f82b24c5163a848b89c86712f4
 SHA512:
-  metadata.gz: a5ce6ac0ca6eedd92d944f0802d74693f79c200ecea1e3ed796d963177b51a22766acb45717a9cfdd00c457477e875ffb62aca6bdb6e33a35a6024d3807d65c0
-  data.tar.gz: 56eaea570426c3e7ae24fb178091213b70c1a5a26440ce20e6c1bbe8e5fa7b6807e160d3d2c3c976941aebb667f803f915e02401e1c61bf5e2840f9e3e2392b9
+  metadata.gz: fcc7057d59576c750558e3cc3bc39fc075bad75722f82f6d14a10fa73cf89b274a6a18ca3b09316f081069e826ae6987d7e790328b725616cac7b24fe46a3910
+  data.tar.gz: 1fc2cd38d2387ba5f78ab5f6cc8ed3d1ff5ea2c47f44edf5a03b6976ac7867baebe9573154ab96cbb1b66357820208f27cc0b85b083a199e766d7691ce02b24f

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/lib/rspec/httpd.rb

@@ -84,9 +84,9 @@ module RSpec::Httpd
 
       if response.status >= 400
         error_message += <<~MSG
-        ---- response.body ----------------------------------------------------
-        #{response.body}
-        -----------------------------------------------------------------------
+          ---- response.body ----------------------------------------------------
+          #{response.body}
+          -----------------------------------------------------------------------
         MSG
       end
 

data/lib/rspec/httpd/config.rb

@@ -7,7 +7,7 @@ class RSpec::Httpd::Config
   def initialize
     self.host = "127.0.0.1"
     self.port = 12_345
-    self.command = "bundle exec rackup -E test -p 12345"
+    self.command = nil
     self.logger = Logger.new(STDERR).tap { |logger| logger.level = Logger::INFO }
   end
 end

data/lib/rspec/httpd/server.rb

@@ -37,24 +37,32 @@ module RSpec::Httpd
     # You can use this method to retrieve a client connection to a server
     # specified via host:, port:, and, optionally, a command.
     def start!(host: "0.0.0.0", port:, command:, logger: nil)
+      puts "start! command: #{command.inspect}"
       @servers ||= {}
-      @servers[[host, port, command]] ||= do_start(host, port, command)
+      @servers[[host, port, command]] ||= command ? do_start(host, port, command) : check_server(host, port)
       @logger = logger if logger
     end
 
     private
 
+    def check_server(host, port)
+      unless wait_for_server(host: host, port: port, timeout: MAX_STARTUP_TIME)
+        logger.error "cannot reach server at http://#{host}:#{port}"
+        exit 1
+      end
+    end
+
     def do_start(host, port, command)
       if port_open?(host, port)
         logger.error "A process is already running on #{host}:#{port}"
         exit 2
       end
-      
+
       STDERR.puts <<~MSG
-         ==== Starting server ================================================================
-         #{command}
-         =====================================================================================
-       MSG
+        ==== Starting server ================================================================
+        #{command}
+        =====================================================================================
+      MSG
 
       # start child process in a separate process group. at exit we'll
       # kill the entire process group. This helps if the started process
@@ -91,11 +99,11 @@ module RSpec::Httpd
       pid
     end
 
-    def wait_for_server(host:, port:, pid:, timeout:)
+    def wait_for_server(host:, port:, pid: nil, timeout:)
       while timeout > 0
         sleep 0.1
         return true if port_open?(host, port)
-        return false if Process.waitpid(pid, Process::WNOHANG)
+        return false if pid && Process.waitpid(pid, Process::WNOHANG)
 
         timeout -= 0.1
         next if timeout > 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-httpd
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Enrico Thierbach
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: RSpec testing for HTTP requests