gusto 1.0.0.beta15 → 1.0.0.beta16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e0f50ae2b7995069000f268d76a88a666b404f1
-  data.tar.gz: b31c91120be48f1ab3e772fae7509bb5eb85b032
+  metadata.gz: 54c35d8ce34b62e62deaf3eefe54c240d29e3af6
+  data.tar.gz: 19e86b796fe7b07039aa2e96bcfca819833edd1e
 SHA512:
-  metadata.gz: 7844eb2a0330065e0b8046625aa7dbb533e1475537f6fd2201104d158100f39fd6aa5ab8d3fb2d4d09171ff912087935e4b915f92bd04700460599079df73867
-  data.tar.gz: d0566ae83ccd4f9ea6a41d0184ebba8382459c518140062c794c712b5038f98dc6d944f5dd80868820a66ceb0a575b5f640ddd8730a1cf5a94d2843bc5004ec5
+  metadata.gz: 118e514a59ee364b213c4169482a5cb856215fa593d63650f7f1a7919fde9622e2537c471909da6b2077541966781b40c478a39fb9aefd3f2be1aac7f74abd91
+  data.tar.gz: a3c22bdb20ca4b5519a55ab6c608ac1060d2d6d012cac4be863a446418e14822cef47db15f83a8b58aea82bd808da586c2ff575535556284188acaa5c5794d7b

data/bin/gusto

@@ -13,10 +13,15 @@ parser = OptionParser.new do |o|
   end
 
   options[:version] = false
-  o.on '-v', '--version', 'Show version' do
+  o.on '--version', 'Show version' do
     options[:version] = true
   end
 
+  options[:verbose] = false
+  o.on '-v', 'Verbose' do
+    options[:verbose] = true
+  end
+
   o.on_tail '-h', '--help', 'Display this screen' do
     puts o
     exit

data/lib/gusto/configuration.rb

@@ -20,7 +20,7 @@ module Gusto
         paths.each do |path|
           if File.exists? path
             @data.merge! JSON.parse(File.read(path))
-            puts "Loaded configuration from “#{path}”"
+            Gusto.logger.info{ "Loaded configuration from “#{path}”" }
           end
         end
       end

data/lib/gusto/runner.rb

@@ -1,10 +1,10 @@
 # encoding: UTF-8
 
-
 module Gusto
   class Runner
     def load_gusto
       require File.join(File.dirname(__FILE__), '..', 'gusto')
+      Gusto.verbose = @verbose
       Gusto::Configuration.load
       Gusto::Configuration.port = @port
     end
@@ -13,8 +13,9 @@ module Gusto
       require File.join(File.dirname(__FILE__), '..', 'gusto', 'version')
     end
 
-    def initialize mode, options={}, parser=nil
+    def initialize(mode, options={}, parser=nil)
       @port = options[:port] || 4567
+      @verbose = options[:verbose]
 
       if options[:version]
         load_gusto_version
@@ -22,7 +23,6 @@ module Gusto
       else
         case mode
           when 's', 'server'
-            puts "Starting gusto server at http://127.0.0.1:#{@port}/"
             load_gusto
             Gusto.server
           when 'c', 'cli'

data/lib/gusto/server.rb

@@ -11,7 +11,14 @@ require File.expand_path(File.dirname(__FILE__) + '/../gusto')
 module Gusto
   class Server < Sinatra::Application
     def self.start(host, port)
-      Rack::Handler.default.run rack_app, :Host => host, :Port => port 
+      options = {
+        app:    rack_app,
+        server: 'webrick',
+        Host:   host,
+        Port:   port,
+      }
+      options[:AccessLog] = [] unless Gusto.verbose
+      Rack::Server.start options
     end
 
     def self.rack_app
@@ -30,7 +37,7 @@ module Gusto
     Slim::Engine.set_default_options :pretty => true
 
     # Hide redundant log messages
-    disable :logging
+    # disable :logging
 
     ::Sprockets::Helpers.configure do |config|
       config.environment = Sprockets.environment
@@ -45,6 +52,8 @@ module Gusto
 
     # Processes request for page index
     get "/" do
+      Gusto.logger.debug{ "Rendering index page with params #{params.inspect}" }
+
       # Fetch list of all specification files in specs path
       @scripts = []
       Gusto::Configuration.spec_paths.each do |path|
@@ -62,5 +71,9 @@ module Gusto
       @headless = params[:headless]
       render :slim, :index
     end
+
+    get "/health_check" do
+      status 200
+    end
   end
 end

data/lib/gusto/server_spawner.rb

@@ -3,11 +3,10 @@ require 'timeout'
 
 module Gusto
   class ServerSpawner
