guard-jasmine 1.11.0 → 1.11.1

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2012 Michael Kessler
+Copyright (c) 2011-2013 Michael Kessler
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -747,7 +747,7 @@ for it!
 
 (The MIT License)
 
-Copyright (c) 2011-2012 Michael Kessler
+Copyright (c) 2011-2013 Michael Kessler
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/guard/jasmine.rb

@@ -21,25 +21,25 @@ module Guard
     attr_accessor :last_run_failed, :last_failed_paths, :run_all_options
 
     DEFAULT_OPTIONS = {
-        :server           => :auto,
-        :server_env       => ENV['RAILS_ENV'] || 'development',
-        :server_timeout   => 15,
-        :port             => nil,
-        :rackup_config    => nil,
-        :jasmine_url      => nil,
-        :timeout          => 10,
-        :spec_dir         => 'spec/javascripts',
-        :notification     => true,
-        :hide_success     => false,
-        :all_on_start     => true,
-        :keep_failed      => true,
-        :clean            => true,
-        :all_after_pass   => true,
-        :max_error_notify => 3,
-        :specdoc          => :failure,
-        :console          => :failure,
-        :errors           => :failure,
-        :focus            => true
+      :server           => :auto,
+      :server_env       => ENV['RAILS_ENV'] || 'development',
+      :server_timeout   => 15,
+      :port             => nil,
+      :rackup_config    => nil,
+      :jasmine_url      => nil,
+      :timeout          => 10,
+      :spec_dir         => 'spec/javascripts',
+      :notification     => true,
+      :hide_success     => false,
+      :all_on_start     => true,
+      :keep_failed      => true,
+      :clean            => true,
+      :all_after_pass   => true,
+      :max_error_notify => 3,
+      :specdoc          => :failure,
+      :console          => :failure,
+      :errors           => :failure,
+      :focus            => true
     }
 
     # Initialize Guard::Jasmine.
@@ -76,7 +76,7 @@ module Guard
       options[:server] ||= :auto
       options[:phantomjs_bin] = Jasmine.which('phantomjs') unless options[:phantomjs_bin]
 
-      self.run_all_options = options.delete(:run_all) || {}
+      self.run_all_options = options.delete(:run_all) || { }
 
       super(watchers, options)
 

data/lib/guard/jasmine/cli.rb

@@ -23,74 +23,74 @@ module Guard
       desc 'spec', 'Run the Jasmine spec runner_options'
 
       method_option :server,
-                    :type => :string,
+                    :type    => :string,
                     :aliases => '-s',
                     :default => 'auto',
-                    :desc => 'Server to start, either `auto`, `webrick`, `mongrel`, `thin`, `unicorn`, `jasmine_gem` or `none`'
+                    :desc    => 'Server to start, either `auto`, `webrick`, `mongrel`, `thin`, `unicorn`, `jasmine_gem` or `none`'
 
       method_option :port,
-                    :type => :numeric,
+                    :type    => :numeric,
                     :aliases => '-p',
-                    :desc => 'Server port to use'
+                    :desc    => 'Server port to use'
 
       method_option :server_env,
-                    :type => :string,
+                    :type    => :string,
                     :aliases => '-e',
                     :default => ENV['RAILS_ENV'] || 'test',
-                    :desc => 'The server environment to use, for example `development`, `test` etc.'
+                    :desc    => 'The server environment to use, for example `development`, `test` etc.'
 
       method_option :server_timeout,
-                    :type => :numeric,
+                    :type    => :numeric,
                     :default => 15,
-                    :desc => 'The number of seconds to wait for the Jasmine spec server'
+                    :desc    => 'The number of seconds to wait for the Jasmine spec server'
 
       method_option :rackup_config,
-                    :type => :string,
+                    :type    => :string,
                     :aliases => '-c',
-                    :desc => 'The rackup config to use (jasminerice only)'
+                    :desc    => 'The rackup config to use (jasminerice only)'
 
       method_option :bin,
-                    :type => :string,
+                    :type    => :string,
                     :aliases => '-b',
-                    :desc => 'The location of the PhantomJS binary'
+                    :desc    => 'The location of the PhantomJS binary'
 
       method_option :spec_dir,
-                    :type => :string,
+                    :type    => :string,
                     :aliases => '-d',
                     :default => 'spec/javascripts',
-                    :desc => 'The directory with the Jasmine specs'
+                    :desc    => 'The directory with the Jasmine specs'
 
       method_option :url,
-                    :type => :string,
+                    :type    => :string,
                     :aliases => '-u',
-                    :desc => 'The url of the Jasmine test runner'
+                    :desc    => 'The url of the Jasmine test runner'
 
       method_option :timeout,
-                    :type => :numeric,
+                    :type    => :numeric,
                     :aliases => '-t',
                     :default => 10,
