guard-jasmine 0.9.14 → 1.0.0

data/lib/guard/jasmine/runner.rb

@@ -6,7 +6,7 @@ module Guard
   class Jasmine
 
     # The Jasmine runner handles the execution of the spec through the PhantomJS binary,
-    # evaluates the JSON response from the PhantomJS Script `run_jasmine.coffee`,
+    # evaluates the JSON response from the PhantomJS Script `guard_jasmine.coffee`,
     # writes the result to the console and triggers optional system notifications.
     #
     module Runner
@@ -118,7 +118,7 @@ module Guard
         # @return [String] the path to the PhantomJS script
         #
         def phantomjs_script
-          File.expand_path(File.join(File.dirname(__FILE__), 'phantomjs', 'run-jasmine.coffee'))
+          File.expand_path(File.join(File.dirname(__FILE__), 'phantomjs', 'guard-jasmine.coffee'))
         end
 
         # The suite name must be extracted from the spec that
@@ -278,7 +278,9 @@ module Guard
         def report_specdoc_logs(spec, options, level)
           if spec['logs'] && (options[:console] == :always || (options[:console] == :failure && !spec['passed']))
             spec['logs'].each do |log|
-              Formatter.info(indent("    • #{ format_message(log, true) }", level))
+              log.split("\n").each_with_index do |message, index|
+                Formatter.info(indent("    #{ index == 0 ? '•' : ' ' } #{ message }", level))
+              end
             end
           end
         end

data/lib/guard/jasmine/task.rb

@@ -34,7 +34,7 @@ module Guard
         desc 'Run all Jasmine specs'
         task(name) do
           begin
-            Guard::Jasmine::CLI.start(options.split)
+            ::Guard::Jasmine::CLI.start(options.split)
 
           rescue SystemExit => e
             case e.status

data/lib/guard/jasmine/version.rb

@@ -1,6 +1,6 @@
 module Guard
   module JasmineVersion
     # Guard::Jasmine version that is used for the Gem specification
-    VERSION = '0.9.14'
+    VERSION = '1.0.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-jasmine
 version: !ruby/object:Gem::Version
-  version: 0.9.14
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-08 00:00:00.000000000 Z
+date: 2012-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70306138105320 !ruby/object:Gem::Requirement
+  requirement: &70338979257280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.3
   type: :runtime
   prerelease: false
-  version_requirements: *70306138105320
+  version_requirements: *70338979257280
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70306138104940 !ruby/object:Gem::Requirement
+  requirement: &70338979256900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70306138104940
+  version_requirements: *70338979256900
 - !ruby/object:Gem::Dependency
   name: childprocess
-  requirement: &70306138104480 !ruby/object:Gem::Requirement
+  requirement: &70338979256440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70306138104480
+  version_requirements: *70338979256440
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70306138104060 !ruby/object:Gem::Requirement
+  requirement: &70338979256020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70306138104060
+  version_requirements: *70338979256020
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70306138103640 !ruby/object:Gem::Requirement
+  requirement: &70338979255600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70306138103640
+  version_requirements: *70338979255600
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70306138103220 !ruby/object:Gem::Requirement
+  requirement: &70338979255180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70306138103220
+  version_requirements: *70338979255180
+- !ruby/object:Gem::Dependency
+  name: guard-coffeescript
+  requirement: &70338979254760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70338979254760
+- !ruby/object:Gem::Dependency
+  name: guard-shell
+  requirement: &70338979254340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70338979254340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70306138102800 !ruby/object:Gem::Requirement
+  requirement: &70338979253920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70306138102800
+  version_requirements: *70338979253920
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70306138102380 !ruby/object:Gem::Requirement
+  requirement: &70338979253500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70306138102380
+  version_requirements: *70338979253500
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70306138101960 !ruby/object:Gem::Requirement
+  requirement: &70338979253080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70306138101960
+  version_requirements: *70338979253080
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70306138101540 !ruby/object:Gem::Requirement
+  requirement: &70338979252660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70306138101540
+  version_requirements: *70338979252660
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70306138101120 !ruby/object:Gem::Requirement
+  requirement: &70338979252240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70306138101120
+  version_requirements: *70338979252240
 description: Guard::Jasmine automatically tests your Jasmine specs on PhantomJS
 email:
 - michi@netzpiraten.ch
