realweb 0.2.0 → 0.2.1

data/lib/realweb.rb

@@ -1,5 +1,7 @@
-require 'realweb/thread_server'
-require 'realweb/forking_server'
+require 'rack'
+require 'stringio'
+require 'logger'
+require 'open-uri'
 
 module RealWeb
   class << self
@@ -22,3 +24,7 @@ module RealWeb
     alias with_server with_server_in_fork
   end
 end
+
+require 'realweb/server'
+require 'realweb/thread_server'
+require 'realweb/forking_server'

data/lib/realweb/forking_server.rb

@@ -1,5 +1,3 @@
-require 'realweb/server'
-
 module RealWeb
   class ForkingServer < Server
 
@@ -22,11 +20,17 @@ module RealWeb
     end
 
     def spawn_server
-      @pid ||= Process.fork do
-        boot_rack_server do |mongrel_server|
-          trap(:TERM) { mongrel_server.stop; exit!(0) }
-        end
+      self.port
+
+      unless @pid = fork
+        process_as_child
       end
     end
+
+    def process_as_child
+      trap(:TERM) { exit!(0) }
+      @server = rack_server
+      @server.start
+    end
   end
 end

data/lib/realweb/server.rb

@@ -1,11 +1,10 @@
-require 'rack'
-require 'stringio'
-require 'logger'
-require 'open-uri'
-
 module RealWeb
   class Server
-    DEFAULT_PORT_RANGE = 8000..10000
+    attr_reader :host, :rack_server
+
+    DEFAULT_PORT_RANGE    = 8000..10000
+    DEFAULT_HOST          = '127.0.0.1'
+    DEFAULT_LOGGER        = Logger.new(StringIO.new)
 
     def self.with_rackup(*args)
       new(*args) do |server|
@@ -15,9 +14,18 @@ module RealWeb
       end
     end
 
-    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
+    def initialize(config_ru, options = {})
+      @config_ru  = config_ru
+      @running    = false
+
+      @port_range = options.delete(:port_range) || DEFAULT_PORT_RANGE
+      @logger     = options.delete(:logger)     || DEFAULT_LOGGER
+      @host       = options.delete(:host)       || DEFAULT_HOST
+
+      @pre_spawn_callback = options.delete(:pre_spawn_callback)
+
+      @rack_options = options
+
       yield self if block_given?
     end
 
@@ -31,10 +39,8 @@ module RealWeb
 
     def start
       return if running?
-      port
       run_pre_spawn
       spawn_server
-      at_exit { stop }
       wait_for_server
       @running = true
     end
@@ -43,10 +49,6 @@ module RealWeb
       @running = false
     end
 
-    def host
-      "127.0.0.1"
-    end
-
     def base_uri
       URI.parse("http://#{host}:#{port}/")
     end
@@ -72,23 +74,14 @@ module RealWeb
       raise "Not implemented"
     end
 
-    # hack around Rack::Server not yielding the real server
-    def boot_rack_server(&block)
-      begin
-        rack_server = Rack::Server.new(
-          :Port      => port,
-          :config    => @config_ru,
-          :server    => 'mongrel'
-        )
-        mongrel_handler = rack_server.server
-        wrapped_app = rack_server.send(:wrapped_app)
-        mongrel_handler.run(wrapped_app, rack_server.options, &block)
-      rescue
-        $stderr.puts "Failed to start server"
-        $stderr.puts $!.inspect
-        $stderr.puts $!.backtrace
-        abort
-      end
+    def rack_server
+      Rack::Server.new(@rack_options.merge(
+        :Port       => port,
+        :Host       => host,
+        :config     => @config_ru,
+        :Logger     => @logger,
+        :AccessLog  => @access_log
+      ))
     end
 
     def wait_for_server

data/lib/realweb/thread_server.rb

@@ -1,21 +1,18 @@
-require 'realweb/server'
-
 module RealWeb
   class ThreadServer < Server
 
     def stop
-      @thread[:kill_server].call
-      @thread.kill
+      @thread.kill if @thread
       super
     end
 
     protected
 
     def spawn_server
-      @thread ||= Thread.new do
-        boot_rack_server do |mongrel_server|
-          Thread.current[:kill_server] = lambda { mongrel_server.stop }
-        end
+      return if @thread && @thread.alive?
+
+      @thread ||= Thread.new(rack_server) do |server|
+        server.start
       end
     end
   end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: realweb
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Ben Burkert
@@ -17,39 +16,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-22 00:00:00 -07:00
+date: 2010-07-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   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
+  name: rack
   type: :runtime
-  prerelease: false
 description: Easily runs a rack app for tests that hit web APIs
 email: cloud-engineering@engineyard.com
 executables: []
@@ -60,13 +43,13 @@ extra_rdoc_files:
 - README.rdoc
 - LICENSE
 files: 
+- lib/realweb.rb
 - lib/realweb/forking_server.rb
 - lib/realweb/server.rb
 - lib/realweb/thread_server.rb
-- lib/realweb.rb
 - README.rdoc
 - LICENSE
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/engineyard/realweb
 licenses: []
 
@@ -76,27 +59,23 @@ 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.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Easily runs a rack app for tests that hit web APIs