autobrewster 0.0.2 → 0.0.3

data/lib/auto_brewster.rb

@@ -4,18 +4,19 @@ require File.expand_path('../auto_brewster/cli',  __FILE__)
 
 module AutoBrewster
   class << self
-    attr_accessor :server, :server_start, :server_port, :rackup_path, :hostname
+    attr_accessor :server, :server_start, :server_port, :rackup_path, :hostname, :server_timeout
     attr_accessor :screen_widths, :url_paths
     attr_accessor :path
-    attr_accessor :failfast
+    attr_accessor :debug, :failfast
 
     def configure
       yield self
     end
 
     def setup
-      include_support
-      @server = AutoBrewster::Server.new(server, server_port, rackup_path, hostname)
+      include_support_env
+      include_support_pre_launch
+      @server = AutoBrewster::Server.new(server, server_port, server_timeout, rackup_path, hostname)
       @screenshot = AutoBrewster::Screenshot.new(@server, path, url_paths, screen_widths)
     end
 
@@ -53,16 +54,17 @@ module AutoBrewster
 
     def run_default_server(app, port)
       require 'rack/handler/thin'
-      Thin::Logging.silent = true
+      Thin::Logging.silent = true unless debug
       Rack::Handler::Thin.run(app, :Port => port, :AccessLog => [])
     end
 
+    def include_support_post_launch
+      Dir.glob("#{path}/support/post_launch/*.rb").map { |file| require file }
+    end
+
     private
-    def include_support
-      include_support_env
-      Dir.glob("#{path}/support/*.rb").map do |file|
-        require file unless file.end_with?('/env.rb')
-      end
+    def include_support_pre_launch
+      Dir.glob("#{path}/support/pre_launch/*.rb").map { |file| require file }
     end
 
     def include_support_env
@@ -75,10 +77,12 @@ end
 AutoBrewster.configure do |config|
   config.server_start = true
   config.server_port = 5001
-  config.path = "#{Dir.pwd}/test/brewster"
+  config.path = "#{Dir.pwd}/test/autobrewster"
   config.rackup_path = 'config.ru'
   config.server {|app, port| AutoBrewster.run_default_server(app, port)}
+  config.server_timeout = 10
   config.hostname = false
+  config.debug = true
   config.failfast = false
   config.screen_widths = [320, 1024]
   config.url_paths = {

data/lib/auto_brewster/server.rb

@@ -10,30 +10,31 @@ module AutoBrewster
                   :hostname,
                   :app
 
-    def initialize(server, port, rackup_path = 'config.ru', hostname = false)
+    def initialize(server, port, timeout = 10, rackup_path = 'config.ru', hostname = false)
       ENV['RACK_ENV'] ||= 'test'
 
       @port = port
       @server = server
+      @timeout = timeout
       @rackup_path = rackup_path
       @hostname = hostname
       @app = build_rack_app
-
       @middleware = AutoBrewster::Middleware.new(@app)
     end
 
     def start
       @server_thread = Thread.new do
+        AutoBrewster.include_support_post_launch
         @server.call(@middleware, @port)
       end
 
-      Timeout.timeout(10) { @server_thread.join(0.1) until responsive? }
+      Timeout.timeout(@timeout) { @server_thread.join(0.1) until responsive? }
     end
 
     def stop
       return if @server_thread.nil?
       @server_thread.kill
-      Timeout.timeout(10) { @server_thread.join(0.1) until !responsive? }
+      Timeout.timeout(@timeout) { @server_thread.join(0.1) until !responsive? }
     end
 
     def get_host_with_protocol_and_port

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Chris Blackburn
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-27 00:00:00 +01:00
+date: 2013-08-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency