guard-jasmine 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01546cd2d6366e46000c481b06b3adeaaaa2f1c7
-  data.tar.gz: ba99f0a41f8880d28e1e0647a92e341fddd68ac6
+  metadata.gz: 653c1770a0ee0afde89d96bc6b55e89523f9e6a7
+  data.tar.gz: 9da1156f41c0da97723d2ab83b908b02b7588faf
 SHA512:
-  metadata.gz: 1cb190cf4bf114ec1e05fce5884e16e7f92aac49d7ba54365c835092668cd1c9747176df8e45ec5822381d162974d3a6a16c9a70d7864834a6afb957366cae95
-  data.tar.gz: a03f6e169a0c472094ad6856d824e06e3e93227cecb75a3a3ee62adccf51f6dacd0598d3cdc93ee034b1737eeb432282fd2e1feb6750f3dcbff1d46ee5f826af
+  metadata.gz: 19f799979a9d26cc253abffd4e5ddf34d3c95e56ac0443f5d79242a3d6659eb31bdea642445c1edc52e836925ab4440647dda3c743a2e348201731dbc84f16b1
+  data.tar.gz: 1bd4ab0e7aa91dd28e1f031fb113b2c95930a6b2bdcac7b9b8101a0494cda518f414565d9b800840402c34a4cc492dc29630cb1743be7e4d6380f9b2411e9b04

data/lib/generators/guard_jasmine/install_generator.rb

@@ -2,7 +2,7 @@ require 'rails/generators'
 
 module GuardJasmine
   class InstallGenerator < Rails::Generators::Base
-    desc "Install a sample Guardfile for running Jasmine specs via GuardJasmine"
+    desc 'Install a sample Guardfile for running Jasmine specs via GuardJasmine'
 
     def self.source_root
       @source_root ||= File.join(File.dirname(__FILE__), 'templates')
@@ -10,8 +10,7 @@ module GuardJasmine
 
     # Generator Code. Remember this is just suped-up Thor so methods are executed in order
     def install
-      template "Guardfile"
+      template 'Guardfile'
     end
-
   end
 end

data/lib/generators/guard_jasmine/templates/Guardfile

@@ -2,8 +2,8 @@
 # More info at https://github.com/guard/guard#readme
 
 guard :jasmine do
-    watch(%r{^spec/javascripts/.*(?:_s|S)pec\.(coffee|js)$})
-    watch(%r{app/assets/javascripts/(.+?)\.(js\.coffee|js|coffee)(?:\.\w+)*$}) { |m|
-      "spec/javascripts/jasmine/#{ m[1] }_spec.#{ m[2] }"
-    }
+  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] }"
+  end
 end

data/lib/guard/jasmine.rb

@@ -1,15 +1,13 @@
 require 'net/http'
 
-require 'guard'
-require 'guard/plugin'
+# Don't require "guard/plugin" here or in any other plugin's files
+require 'guard/compat/plugin'
 
 module Guard
-
   # The Jasmine guard that gets notifications about the following
   # Guard events: `start`, `stop`, `reload`, `run_all` and `run_on_modifications`.
   #
   class Jasmine < Plugin
-
     require 'guard/jasmine/coverage'
     require 'guard/jasmine/inspector'
     require 'guard/jasmine/runner'
@@ -43,7 +41,7 @@ module Guard
       focus:                    true,
       coverage:                 false,
       coverage_html:            false,
-      coverage_html_dir:        "./coverage",
+      coverage_html_dir:        './coverage',
       coverage_summary:         false,
       statements_threshold:     0,
       functions_threshold:      0,
@@ -88,17 +86,17 @@ module Guard
     # @option options [Symbol] :lines_threshold options for the statement lines threshold
     # @option options [Hash] :run_all options overwrite options when run all specs
     #
-    def initialize(options = { })
+    def initialize(options = {})
       options[:server_mount] ||= defined?(JasmineRails) ? '/specs' : '/jasmine'
 
       options = DEFAULT_OPTIONS.merge(options)
 
