guard-jasmine 0.8.8 → 0.9.0

data/README.md

@@ -212,7 +212,7 @@ end
 The general options configures the environment that is needed to run Guard::Jasmine:
 
 ```ruby
-:server => :jasmine_gem                       # Jasmine server to use, either :auto, :rack, :jasmine_gem or :none
+:server => :jasmine_gem                       # Jasmine server to use, either :auto, :none, :webrick, :mongrel, :thin, :jasmine_gem
                                               # default: :auto
 
 :server_env => :test                          # Jasmine server Rails environment to set, e.g. :development or :test
@@ -235,6 +235,9 @@ If you're setting the `:server` option to `:none`, you can supply the Jasmine ru
                                               # default: http://127.0.0.1:8888/jasmine
 ```
 
+Detecting the server with the `auto` option does only detect the jasmine gem or webrick. If you want to use mongrel or
+thins, you have to set it explicit in the server option.
+
 The reason why the Server environment is set to `development` by default is that in development mode
 the asset pipeline doesn't concatenate the JavaScripts and you'll see the line number in the real file,
 instead of a ridiculous high line number in a single, very large JavaScript.
@@ -344,7 +347,7 @@ Usage:
   guard-jasmine spec
 
 Options:
-  -s, [--server=SERVER]    # Server to start, either `auto`, `rack`, `jasmine_gem` or `none`
+  -s, [--server=SERVER]    # Server to start, either `auto`, `none`, `webrick`, `mongrel`, `thin`, `jasmine_gem`
                            # Default: auto
   -p, [--port=N]           # Server port to use
                            # Default: 8888

data/lib/guard/jasmine.rb

@@ -39,7 +39,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 the server to use, either :auto, :none, :webrick, :mongrel, :thin, :jasmine_gem
     # @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
@@ -59,7 +59,7 @@ module Guard
       options[:jasmine_url] = "http://localhost:#{ options[:port] }/jasmine" if options[:port] && !options[:jasmine_url]
       options = DEFAULT_OPTIONS.merge(options)
       options[:specdoc] = :failure if ![:always, :never, :failure].include? options[:specdoc]
-      options[:server] = :auto if ![:auto, :none, :rack, :jasmine_gem].include? options[:server]
+      options[:server] = :auto if ![:none, :webrick, :mongrel, :thin, :jasmine_gem].include? options[:server]
       options[:phantomjs_bin] = Jasmine.which('phantomjs') unless options[:phantomjs_bin]
 
       super(watchers, options)

data/lib/guard/jasmine/cli.rb

@@ -77,7 +77,7 @@ module Guard
         runner[:port] = options.port
         runner[:server_env] = options.server_env
         runner[:console] = [:always, :never, :failure].include?(options.console.to_sym) ? options.console.to_sym : :failure
-        runner[:server] = [:auto, :rack, :jasmine_gem, :none].include?(options.server.to_sym) ? options.server.to_sym : :auto
+        runner[:server] = [:auto, :none, :webrick, :mongrel, :thin, :jasmine_gem].include?(options.server.to_sym) ? options.server.to_sym : :auto
 
         runner[:notification] = false
         runner[:hide_success] = true

data/lib/guard/jasmine/server.rb

@@ -21,8 +21,8 @@ module Guard
           strategy = detect_server if strategy == :auto
 
           case strategy
-          when :rack
-            start_rack_server(port, environment)
+          when :webrick, :mongrel, :thin
+            start_rack_server(port, environment, strategy)
           when :jasmine_gem
             start_jasmine_gem_server(port)
           end
@@ -44,15 +44,16 @@ module Guard
         #
         # @param [Number] port the server port
         # @param [String] environment the Rails environment
+        # @param [Symbol] server the rack server to use
         #
-        def start_rack_server(port, environment)
+        def start_rack_server(port, environment, server)
           require 'rack'
 
-          ::Guard::UI.info "Guard::Jasmine starts Rack test server on port #{ port } in #{ environment } environment."
+          ::Guard::UI.info "Guard::Jasmine starts #{ server } test server on port #{ port } in #{ environment } environment."
 
           self.thread = Thread.new {
             ENV['RAILS_ENV'] = environment.to_s
-            Rack::Server.start(:config => 'config.ru', :Port => port, :AccessLog => [])
+            Rack::Server.start(:config => 'config.ru', :Port => port, :server => server)
           }
 
         rescue Exception => e
@@ -84,7 +85,7 @@ module Guard
         #
         def detect_server
           if File.exists?('config.ru')
-            :rack
+            :webrick
           elsif File.exists?(File.join('spec', 'javascripts', 'support', 'jasmine.yml'))
             :jasmine_gem
           else

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.8'
+    VERSION = '0.9.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-jasmine
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-15 00:00:00.000000000Z
+date: 2011-12-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70258909388700 !ruby/object:Gem::Requirement
+  requirement: &70364667614360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.3
   type: :runtime
   prerelease: false
-  version_requirements: *70258909388700
+  version_requirements: *70364667614360
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70258909387020 !ruby/object:Gem::Requirement
+  requirement: &70364667607740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70258909387020
+  version_requirements: *70364667607740
 - !ruby/object:Gem::Dependency
   name: version
-  requirement: &70258909386160 !ruby/object:Gem::Requirement
+  requirement: &70364667598460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70258909386160
+  version_requirements: *70364667598460
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70258909311800 !ruby/object:Gem::Requirement
+  requirement: &70364667594640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70258909311800
+  version_requirements: *70364667594640
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70258909310640 !ruby/object:Gem::Requirement
+  requirement: &70364667591680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70258909310640
+  version_requirements: *70364667591680
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70258909309160 !ruby/object:Gem::Requirement
+  requirement: &70364667589820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70258909309160
+  version_requirements: *70364667589820
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70258909308540 !ruby/object:Gem::Requirement
+  requirement: &70364667588300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *70258909308540
+  version_requirements: *70364667588300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70258909307680 !ruby/object:Gem::Requirement
+  requirement: &70364667585360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70258909307680
+  version_requirements: *70364667585360
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70258909306820 !ruby/object:Gem::Requirement
+  requirement: &70364667569100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.7.3
   type: :development
   prerelease: false
-  version_requirements: *70258909306820
+  version_requirements: *70364667569100
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70258909305760 !ruby/object:Gem::Requirement
+  requirement: &70364667563080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 1.17.2
   type: :development
   prerelease: false
-  version_requirements: *70258909305760
+  version_requirements: *70364667563080
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70258909305180 !ruby/object:Gem::Requirement
+  requirement: &70364667540220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: 0.9.6.2
   type: :development
   prerelease: false
-  version_requirements: *70258909305180
+  version_requirements: *70364667540220
 description: Guard::Jasmine automatically tests your Jasmine specs on PhantomJS
 email:
 - michi@netzpiraten.ch