-                    :desc => 'The maximum time in seconds to wait for the spec runner to finish'
+                    :desc    => 'The maximum time in seconds to wait for the spec runner to finish'
 
       method_option :console,
-                    :type => :string,
+                    :type    => :string,
                     :default => 'failure',
-                    :desc => 'Whether to show console.log statements in the spec runner, either `always`, `never` or `failure`'
+                    :desc    => 'Whether to show console.log statements in the spec runner, either `always`, `never` or `failure`'
 
       method_option :errors,
-                    :type => :string,
+                    :type    => :string,
                     :default => 'failure',
-                    :desc => 'Whether to show errors in the spec runner, either `always`, `never` or `failure`'
+                    :desc    => 'Whether to show errors in the spec runner, either `always`, `never` or `failure`'
 
       method_option :focus,
-                    :type => :boolean,
+                    :type    => :boolean,
                     :aliases => '-f',
                     :default => true,
                     :desc    => 'Specdoc focus to hide successful tests when at least one test fails'
 
       method_option :specdoc,
-                    :type => :string,
+                    :type    => :string,
                     :default => :always,
-                    :desc => 'Whether to show successes in the spec runner, either `always`, `never` or `failure`'
+                    :desc    => 'Whether to show successes in the spec runner, either `always`, `never` or `failure`'
 
       # Run the Guard::Jasmine::Runner with options from
       # the command line.
@@ -100,19 +100,20 @@ module Guard
       def spec(*paths)
         paths = [options.spec_dir] if paths.empty?
 
-        runner_options = {}
-        runner_options[:port] = options.port || CLI.find_free_server_port
-        runner_options[:jasmine_url] = options.url || "http://localhost:#{ runner_options[:port] }/jasmine"
-        runner_options[:phantomjs_bin] = options.bin || CLI.which('phantomjs')
-        runner_options[:timeout] = options.timeout
-        runner_options[:server_env] = options.server_env
+        runner_options                  = { }
+        runner_options[:port]           = options.port || CLI.find_free_server_port
+        runner_options[:jasmine_url]    = options.url || "http://localhost:#{ runner_options[:port] }/jasmine"
+        runner_options[:phantomjs_bin]  = options.bin || CLI.which('phantomjs')
+        runner_options[:timeout]        = options.timeout
+        runner_options[:server]         = options.server.to_sym
+        runner_options[:server_env]     = options.server_env
         runner_options[:server_timeout] = options.server_timeout
-        runner_options[:spec_dir] = options.spec_dir
-        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[:server] = options.server.to_sym
-        runner_options[:focus] = options.focus
+        runner_options[:rackup_config]  = options.rackup_config
+        runner_options[:spec_dir]       = options.spec_dir
+        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[:notification] = false

data/lib/guard/jasmine/formatter.rb

@@ -54,7 +54,7 @@ module Guard
         # @param [Hash] options the output options
         #
         def spec_failed(message, options = { })
-           ::Guard::UI.info(color(message, ';31'), options)
+          ::Guard::UI.info(color(message, ';31'), options)
         end
 
         # Print a red spec failed message to the console.
@@ -63,7 +63,7 @@ module Guard
         # @param [Hash] options the output options
         #
         def suite_name(message, options = { })
-           ::Guard::UI.info(color(message, ';33'), options)
+          ::Guard::UI.info(color(message, ';33'), options)
         end
 
         # Outputs a system notification.
@@ -81,7 +81,7 @@ module Guard
 
         # Print a info message to the console.
         #
-        # @param [String] test the text to colorize
+        # @param [String] text the text to colorize
         # @param [String] color_code the color code
         #
         def color(text, color_code)

data/lib/guard/jasmine/inspector.rb

@@ -34,7 +34,7 @@ module Guard
 
         # Tests if the file is valid.
         #
-        # @param [String] file the file
+        # @param [String] path the file
         # @return [Boolean] when the file valid
         #
         def jasmine_spec?(path)

data/lib/guard/jasmine/runner.rb

@@ -80,7 +80,7 @@ module Guard
 
         # Run the Jasmine spec by executing the PhantomJS script.
         #
-        # @param [String] path the path of the spec
+        # @param [String] file the path of the spec
         # @param [Hash] options the options for the execution
         # @option options [Integer] :timeout the maximum time in seconds to wait for the spec runner to finish
         #
@@ -157,6 +157,7 @@ module Guard
         #
         def evaluate_response(output, file, options)
           json = output.read
+          json = json.encode('UTF-8') if json.respond_to?(:encode)
 
           begin
             result = MultiJson.decode(json, { :max_nesting => false })
@@ -185,7 +186,7 @@ module Guard
         # Notification when a system error happens that
         # prohibits the execution of the Jasmine spec.
         #