-      options[:spec_dir]    ||= File.exists?(File.join('spec', 'javascripts')) ? File.join('spec', 'javascripts') : 'spec'
+      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[: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[:specdoc]       = :failure if ![:always, :never, :failure].include? options[:specdoc]
+      options[:specdoc]       = :failure unless [:always, :never, :failure].include? options[:specdoc]
       options[:phantomjs_bin] = Jasmine.which('phantomjs') unless options[:phantomjs_bin]
 
       self.run_all_options = options.delete(:run_all) || {}
@@ -107,7 +105,7 @@ module Guard
 
       self.last_run_failed   = false
       self.last_failed_paths = []
-      @runner = Runner.new( options.merge(self.run_all_options) )
+      @runner = Runner.new(options.merge(run_all_options))
     end
 
     # Gets called once when Guard starts.
@@ -119,9 +117,7 @@ module Guard
 
         Server.start(options) unless options[:server] == :none
 
-        if Jasmine.runner_available?(options)
-          run_all if options[:all_on_start]
-        end
+        run_all if Jasmine.runner_available?(options) && options[:all_on_start]
       else
         throw :task_has_failed
       end
@@ -154,7 +150,7 @@ module Guard
       self.last_failed_paths = results.keys
       self.last_run_failed   = !results.empty?
 
-      throw :task_has_failed if self.last_run_failed
+      throw :task_has_failed if last_run_failed
     end
     # Gets called when watched paths and files have changes.
     #
@@ -162,8 +158,7 @@ module Guard
     # @raise [:task_has_failed] when run_on_modifications has failed
     #
     def run_on_modifications(paths)
-
-      specs = options[:keep_failed] ? paths + self.last_failed_paths : paths
+      specs = options[:keep_failed] ? paths + last_failed_paths : paths
       specs = Inspector.clean(specs, options) if options[:clean]
 
       return false if specs.empty?
@@ -171,17 +166,15 @@ module Guard
       results = runner.run(specs)
 
       if results.empty?
-        self.last_failed_paths = self.last_failed_paths - paths
-        run_all if self.last_run_failed && options[:all_after_pass]
+        self.last_failed_paths = last_failed_paths - paths
+        run_all if last_run_failed && options[:all_after_pass]
       else
-        self.last_failed_paths = self.last_failed_paths + results.keys
+        self.last_failed_paths = last_failed_paths + results.keys
       end
 
       self.last_run_failed = !results.empty?
 
-      throw :task_has_failed if self.last_run_failed
+      throw :task_has_failed if last_run_failed
     end
-
   end
 end
-

data/lib/guard/jasmine/cli.rb

@@ -1,5 +1,4 @@
 require 'thor'
-require 'guard/ui'
 require 'guard/jasmine/version'
 require 'guard/jasmine/runner'
 require 'guard/jasmine/formatter'
@@ -9,7 +8,6 @@ require 'guard/jasmine/server'
 
 module Guard
   class Jasmine
-
     # Small helper class to run the Jasmine runner_options once from the
     # command line. This can be useful to integrate guard-jasmine
     # into a continuous integration server.
@@ -119,7 +117,7 @@ module Guard
 
       method_option :coverage_html_dir,
                     type:    :string,
-                    default: "./coverage",
+                    default: './coverage',
                     desc:    'Where to save html coverage reports. Defaults to ./coverage. Implies --coverage-html'
 
       method_option :coverage_summary,
@@ -129,7 +127,7 @@ module Guard
 
       method_option :ignore_instrumentation,
                     type:    :string,
-                    default: "",
+                    default: '',
                     desc:    'Files matching this regex will not be instrumented (e.g. vendor)'
 
       method_option :statements_threshold,
@@ -175,7 +173,7 @@ module Guard
       def spec(*paths)
         runner_options                            = {}
         runner_options[:port]                     = options.port || CLI.find_free_server_port
-        runner_options[:spec_dir]                 = options.spec_dir || (File.exists?(File.join('spec', 'javascripts')) ? File.join('spec', 'javascripts') : 'spec')
+        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')
@@ -190,8 +188,8 @@ module Guard
         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]                 = 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
@@ -207,8 +205,6 @@ module Guard
         runner_options[:junit_save_path]          = options.junit_save_path
         runner_options[:is_cli]                   = true
 
-        ::Guard::UI.options = ::Guard::UI.options.merge({ :template => ':message' })
-
         paths = [runner_options[:spec_dir]] if paths.empty?
 
         if CLI.phantomjs_bin_valid?(runner_options[:phantomjs_bin])
@@ -245,7 +241,6 @@ module Guard
       def version
         ::Guard::UI.info "Guard::Jasmine version #{ ::Guard::JasmineVersion::VERSION }"
       end
