gusto 1.0.0.beta8 → 1.0.0.beta9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d17eea0ab54967209a74af0bc7e018cd4131be5
-  data.tar.gz: 5528ecb8ec2a199eecec326defd2466b56be529b
+  metadata.gz: a4401a2967b016a74b76bc70b3c81e299f04436a
+  data.tar.gz: a266269b65fdbd960acd872992133bcdb65c135d
 SHA512:
-  metadata.gz: 679de6ad1176a1b96a8719797e512447404be443423e567df9a3626cb6e7ba441c40bb939dc7cc3b47f0de9b4b7f4d4bb28c1af4b920a05b3489a1619831b861
-  data.tar.gz: 0938a1f216db53bcffbff44addc396d6a4a54af8a302c747d6691689dc8dac23da44076686db917c45954872eae4ffc5bb62a1dc606477b47a62a258d7ab016e
+  metadata.gz: 1bb1ec2b810205bbd1fb371d137ccae69951315a66b6260fa5f33ada1cdadaa3539f0ca9f763d3ed2d75910dc44ddb5ad0fe292a1854887d2c96355731a866ee
+  data.tar.gz: 59a1f8d9caa50163d5bd8925217feffe97b6055fcfe2e221d247eb58b0deab0d13cc376c871591cd1828775a66e8bf2cddc407de33b35c3ac27f6ea0085c80d7

data/lib/HtmlReport.coffee

@@ -3,11 +3,7 @@ class window.HtmlReport
     @element = element
 
   run: ->
-    root = new Spec.Suite()
-    for suite in Spec.suites
-      root.add suite
-
-    @report = root.run([])
+    @report = (new Spec.RootSuite()).run()
     @element.innerHTML = @html()
 
   html: ->

data/lib/Spec/RootSuite.coffee

@@ -0,0 +1,8 @@
+class window.Spec.RootSuite extends window.Spec.Suite
+  constructor: ->
+    super()
+    for suite in Spec.suites
+      @add suite
+  
+  run: ->
+    super []

data/lib/Spec.coffee

@@ -1,6 +1,7 @@
 #= require Spec/Util
 #= require Spec/Test
 #= require Spec/Suite
+#= require Spec/RootSuite
 #= require Spec/Report
 #= require Spec/ObjectDSL
 #= require Spec/DSL

data/lib/gusto/cli_renderer.rb

@@ -0,0 +1,74 @@
+module Gusto
+  class CliRenderer
+    PASSED = 0
+    PENDING = 1
+    FAILED = 2
+
+    attr :root_report
+
+    def initialize(root_report)
+      @root_report = root_report
+    end
+
+    def render
+      [body, footer].compact.reject(&:empty?).join("\n\n")
+    end
+
+    private
+
+    def body
+      root_report['subreports'].map do |subreport|
+        report_and_subreport_results subreport
+      end.flatten.join "\n"
+    end
+
+    def report_and_subreport_results(report)
+      [report_result(report)] + report['subreports'].map do |subreport|
+        indented_report_and_subreport_results(subreport)
+      end.flatten
+    end
+
+    def indented_report_and_subreport_results(report)
+      report_and_subreport_results(report).map do |result|
+        "  #{result}"
+      end
+    end
+
+    def report_result(report)
+      result_color report['status'], report['title']
+    end
+
+    def footer
+      result_color root_report['status'], "#{total} total, #{passed} passed, #{pending} pending, #{failed} failed"
+    end
+
+    def total
+      root_report['counts'].inject(0, &:+)
+    end
+
+    def passed
+      root_report['counts'][PASSED]
+    end
+
+    def pending
+      root_report['counts'][PENDING]
+    end
+
+    def failed
+      root_report['counts'][FAILED]
+    end
+
+    def result_color(result, string)
+      case result
+        when PASSED
+          "\e[32m#{string}\e[0m"
+        when PENDING
+          "\e[33m#{string}\e[0m"
+        when FAILED
+          "\e[31m#{string}\e[0m"
+        else
+          string
+      end
+    end
+  end
+end

data/lib/gusto/server.rb

