guard-jasmine 1.9.3 → 1.9.4

data/README.md

@@ -359,8 +359,8 @@ The server options configures the server environment that is needed to run Guard
 :phantomjs_bin => '~/bin/phantomjs'           # Path to phantomjs.
                                               # default: auto-detect 'phantomjs'
 
-:timeout => 20000                             # The time in ms to wait for the spec runner to finish.
-                                              # default: 10000
+:timeout => 20                                # The time in seconds to wait for the spec runner to finish.
+                                              # default: 10
 
 :rackup_config => 'spec/dummy/config.ru'      # Path to rackup config file (i.e. for webrick, mongrel, thin, unicorn).
                                               # default: ./config.ru

data/lib/guard/jasmine.rb

@@ -27,7 +27,7 @@ module Guard
         :port             => 8888,
         :rackup_config    => nil,
         :jasmine_url      => 'http://localhost:8888/jasmine',
-        :timeout          => 10000,
+        :timeout          => 10,
         :spec_dir         => 'spec/javascripts',
         :notification     => true,
         :hide_success     => false,
@@ -53,7 +53,7 @@ module Guard
     # @option options [String] :rackup_config custom rackup config to use
     # @option options [String] :jasmine_url the url of the Jasmine test runner
     # @option options [String] :phantomjs_bin the location of the PhantomJS binary
-    # @option options [Integer] :timeout the maximum time in milliseconds to wait for the spec runner to finish
+    # @option options [Integer] :timeout the maximum time in seconds to wait for the spec runner to finish
     # @option options [String] :spec_dir the directory with the Jasmine specs
     # @option options [Boolean] :notification show notifications
     # @option options [Boolean] :hide_success hide success message notification

data/lib/guard/jasmine/cli.rb

@@ -70,8 +70,8 @@ module Guard
       method_option :timeout,
                     :type => :numeric,
                     :aliases => '-t',
-                    :default => 10000,
-                    :desc => 'The maximum time in milliseconds to wait for the spec runner to finish'
+                    :default => 10,
+                    :desc => 'The maximum time in seconds to wait for the spec runner to finish'
 
       method_option :console,
                     :type => :string,
@@ -123,7 +123,9 @@ module Guard
         runner_options[:max_error_notify] = 0
 
         if CLI.phantomjs_bin_valid?(runner_options[:phantomjs_bin])
-          ::Guard::Jasmine::Server.start(runner_options) unless runner_options[:server] == :none
+          catch(:task_has_failed) do
+            ::Guard::Jasmine::Server.start(runner_options) unless runner_options[:server] == :none
+          end
 
           if CLI.runner_available?(runner_options)
             result = ::Guard::Jasmine::Runner.run(paths, runner_options)

data/lib/guard/jasmine/runner.rb

@@ -18,7 +18,7 @@ module Guard
         # @param [Hash] options the options for the execution
         # @option options [String] :jasmine_url the url of the Jasmine test runner
         # @option options [String] :phantomjs_bin the location of the PhantomJS binary
-        # @option options [Integer] :timeout the maximum time in milliseconds to wait for the spec runner to finish
+        # @option options [Integer] :timeout the maximum time in seconds to wait for the spec runner to finish
         # @option options [String] :rackup_config custom rackup config to use
         # @option options [Boolean] :notification show notifications
         # @option options [Boolean] :hide_success hide success message notification
@@ -82,12 +82,12 @@ module Guard
         #
         # @param [String] path the path of the spec
         # @param [Hash] options the options for the execution
-        # @option options [Integer] :timeout the maximum time in milliseconds to wait for the spec runner to finish
+        # @option options [Integer] :timeout the maximum time in seconds to wait for the spec runner to finish
         #
         def run_jasmine_spec(file, options)
           suite = jasmine_suite(file, options)
           Formatter.info("Run Jasmine suite at #{ suite }")
-          IO.popen("#{ phantomjs_command(options) } \"#{ suite }\" #{ options[:timeout] } #{ options[:specdoc] } #{ options[:focus] } #{ options[:console] } #{ options[:errors] }", 'r:UTF-8')
+          IO.popen("#{ phantomjs_command(options) } \"#{ suite }\" #{ options[:timeout] * 1000 } #{ options[:specdoc] } #{ options[:focus] } #{ options[:console] } #{ options[:errors] }", 'r:UTF-8')
         end
 
         # Get the PhantomJS binary and script to execute.

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.9.3'
+    VERSION = '1.9.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-jasmine
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 1.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-30 00:00:00.000000000 Z
+date: 2012-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -137,9 +137,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1974588860096635221
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -148,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