guard-jasmine 1.10.1 → 1.11.0

data/README.md

@@ -274,8 +274,7 @@ We add support for CoffeeScript specs, using Thin as spec server and adding Jasm
 create a Rack configuration to spin up a mini-Rails app for testing:
 
 ```Ruby
-require 'rails'
-require 'rails/all'
+require 'action_controller/railtie'
 require 'jasminerice'
 require 'sprockets/railtie'
 require 'jquery-rails'
@@ -343,7 +342,7 @@ The server options configures the server environment that is needed to run Guard
 
 ```ruby
 :server => :jasmine_gem                       # Jasmine server to use, either :auto, :none,
-                                              # :webrick, :mongrel, :thin, :unicorn, :jasmine_gem
+                                              # :webrick, :mongrel, :thin, :unicorn, :jasmine_gem, :puma
                                               # default: :auto
 
 :server_env => :test                          # Jasmine server Rails environment to set,
@@ -362,7 +361,7 @@ The server options configures the server environment that is needed to run Guard
 :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).
+:rackup_config => 'spec/dummy/config.ru'      # Path to rackup config file (i.e. for webrick, mongrel, thin, unicorn, puma).
                                               # default: ./config.ru
                                               # This option is useful when using guard-jasmine in a mountable engine
                                               # and the config.ru is within the dummy app
@@ -538,7 +537,7 @@ Usage:
   guard-jasmine spec
 
 Options:
-  -s, [--server=SERVER]          # Server to start, either `auto`, `webrick`, `mongrel`, `thin`,
+  -s, [--server=SERVER]          # Server to start, either `auto`, `webrick`, `mongrel`, `thin`, `puma`
                                  # `unicorn`, `jasmine_gem` or `none`
                                  # Default: auto
   -p, [--port=N]                 # Server port to use

data/lib/guard/jasmine/runner.rb

@@ -170,13 +170,12 @@ module Guard
 
             result
 
-          rescue => e
-            if json == ''
-              Formatter.error("No response from the Jasmine runner!")
+          rescue MultiJson::DecodeError => e
+            if e.data == ''
+              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 }")
+              Formatter.error("JSON response: #{ e.data }")
             end
           ensure
             output.close

data/lib/guard/jasmine/server.rb

@@ -32,7 +32,7 @@ module Guard
           timeout = options[:server_timeout]
 
           case server
-          when :webrick, :mongrel, :thin
+          when :webrick, :mongrel, :thin, :puma
             start_rack_server(server, port, options)
           when :unicorn
             start_unicorn_server(port, options)

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-jasmine
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-22 00:00:00.000000000 Z
+date: 2012-12-17 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.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Guard gem for headless testing with Jasmine