-    attr :port, :quiet
+    attr :port
     
     def initialize(options={})
       @port = options[:port]
-      @quiet = options.fetch(:quiet, false)
     end
 
     def host
@@ -16,16 +15,17 @@ module Gusto
 
     def spawn
       choose_open_port
+      Gusto.logger.info{ "Starting Gusto server on port #{port}" }
       @server = Process.fork do
-        close_std_io if quiet
         self.process_name = "gusto server on #{host}:#{port}"
         start_server
       end
-      wait_for_server_at root_url
+      wait_for_server_at health_check_url
+      Gusto.logger.info{ "Gusto server ready at #{root_url}" }
     end
 
-    def terminate
-      Process.kill 'TERM', @server if @server
+    def stop
+      Process.kill 'INT', @server if @server
     end
 
     private
@@ -37,11 +37,6 @@ module Gusto
       end
     end
 
-    def close_std_io
-      $stdout.reopen "/dev/null", "w"
-      $stderr.reopen "/dev/null", "w"
-    end
-
     def process_name=(name)
       $0 = name
     end
@@ -54,11 +49,19 @@ module Gusto
       "http://#{host}:#{port}/"
     end
 
+    def health_check_url
+      "#{root_url}health_check"
+    end
+
     def wait_for_server_at(url)
-      Net::HTTP.get URI.parse(url)
-    rescue Errno::ECONNREFUSED
-      sleep 1
-      retry
+      Gusto.logger.debug{ "Waiting for server to respond" }
+      begin
+        Net::HTTP.get URI.parse(url)
+      rescue Errno::ECONNREFUSED
+        Gusto.logger.debug{ "Server not responding, retrying" }
+        sleep 1
+        retry
+      end
     end
 
     def port_open?(port)

data/lib/gusto/version.rb

@@ -1,3 +1,3 @@
 module Gusto
-  VERSION = "1.0.0.beta15"
+  VERSION = "1.0.0.beta16"
 end

data/lib/gusto.rb

@@ -5,9 +5,9 @@ require 'sprockets'
 require 'net/http'
 require 'rack'
 require 'json'
+require 'logger'
 require File.join(File.dirname(__FILE__), 'gusto', 'version')
 
-
 module Gusto
   autoload :Configuration,  File.join(File.dirname(__FILE__), 'gusto', 'configuration')
   autoload :Server,         File.join(File.dirname(__FILE__), 'gusto', 'server')
@@ -19,6 +19,14 @@ module Gusto
     File.join(File.dirname(__FILE__), '..', 'phantom', 'headless_runner.js'))
 
   class << self
+    attr_accessor :verbose
+
+    def logger
+      @logger ||= Logger.new(STDOUT).tap do |logger|
+        logger.level = verbose ? Logger::DEBUG : Logger::INFO
+      end
+    end
+
     def root
       File.expand_path File.join(File.dirname(__FILE__), '..')
     end
@@ -34,7 +42,7 @@ module Gusto
     end
 
     def cli
-      server_spawner(quiet: true).spawn
+      server_spawner.spawn
       result = run_suite?(server_spawner.port)
     ensure
       shut_down(result ? 0 : 1)
@@ -42,24 +50,30 @@ module Gusto
 
     def autotest
       trap_sigint
-      sever_spawner(quie: true).spawn
+      sever_spawner.spawn
       run_suite?(server_spawner.port)
       watch_for_changes
       Process.waitall
     end
 
     def run_suite?(port)
+      Gusto.logger.debug{ "Running test suite with phantomjs" }
       json = `phantomjs #{Shellwords.escape HEADLESS_RUNNER_PATH} #{port}`
+
+      Gusto.logger.debug{ "Parsing JSON response" }
       report = JSON.parse json
+
+      Gusto.logger.debug{ "Rendering test results" }
       puts CliRenderer.new(report).render
+
       report['status'] != 2
     rescue => e
-      puts "Error running test suite: #{e.inspect}"
+      Gusto.logger.error{ "Error running test suite: #{e.inspect}" }
       false
     end
 
-    def server_spawner(quiet: false)
-      @server_spawner ||= ServerSpawner.new(port: Configuration.port, quiet: quiet)
+    def server_spawner
+      @server_spawner ||= ServerSpawner.new(port: Configuration.port)
     end
 
     def watch_for_changes
@@ -77,7 +91,7 @@ module Gusto
     def shut_down(status=0)
       @listener.stop if @listener
       @browser.close if @browser
-      server_spawner.terminate
+      @server_spawner.stop if @server_spawner
       exit status
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gusto
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta15
+  version: 1.0.0.beta16
 platform: ruby
 authors:
 - Tobias Cohen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script