realweb 1.0.0 → 1.0.1

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 geemus (Wesley Beary)
+Copyright (c) 2012 Engine Yard
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/realweb.rb

@@ -1,9 +1,10 @@
-require 'rack'
-require 'stringio'
-require 'logger'
-require 'open-uri'
+require 'realweb/server'
+require 'realweb/thread_server'
+require 'realweb/forking_server'
 
 module RealWeb
+  ServerUnreachable = Class.new(RuntimeError)
+
   class << self
     def start_server_in_thread(*args)
       ThreadServer.new(*args) { |server| server.start }
@@ -24,7 +25,3 @@ 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,3 +1,5 @@
+require 'realweb/server'
+
 module RealWeb
   class ForkingServer < Server
 

data/lib/realweb/server.rb

@@ -1,3 +1,10 @@
+require 'rack'
+require 'timeout'
+require 'logger'
+require 'uri'
+require 'open-uri'
+require 'stringio'
+
 module RealWeb
   class Server
     attr_reader :host, :rack_server
@@ -5,6 +12,17 @@ module RealWeb
     DEFAULT_PORT_RANGE    = 8000..10000
     DEFAULT_HOST          = '127.0.0.1'
     DEFAULT_LOGGER        = Logger.new(StringIO.new)
+    DEFAULT_TIMEOUT       = 2 # seconds
+
+    # return true if available, false if still waiting
+    def self.server_ready?(server)
+      open(server.base_uri)
+      true
+    rescue OpenURI::HTTPError
+      true
+    rescue Errno::ECONNREFUSED => e
+      false
+    end
 
     def self.with_rackup(*args)
       new(*args) do |server|
@@ -14,6 +32,21 @@ module RealWeb
       end
     end
 
+    # Create a RealWeb::Server object, either a RealWeb::ForkingServer or
+    # a RealWeb::ThreadServer.
+    #
+    # :port_range - Range specifying acceptable tcp ports to boot on.
+    # :logger     - An instance of Logger.
+    # :host       - Alternative host. Default is 127.0.0.1.
+    # :verbose    - Print server logs and errors to stdout/err
+    # :timeout    - Timout in seconds to wait for the server to boot.
+    # :ready      - A Proc that returns true when the server is ready, or false
+    #     if it is not ready yet. This proc will be called every 100ms with the
+    #     server as an argument. If blank, an open-uri based check will be used.
+    # :pre_spawn_callback - a lambda to be called with the server object before
+    #     spawning the server.
+    #
+    # Any remaining options will be passed to Rack::Server on boot.
     def initialize(config_ru, options = {})
       @config_ru  = config_ru
       @running    = false
@@ -22,6 +55,8 @@ module RealWeb
       @logger     = options.delete(:logger)     || DEFAULT_LOGGER
       @host       = options.delete(:host)       || DEFAULT_HOST
       @verbose    = options.delete(:verbose)    || false
+      @timeout    = options.delete(:timeout)    || DEFAULT_TIMEOUT
+      @ready      = options.delete(:ready)      || self.class.method(:server_ready?)
 
       @pre_spawn_callback = options.delete(:pre_spawn_callback)
       @rack_options = options
@@ -85,17 +120,16 @@ module RealWeb
     end
 
     def wait_for_server
-      20.times do
+      Timeout.timeout(@timeout) do
         begin
           sleep 0.1
-          open(base_uri)
-          return
-        rescue OpenURI::HTTPError
-          return
-        rescue Errno::ECONNREFUSED => e
-        end
+        end until @ready.call(self)
       end
-      abort "Unable to reach RealWeb server: Problem booting #{@config_ru}"
+    rescue Timeout::Error
+      raise RealWeb::ServerUnreachable, <<-ERROR
+Unable to reach RealWeb server after #{@timeout}s: #{@config_ru}.#{@verbose || "\nBoot RealWeb with {verbose: true} to print errrors."}
+      ERROR
     end
+
   end
 end

data/lib/realweb/thread_server.rb

@@ -1,3 +1,5 @@
+require 'realweb/server'
+
 module RealWeb
   class ThreadServer < Server
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: realweb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-10 00:00:00.000000000 Z
+date: 2012-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -77,6 +77,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Easily runs a rack app for tests that hit web APIs
 email: cloud-engineering@engineyard.com
 executables: []
@@ -103,18 +119,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1675846270648618555
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1675846270648618555
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -122,3 +132,4 @@ signing_key:
 specification_version: 3
 summary: Easily runs a rack app for tests that hit web APIs
 test_files: []
+has_rdoc: false