realweb 0.1.6 → 0.2.0

data/lib/realweb.rb

@@ -1,10 +1,10 @@
-require 'realweb/in_thread_server'
+require 'realweb/thread_server'
 require 'realweb/forking_server'
 
 module RealWeb
   class << self
     def start_server_in_thread(*args)
-      InThreadServer.new(*args) { |server| server.start }
+      ThreadServer.new(*args) { |server| server.start }
     end
 
     def start_server_in_fork(*args)
@@ -13,7 +13,7 @@ module RealWeb
     alias start_server start_server_in_fork
 
     def with_server_in_thread(*args, &block)
-      InThreadServer.with_rackup(*args, &block)
+      ThreadServer.with_rackup(*args, &block)
     end
 
     def with_server_in_fork(*args, &block)

data/lib/realweb/forking_server.rb

@@ -23,8 +23,8 @@ module RealWeb
 
     def spawn_server
       @pid ||= Process.fork do
-        boot_rack_server do |webrick_server|
-          trap(:TERM) { webrick_server.shutdown; exit!(0) }
+        boot_rack_server do |mongrel_server|
+          trap(:TERM) { mongrel_server.stop; exit!(0) }
         end
       end
     end

data/lib/realweb/server.rb

@@ -1,5 +1,4 @@
 require 'rack'
-require 'webrick'
 require 'stringio'
 require 'logger'
 require 'open-uri'
@@ -16,21 +15,23 @@ module RealWeb
       end
     end
 
-    attr_reader :port
-
     def initialize(config_ru, pre_spawn_callback = nil, port_range = DEFAULT_PORT_RANGE)
       @config_ru, @pre_spawn_callback, @port_range = config_ru, pre_spawn_callback, port_range
       @running = false
       yield self if block_given?
     end
 
+    def port
+      @port ||= find_port
+    end
+
     def running?
       @running
     end
 
     def start
       return if running?
-      find_port
+      port
       run_pre_spawn
       spawn_server
       at_exit { stop }
@@ -47,16 +48,16 @@ module RealWeb
     end
 
     def base_uri
-      URI.parse("http://#{host}:#{@port}/")
+      URI.parse("http://#{host}:#{port}/")
     end
 
     protected
 
     def find_port
-      return if @port
       begin
-        @port = random_port
-      end while system("lsof -i tcp:#{@port} > /dev/null")
+        port = random_port
+      end while system("lsof -i tcp:#{port} > /dev/null")
+      port
     end
 
     def random_port
@@ -75,15 +76,13 @@ module RealWeb
     def boot_rack_server(&block)
       begin
         rack_server = Rack::Server.new(
-          :Port      => @port,
+          :Port      => port,
           :config    => @config_ru,
-          :server    => 'webrick',
-          :Logger    => Logger.new(StringIO.new), # quiet webrick
-          :AccessLog => [ StringIO.new, WEBrick::AccessLog::COMMON_LOG_FORMAT ]
+          :server    => 'mongrel'
         )
-        webrick_handler = rack_server.server
+        mongrel_handler = rack_server.server
         wrapped_app = rack_server.send(:wrapped_app)
-        webrick_handler.run(wrapped_app, rack_server.options, &block)
+        mongrel_handler.run(wrapped_app, rack_server.options, &block)
       rescue
         $stderr.puts "Failed to start server"
         $stderr.puts $!.inspect
@@ -93,13 +92,14 @@ module RealWeb
     end
 
     def wait_for_server
-      10.times do
+      20.times do
         begin
-          sleep 0.5
           open(base_uri)
           return
-        rescue Errno::ECONNREFUSED
-          sleep 0.5
+        rescue OpenURI::HTTPError
+          return
+        rescue Errno::ECONNREFUSED => e
+          sleep 2
         end
       end
       abort "Unable to reach RealWeb server: Problem booting #{@config_ru}"

data/lib/realweb/{in_thread_server.rb → thread_server.rb}

@@ -1,7 +1,7 @@
 require 'realweb/server'
 
 module RealWeb
-  class InThreadServer < Server
+  class ThreadServer < Server
 
     def stop
       @thread[:kill_server].call
@@ -13,8 +13,8 @@ module RealWeb
 
     def spawn_server
       @thread ||= Thread.new do
-        boot_rack_server do |webrick_server|
-          Thread.current[:kill_server] = lambda { webrick_server.shutdown }
+        boot_rack_server do |mongrel_server|
+          Thread.current[:kill_server] = lambda { mongrel_server.stop }
         end
       end
     end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: realweb
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 6
-  version: 0.1.6
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Ben Burkert
@@ -16,23 +17,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-02 00:00:00 -07:00
+date: 2010-06-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 1
         - 0
         version: 1.1.0
+  requirement: *id001
   name: rack
+  type: :runtime
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id002
+  name: mongrel
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
 description: Easily runs a rack app for tests that hit web APIs
 email: cloud-engineering@engineyard.com
 executables: []
@@ -44,12 +61,12 @@ extra_rdoc_files:
 - LICENSE
 files: 
 - lib/realweb/forking_server.rb
-- lib/realweb/in_thread_server.rb
 - lib/realweb/server.rb
+- lib/realweb/thread_server.rb
 - lib/realweb.rb
 - README.rdoc
 - LICENSE
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/engineyard/realweb
 licenses: []
 
@@ -59,23 +76,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Easily runs a rack app for tests that hit web APIs