guard-jasmine 0.8.3 → 0.8.4

data/README.md

@@ -2,7 +2,7 @@
 
 Guard::Jasmine automatically tests your Jasmine specs on Rails when files are modified.
 
-Tested on MRI Ruby 1.8.7, 1.9.2, 1.9.3, REE, JRuby 1.6.5 & Rubinius 1.2.4.
+Tested on MRI Ruby 1.8.7, 1.9.2, 1.9.3, REE and the latest versions of JRuby and Rubinius.
 
 If you have any questions please join us on our [Google group](http://groups.google.com/group/guard-dev) or on `#guard`
 (irc.freenode.net).
@@ -215,6 +215,9 @@ The general options configures the environment that is needed to run Guard::Jasm
 :server => :jasmine_gem                       # Jasmine server to use, either :auto, :rack, :jasmine_gem or :none
                                               # default: :auto
 
+:server_env => :development                   # Jasmine server Rails environment to set, e.g. :development or :test
+                                              # default: :test
+
 :port => 9292                                 # Jasmine server port to use.
                                               # default: 8888
 

data/lib/guard/jasmine.rb

@@ -20,6 +20,7 @@ module Guard
 
     DEFAULT_OPTIONS = {
         :server           => :auto,
+        :server_env       => 'test',
         :port             => 8888,
         :jasmine_url      => 'http://localhost:8888/jasmine',
         :timeout          => 10000,
@@ -39,6 +40,7 @@ module Guard
     # @param [Array<Guard::Watcher>] watchers the watchers in the Guard block
     # @param [Hash] options the options for the Guard
     # @option options [String] :server the server to use, either :rails or :jasmine
+    # @option options [String] :server_env the server environment to use, for example :development, :test
     # @option options [String] :port the port for the Jasmine test server
     # @option options [String] :jasmine_url the url of the Jasmine test runner
     # @option options [String] :phantomjs_bin the location of the PhantomJS binary
@@ -73,7 +75,7 @@ module Guard
     def start
       if phantomjs_bin_valid?(options[:phantomjs_bin])
 
-        Server.start(options[:server], options[:port]) unless options[:server] == :none
+        Server.start(options[:server], options[:port], options[:server_env]) unless options[:server] == :none
 
         if jasmine_runner_available?(options[:jasmine_url])
           run_all if options[:all_on_start]

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

@@ -38,7 +38,7 @@ waitFor = (test, ready, timeout = 5000) ->
 # Test if the specs have finished.
 #
 specsReady = ->
-  page.evaluate -> if document.body.querySelector('.finished-at') then true else false
+  page.evaluate -> window.resultReceived
 
 #
 # SCRIPT START
@@ -84,6 +84,7 @@ page.onConsoleMessage = (msg, line, source) ->
       page.addLogs(suite)
 
     console.log JSON.stringify(result, undefined, 2)
+    page.evaluate -> window.resultReceived = true
 
   else if /^SPEC_START: (\d+)$/.test(msg)
     currentSpecId = Number(RegExp.$1)
@@ -227,6 +228,7 @@ page.onInitialized = ->
     # Attach the console reporter when the document is ready.
     #
     window.onload = ->
+      window.resultReceived = false
       jasmine.getEnv().addReporter(new ConsoleReporter())
 
 # Open web page and run the Jasmine test runner

data/lib/guard/jasmine/runner.rb

@@ -164,9 +164,13 @@ module Guard
             result
 
           rescue Exception => e
-            Formatter.error("Cannot decode JSON from PhantomJS runner: #{ e.message }")
-            Formatter.error('Please report an issue at: https://github.com/netzpirat/guard-jasmine/issues')
-            Formatter.error("JSON response: #{ json }")
+            if json == ''
+              Formatter.error("No response from the Jasmine runner!")
+            else
+              Formatter.error("Cannot decode JSON from PhantomJS runner: #{ e.message }")
+              Formatter.error('Please report an issue at: https://github.com/netzpirat/guard-jasmine/issues')
+              Formatter.error("JSON response: #{ json }")
+            end
           ensure
             output.close
           end

data/lib/guard/jasmine/server.rb

@@ -15,13 +15,14 @@ module Guard
         #
         # @param [String] strategy the server strategy to use
         # @param [Number] port the server port
+        # @param [String] environment the Rails environment
         #
-        def start(strategy, port)
+        def start(strategy, port, environment)
           strategy = detect_server if strategy == :auto
 
           case strategy
           when :rack
-            start_rack_server(port)
+            start_rack_server(port, environment)
           when :jasmine_gem
             start_jasmine_gem_server(port)
           end
@@ -42,15 +43,16 @@ module Guard
         # in the current directory.
         #
         # @param [Number] port the server port
+        # @param [String] environment the Rails environment
         #
-        def start_rack_server(port)
+        def start_rack_server(port, environment)
           require 'rack'
 
-          ::Guard::UI.info "Guard::Jasmine starts Rack test server on port #{ port }."
+          ::Guard::UI.info "Guard::Jasmine starts Rack test server on port #{ port } in #{ environment } environment."
 
           self.thread = Thread.new {
-            ENV['RAILS_ENV'] = 'test'
-            Rack::Server.start(:config => 'config.ru', :Port => port, :AccessLog => [], :environment => 'test')
+            ENV['RAILS_ENV'] = environment.to_s
+            Rack::Server.start(:config => 'config.ru', :Port => port, :AccessLog => [])
           }
 
         rescue Exception => e

data/lib/guard/jasmine/version.rb

@@ -1,6 +1,6 @@
 module Guard
   module JasmineVersion
     # Guard::Jasmine version that is used for the Gem specification
-    VERSION = '0.8.3'
+    VERSION = '0.8.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-jasmine
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70293620495080 !ruby/object:Gem::Requirement
+  requirement: &70096761369580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.3
   type: :runtime
   prerelease: false
-  version_requirements: *70293620495080
+  version_requirements: *70096761369580
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70293620494220 !ruby/object:Gem::Requirement
+  requirement: &70096761368900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70293620494220
+  version_requirements: *70096761368900
 - !ruby/object:Gem::Dependency
   name: version
-  requirement: &70293620493140 !ruby/object:Gem::Requirement
+  requirement: &70096761368140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70293620493140
+  version_requirements: *70096761368140
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70293620492420 !ruby/object:Gem::Requirement
+  requirement: &70096761366940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70293620492420
+  version_requirements: *70096761366940
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70293620491280 !ruby/object:Gem::Requirement
+  requirement: &70096761366300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70293620491280
+  version_requirements: *70096761366300
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70293620490200 !ruby/object:Gem::Requirement
+  requirement: &70096761365220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70293620490200
+  version_requirements: *70096761365220
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70293620489640 !ruby/object:Gem::Requirement
+  requirement: &70096761364340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *70293620489640
+  version_requirements: *70096761364340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70293620488960 !ruby/object:Gem::Requirement
+  requirement: &70096761363720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70293620488960
+  version_requirements: *70096761363720
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70293620488080 !ruby/object:Gem::Requirement
+  requirement: &70096761362980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.7.3
   type: :development
   prerelease: false
-  version_requirements: *70293620488080
+  version_requirements: *70096761362980
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70293620487100 !ruby/object:Gem::Requirement
+  requirement: &70096761361980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 1.17.2
   type: :development
   prerelease: false
-  version_requirements: *70293620487100
+  version_requirements: *70096761361980
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70293620486520 !ruby/object:Gem::Requirement
+  requirement: &70096761361200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: 0.9.6.2
   type: :development
   prerelease: false
-  version_requirements: *70293620486520
+  version_requirements: *70096761361200
 description: Guard::Jasmine automatically tests your Jasmine specs on PhantomJS
 email:
 - michi@netzpiraten.ch