guard-jasmine 0.3.1 → 0.3.2

data/README.md

@@ -53,7 +53,7 @@ Add guard definition to your `Guardfile` by running this command:
 
     $ guard init jasmine
 
-### Rails 3.1
+### Jasminerice
 
 With Rails 3.1 you can write your Jasmine specs in addition to JavaScript with CoffeeScript, fully integrated into the
 Rails 3.1 asset pipeline with Jasminerice.
@@ -104,8 +104,6 @@ Please read the [Guard usage documentation](https://github.com/guard/guard#readm
 Guard::Jasmine can be adapted to all kind of projects. Please read the
 [Guard documentation](https://github.com/guard/guard#readme) for more information about the Guardfile DSL.
 
-### Rails 3.1 with Jasminerice
-
     guard 'jasmine' do
       watch(%r{app/assets/javascripts/(.+)\.(js\.coffee|js)}) { |m| "spec/javascripts/#{m[1]}_spec.#{m[2]}" }
       watch(%r{spec/javascripts/(.+)_spec\.(js\.coffee|js)})  { |m| "spec/javascripts/#{m[1]}_spec.#{m[2]}" }
@@ -144,8 +142,9 @@ than running a whole suite.
 
 ### A note on Rails 2 and 3
 
-This readme describes the use of Guard::Jasmine with Jasminerice through the asset pipeline. But as long as you
-serve the Jasmine test runner under a certain url, it's freely up to you how to prepare and serve the runner.
+This readme describes the use of Guard::Jasmine with Jasminerice through the asset pipeline, but it is not really
+a requirement for Guard::Jasmine. As long as you serve the Jasmine test runner under a certain url,
+it's freely up to you how you'll prepare the assets and serve the Jasmine runner.
 
 You can use [the Jasmine Gem][], configure the test suite in `jasmine.yml` and start the Jasmine test runner with
 the supplied Rake task:
@@ -164,8 +163,8 @@ Next follows an example on how to configure your `Guardfile` with the Jasmine ge
 It is also possible to use CoffeeScript in this setup, by using [Guard::CoffeeScript][] to compile your code and even
 specs. Just add something like this *before* Guard::Jasmine:
 
-  guard 'coffeescript', :input => 'app/coffeescripts', :output => 'public/javascripts'
-  guard 'coffeescript', :input => 'spec/coffeescripts', :output => 'spec/javascripts'
+    guard 'coffeescript', :input => 'app/coffeescripts',  :output => 'public/javascripts'
+    guard 'coffeescript', :input => 'spec/coffeescripts', :output => 'spec/javascripts'
 
 ## Alternatives
 
@@ -177,7 +176,7 @@ featured browser environment.
 
 ## Development
 
-- Documentation hosted at [RubyDoc](http://rubydoc.info/gems/guard-jasmine/file/README.md).
+- Documentation hosted at [RubyDoc](http://rubydoc.info/github/guard/guard-jasmine/master/frames).
 - Source hosted at [GitHub](https://github.com/netzpirat/guard-jasmine).
 - Report issues and feature requests to [GitHub Issues](https://github.com/netzpirat/guard-jasmine/issues).
 

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

@@ -37,38 +37,39 @@ specsReady = ->
 #
 extractResult = ->
   page.evaluate ->
-    stats = /(\d+) specs, (\d+) failures? in (\d+.\d+)s/.exec document.body.querySelector('.description').innerText
+    stats = /(\d+) specs?, (\d+) failures? in (\d+.\d+)s/.exec(document.body.querySelector('.description').innerText)
+    specs = parseInt stats[1]
+    failures = parseInt stats[2]
+    time = parseFloat stats[3]
+    passed = failures is 0
 
     result = {
-      passed: true
+      passed: passed
       stats: {
-        specs: parseInt stats[1]
-        failures: parseInt stats[2]
-        time: parseFloat stats[3]
+        specs: specs
+        failures: failures
+        time: time
       }
       suites: []
     }
 
     for suite in document.body.querySelectorAll('div.jasmine_reporter > div.suite')
       description = suite.querySelector('a.description')
-
       suite_ = {
         description: description.innerText
         specs: []
       }
 
       for spec in suite.querySelectorAll('div.spec')
-        passed = spec.getAttribute('class').indexOf('passed') isnt -1
-        result['passed'] = false if not passed
-
-        spec_ = {
-          description: spec.querySelector('a.description').getAttribute 'title'
-          passed: passed
-        }
-
-        spec_['error_message'] = spec.querySelector('div.resultMessage').innerText if not passed
-
-        suite_['specs'].push spec_
+        status = spec.getAttribute('class').substring(5)
+        if status isnt 'skipped'
+          passed = status is 'passed'
+          spec_ = {
+            description: spec.querySelector('a.description').getAttribute 'title'
+            passed: passed
+          }
+          spec_['error_message'] = spec.querySelector('div.resultMessage').innerText if not passed
+          suite_['specs'].push spec_
 
       result['suites'].push suite_
 

data/lib/guard/jasmine/runner.rb

@@ -25,8 +25,7 @@ module Guard
         def run(paths, options = { })
           return [false, []] if paths.empty?
 
-          message = options[:message] || (paths == ['spec/javascripts'] ? 'Run all specs' : "Run specs #{ paths.join(' ') }")
-          UI.info message, :reset => true
+          notify_start_message(paths)
 
           results = paths.inject([]) do |results, file|
             results << evaluate_result(run_jasmine_spec(file, options), file, options)
@@ -39,13 +38,27 @@ module Guard
 
         private
 
+        # Shows a notification in the console that the runner starts.
+        #
+        # @param [Array<String>] paths the spec files or directories
+        #
+        def notify_start_message(paths)
+          message = if paths == ['spec/javascripts']
+                      'Run all Jasmine suites'
+                    else
+                      "Run Jasmine suite#{ paths.size == 1 ? '' : 's' } #{ paths.join(' ') }"
+                    end
+
+          Formatter.info(message, :reset => true)
+        end
+
         # Returns the failed spec file names.
         #
         # @param [Array<Object>] results the spec runner results
         # @return [Array<String>] the list of failed spec files
         #
         def failed_paths_from(results)
-          results.map { |r| !r['passed'] ? r['file']: nil }.compact
+          results.map { |r| !r['passed'] ? r['file'] : nil }.compact
         end
 
         # Returns the response status for the given result set.
@@ -63,7 +76,7 @@ module Guard
         #
         def run_jasmine_spec(file, options)
           suite = jasmine_suite(file, options)
-          Formatter.info("Run Jasmine tests at #{ suite }")
+          Formatter.info("Run Jasmine suite at #{ suite }")
           IO.popen(phantomjs_command(options) + ' ' + suite)
         end
 
@@ -83,7 +96,7 @@ module Guard
         # @return [String] the Jasmine url
         #
         def jasmine_suite(file, options)
-          options[:jasmine_url] + suite_name_for(file)
+          options[:jasmine_url] + query_string_for_suite(file)
         end
 
         # Get the PhantomJS script that executes the spec and extracts
@@ -103,14 +116,14 @@ module Guard
         # @param [String] file the spec file
         # @return [String] the suite name
         #
-        def suite_name_for(file)
+        def query_string_for_suite(file)
           return '' if file == 'spec/javascripts'
 
           query_string = ''
 
           File.foreach(file) do |line|
             if line =~ /describe\s*[("']+(.*?)["')]+/
-              query_string = "?#{ $1 }"
+              query_string = "?spec=#{ $1 }"
               break
             end
           end
@@ -128,17 +141,26 @@ module Guard
         # @return [Hash] the suite result
         #
         def evaluate_result(output, file, options)
-          result = MultiJson.decode(output.read)
-          output.close
+          json = output.read
 
-          if result['error']
-            notify_runtime_error(result, options)
-          else
-            result['file'] = file
-            notify_spec_result(result, options)
-          end
+          begin
+            result = MultiJson.decode(json)
+            output.close
+
+            if result['error']
+              notify_runtime_error(result, options)
+            else
+              result['file'] = file
+              notify_spec_result(result, options)
+            end
+
+            result
 
-          result
+          rescue Exception => e
+            Formatter.error("Cannot decode JSON from PhantomJS runner: #{ e.message }")
+            Formatter.error('Please report an issue at: https://github.com/netzpirat/guard-jasmine/issues')
+            Formatter.error(json)
+          end
         end
 
         # Notification when a system error happens that
@@ -172,9 +194,10 @@ module Guard
 
           if failures != 0
             notify_specdoc(result, message, options)
+            Formatter.notify(message, :title => 'Jasmine suite failed', :image => :failed, :priority => 2) if options[:notification]
           else
             Formatter.success(message)
-            Formatter.notify(message, :title => 'Jasmine specs passed') if options[:notification] && !options[:hide_success]
+            Formatter.notify(message, :title => 'Jasmine suite passed') if options[:notification] && !options[:hide_success]
           end
         end
 
@@ -192,14 +215,37 @@ module Guard
               if spec['passed']
                 Formatter.success(" ✔ #{ spec['description'] }") if !options[:hide_success]
               else
-                Formatter.spec_failed(" ✘ #{ spec['description'] } ➤ #{ spec['error_message'] }")
-                Formatter.notify(stats, :title => "#{ spec['description'] }: #{ spec['error_message'] }", :image => :failed, :priority => 2) if options[:notification]
+                Formatter.spec_failed(" ✘ #{ spec['description'] }")
+                Formatter.spec_failed("   ➤ #{ format_error_message(spec['error_message'], false) }")
+                Formatter.notify("#{ spec['description'] }: #{ format_error_message(spec['error_message'], true) }",
+                                 :title    => 'Jasmine spec failed',
+                                 :image    => :failed,
+                                 :priority => 2) if options[:notification]
               end
             end
           end
 
           Formatter.info(stats)
         end
+
+        # Formats the error message.
+        #
+        # Known message styles:
+        #
+        # - {message} in http.*assets/{spec}?body=\d ({line})
+        #
+        # @param [String] message the error message
+        # @param [Boolean] short show a short version of the message
+        # @return [String] the cleaned error message
+        #
+        def format_error_message(message, short)
+          if message =~ /(.*?) in http.+?assets\/(.*)\?body=\d+\s\((line\s\d+)/
+            short ? $1 : "#{ $1 } in #{ $2 } on #{ $3 }"
+          else
+            message
+          end
+        end
+
       end
     end
   end

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.3.1'
+    VERSION = '0.3.2'
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: guard-jasmine
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Michael Kessler