@@ -146,7 +168,13 @@ files:
 - lib/guard/jasmine/cli.rb
 - lib/guard/jasmine/formatter.rb
 - lib/guard/jasmine/inspector.rb
-- lib/guard/jasmine/phantomjs/run-jasmine.coffee
+- lib/guard/jasmine/phantomjs/guard-jasmine.coffee
+- lib/guard/jasmine/phantomjs/lib/console.js
+- lib/guard/jasmine/phantomjs/lib/reporter.js
+- lib/guard/jasmine/phantomjs/src/console.coffee
+- lib/guard/jasmine/phantomjs/src/reporter.coffee
+- lib/guard/jasmine/phantomjs/test/console_spec.coffee
+- lib/guard/jasmine/phantomjs/test/reporter_spec.coffee
 - lib/guard/jasmine/runner.rb
 - lib/guard/jasmine/server.rb
 - lib/guard/jasmine/task.rb

data/lib/guard/jasmine/phantomjs/run-jasmine.coffee

@@ -1,247 +0,0 @@
-# This file is the script that runs within PhantomJS, requests the Jasmine specs
-# and waits until they are ready.
-
-# Wait until the test condition is true or a timeout occurs.
-#
-# @param [Function] test the test that returns true if condition is met
-# @param [Function] ready the action when the condition is fulfilled
-# @param [Number] timeout the max amount of time to wait in milliseconds
-#
-waitFor = (test, ready, timeout = 5000) ->
-    start = new Date().getTime()
-    condition = false
-
-    wait = ->
-      if (new Date().getTime() - start < timeout) and not condition
-        condition = test()
-      else
-        if not condition
-          text = page.evaluate -> document.getElementsByTagName('body')[0]?.innerText
-
-          if text
-            error = """
-                    Timeout waiting for the Jasmine test results!
-
-                    #{ text }
-                    """
-            console.log JSON.stringify({ error: error })
-          else
-            console.log JSON.stringify({ error: 'Timeout waiting for the Jasmine test results!' })
-
-          phantom.exit(1)
-        else
-          ready()
-          clearInterval interval
-
-    interval = setInterval wait, 250
-
-# Test if the specs have finished.
-#
-specsReady = ->
-  page.evaluate -> window.resultReceived
-
-#
-# SCRIPT START
-#
-
-# Set default values
-url = phantom.args[0] || 'http://127.0.0.1:3000/jasmine'
-timeout = parseInt(phantom.args[1] || 5000)
-
-# Create the web page.
-#
-page = require('webpage').create()
-
-# Used to collect log messages for later assignment to the spec
-#
-currentSpecId = -1
-logs = {}
-
-# Add logs to the given suite
-#
-# @param suite [Object} the suite result
-#
-page.addLogs = (suite) ->
-  for s in suite.suites
-    arguments.callee(s) if s
-
-  for spec in suite.specs
-    id = Number(spec['id'])
-    spec['logs'] = logs[id] if logs[id] && logs[id].length isnt 0
-    delete spec['id']
-
-  delete suite['id']
-  delete suite['parent']
-
-# Capture console.log output to add it to
-# the result when specs have finished.
-#
-page.onConsoleMessage = (msg, line, source) ->
-  if /^RUNNER_RESULT: ([\s\S]*)$/.test(msg)
-    result = JSON.parse(RegExp.$1)
-
-    for suite in result.suites
-      page.addLogs(suite)
-
-    console.log JSON.stringify(result, undefined, 2)
-    page.evaluate -> window.resultReceived = true
-
-  else if /^SPEC_START: (\d+)$/.test(msg)
-    currentSpecId = Number(RegExp.$1)
-    logs[currentSpecId] = []
-
-  else
-    logs[currentSpecId].push("#{ msg } in #{ source } (line #{ line })") if currentSpecId isnt -1
-
-# Initialize the page before the JavaScript is run.
-#
-page.onInitialized = ->
-  page.evaluate ->
-
-    # Jasmine Reporter that logs reporter steps
-    # and results to the console.
-    #
-    class ConsoleReporter
-
-      runnerResult: {
-        passed: false
-        stats: {
-          specs: 0
-          failures: 0
-          time: 0.0
-        }
-        suites: []
-      }
-
-      specCount: 0
-      currentSpecs: []
-      nestedSuiteResults: {}
-
-      # Report the start of a spec.
-      #
-      # @param spec [jasmine.Spec] the spec
-      #
-      reportSpecStarting: (spec) ->
-        console.log "SPEC_START: #{ spec.id }"
-
-      # Report results from a spec.
-      #
-      # @param spec [jasmine.Spec] the spec
-      #
-      reportSpecResults: (spec) ->
-        unless spec.results().skipped
-          specResult = {
-            id: spec.id
-            description: spec.description
-            passed: spec.results().failedCount is 0
-          }
-
-          if spec.results().failedCount isnt 0
-            messages = []
-            messages.push result.message for result in spec.results().getItems()
-            specResult['messages'] = messages if messages.length isnt 0
-
-          @specCount += 1
-          @currentSpecs.push specResult
-
-      # Report results from a suite.
-      #
-      # @param suite [jasmine.Suite] the suite
-      #
-      reportSuiteResults: (suite) ->
-        unless suite.results().skipped
-          suiteResult = {
-            id: suite.id
-            parent: suite.parentSuite?.id
-            description: suite.description
-            passed: suite.results().failedCount is 0
-            specs: @currentSpecs
-            suites: []
-          }
-
-          if suite.parentSuite?
-            parent = suite.parentSuite.id
-            @nestedSuiteResults[parent] = [] unless @nestedSuiteResults[parent]
-            @nestedSuiteResults[parent].push suiteResult
-          else
-            @addNestedSuites suiteResult
-            @removeEmptySuites suiteResult
-
-            if suiteResult.specs.length isnt 0 || suiteResult.suites.length isnt 0
-              @runnerResult.suites.push suiteResult
-
-        @currentSpecs = []
-
-      # Report results from the runner.
-      #
-      # @param runner [jasmine.Runner] the runner
-      #
-      reportRunnerResults: (runner) ->
-        runtime = (new Date().getTime() - @startTime) / 1000
-
-        @runnerResult['passed'] = runner.results().failedCount is 0
-
-        @runnerResult['stats'] = {
-          specs: @specCount
-          failures: runner.results().failedCount
-          time: runtime
-        }
-
-        console.log "RUNNER_RESULT: #{ JSON.stringify(@runnerResult) }"
-
-      # Report the start of the runner
-      #
-      # @param runner [jasmine.Runner] the runner
-      #
-      reportRunnerStarting: (runner) ->
-        @startTime = new Date().getTime()
-
-      # Add all nested suites that have previously
-      # been processed.
-      #
-      # @param suiteResult [Object] the suite result
-      #
-      addNestedSuites: (suiteResult) ->
-        if @nestedSuiteResults[suiteResult.id]
-          for suite in @nestedSuiteResults[suiteResult.id]
-            @addNestedSuites suite
-            suiteResult.suites.push suite
-
-      # Removes suites without child suites or specs.
-      #
-      # @param suiteResult [Object] the suite result
-      #
-      removeEmptySuites: (suiteResult) ->
-        suites = []
-
-        for suite in suiteResult.suites
-          @removeEmptySuites suite
-
-          suites.push suite if suite.suites.length isnt 0 || suite.specs.length isnt 0
-
-        suiteResult.suites = suites
-
-      # Log a message
-      #
-      # @param message [String] the log message
-      #
-      log: (message) ->
-
-    # Attach the console reporter when the document is ready.
-    #
-    window.onload = ->
-      window.resultReceived = false
-      jasmine.getEnv().addReporter(new ConsoleReporter())
-
-# Open web page and run the Jasmine test runner
-#
-page.open url, (status) ->
-  # Avoid that a failed iframe load breaks the runner, see https://github.com/netzpirat/guard-jasmine/pull/19
-  page.onLoadFinished = ->
-
-  if status isnt 'success'
-    console.log JSON.stringify({ error: "Unable to access Jasmine specs at #{ url }" })
-    phantom.exit()
-  else
-    done = -> phantom.exit()
-    waitFor specsReady, done, timeout