gusto 1.0.0.beta14 → 1.0.0.beta15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aca9cea8b1abeda163c9bf46333ccb2ae2a3bd4c
-  data.tar.gz: 31e50947ce1983c5dcb37355c1fddf4245a7b39f
+  metadata.gz: 4e0f50ae2b7995069000f268d76a88a666b404f1
+  data.tar.gz: b31c91120be48f1ab3e772fae7509bb5eb85b032
 SHA512:
-  metadata.gz: 5e8e7fe4ee8f830f4922d3f086a6bbc1cec598ee771078d095c4aee1134dae6a8589484d3df9b47d96dd82fc284ca94820a7386f4673b5c04f2de54c73b08c10
-  data.tar.gz: 60f8921a10e52f2e2e1d3bb7d7abea11139ec1dc3dcab2f402c0459a51d6919d9c72c1fbbe29fe961702a4ca6ba05c5ed874f46197079b53873b43fcf6eaf1de
+  metadata.gz: 7844eb2a0330065e0b8046625aa7dbb533e1475537f6fd2201104d158100f39fd6aa5ab8d3fb2d4d09171ff912087935e4b915f92bd04700460599079df73867
+  data.tar.gz: d0566ae83ccd4f9ea6a41d0184ebba8382459c518140062c794c712b5038f98dc6d944f5dd80868820a66ceb0a575b5f640ddd8730a1cf5a94d2843bc5004ec5

data/assets/test_results.sass

@@ -31,6 +31,17 @@
   white-space:    nowrap
   text-overflow:  ellipsis
 
+.test-results--full-error-message
+  padding:        10px
+  background:     lighten($red, 47.5%)
+  color:          #900
+
+.test-results--stack-trace
+  font:           13px/1.6em Consolas, monaco, monospace
+  background:     lighten($red, 50%)
+  padding:        10px
+  margin:         0
+
 .test-results--test--failed
   background: lighten($red, 45%)
 

data/lib/HtmlReport.coffee

@@ -41,16 +41,27 @@ class window.HtmlReport
     html + '</ul>'
 
   testResultsReport: (report) ->
-    "
-      <li class=\"test-results--test test-results--test--#{@testResultsStatusClass report.status}\">
-        <div class=\"test-results--title\">#{report.title}</div>
-        #{if report.error then @testResultsErrorReport(report) else ''}
-        #{if report.subreports.length then @testResultsReports(report.subreports) else ''}
-      </li>
-    "
+    html = "<li class=\"test-results--test test-results--test--#{@testResultsStatusClass report.status}\">"
+    html += "<div class=\"test-results--title\">#{report.title}</div>"
+    if report.error
+      html += @testResultsErrorReport(report)
+      if report.status == Spec.Report.Failed
+        html += @testResultsErrorDetails(report)
+    if report.subreports.length
+      html += @testResultsReports(report.subreports)
+    html += "</li>"
+    html
 
   testResultsErrorReport: (report) ->
-    "<div class=\"test-results--error-message\">#{report.error}</div>"
+    "<div class=\"test-results--error-message\">#{Spec.Util.escape report.error}</div>"
+
+  testResultsErrorDetails: (report) ->
+    details = "<div class=\"test-results--error-details\">"
+    details += "<div class=\"test-results--full-error-message\">#{report.htmlMessage || Spec.Util.escape(report.error)}</div>"
+    if report.stack
+      details += "<pre class=\"test-results--stack-trace\">#{Spec.Util.escape report.stack}</pre>"
+    details += "</div>"
+    details
 
   testResultsStatusClass: (status) ->
     switch status

data/lib/Spec.coffee

@@ -16,7 +16,6 @@
 window.Spec ||= {}
 
 class window.Spec.ExpectationError extends Error
-  constructor: (@message) ->
 
 class window.Spec.PendingError extends Error
   constructor: (@message) ->

data/lib/Spec/DSL.coffee

@@ -20,12 +20,18 @@ window.Spec.DSL = DSL =
     # matcher function
     to: (matcher) ->
       match = matcher(object)