-        # @param [Hash] the suite result
+        # @param [Hash] result the suite result
         # @param [Hash] options the options for the execution
         # @option options [Boolean] :notification show notifications
         #
@@ -207,7 +208,7 @@ module Guard
           specs           = result['stats']['specs']
           failures        = result['stats']['failures']
           time            = result['stats']['time']
-          specs_plural    = specs == 1    ? '' : 's'
+          specs_plural    = specs == 1 ? '' : 's'
           failures_plural = failures == 1 ? '' : 's'
 
           Formatter.info("\nFinished in #{ time } seconds")
@@ -254,7 +255,7 @@ module Guard
         #
         def report_specdoc_suite(suite, passed, options, level = 0)
           # Print the suite description when the specdoc is shown or there are logs to display
-          if (specdoc_shown?(passed, options) || console_logs_shown?(suite, passed, options) || error_logs_shown?(suite, passed, options))
+          if specdoc_shown?(passed, options) || console_logs_shown?(suite, passed, options) || error_logs_shown?(suite, passed, options)
             Formatter.suite_name((' ' * level) + suite['description']) if passed || options[:focus] && contains_failed_spec?(suite)
           end
 
@@ -275,56 +276,87 @@ module Guard
             end
           end
 
-          suite['suites'].each { |suite| report_specdoc_suite(suite, passed, options, level + 2) } if suite['suites']
+          suite['suites'].each { |s| report_specdoc_suite(s, passed, options, level + 2) } if suite['suites']
         end
 
         # Is the specdoc shown for this suite?
-        def specdoc_shown?(passed, options = {})
-          (options[:specdoc] == :always || (options[:specdoc] == :failure && !passed))
+        #
+        # @param [Boolean] passed the spec status
+        # @param [Hash] options the options
+        #
+        def specdoc_shown?(passed, options = { })
+          options[:specdoc] == :always || (options[:specdoc] == :failure && !passed)
         end
 
         # Are console logs shown for this suite?
-        def console_logs_shown?(suite, passed, options = {})
+        #
+        # @param [Hash] suite the suite
+        # @param [Boolean] passed the spec status
+        # @param [Hash] options the options
+        #
+        def console_logs_shown?(suite, passed, options = { })
           # Are console messages displayed?
-          console_enabled = (options[:console] == :always || (options[:console] == :failure && !passed))
+          console_enabled = options[:console] == :always || (options[:console] == :failure && !passed)
+
           # Are there any logs to display at all for this suite?
           logs_for_current_options = suite['specs'].select do |spec|
             spec['logs'] && (options[:console] == :always || (options[:console] == :failure && !spec['passed']))
           end
-          any_logs_present = (!logs_for_current_options.empty?)
-          (console_enabled && any_logs_present)
+
+          any_logs_present = !logs_for_current_options.empty?
+
+          console_enabled && any_logs_present
         end
 
         # Are console logs shown for this spec?
-        def console_for_spec?(spec, options = {})
-          console = (spec['logs'] && ((spec['passed'] && options[:console] == :always) ||
-                                      (!spec['passed'] && options[:console] != :never)))
+        #
+        # @param [Hash] spec the spec
+        # @param [Hash] options the options
+        #
+        def console_for_spec?(spec, options = { })
+          spec['logs'] && ((spec['passed'] && options[:console] == :always) ||
+            (!spec['passed'] && options[:console] != :never))
         end
 
         # Are error logs shown for this suite?
-        def error_logs_shown?(suite, passed, options = {})
+        #
+        # @param [Hash] suite the suite
+        # @param [Boolean] passed the spec status
+        # @param [Hash] options the options
+        #
+        def error_logs_shown?(suite, passed, options = { })
           # Are error messages displayed?
-          errors_enabled = (options[:errors] == :always || (options[:errors] == :failure && !passed))
+          errors_enabled = options[:errors] == :always || (options[:errors] == :failure && !passed)
+
           # Are there any errors to display at all for this suite?
           errors_for_current_options = suite['specs'].select do |spec|
             spec['errors'] && (options[:errors] == :always || (options[:errors] == :failure && !spec['passed']))
           end
-          any_errors_present = (!errors_for_current_options.empty?)
-          (errors_enabled && any_errors_present)
+
+          any_errors_present= !errors_for_current_options.empty?
+
+          errors_enabled && any_errors_present
         end
 
         # Are errors shown for this spec?
-        def errors_for_spec?(spec, options = {})
-          errors = (spec['errors'] && ((spec['passed'] && options[:errors] == :always) ||
-                                       (!spec['passed'] && options[:errors] != :never)))
+        #
+        # @param [Hash] spec the spec
+        # @param [Hash] options the options
+        def errors_for_spec?(spec, options = { })
+          spec['errors'] && ((spec['passed'] && options[:errors] == :always) ||
+            (!spec['passed'] && options[:errors] != :never))
         end
 
         # Is the description shown for this spec?