-
     end
   end
 end

data/lib/guard/jasmine/coverage.rb

@@ -15,32 +15,30 @@ class JasmineCoverage < Tilt::Template
 
   # Returns a coverage instrumented JavaScript file
   #
-  def evaluate(context, locals)
+  def evaluate(_context, _locals)
     return data if !ENV['IGNORE_INSTRUMENTATION'].to_s.empty? && file =~ Regexp.new(ENV['IGNORE_INSTRUMENTATION'])
     return data unless JasmineCoverage.coverage_bin
     return data unless file.include?(JasmineCoverage.app_asset_path)
 
     Dir.mktmpdir do |path|
       filename = File.basename(file)
-      input    = File.join(path, filename).sub /\.js.+/, '.js'
+      input    = File.join(path, filename).sub(/\.js.+/, '.js')
 
       File.write input, data
 
-      result = %x[#{JasmineCoverage.coverage_bin} instrument --embed-source #{input.shellescape}]
+      result = `#{JasmineCoverage.coverage_bin} instrument --embed-source #{input.shellescape}`
 
-      raise "Could not generate coverage instrumented file for #{ file }" unless $?.exitstatus == 0
+      fail "Could not generate coverage instrumented file for #{ file }" unless $CHILD_STATUS.exitstatus == 0
 
       result.gsub input, file
-
     end
   end
 
-  private
-
   # Get the absolute path to the projects assets path `/app/assets`.
   #
   # @return [String] the path to the Rails assets
   #
+  # @private
   def self.app_asset_path
     @app_asset_path ||= File.join(Rails.root, 'app', 'assets')
   end
@@ -49,13 +47,13 @@ class JasmineCoverage < Tilt::Template
   #
   # @return [String] the path
   #
+  # @private
   def self.coverage_bin
     @coverage_bin ||= which 'istanbul'
   end
-
 end
 
-if ENV['COVERAGE'] == 'true' and defined?(Rails)
+if ENV['COVERAGE'] == 'true' && defined?(Rails)
 
   # Guard::Jasmine engine to register coverage instrumented
   # Jasmine spec files.

data/lib/guard/jasmine/formatter.rb

@@ -1,20 +1,18 @@
 module Guard
   class Jasmine
-
     # The Guard::Jasmine formatter collects console and
     # system notification methods and enhances them with
     # some color information.
     #
     module Formatter
       class << self
-
         # Print an info message to the console.
         #
         # @param [String] message the message to print
         # @param [Hash] options the output options
         # @option options [Boolean] :reset reset the UI
         #
-        def info(message, options = { })
+        def info(message, options = {})
           ::Guard::UI.info(message, options)
         end
 
@@ -24,7 +22,7 @@ module Guard
         # @param [Hash] options the output options
         # @option options [Boolean] :reset reset the UI
         #
-        def debug(message, options = { })
+        def debug(message, options = {})
           ::Guard::UI.debug(message, options)
         end
 
@@ -34,7 +32,7 @@ module Guard
         # @param [Hash] options the output options
         # @option options [Boolean] :reset reset the UI
         #
-        def error(message, options = { })
+        def error(message, options = {})
           ::Guard::UI.error(color(message, ';31'), options)
         end
 
@@ -44,7 +42,7 @@ module Guard
         # @param [Hash] options the output options
         # @option options [Boolean] :reset reset the UI
         #
-        def success(message, options = { })
+        def success(message, options = {})
           ::Guard::UI.info(color(message, ';32'), options)
         end
 
@@ -54,7 +52,7 @@ module Guard
         # @param [Hash] options the output options
         # @option options [Boolean] :reset reset the UI
         #
-        def spec_pending(message, options = { })
+        def spec_pending(message, options = {})
           ::Guard::UI.info(color(message, ';33'), options)
         end
 
@@ -63,7 +61,7 @@ module Guard
         # @param [String] message the message to print
         # @param [Hash] options the output options
         #
-        def spec_failed(message, options = { })
+        def spec_failed(message, options = {})
           ::Guard::UI.info(color(message, ';31'), options)
         end
 
@@ -72,7 +70,7 @@ module Guard
         # @param [String] message the message to print
         # @param [Hash] options the output options
         #
-        def suite_name(message, options = { })
+        def suite_name(message, options = {})
           ::Guard::UI.info(color(message, ';33'), options)
         end
 
@@ -83,7 +81,7 @@ module Guard
         # @option options [Symbol, String] :image the image to use, either :failed, :pending or :success, or an image path
         # @option options [String] :title the title of the system notification
         #
-        def notify(message, options = { })
+        def notify(message, options = {})
           ::Guard::Notifier.notify(message, options)
         end
 
@@ -97,7 +95,6 @@ module Guard
         def color(text, color_code)
           ::Guard::UI.send(:color_enabled?) ? "\e[0#{ color_code }m#{ text }\e[0m" : text
         end
-
       end
     end
   end

data/lib/guard/jasmine/inspector.rb

@@ -1,6 +1,5 @@
 module Guard
   class Jasmine
-
     # The inspector verifies if the changed paths are valid
     # for Guard::Jasmine. Please note that request to {.clean}
     # paths keeps the current valid files cached until {.clear} is
@@ -8,7 +7,6 @@ module Guard
     #
     module Inspector
       class << self
-
         # Clean the changed paths and return only valid
         # Jasmine specs in either JavaScript or CoffeeScript.
         #
@@ -37,9 +35,8 @@ module Guard
         # @return [Boolean] when the file valid
         #
         def jasmine_spec?(path)
-          path =~ /(?:_s|S)pec\.(js|coffee|js\.coffee)$/ && File.exists?(path)
+          path =~ /(?:_s|S)pec\.(js|coffee|js\.coffee)$/ && File.exist?(path)
         end
-
       end
     end
   end

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

@@ -1,5 +1,5 @@
 (function() {
-  var exitSuccessfully, jasmineAvailable, options, page, reportError, reporterMissing, reporterReady, specsDone, specsTimedout, waitFor;
+  var exitSuccessfully, jasmineAvailable, options, page, phantomExit, reportError, reporterMissing, reporterReady, specsDone, specsTimedout, waitFor;
 
   options = {
     url: phantom.args[0] || 'http://127.0.0.1:3000/jasmine',
@@ -60,13 +60,20 @@
     });
   };
 
+  phantomExit = function(exitCode) {
+    page.close();
+    return setTimeout(function() {
+      return phantom.exit(exitCode);
+    }, 0);
+  };
+
   exitSuccessfully = function() {
     var results;
     results = page.evaluate(function() {
       return window.reporter.results();
     });
     console.log(JSON.stringify(results));
-    return phantom.exit();
+    return phantomExit();
   };
 
   specsTimedout = function() {
@@ -75,7 +82,8 @@
       var _ref;
       return (_ref = document.getElementsByTagName('body')[0]) != null ? _ref.innerText : void 0;
     });