-      throw new Spec.ExpectationError("expected #{match.description()}") unless match.result
+      unless match.result
+        error = new Spec.ExpectationError("expected to #{match.text()}")
+        error.htmlMessage = match.html() if match.html
+        throw error
 
     # Specifies that the object should receive a negative response
     notTo: (matcher) ->
       match = matcher(object)
-      throw new Spec.ExpectationError("expected not #{match.description()}") if match.result
+      if match.result
+        error = new Spec.ExpectationError("expected not to #{match.text()}")
+        error.htmlMessage = match.html() if match.html
+        throw error
 
     # Sets up a stub on the given method, with a delayed expectation that this
     # stub method be called

data/lib/Spec/Matchers.coffee

@@ -4,8 +4,9 @@ window.Spec.Matchers =
   # Tests if matched value === expected value
   be: (expected) ->
     (value) ->
-      result:       value is expected
-      description:  -> "be #{Spec.Util.inspect expected}, actual #{Spec.Util.inspect value}"
+      result: value is expected
+      text:   ->
+        "be #{Spec.Util.inspect expected}, actual #{Spec.Util.inspect value}"
 
   # Tests that value type matches specified class
   beA: (klass) ->
@@ -20,8 +21,18 @@ window.Spec.Matchers =
   # Tests if matched value == expected value
   equal: (expected) ->
     (value) ->
-      result:       String(value) == String(expected)
-      description:  -> "equal “#{String expected}”, actual “#{String value}” – #{$.trim diffString(String(value), String(expected))}"
+      result: String(value) == String(expected)
+      text:   ->
+        "equal #{Spec.Util.inspect expected}, actual #{Spec.Util.inspect value}"
+      html:   ->
+        "<dl>
+          <dt>expected:</dt>
+          <dd>#{Spec.Util.inspectAndEscape expected}</dd>
+          <dt>actual:</dt>
+          <dd>#{Spec.Util.inspectAndEscape value}</dd>
+          <dt>diff:</dt>
+          <dd>#{$.trim diffString(String(value), String(expected))}</dd>
+        </dl>"
 
   # All-purpose inclusion matcher
   include: (expected) ->
@@ -30,8 +41,9 @@ window.Spec.Matchers =
         match = true
         for test in expected
           match = false unless (value.indexOf && value.indexOf(test) >= 0) || value[test]?
-        result:       match
-        description:  -> "include #{Spec.Util.inspect expected}, actual #{Spec.Util.inspect value}"
+        result: match
+        text:   ->
+          "include #{Spec.Util.inspect expected}, actual #{Spec.Util.inspect value}"
     else if typeof expected == 'object'
       (value) ->
         missing = {}
@@ -41,8 +53,9 @@ window.Spec.Matchers =
             unless value[test] isnt undefined && String(value[test]) == String(expected[test])
               match = false
               missing[test] = expected[test]
-        result:       match
-        description:  -> "include #{Spec.Util.inspect expected}, actual #{Spec.Util.inspect value}, missing #{Spec.Util.inspect missing}"
+        result: match
+        text:   ->
+          "include #{Spec.Util.inspect expected}, actual #{Spec.Util.inspect value}, missing #{Spec.Util.inspect missing}"
     else
       include([expected])
 
@@ -55,11 +68,15 @@ window.Spec.Matchers =
       catch e
         thrown = e.message
       if thrown
-        result:      thrown == message
-        description: -> "throw an error with message “#{String thrown}”, actual message “#{String message}” – #{$.trim diffString(String(thrown), String(message))}"
+        result: thrown == message
+        text:   ->
+          "throw an error with message “#{String thrown}”, actual message “#{String message}”"
+        html:   ->
+          "#{$.trim diffString(String(thrown), String(message))}"
       else
-        result:      false
-        description: -> "throw an error with message “#{message}”, no error thrown"
+        result: false
+        text:   ->
+          "throw an error with message #{Spec.Util.inspect message}, no error thrown"
 
   # Tests a value type using typeof, falling back to instanceof if type is an object
   _haveType: (type, klass) ->
@@ -67,13 +84,16 @@ window.Spec.Matchers =
       if typeof value is 'object'
         @_beAnInstanceOf(klass)(value)
       else