@@ -59,6 +59,7 @@ module Gusto
       if params[:filter]
         @scripts = @scripts.select{|file| file.downcase.include? params[:filter].downcase}
       end
+      @headless = params[:headless]
       render :slim, :index
     end
   end

data/lib/gusto/version.rb

@@ -1,3 +1,3 @@
 module Gusto
-  VERSION = "1.0.0.beta8"
+  VERSION = "1.0.0.beta9"
 end

data/lib/gusto.rb

@@ -7,10 +7,15 @@ require 'rack'
 require 'json'
 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')
   autoload :Sprockets,      File.join(File.dirname(__FILE__), 'gusto', 'sprockets')
+  autoload :CliRenderer,    File.join(File.dirname(__FILE__), 'gusto', 'cli_renderer')
+
+  HEADLESS_RUNNER_PATH =    File.realpath(
+    File.join(File.dirname(__FILE__), '..', 'phantom', 'headless_runner.js'))
 
   class << self
     def root
@@ -33,35 +38,36 @@ module Gusto
 
     def cli
       trap_sigint
-      spawn_server
-      result = run_suite
+      spawn_server(quiet: true)
+      result = run_suite?
       shut_down(result ? 0 : 1)
     end
 
     def autotest
       trap_sigint
       spawn_server
-      run_suite
+      run_suite?
       watch_for_changes
       Process.waitall
     end
 
-    def spawn_server
-      @server = Process.fork{ $0 = 'gusto server'; Server.start }
+    def spawn_server(options={})
+      @server = Process.fork do
+        if options[:quiet]
+          $stdout.reopen "/dev/null", "w"
+          $stderr.reopen "/dev/null", "w"
+        end
+        $0 = 'gusto server'
+        Server.start
+      end
       wait_for_server_at(root_url)
     end
 
-    def run_suite
-      if @browser
-        @browser.navigate.refresh
-      else
-        require 'selenium/webdriver'
-        @browser = Selenium::WebDriver.for :firefox, profile: Selenium::WebDriver::Firefox::Profile.new
-        @browser.get "#{root_url}#terminal"
-      end
-      result = @browser[css: '.results'].text
-      puts result
-      !!result.match('passed, 0 failed')
+    def run_suite?
+      json = `phantomjs #{Shellwords.escape HEADLESS_RUNNER_PATH} #{Configuration.port}`
+      report = JSON.parse json
+      puts CliRenderer.new(report).render
+      report['status'] != 2
     end
 
     def watch_for_changes
@@ -93,7 +99,7 @@ module Gusto
     private
 
     def wait_for_server_at(url)
-      page = Net::HTTP.get URI.parse(url)
+      Net::HTTP.get URI.parse(url)
     rescue Errno::ECONNREFUSED
       sleep 1
       retry

data/views/index.slim

@@ -11,8 +11,9 @@ head
     == javascript_tag(script) + "\n"
 
 body
-  javascript:
-    $(function() {
-      window.report = new HtmlReport(document.body);
-      report.run();
-    });
+  - unless @headless
+    javascript:
+      $(function() {
+        window.report = new HtmlReport(document.body);
+        report.run();
+      });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gusto
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta8
+  version: 1.0.0.beta9
 platform: ruby
 authors:
 - Tobias Cohen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script
@@ -108,20 +108,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: selenium-webdriver
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -156,6 +142,7 @@ files:
 - lib/gusto/configuration.rb
 - lib/gusto/version.rb
 - lib/gusto/server.rb
+- lib/gusto/cli_renderer.rb
 - lib/gusto/runner.rb
 - lib/Spec/Matchers.coffee
 - lib/Spec/Mock.coffee
@@ -165,12 +152,12 @@ files:
 - lib/Spec/DSL.coffee
 - lib/Spec/Report.coffee
 - lib/Spec/Test.coffee
+- lib/Spec/RootSuite.coffee
 - lib/Spec/Util.coffee
 - lib/Spec/Suite.coffee
 - lib/Spec/DelayedExpectation.coffee
 - public/jsdiff.js
 - public/ie.js
-- public/jquery-1.10.2.js
 - public/jquery-1.5.2.js
 - public/stacktrace.js
 - views/index.slim