-    return reportError("Timeout waiting for the Jasmine test results!\n\n" + text);
+    reportError("Timeout waiting for the Jasmine test results!\n\n" + text);
+    return phantomExit(1);
   };
 
   waitFor = function(test, ready, timeout, timeoutFunction) {
@@ -114,7 +122,7 @@
       error: msg,
       trace: trace
     }));
-    return phantom.exit(1);
+    return phantomExit(1);
   };
 
 }).call(this);

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

@@ -55,21 +55,31 @@ specsDone = ->
     result = page.evaluate ->
         window.reporter.resultComplete
 
+# Workaround for https://github.com/ariya/phantomjs/issues/12697 since
+# it doesn't seem like there will be another 1.9.x release fixing this
+phantomExit = (exitCode)->
+    page.close()
+    setTimeout( ->
+        phantom.exit(exitCode)
+    ,0)
+
+
 # We should end up here.  Logs the results as JSON and exits
 exitSuccessfully = ->
     results  = page.evaluate -> window.reporter.results()
     console.log JSON.stringify( results )
-    phantom.exit()
+    phantomExit()
 
 
 # Error message for when specs time out
 specsTimedout = ->
-  text = page.evaluate -> document.getElementsByTagName('body')[0]?.innerText
-  reportError """
+    text = page.evaluate -> document.getElementsByTagName('body')[0]?.innerText
+    reportError """
             Timeout waiting for the Jasmine test results!
 
             #{ text }
             """
+    return phantomExit(1)
 
 # Wait until the test condition is true or a timeout occurs.
 #
@@ -98,4 +108,4 @@ reportError = (msg, trace=[])->
         err = new Error();
         trace = err.stack
     console.log JSON.stringify({ error: msg, trace: trace })
-    phantom.exit(1)
+    return phantomExit(1)