-        def description_shown?(passed, spec, options = {})
-          (specdoc_shown?(passed, options) || console_for_spec?(spec, options) || errors_for_spec?(spec, options))
+        #
+        # @param [Boolean] passed the spec status
+        # @param [Hash] spec the spec
+        # @param [Hash] options the options
+        #
+        def description_shown?(passed, spec, options = { })
+          specdoc_shown?(passed, options) || console_for_spec?(spec, options) || errors_for_spec?(spec, options)
         end
 
-
         # Shows the logs for a given spec.
         #
         # @param [Hash] spec the spec result
@@ -403,7 +435,7 @@ module Guard
         # Get all specs from the suites and its nested suites.
         #
         # @param suites [Array<Hash>] the suites results
-        # @param [Array<Hash>] all specs
+        # @return [Array<Hash>] all specs
         #
         def collect_specs(suites)
           suites.inject([]) do |specs, suite|

data/lib/guard/jasmine/server.rb

@@ -21,7 +21,7 @@ module Guard
         # @option options [String] server the server to use
         # @option options [Number] port the server port
         # @option options [String] server_env the Rails environment
-        # @option options [Number] server_timeoout the server start timeout
+        # @option options [Number] server_timeout the server start timeout
         # @option options [String] spec_dir the spec directory
         # @option options [String] rackup_config custom rackup config to use (i.e. spec/dummy/config.ru for mountable engines)
         #
@@ -32,14 +32,14 @@ module Guard
           timeout = options[:server_timeout]
 
           case server
-          when :webrick, :mongrel, :thin, :puma
-            start_rack_server(server, port, options)
-          when :unicorn
-            start_unicorn_server(port, options)
-          when :jasmine_gem
-            start_rake_server(port, 'jasmine')
-          else
-            start_rake_server(port, server.to_s) unless server == :none
+            when :webrick, :mongrel, :thin, :puma
+              start_rack_server(server, port, options)
+            when :unicorn
+              start_unicorn_server(port, options)
+            when :jasmine_gem
+              start_rake_server(port, 'jasmine')
+            else
+              start_rake_server(port, server.to_s) unless server == :none
           end
 
           wait_for_server(port, timeout) unless server == :none
@@ -90,7 +90,7 @@ module Guard
         # @option options [Number] port the server port
         #
         def start_unicorn_server(port, options)
-          environment   = options[:server_env]
+          environment = options[:server_env]
 
           ::Guard::UI.info "Guard::Jasmine starts Unicorn test server on port #{ port } in #{ environment } environment."
 

data/lib/guard/jasmine/task.rb

@@ -25,7 +25,7 @@ module Guard
     # @yield [JasmineTask] the task
     #
     def initialize(name = :jasmine, options = '')
-      @name = name
+      @name    = name
       @options = options
 
       yield self if block_given?

data/lib/guard/jasmine/util.rb

@@ -26,11 +26,12 @@ module Guard
 
           Timeout::timeout(options[:server_timeout]) do
             Net::HTTP.start(url.host, url.port) do |http|
-              response = http.request(Net::HTTP::Head.new(url.path))
+              response  = http.request(Net::HTTP::Get.new(url.path))
               available = response.code.to_i == 200
 
               unless available
                 ::Guard::Jasmine::Formatter.error "Jasmine test runner fails with response code #{ response.code }"
+                ::Guard::Jasmine::Formatter.error(response.body) if response.body
               end
 
               available
@@ -38,7 +39,7 @@ module Guard
           end
 
         rescue Timeout::Error => e
-          ::Guard::Jasmine::Formatter.error "Timeout waiting for the Jasmine test runner."
+          ::Guard::Jasmine::Formatter.error 'Timeout waiting for the Jasmine test runner.'
           false
 
         rescue => e
@@ -74,7 +75,7 @@ module Guard
             ::Guard::Jasmine::Formatter.error "PhantomJS executable doesn't exist at #{ bin }"
           end
         else
-          ::Guard::Jasmine::Formatter.error "PhantomJS executable couldn't be auto detected."
+          ::Guard::Jasmine::Formatter.error 'PhantomJS executable couldn\'t be auto detected.'
         end
       end
 
@@ -84,7 +85,7 @@ module Guard
       #
       def find_free_server_port
         server = TCPServer.new('127.0.0.1', 0)
-        port = server.addr[1]
+        port   = server.addr[1]
         server.close
 
         port

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 = '1.11.0'
+    VERSION = '1.11.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-jasmine
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: guard-jasmine
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Guard gem for headless testing with Jasmine