-        result:       typeof value is type
-        description:  -> "to have type “#{type}”, actual “#{typeof value}”"
+        result: typeof value is type
+        text:   ->
+          "have type #{Spec.Util.inspect type}, actual #{Spec.Util.inspect(typeof value)}"
 
   # Tests if matched value is an instance of class
   _beAnInstanceOf: (klass) ->
     (value) ->
-      result:      value instanceof klass
-      description: -> "#{value} to be an instance of “#{klass.name || klass}”, actually “#{Spec.Util.inspectClass value}"
+      result: value instanceof klass
+      text:   ->
+        "#{Spec.Util.inspect value} to be an instance of #{Spec.Util.inspect(klass.name || klass)}, actually #{Spec.Util.inspectClass value}"
 
+window.Spec.Matchers.eq = window.Spec.Matchers.equal
 window.Spec.Matchers.beAn = window.Spec.Matchers.beA

data/lib/Spec/Test.coffee

@@ -14,7 +14,8 @@ class window.Spec.Test
         error.status || Spec.Report.Failed,
         error.message
       )
-      report.location = error.fileName + ':' + error.lineNumber
+      report.stack            = error.stack
+      report.htmlMessage      = error.htmlMessage
     finally
       Spec.DelayedExpectation.reset()
       Spec.MethodStub.reset()

data/lib/Spec/Util.coffee

@@ -64,10 +64,13 @@ window.Spec.Util =
         # Access hasOwnProperty through Object.prototype to work around bug
         # in IE6/7/8 when calling hasOwnProperty on a DOM element
         if Object.prototype.hasOwnProperty.call(object, key)
-          properties.push Spec.Util.escape(key) + ': ' + Spec.Util.inspect(value)
+          properties.push key + ': ' + Spec.Util.inspect(value)
       "{#{properties.join ', '}}"
     else
-      "“#{Spec.Util.escape(object)}”"
+      "“#{object}”"
+
+  inspectAndEscape: (object) ->
+    @escape @inspect(object)
 
   # Gets the class name of an object using JavaScript magic
   inspectClass: (object) ->

data/lib/gusto.rb

@@ -11,6 +11,7 @@ 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 :ServerSpawner,  File.join(File.dirname(__FILE__), 'gusto', 'server_spawner')
   autoload :Sprockets,      File.join(File.dirname(__FILE__), 'gusto', 'sprockets')
   autoload :CliRenderer,    File.join(File.dirname(__FILE__), 'gusto', 'cli_renderer')
 
@@ -26,48 +27,39 @@ module Gusto
       File.expand_path "."
     end
 
-    def root_url
-      "http://localhost:#{Configuration.port}/"
-    end
-
     def server
       trap_sigint
-      spawn_server
+      server_spawner.spawn
       Process.waitall
     end
 
     def cli
-      trap_sigint
-      spawn_server(quiet: true)
-      result = run_suite?
+      server_spawner(quiet: true).spawn
+      result = run_suite?(server_spawner.port)
+    ensure
       shut_down(result ? 0 : 1)
     end
 
     def autotest
       trap_sigint
-      spawn_server
-      run_suite?
+      sever_spawner(quie: true).spawn
+      run_suite?(server_spawner.port)
       watch_for_changes
       Process.waitall
     end
 
-    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?
-      json = `phantomjs #{Shellwords.escape HEADLESS_RUNNER_PATH} #{Configuration.port}`
+    def run_suite?(port)
+      json = `phantomjs #{Shellwords.escape HEADLESS_RUNNER_PATH} #{port}`
       report = JSON.parse json
       puts CliRenderer.new(report).render
       report['status'] != 2
+    rescue => e
+      puts "Error running test suite: #{e.inspect}"
+      false
+    end
+
+    def server_spawner(quiet: false)
+      @server_spawner ||= ServerSpawner.new(port: Configuration.port, quiet: quiet)
     end
 
     def watch_for_changes
@@ -85,7 +77,7 @@ module Gusto
     def shut_down(status=0)
       @listener.stop if @listener
       @browser.close if @browser
