rack_check 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4aa32f99238054589b506204575a854191839f76
-  data.tar.gz: 7054ecea565a3f0d90c366c52a93b5e03cfa87a8
+  metadata.gz: 51a5f8038bf2d6a1eec85fc2541bb28a79a5f4b5
+  data.tar.gz: 9fddcb754b84d4be178967f2cf3c36e58bd929b2
 SHA512:
-  metadata.gz: 7d1007233623eca042e83c1b6be51cd577b1571491b010fcf0d57c611b267bc00a249a6b226875ac863cc300e5a426d608ad7a2f70eb4f7ac4f4afd3533f838a
-  data.tar.gz: 762e6e53caddf58c63d641ba24c21ba141f2cb9e6e7ef3ccf88cc82f50b60203cb8daab7a1185e2ddf8117d1925d9b2510a97b85d070406f67014acc6d00c880
+  metadata.gz: f296542b7adcdf240c6eba71f994a538fe119494fb15f0683bd8e54de88dfb484a3b3ca3425bfa635d97ac8ea6ca0146c49ffbf19ee49b2a05a352ebca9b471e
+  data.tar.gz: b1f8e490981615f260a13e9380034969b167edeb06be6de530a8243aa8604e417f0655ac6de9f2ccd27e0565f0141fe0dafd36de1a9be4e845058d7e2585acca

data/lib/rack_check/server_manager.rb

@@ -1,4 +1,5 @@
 require 'socket'
+require 'open4'
 
 module RackCheck
 
@@ -17,15 +18,13 @@ class ServerManager
     Thread.new do
       begin
         with_environment(ru_file) do |dir|
-          @pid = Process.spawn context.app_server_command,
-            in: '/dev/null',
-            out: '/dev/null',
-            err: '/dev/null',
-            chdir: dir
-          @stop_var.take
-          Process.kill 'TERM', @pid
-          Process.wait @pid
-          @pid = nil
+          Dir.chdir(dir) do
+            @pid, @in, @out, @err = Open4.popen4 context.app_server_command
+            @stop_var.take
+            Process.kill 'TERM', @pid
+            Process.wait @pid
+            @pid = nil
+          end
         end
       rescue => e
         $stderr.puts "App server thread exited: #{e.message}\n#{e.backtrace.join("\n")}"
@@ -44,6 +43,14 @@ class ServerManager
     end
   end
 
+  def errors
+    @err&.read.strip
+  end
+
+  def output
+    @out&.read.strip
+  end
+
   private
 
   def wait_for_port

data/lib/rack_check/spec/env.rb

@@ -9,6 +9,9 @@ module RackCheck::Spec
 
     def with_server(ru_file)
       yield start_server(ru_file)
+    rescue HTTP::ConnectionError => e
+      e.message << "\n\nServer error:\n#{@server&.errors}"
+      raise e
     ensure
       stop_server
     end

data/lib/rack_check/spec.rb

@@ -14,6 +14,7 @@ module RackCheck::Spec
   STARTUP_TIMEOUT = 10
 
   def self.run(app_server_command, app_server_port)
+    load_tests
     @@context = Context.new(app_server_command, app_server_port, STARTUP_TIMEOUT)
 
     # TODO there must be a better way to pass context to a rspec suite
@@ -23,7 +24,9 @@ module RackCheck::Spec
   def self.server_context
     @@context
   end
-end
 
-require 'rack_check/spec/rackup'
-require 'rack_check/spec/env'
+  def self.load_tests
+    require 'rack_check/spec/rackup'
+    require 'rack_check/spec/env'
+  end
+end

data/lib/rack_check/version.rb

@@ -1,3 +1,3 @@
 module RackCheck
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

data/rack_check.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rspec", "~> 3.0"
   spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
   spec.add_runtime_dependency "http", "~> 2.2"
+  spec.add_runtime_dependency "open4", "~> 1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack_check
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Tinco Andringa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-04 00:00:00.000000000 Z
+date: 2017-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: open4
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: 
 email:
 - tinco@phusion.nl
@@ -127,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Tool that checks a Ruby application server for Rack compliancy