guard-jasmine 2.0.6 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a32c46dde08e58ce675e76ad7173e7bfb139d3b
-  data.tar.gz: c719c3dd1f8f532fdd397f9bfd06bd3f55aa5c71
+  metadata.gz: 12c271a333b0412865d54f16da8376dbb478abbc
+  data.tar.gz: d07623663f5f1e48c537730e0db93b3283a2d24f
 SHA512:
-  metadata.gz: 46a01b21d0d1b1e0aaebf3f8aeeb48c937f71bfd3b39dd038432c44587958a89b6188bd8b6e488dba816d783f7d5634693ff3cfb1b293c5cc94cca20801ac532
-  data.tar.gz: 73802e267a0b8a38fc4a7341733e34324fe1e2addd2312fb7f2af4eca8cda376198f6374b112a877b43de2b72e25460ca5eebe86fd1aba41c1268586589a306a
+  metadata.gz: bfe42393a0ac67853b9fec568f60538bb92512edc0fcca210a19e323b445ff9771fac363368728236d74999b32a22a1915f57b02ba2ab64dee575bf60f3498bd
+  data.tar.gz: 20a4cc2b18881720e2befda1a6a9e32108131b6217b22825bff5fc23ac1fe7133a7f94966909d7dff6d2b781905ff95e476e4d9b219427b976f34c6c66c5d3fd

data/README.md

@@ -1,4 +1,4 @@
-# Guard::Jasmine [![Build Status](https://secure.travis-ci.org/guard/guard-jasmine.png)](http://travis-ci.org/guard/guard-jasmine)
+# Guard::Jasmine [![Build Status](https://secure.travis-ci.org/guard/guard-jasmine.png)](https://travis-ci.org/guard/guard-jasmine)
 
 Guard::Jasmine automatically tests your Jasmine specs when files are modified.
 
@@ -23,7 +23,7 @@ generate coverage reports.
 
 * Custom console logger implementation for pretty printing JavaScript objects and DOM elements.
 