-      Process.kill 'TERM', @server if @server
+      server_spawner.terminate
       exit status
     end
 
@@ -96,13 +88,5 @@ module Gusto
       end
     end
 
-    private
-
-    def wait_for_server_at(url)
-      Net::HTTP.get URI.parse(url)
-    rescue Errno::ECONNREFUSED
-      sleep 1
-      retry
-    end
   end
 end

data/lib/gusto/cli_renderer.rb

@@ -11,7 +11,7 @@ module Gusto
     end
 
     def render
-      [body, footer].compact.reject(&:empty?).join("\n\n")
+      [body, stack_traces, footer].compact.reject(&:empty?).join("\n\n")
     end
 
     private
@@ -38,6 +38,25 @@ module Gusto
       result_color report['status'], report['title']
     end
 
+    def stack_traces
+      reports = failures_with_stack_traces(root_report['subreports'])
+      reports.each_with_index.map do |report, i|
+        result_color(report['status'], "#{i+1}. #{report['title']}") +
+          "\n\n" + report['stack']
+      end.join("\n\n")
+    end
+
+    def failures_with_stack_traces(reports)
+      collected = []
+      reports.each do |report|
+        collected << report if report['status'] == FAILED && report['stack']
+        if report['subreports']
+          collected += failures_with_stack_traces(report['subreports'])
+        end
+      end
+      collected
+    end
+
     def footer
       result_color root_report['status'], "#{total} total, #{passed} passed, #{pending} pending, #{failed} failed"
     end

data/lib/gusto/server.rb

@@ -10,8 +10,8 @@ require File.expand_path(File.dirname(__FILE__) + '/../gusto')
 
 module Gusto
   class Server < Sinatra::Application
-    def self.start
-      Rack::Handler.default.run rack_app, :Port => Configuration.port
+    def self.start(host, port)
+      Rack::Handler.default.run rack_app, :Host => host, :Port => port 
     end
 
     def self.rack_app

data/lib/gusto/server_spawner.rb

@@ -0,0 +1,68 @@
+require 'socket'
+require 'timeout'
+
+module Gusto
+  class ServerSpawner
+    attr :port, :quiet
+    
+    def initialize(options={})
+      @port = options[:port]
+      @quiet = options.fetch(:quiet, false)
+    end
+
+    def host
+      '127.0.0.1'
+    end
+
+    def spawn
+      choose_open_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
+    end
+
+    def terminate
+      Process.kill 'TERM', @server if @server
+    end
+
+    private
+
+    def choose_open_port
+      until port_open?(port)
+        puts "Port #{port} is busy, trying #{port + 1} instead"
+        @port += 1
+      end
+    end
+
+    def close_std_io
+      $stdout.reopen "/dev/null", "w"
+      $stderr.reopen "/dev/null", "w"
+    end
+
+    def process_name=(name)
+      $0 = name
+    end
+
+    def start_server
+      Server.start host, port
+    end
+
+    def root_url
+      "http://#{host}:#{port}/"
+    end
+
+    def wait_for_server_at(url)
+      Net::HTTP.get URI.parse(url)
+    rescue Errno::ECONNREFUSED
+      sleep 1
+      retry
+    end
+
+    def port_open?(port)
+      !system("lsof -i:#{port}", out: '/dev/null')
+    end
+  end
+end

data/lib/gusto/version.rb

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

metadata

@@ -1,125 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: gusto
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta14
+  version: 1.0.0.beta15
 platform: ruby
 authors:
 - Tobias Cohen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-31 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script
   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: json
   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: sprockets
   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: sprockets-helpers
   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: sinatra
   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: sass
   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: slim
   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
     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: fosl
+  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'
 description: Gusto is Coffeescript behavioral testing framework, with a command line
@@ -154,6 +168,7 @@ files:
 - lib/gusto/configuration.rb
 - lib/gusto/runner.rb
 - lib/gusto/server.rb
+- lib/gusto/server_spawner.rb
 - lib/gusto/sprockets.rb
 - lib/gusto/version.rb
 - phantom/headless_runner.js
@@ -172,17 +187,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Coffeescript testing framework