-* Can be used to run [Jasmine-species](http://rudylattae.github.com/jasmine-species/) acceptance tests provided by
+* Can be used to run [Jasmine-species](http://rudylattae.github.io/jasmine-species/) acceptance tests provided by
 [Jasmine Stories](https://github.com/DominikGuzei/jasmine-stories).
 
 * Thor and Rake command line helper for CI server integration.
@@ -40,7 +40,7 @@ for an introduction to Jasmine, Jasminerice and Guard::Jasmine.
 
 ### Guard and Guard::Jasmine
 
-The simplest way to install Guard is to use [Bundler](http://gembundler.com/).
+The simplest way to install Guard is to use [Bundler](http://bundler.io).
 Please make sure to have [Guard][] installed.
 
 Add Guard::Jasmine to your `Gemfile`:
@@ -309,6 +309,38 @@ You can further customize the log output by implement one of these methods:
 In addition, the console can log jQuery collections and outputs the HTML representation of the element by using the
 jQuery `html()` method.
 
+### Custom Report options
+
+Guard::Jasmine supports [custom jasmine reporters](http://jasmine.github.io/2.1/custom_reporter.html). In order to use them you have to configure jasmine and make sure that you add the javascript files to the available assets, in this case I use the ones from [larrymyers/jasmine-reporters](https://github.com/larrymyers/jasmine-reporters):
+
+```yaml
+reporters:
+  junit:
+    - "junit_reporter.js"
+    - "junit_reporter.boot.js"
+```
+
+junit_reporter.boot.js is the file where you'll have to intialize and configure the reporter:
+
+```javascript
+(function() {
+    var reporter = new jasmineReporters.JUnitXmlReporter({
+        // Here you can set any options that the custom reporter accepts
+        savePath: 'reports/junit'
+    });
+    jasmine.getEnv().addReporter(reporter);
+})();
+```
+
+Once you got everything in the right place, run guard-jasmine with --reporters
+
+#### Making your own reporter write to the filesystem
+
+If none of the existing reporters work for you, you are writing your own one and you want it to write it's output to the filesystem, you have two options:
+
+  1. use window.__phantom_writeFile(filename, text) (the way [larrymyers/jasmine-reporters](https://github.com/larrymyers/jasmine-reporters) works)
+  2. use window.callPhantom({event: 'writeFile', filename: filename, text: text}) (the way [shepmaster/jasmine-junitreporter](https://github.com/shepmaster/jasmine-junitreporter) works)
+
 ### Coverage options
 
 Guard::Jasmine supports coverage reports generated by [Istanbul](https://github.com/gotwarlost/istanbul). You need to
@@ -330,7 +362,7 @@ coverage: true                                # Enable/disable JavaScript covera
 Istanbul needs to instrument the implementation files so that the execution path can be detected. Guard::Jasmine comes
 with a tilt template that generates instrumented implementation files when using in the asset pipeline. If you do not
 use asset pipeline, than you need to instrument your files on your own, either manually (basic example: `istanbul instrument --output instrumented_scripts scripts`) or by using something like
-[Guard::Process](https://github.com/socialreferral/guard-process). You can get more information about the
+[Guard::Process](https://github.com/guard/guard-process). You can get more information about the
 instrumentation with `istanbul help instrument`. You'll also need to update your `:spec_dir` or `jasmine.yml/src_dir` settings to point Guard::Jasmine to these instrumented source files.
 
 **Important**: You need to clear the asset cache when you change this setting, so that already compiled assets will be
@@ -413,7 +445,7 @@ end
 These options affects what system notifications are shown after a spec run:
 
 ```ruby
-notifications: false                          # Show success and error notifications.
+notification: false                           # Show success and error notifications.
                                               # default: true
 
 hide_success: true                            # Disable successful spec run notification.
@@ -545,7 +577,7 @@ $ rake guard:jasmine
 
 ### Travis CI integration
 
-With the given `guard-jasmine` script you're able to configure [Travis CI](http://travis-ci.org/) to run Guard::Jasmine.
+With the given `guard-jasmine` script you're able to configure [Travis CI](https://travis-ci.org/) to run Guard::Jasmine.
 Simply use the `script` setting in your `.travis.yml`:
 
 ```yaml
@@ -614,7 +646,7 @@ When you file an issue, please try to follow to these simple rules if applicable
 
 ## Development information
 
-- Documentation hosted at [RubyDoc](http://rubydoc.info/github/guard/guard-jasmine/master/frames).
+- Documentation hosted at [RubyDoc](http://www.rubydoc.info/github/guard/guard-jasmine/master/frames).
 - Source hosted at [GitHub](https://github.com/guard/guard-jasmine).
 
 Pull requests are very welcome! Please try to follow these simple rules if applicable:
@@ -710,20 +742,20 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 [Guard]: https://github.com/guard/guard
 [Guards]: https://github.com/guard
 [Guard Team]: https://github.com/guard/guard/contributors
-[Ariya Hidayat]: http://twitter.com/#!/AriyaHidayat
+[Ariya Hidayat]: https://twitter.com/#!/AriyaHidayat
 [PhantomJS]: http://www.phantomjs.org/
 [the PhantomJS download section]: http://code.google.com/p/phantomjs/downloads/list
 [PhantomJS build instructions]: http://code.google.com/p/phantomjs/wiki/BuildInstructions
-[Brad Phelan]: http://twitter.com/#!/bradgonesurfing
+[Brad Phelan]: https://twitter.com/#!/bradgonesurfing
 [Jasminerice]: https://github.com/bradphelan/jasminerice
 [jasmine-rails]: https://github.com/searls/jasmine-rails
 [Pivotal Labs]: http://pivotallabs.com/
 [Jasmine]: http://pivotal.github.com/jasmine/
 [the Jasmine Gem]: https://github.com/pivotal/jasmine-gem
-[Jeremy Ashkenas]: http://twitter.com/#!/jashkenas
-[CoffeeScript]: http://jashkenas.github.com/coffee-script/
+[Jeremy Ashkenas]: https://twitter.com/#!/jashkenas
+[CoffeeScript]: http://coffeescript.org/
 [Rails 3.1 asset pipeline]: http://guides.rubyonrails.org/asset_pipeline.html
-[Homebrew]: http://mxcl.github.com/homebrew/
+[Homebrew]: http://brew.sh/
 [PhantomJS script]: https://github.com/netzpirat/guard-jasmine/blob/master/lib/guard/jasmine/phantomjs/guard-jasmine.coffee
 [Guard::CoffeeScript]: https://github.com/guard/guard-coffeescript
 [Sinon.JS]: http://sinonjs.org
@@ -731,5 +763,5 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 [guard-konacha]: https://github.com/alexgb/guard-konacha
 [konacha]: https://github.com/jfirebaugh/konacha
 [Karma]: https://github.com/karma-runner/karma
-[guard-teabag]: https://github.com/modeset/guard-teabag
-[Teabag]: https://github.com/modeset/teabag
+[guard-teabag]: https://github.com/modeset/guard-teaspoon
+[Teabag]: https://github.com/modeset/teaspoon

data/lib/generators/guard_jasmine/templates/Guardfile

@@ -4,6 +4,6 @@
 guard :jasmine do
   watch(%r{^spec/javascripts/.*(?:_s|S)pec\.(coffee|js)$})
   watch(%r{app/assets/javascripts/(.+?)\.(js\.coffee|js|coffee)(?:\.\w+)*$}) do |m|
-    "spec/javascripts/jasmine/#{ m[1] }_spec.#{ m[2] }"
+    "spec/javascripts/jasmine/#{m[1]}_spec.#{m[2]}"
   end
 end

data/lib/guard/jasmine.rb

@@ -22,7 +22,7 @@ module Guard
       server:                   :auto,
       server_env:               ENV['RAILS_ENV'] || 'development',
       server_timeout:           60,
-      server_mount:             '/jasmine',  # set here for documentation purposes; actually determiend at runtime by presence (or lack thereof) of the JasmineRails constant
+      server_mount:             '/jasmine', # set here for documentation purposes; actually determiend at runtime by presence (or lack thereof) of the JasmineRails constant
       port:                     nil,
       rackup_config:            nil,
       jasmine_url:              nil,
@@ -47,11 +47,9 @@ module Guard
       functions_threshold:      0,
       branches_threshold:       0,
       lines_threshold:          0,
-      junit:                    false,
-      junit_consolidate:        true,
-      junit_save_path:          '',
+      reporters:                nil,
       debug:                    false
-    }
+    }.freeze
 
     # Initialize Guard::Jasmine.
     #
@@ -93,9 +91,9 @@ module Guard
 
       options[:spec_dir]    ||= File.exist?(File.join('spec', 'javascripts')) ? File.join('spec', 'javascripts') : 'spec'
       options[:server]      ||= :auto
-      options[:server]       =  ::Guard::Jasmine::Server.detect_server(options[:spec_dir]) if options[:server] == :auto
+      options[:server] = ::Guard::Jasmine::Server.detect_server(options[:spec_dir]) if options[:server] == :auto
       options[:port]        ||= ::Guard::Jasmine::Server.choose_server_port(options)
-      options[:jasmine_url]   = "http://localhost:#{ options[:port] }#{ options[:server] == :jasmine_gem ? '/' : options[:server_mount] }" unless options[:jasmine_url]
+      options[:jasmine_url]   = "http://localhost:#{options[:port]}#{options[:server] == :jasmine_gem ? '/' : options[:server_mount]}" unless options[:jasmine_url]
       options[:specdoc]       = :failure unless [:always, :never, :failure].include? options[:specdoc]
       options[:phantomjs_bin] = Jasmine.which('phantomjs') unless options[:phantomjs_bin]
 
@@ -152,6 +150,7 @@ module Guard
 
       throw :task_has_failed if last_run_failed
     end
+
     # Gets called when watched paths and files have changes.
     #
     # @param [Array<String>] paths the changed paths and files

data/lib/guard/jasmine/cli.rb

@@ -150,20 +150,11 @@ module Guard
                     default: 0,
                     desc:    'Lines coverage threshold'
 
-      method_option :junit,
-                    type:    :boolean,
-                    default: false,
-                    desc:    'Whether to save jasmine test results in JUnit-compatible xml files'
-
-      method_option :junit_consolidate,
-                    type:    :boolean,
-                    default: false,
-                    desc:    'Whether to save nested describes within the same xml file as their parent'
-
-      method_option :junit_save_path,
+      method_option :reporters,
                     type:    :string,
-                    default: '',
-                    desc:    'The directory to save junit xml files into'
+                    default: nil,
+                    desc:    'Comma separated list of jasmine reporters to use'
+
 
       # Run the Guard::Jasmine::Runner with options from
       # the command line.
@@ -171,49 +162,14 @@ module Guard
       # @param [Array<String>] paths the name of the specs to run
       #
       def spec(*paths)
-        runner_options                            = {}
-        runner_options[:port]                     = options.port || CLI.find_free_server_port
-        runner_options[:spec_dir]                 = options.spec_dir || (File.exist?(File.join('spec', 'javascripts')) ? File.join('spec', 'javascripts') : 'spec')
-        runner_options[:line_number]              = options.line_number
-        runner_options[:server]                   = options.server.to_sym == :auto ? ::Guard::Jasmine::Server.detect_server(runner_options[:spec_dir]) : options.server.to_sym
-        runner_options[:server_mount]             = options.mount || (defined?(JasmineRails) ? '/specs' : '/jasmine')
-        runner_options[:jasmine_url]              = options.url || "http://localhost:#{ runner_options[:port] }#{ options.server.to_sym == :jasmine_gem ? '/' : runner_options[:server_mount] }"
-        runner_options[:phantomjs_bin]            = options.bin || CLI.which('phantomjs')
-        runner_options[:timeout]                  = options.timeout
-        runner_options[:verbose]                  = options.verbose
-        runner_options[:server_env]               = options.server_env
-        runner_options[:server_timeout]           = options.server_timeout
-        runner_options[:rackup_config]            = options.rackup_config
-        runner_options[:console]                  = [:always, :never, :failure].include?(options.console.to_sym) ? options.console.to_sym : :failure
-        runner_options[:errors]                   = [:always, :never, :failure].include?(options.errors.to_sym) ? options.errors.to_sym : :failure
-        runner_options[:specdoc]                  = [:always, :never, :failure].include?(options.specdoc.to_sym) ? options.specdoc.to_sym : :always
-        runner_options[:focus]                    = options.focus
-        runner_options[:coverage]                 = options.coverage || options.coverage_html || options.coverage_summary || options.coverage_html_dir != './coverage'
-        runner_options[:coverage_html]            = options.coverage_html || options.coverage_html_dir != './coverage'
-        runner_options[:coverage_html_dir]        = options.coverage_html_dir
-        runner_options[:coverage_summary]         = options.coverage_summary
-        runner_options[:ignore_instrumentation]   = options.ignore_instrumentation
-        runner_options[:statements_threshold]     = options.statements_threshold
-        runner_options[:functions_threshold]      = options.functions_threshold
-        runner_options[:branches_threshold]       = options.branches_threshold
-        runner_options[:lines_threshold]          = options.lines_threshold
-        runner_options[:notification]             = false
-        runner_options[:hide_success]             = true
-        runner_options[:max_error_notify]         = 0
-        runner_options[:junit]                    = options.junit
-        runner_options[:junit_consolidate]        = options.junit_consolidate
-        runner_options[:junit_save_path]          = options.junit_save_path
-        runner_options[:is_cli]                   = true
-
-        paths = [runner_options[:spec_dir]] if paths.empty?
-
-        if CLI.phantomjs_bin_valid?(runner_options[:phantomjs_bin])
+        options = runner_options
+        paths = [options[:spec_dir]] if paths.empty?
+        if CLI.phantomjs_bin_valid?(options[:phantomjs_bin])
           catch(:task_has_failed) do
-            ::Guard::Jasmine::Server.start(runner_options) unless runner_options[:server] == :none
+            ::Guard::Jasmine::Server.start(options) unless options[:server] == :none
           end
-
-          if CLI.runner_available?(runner_options)
-            result = ::Guard::Jasmine::Runner.new(runner_options).run(paths)
+          if CLI.runner_available?(options)
+            result = ::Guard::Jasmine::Runner.new(options).run(paths)
             ::Guard::Jasmine::Server.stop
             Process.exit result.empty? ? 0 : 1
           else
@@ -239,8 +195,46 @@ module Guard
       # @see Guard::Jasmine::VERSION
       #
       def version
-        Compat::UI.info "Guard::Jasmine version #{ ::Guard::JasmineVersion::VERSION }"
+        Compat::UI.info "Guard::Jasmine version #{::Guard::JasmineVersion::VERSION}"
       end
+
+      private
+
+      def runner_options
+        ro                            = {}
+        ro[:port]                     = options.port || CLI.find_free_server_port
+        ro[:spec_dir]                 = options.spec_dir || (File.exist?(File.join('spec', 'javascripts')) ? File.join('spec', 'javascripts') : 'spec')
+        ro[:line_number]              = options.line_number
+        ro[:server]                   = options.server.to_sym == :auto ? ::Guard::Jasmine::Server.detect_server(ro[:spec_dir]) : options.server.to_sym
+        ro[:server_mount]             = options.mount || (defined?(JasmineRails) ? '/specs' : '/jasmine')
+        ro[:jasmine_url]              = options.url || "http://localhost:#{ro[:port]}#{options.server.to_sym == :jasmine_gem ? '/' : ro[:server_mount]}"
+        ro[:phantomjs_bin]            = options.bin || CLI.which('phantomjs')
+        ro[:timeout]                  = options.timeout
+        ro[:verbose]                  = options.verbose
+        ro[:server_env]               = options.server_env
+        ro[:server_timeout]           = options.server_timeout
+        ro[:rackup_config]            = options.rackup_config
+        ro[:console]                  = [:always, :never, :failure].include?(options.console.to_sym) ? options.console.to_sym : :failure
+        ro[:errors]                   = [:always, :never, :failure].include?(options.errors.to_sym) ? options.errors.to_sym : :failure
+        ro[:specdoc]                  = [:always, :never, :failure].include?(options.specdoc.to_sym) ? options.specdoc.to_sym : :always
+        ro[:focus]                    = options.focus
+        ro[:coverage]                 = options.coverage || options.coverage_html || options.coverage_summary || options.coverage_html_dir != './coverage'
+        ro[:coverage_html]            = options.coverage_html || options.coverage_html_dir != './coverage'
+        ro[:coverage_html_dir]        = options.coverage_html_dir
+        ro[:coverage_summary]         = options.coverage_summary
+        ro[:ignore_instrumentation]   = options.ignore_instrumentation
+        ro[:statements_threshold]     = options.statements_threshold
+        ro[:functions_threshold]      = options.functions_threshold
+        ro[:branches_threshold]       = options.branches_threshold
+        ro[:lines_threshold]          = options.lines_threshold
+        ro[:notification]             = false
+        ro[:hide_success]             = true
+        ro[:max_error_notify]         = 0
+        ro[:query_params]             = options.reporters ? { reporters: options.reporters } : nil
+        ro[:is_cli]                   = true
+        ro
+      end
+
     end
   end
 end

data/lib/guard/jasmine/coverage.rb

@@ -28,7 +28,7 @@ class JasmineCoverage < Tilt::Template
 
       result = `#{JasmineCoverage.coverage_bin} instrument --embed-source #{input.shellescape}`
 
-      fail "Could not generate coverage instrumented file for #{ file }" unless $CHILD_STATUS.exitstatus == 0
+      raise "Could not generate coverage instrumented file for #{file}" unless $CHILD_STATUS.exitstatus.zero?
 
       result.gsub input, file
     end
@@ -60,7 +60,9 @@ if ENV['COVERAGE'] == 'true' && defined?(Rails)
   #
   class GuardJasmineCoverageEngine < ::Rails::Engine
     initializer 'guard-jasmine.initialize' do |app|
-      app.assets.register_postprocessor 'application/javascript', JasmineCoverage
+      app.config.assets.configure do |env|
+        env.register_postprocessor 'application/javascript', JasmineCoverage
+      end
     end
   end
 

data/lib/guard/jasmine/formatter.rb

@@ -95,7 +95,7 @@ module Guard
         # @param [String] color_code the color code
         #
         def color(text, color_code)
-          Compat::UI.color_enabled? ? "\e[0#{ color_code }m#{ text }\e[0m" : text
+          Compat::UI.color_enabled? ? "\e[0#{color_code}m#{text}\e[0m" : text
         end
       end
     end

data/lib/guard/jasmine/inspector.rb

@@ -20,11 +20,11 @@ module Guard
         def clean(paths, options)
           paths.uniq!
           paths.compact!
-          if paths.include?(options[:spec_dir])
-            paths = [options[:spec_dir]]
-          else
-            paths = paths.select { |p| jasmine_spec?(p) }
-          end
+          paths = if paths.include?(options[:spec_dir])
+                    [options[:spec_dir]]
+                  else
+                    paths.select { |p| jasmine_spec?(p) }
+                  end
 
           paths
         end
@@ -37,7 +37,7 @@ module Guard
         # @return [Boolean] when the file valid
         #
         def jasmine_spec?(path)
-          path =~ /(?:_s|S)pec\.(js|coffee|js\.coffee)$/ && File.exist?(path)
+          path =~ /(?:_s|S)pec\.(js|coffee|js\.coffee|cjsx|js\.cjsx)$/ && File.exist?(path)
         end
       end
     end

data/lib/guard/jasmine/phantomjs/guard-jasmine.js

@@ -1,5 +1,5 @@
 (function() {
-  var exitError, exitSuccessfully, hasLoggedError, jasmineAvailable, options, page, phantomExit, reportError, reporterMissing, reporterReady, specsDone, specsTimedout, system, waitFor;
+  var exitError, exitSuccessfully, fs, hasLoggedError, jasmineAvailable, options, page, phantomExit, reportError, reporterMissing, reporterReady, specsDone, specsTimedout, system, waitFor;
 
   system = require('system');
 
@@ -10,6 +10,8 @@
 
   page = require('webpage').create();
 
+  fs = require('fs');
+
   page.onError = function(message, trace) {
     return reportError("Javascript error encountered on Jasmine test page: " + message, trace);
   };
@@ -20,15 +22,25 @@
   };
 
   page.onInitialized = function() {
+    var injectReporter;
     page.injectJs('guard-reporter.js');
-    return page.evaluate(function() {
+    injectReporter = function(pathSeparator) {
       return window.onload = function() {
         window.reporter = new GuardReporter();
+        window.fs_path_separator = "" + pathSeparator;
+        window.__phantom_writeFile = function(filename, text) {
+          return window.callPhantom({
+            event: 'writeFile',
+            filename: filename,
+            text: text
+          });
+        };
         if (window.jasmine) {
           return window.jasmine.getEnv().addReporter(window.reporter);
         }
       };
-    });
+    };
+    return page.evaluate(injectReporter, fs.separator);
   };
 
   page.onLoadFinished = function(status) {
@@ -39,6 +51,14 @@
     }
   };
 
+  page.onCallback = function(data) {
+    if (data.event === 'writeFile') {
+      return fs.write(data.filename, data.text, 'w');
+    } else {
+      return console.log('unknown event callback: ' + data.event);
+    }
+  };
+
   page.open(options.url);
 
   reporterReady = function() {

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

@@ -9,6 +9,9 @@ options =
 # Create the web page.
 page = require('webpage').create()
 
+# Define fs to write files for custom reporters
+fs = require('fs')
+
 # Catch JavaScript errors
 # abort the request and return the error
 page.onError = (message, trace) ->
@@ -22,18 +25,28 @@ page.onResourceError = (error)->
 # the GuardReporter class
 page.onInitialized = ->
     page.injectJs 'guard-reporter.js'
-    page.evaluate ->
+    injectReporter = (pathSeparator) ->
         window.onload = ->
             window.reporter = new GuardReporter()
+            window.fs_path_separator = "#{pathSeparator}"
+            window.__phantom_writeFile = (filename, text) ->
+                window.callPhantom({event: 'writeFile', filename: filename, text: text})
             window.jasmine.getEnv().addReporter(window.reporter) if window.jasmine
+    page.evaluate injectReporter, fs.separator
 
 # Once the page is finished loading
-page.onLoadFinished = (status)->
+page.onLoadFinished = (status) ->
     if status isnt 'success'
         reportError "Unable to access Jasmine specs at #{page.reason_url}. #{page.reason}"
     else
         waitFor reporterReady, jasmineAvailable, options.timeout, reporterMissing
 
+page.onCallback = (data) ->
+    if data.event is 'writeFile'
+        fs.write(data.filename, data.text, 'w')
+    else
+        console.log('unknown event callback: ' + data.event)
+
 # Open web page, which will kick off the Jasmine test runner
 page.open options.url
 

data/lib/guard/jasmine/runner.rb

@@ -19,7 +19,7 @@ module Guard
       attr_reader :options
 
       # Name of the coverage threshold options
-      THRESHOLDS = [:statements_threshold, :functions_threshold, :branches_threshold, :lines_threshold]
+      THRESHOLDS = [:statements_threshold, :functions_threshold, :branches_threshold, :lines_threshold].freeze
 
       # Run the supplied specs.
       #
@@ -58,7 +58,7 @@ module Guard
           end
         end
         # return the errors
-        return run_results.each_with_object({}) do | spec_run, hash |
+        return run_results.each_with_object({}) do |spec_run, hash|
           file, r = spec_run
           errors = collect_spec_errors(r['suites'] || [])
           errors.push(r['error']) if r.key? 'error'
@@ -78,7 +78,7 @@ module Guard
         message = if paths == [options[:spec_dir]]
                     'Run all Jasmine suites'
                   else
-                    "Run Jasmine suite#{ paths.size == 1 ? '' : 's' } #{ paths.join(' ') }"
+                    "Run Jasmine suite#{paths.size == 1 ? '' : 's'} #{paths.join(' ')}"
                   end
 
         Formatter.info(message, reset: true)
@@ -94,7 +94,7 @@ module Guard
         arguments = [
           options[:timeout] * 1000
         ]
-        cmd = "#{ phantomjs_command } \"#{ suite }\" #{ arguments.collect(&:to_s).join(' ')}"
+        cmd = "#{phantomjs_command} \"#{suite}\" #{arguments.collect(&:to_s).join(' ')}"
         puts cmd if options[:debug]
         IO.popen(cmd, 'r:UTF-8')
       end
@@ -206,7 +206,7 @@ module Guard
       #
       def it_and_describe_lines(file, from, to)
         File.readlines(file)[from, to]
-          .select { |x| x =~ /^\s*(it|describe)/ }
+            .select { |x| x =~ /^\s*(it|describe)/ }
       end
 
       # Extracts the title of a 'description' or a 'it' declaration.
@@ -229,13 +229,14 @@ module Guard
       def evaluate_response(output, file)
         json = output.read
         json = json.encode('UTF-8') if json.respond_to?(:encode)
+        json = json.gsub(/Unsafe JavaScript.*/, '')
         begin
-          result = MultiJson.decode(json,  max_nesting: false)
-          fail 'No response from Jasmine runner' if !result && options[:is_cli]
+          result = MultiJson.decode(json, max_nesting: false)
+          raise 'No response from Jasmine runner' if !result && options[:is_cli]
           pp result if options[:debug]
           if result['error']
             if options[:is_cli]
-              fail "Runner error: #{result['error']}"
+              raise "Runner error: #{result['error']}"
             else
               notify_runtime_error(result)
             end
@@ -257,14 +258,12 @@ module Guard
             else
               Formatter.error('No response from the Jasmine runner!')
             end
+          elsif options[:is_cli]
+            raise "Cannot decode JSON from PhantomJS runner, message received was:\n#{json}"
           else
-            if options[:is_cli]
-              raise "Cannot decode JSON from PhantomJS runner, message received was:\n#{json}"
-            else
-              Formatter.error("Cannot decode JSON from PhantomJS runner: #{ e.message }")
-              Formatter.error("JSON response: #{ e.data }")
-              Formatter.error("message received was:\n#{json}")
-            end
+            Formatter.error("Cannot decode JSON from PhantomJS runner: #{e.message}")
+            Formatter.error("JSON response: #{e.data}")
+            Formatter.error("message received was:\n#{json}")
           end
         ensure
           output.close
@@ -277,7 +276,7 @@ module Guard
       # @param [Hash] result the suite result
       #
       def notify_runtime_error(result)
-        message = "An error occurred: #{ result['error'] }"
+        message = "An error occurred: #{result['error']}"
         Formatter.error(message)
         Formatter.error(result['trace']) if result['trace']
         Formatter.notify(message, title: 'Jasmine error', image: :failed, priority: 2) if options[:notification]
@@ -291,14 +290,14 @@ module Guard
       def notify_spec_result(result)
         specs         = result['stats']['specs'] - result['stats']['disabled']
         failed        = result['stats']['failed']
-        time          = sprintf('%0.2f', result['stats']['time'])
+        time          = format('%0.2f', result['stats']['time'])
         specs_plural  = specs == 1 ? '' : 's'
         failed_plural = failed == 1 ? '' : 's'
-        Formatter.info("Finished in #{ time } seconds")
+        Formatter.info("Finished in #{time} seconds")
         pending = result['stats']['pending'].to_i > 0 ? " #{result['stats']['pending']} pending," : ''
-        message      = "#{ specs } spec#{ specs_plural },#{pending} #{ failed } failure#{ failed_plural }"
-        full_message = "#{ message }\nin #{ time } seconds"
-        passed       = failed == 0
+        message      = "#{specs} spec#{specs_plural},#{pending} #{failed} failure#{failed_plural}"
+        full_message = "#{message}\nin #{time} seconds"
+        passed       = failed.zero?
 
         report_specdoc(result, passed) if specdoc_shown?(passed)
 
@@ -374,7 +373,7 @@ module Guard
         if any_coverage_threshold?
           coverage = `#{coverage_bin} check-coverage #{ istanbul_coverage_options } #{ coverage_file } 2>&1`
           coverage = coverage.split("\n").grep(/ERROR/).join.sub('ERROR:', '')
-          failed   = $CHILD_STATUS && $CHILD_STATUS.exitstatus != 0
+          failed   = $CHILD_STATUS && $CHILD_STATUS.exitstatus.nonzero?
 
           if failed
             Formatter.error coverage
@@ -392,7 +391,7 @@ module Guard
       def generate_html_report
         report_directory = coverage_report_directory
         `#{coverage_bin} report --dir #{ report_directory } --root #{ coverage_root } html #{ coverage_file }`
-        Formatter.info "Updated HTML report available at: #{ report_directory }/index.html"
+        Formatter.info "Updated HTML report available at: #{report_directory}/index.html"
       end
 
       # Uses the Istanbul text-summary reporter to output the
@@ -437,11 +436,11 @@ module Guard
           # If the focus option is set, then only failing tests are shown
           next unless :always == options[:specdoc] || spec['status'] == 'failed' || (!run_passed && !options[:focus])
           if spec['status'] == 'passed'
-            Formatter.success(indent("  ✔ #{ spec['description'] }", level))
+            Formatter.success(indent("  ✔ #{spec['description']}", level))
           elsif spec['status'] == 'failed'
-            Formatter.spec_failed(indent("  ✘ #{ spec['description'] }", level))
+            Formatter.spec_failed(indent("  ✘ #{spec['description']}", level))
           else
-            Formatter.spec_pending(indent("  ○ #{ spec['description'] }", level))
+            Formatter.spec_pending(indent("  ○ #{spec['description']}", level))
           end
           report_specdoc_errors(spec, level)
           report_specdoc_logs(spec, level)
@@ -493,7 +492,7 @@ module Guard
         if console_for_spec?(spec)
           spec['logs'].each do |log_level, message|
             log_level = log_level == 'log' ? '' : "#{log_level.upcase}: "
-            Formatter.info(indent("    • #{log_level}#{ message }", level))
+            Formatter.info(indent("    • #{log_level}#{message}", level))
           end
         end
       end
@@ -507,11 +506,11 @@ module Guard
         return unless spec['errors'] && (options[:errors] == :always || (options[:errors] == :failure && spec['status'] == 'failed'))
 
         spec['errors'].each do |error|
-          Formatter.spec_failed(indent("    ➤ #{ format_error(error, true)  }", level))
+          Formatter.spec_failed(indent("    ➤ #{format_error(error, true)}", level))
           next unless error['trace']
 
           error['trace'].each do |trace|
-            Formatter.spec_failed(indent("    ➜ #{ trace['file'] } on line #{ trace['line'] }", level + 2))
+            Formatter.spec_failed(indent("    ➜ #{trace['file']} on line #{trace['line']}", level + 2))
           end
         end
       end
@@ -565,7 +564,7 @@ module Guard
       #
       def format_error(error, short)
         message = error['message'].gsub(%r{ in http.*\(line \d+\)$}, '')
-        if !short && error['trace'] && error['trace'].length > 0
+        if !short && error['trace'] && !error['trace'].empty?
           location = error['trace'][0]
           "#{message} in #{location['file']}:#{location['line']}"
         else
@@ -581,20 +580,18 @@ module Guard
       #
       def update_coverage(coverage, file)
         if file == options[:spec_dir]
-          File.write(coverage_file, MultiJson.encode(coverage,  max_nesting: false))
-        else
-          if File.exist?(coverage_file)
-            impl     = file.sub('_spec', '').sub(options[:spec_dir], '')
-            coverage = MultiJson.decode(File.read(coverage_file),  max_nesting: false)
+          File.write(coverage_file, MultiJson.encode(coverage, max_nesting: false))
+        elsif File.exist?(coverage_file)
+          impl     = file.sub('_spec', '').sub(options[:spec_dir], '')
+          coverage = MultiJson.decode(File.read(coverage_file), max_nesting: false)
 
-            coverage.each do |coverage_file, data|
-              coverage[coverage_file] = data if coverage_file == impl
-            end
-
-            File.write(coverage_file, MultiJson.encode(coverage,  max_nesting: false))
-          else
-            File.write(coverage_file, MultiJson.encode({}))
+          coverage.each do |coverage_file, data|
+            coverage[coverage_file] = data if coverage_file == impl
           end
+
+          File.write(coverage_file, MultiJson.encode(coverage, max_nesting: false))
+        else
+          File.write(coverage_file, MultiJson.encode({}))
         end
       end
 
@@ -603,7 +600,7 @@ module Guard
       # @return [Boolean] true if any coverage threshold is set
       #
       def any_coverage_threshold?
-        THRESHOLDS.any? { |threshold| options[threshold] != 0 }
+        THRESHOLDS.any? { |threshold| options[threshold].nonzero? }
       end
 
       # Converts the options to Istanbul recognized options
@@ -613,7 +610,7 @@ module Guard
       def istanbul_coverage_options
         THRESHOLDS.inject([]) do |coverage, name|
           threshold = options[name]
-          coverage << (threshold != 0 ? "--#{ name.to_s.sub('_threshold', '') } #{ threshold }" : '')
+          coverage << (threshold.nonzero? ? "--#{name.to_s.sub('_threshold', '')} #{threshold}" : '')
         end.reject(&:empty?).join(' ')
       end
 

data/lib/guard/jasmine/server.rb

@@ -14,8 +14,7 @@ module Guard
     #
     module Server
       class << self
-        attr_accessor :process
-        attr_accessor :cmd
+        attr_accessor :process, :cmd
         # Start the internal test server for getting the Jasmine runner.
         #
         # @param [Hash] options the server options
@@ -27,31 +26,29 @@ module Guard
         # @option options [String] rackup_config custom rackup config to use (i.e. spec/dummy/config.ru for mountable engines)
         #
         def start(options)
-          server  = options[:server]
-          port    = options[:port]
-          timeout = options[:server_timeout]
+          port = options[:port]
 
-          case server
+          case options[:server]
           when :webrick, :mongrel, :thin, :puma
-            start_rack_server(server, port, options)
+            start_rack_server(options[:server], port, options)
           when :unicorn
             start_unicorn_server(port, options)
           when :jasmine_gem
             start_rake_server(port, 'jasmine', options)
+          when :none # noop
           else
-            start_rake_server(port, server.to_s, options) unless server == :none
+            start_rake_server(port, options[:server], options)
           end
 
-          wait_for_server(port, timeout) unless server == :none
+          wait_for_server(port, options[:server_timeout]) unless options[:server] == :none
         end
 
         # Stop the server thread.
         #
         def stop
-          if process
-            Compat::UI.info 'Guard::Jasmine stops server.'
-            process.stop(5)
-          end
+          return unless process
+          Compat::UI.info 'Guard::Jasmine stops server.'
+          process.stop(5)
         end
 
         # A port was not specified, therefore we attempt to detect the best port to use
@@ -103,12 +100,9 @@ module Guard
         # @option options [String] rackup_config custom rackup config to use (i.e. spec/dummy/config.ru for mountable engines)
         #
         def start_rack_server(server, port, options)
-          environment   = options[:server_env]
-          rackup_config = options[:rackup_config]
-          coverage      = options[:coverage] ? 'on' : 'off'
-
-          Compat::UI.info "Guard::Jasmine starts #{ server } spec server on port #{ port } in #{ environment } environment (coverage #{ coverage })."
-          execute(options, ['rackup', '-E', environment.to_s, '-p', port.to_s, '-s', server.to_s, rackup_config])
+          coverage = options[:coverage] ? 'on' : 'off'
+          Compat::UI.info "Guard::Jasmine starts #{server} spec server on port #{port} in #{options[:server_env]} environment (coverage #{coverage})."
+          execute(options, ['rackup', '-E', options[:server_env].to_s, '-p', port.to_s, '-s', server.to_s, options[:rackup_config]])
         end
 
         # Start the Rack server of the current project. This
@@ -120,11 +114,9 @@ module Guard
         # @option options [Number] port the server port
         #
         def start_unicorn_server(port, options)
-          environment = options[:server_env]
-          coverage    = options[:coverage] ? 'on' : 'off'
-
-          Compat::UI.info "Guard::Jasmine starts Unicorn spec server on port #{ port } in #{ environment } environment (coverage #{ coverage })."
-          execute(options, ['unicorn_rails', '-E', environment.to_s, '-p', port.to_s])
+          coverage = options[:coverage] ? 'on' : 'off'
+          Compat::UI.info "Guard::Jasmine starts Unicorn spec server on port #{port} in #{options[:server_env]} environment (coverage #{coverage})."
+          execute(options, ['unicorn_rails', '-E', options[:server_env].to_s, '-p', port.to_s])
         end
 
         # Start the Jasmine gem server of the current project.
@@ -134,8 +126,8 @@ module Guard
         # @option options [Symbol] server the rack server to use
         #
         def start_rake_server(port, task, options)
-          Compat::UI.info "Guard::Jasmine starts Jasmine Gem test server on port #{ port }."
-          execute(options, ['rake', task, "JASMINE_PORT=#{ port }"])
+          Compat::UI.info "Guard::Jasmine starts Jasmine Gem test server on port #{port}."
+          execute(options, ['rake', task, "JASMINE_PORT=#{port}"])
         end
 
         # Builds a child process with the given command and arguments
@@ -147,17 +139,15 @@ module Guard
             cmd.unshift("ruby", "-S")
           end
           self.cmd = cmd
-          if options[:debug]
-            puts "Starting server using: #{cmd.join(' ')}"
-          end
+          puts "Starting server using: #{cmd.join(' ')}" if options[:debug]
           self.process = ChildProcess.build(*cmd.compact)
           process.environment['COVERAGE'] = options[:coverage].to_s
           process.environment['IGNORE_INSTRUMENTATION'] = options[:ignore_instrumentation].to_s
           process.io.inherit! if options[:verbose]
           process.start
         rescue => e
-          Compat::UI.error "Cannot start server using command #{ cmd.join(' ') }."
-          Compat::UI.error "Error was: #{ e.message }"
+          Compat::UI.error "Cannot start server using command #{cmd.join(' ')}."
+          Compat::UI.error "Error was: #{e.message}"
         end
 
         # Wait until the Jasmine test server is running.

data/lib/guard/jasmine/task.rb

@@ -39,7 +39,7 @@ module Guard
             when 1
               raise 'Some specs have failed'
             when 2
-              raise "The spec couldn't be run: #{ e.message }'"
+              raise "The spec couldn't be run: #{e.message}'"
             end
           end
         end

data/lib/guard/jasmine/templates/Guardfile

@@ -2,5 +2,5 @@ guard :jasmine do
   watch(%r{spec/javascripts/spec\.(js\.coffee|js|coffee)$}) { 'spec/javascripts' }
   watch(%r{spec/javascripts/.+_spec\.(js\.coffee|js|coffee)$})
   watch(%r{spec/javascripts/fixtures/.+$})
-  watch(%r{app/assets/javascripts/(.+?)\.(js\.coffee|js|coffee)(?:\.\w+)*$}) { |m| "spec/javascripts/#{ m[1] }_spec.#{ m[2] }" }
+  watch(%r{app/assets/javascripts/(.+?)\.(js\.coffee|js|coffee)(?:\.\w+)*$}) { |m| "spec/javascripts/#{m[1]}_spec.#{m[2]}" }
 end

data/lib/guard/jasmine/util.rb

@@ -21,7 +21,7 @@ module Guard
         url = URI.parse(options[:jasmine_url])
 
         begin
-          ::Guard::Jasmine::Formatter.info "Waiting for Jasmine test runner at #{ url }"
+          ::Guard::Jasmine::Formatter.info "Waiting for Jasmine test runner at #{url}"
 
           http = Net::HTTP.new(url.host, url.port)
           http.read_timeout = options[:server_timeout]
@@ -30,7 +30,7 @@ module Guard
             available = response.code.to_i == 200
 
             unless available
-              ::Guard::Jasmine::Formatter.error "Jasmine test runner failed with status #{ response.code }"
+              ::Guard::Jasmine::Formatter.error "Jasmine test runner failed with status #{response.code}"
               if response.body
                 ::Guard::Jasmine::Formatter.error 'Please open the Jasmine runner in your browser for more information.'
               end
@@ -44,7 +44,7 @@ module Guard
           false
 
         rescue => e
-          ::Guard::Jasmine::Formatter.error "Jasmine test runner isn't available: #{ e.message }"
+          ::Guard::Jasmine::Formatter.error "Jasmine test runner isn't available: #{e.message}"
           false
         end
       end
@@ -65,15 +65,15 @@ module Guard
 
             if cleaned_version
               if Gem::Version.new(cleaned_version[0]) < Gem::Version.new('1.3.0')
-                ::Guard::Jasmine::Formatter.error "PhantomJS executable at #{ bin } must be at least version 1.3.0"
+                ::Guard::Jasmine::Formatter.error "PhantomJS executable at #{bin} must be at least version 1.3.0"
               else
                 true
               end
             else
-              ::Guard::Jasmine::Formatter.error "PhantomJS reports unknown version format: #{ version }"
+              ::Guard::Jasmine::Formatter.error "PhantomJS reports unknown version format: #{version}"
             end
           else
-            ::Guard::Jasmine::Formatter.error "PhantomJS executable doesn't exist at #{ bin }"
+            ::Guard::Jasmine::Formatter.error "PhantomJS executable doesn't exist at #{bin}"
           end
         else
           ::Guard::Jasmine::Formatter.error 'PhantomJS executable couldn\'t be auto detected.'
@@ -102,7 +102,7 @@ module Guard
 
         ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
           exts.each do |ext|
-            exe = "#{ path }/#{ cmd }#{ ext }"
+            exe = "#{path}/#{cmd}#{ext}"
             return exe if File.file?(exe) && File.executable?(exe)
           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 = '2.0.6'
+    VERSION = '2.1.0'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-jasmine
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.1.0
 platform: ruby
 authors:
 - Michael Kessler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: guard-compat
   requirement: !ruby/object:Gem::Requirement
@@ -45,28 +45,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
@@ -175,9 +175,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: guard-jasmine
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Guard gem for headless testing with Jasmine
 test_files: []
-has_rdoc: