guard-jasmine 1.8.3 → 1.9.0

data/README.md

@@ -361,6 +361,11 @@ The server options configures the server environment that is needed to run Guard
 
 :timeout => 20000                             # The time in ms to wait for the spec runner to finish.
                                               # default: 10000
+
+:rackup_config => 'spec/dummy/config.ru'      # Path to rackup config file (i.e. for webrick, mongrel, thin, unicorn).
+                                              # default: ./config.ru
+                                              # This option is useful when using guard-jasmine in a mountable engine
+                                              # and the config.ru is within the dummy app
 ```
 
 If you're setting the `:server` option to `:none`, you can supply the Jasmine runner url manually:

data/lib/guard/jasmine.rb

@@ -25,6 +25,7 @@ module Guard
         :server_env       => ENV['RAILS_ENV'] || 'development',
         :server_timeout   => 15,
         :port             => 8888,
+        :rackup_config    => nil,
         :jasmine_url      => 'http://localhost:8888/jasmine',
         :timeout          => 10000,
         :spec_dir         => 'spec/javascripts',
@@ -49,6 +50,7 @@ module Guard
     # @option options [String] :server_env the server environment to use, for example :development, :test
     # @option options [Integer] :server_timeout the number of seconds to wait for the Jasmine spec server
     # @option options [String] :port the port for the Jasmine test server
+    # @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
@@ -88,7 +90,7 @@ module Guard
     def start
       if Jasmine.phantomjs_bin_valid?(options[:phantomjs_bin])
 
-        Server.start(options[:server], options[:port], options[:server_env], options[:spec_dir]) unless options[:server] == :none
+        Server.start(options) unless options[:server] == :none
 
         if Jasmine.runner_available?(options)
           run_all if options[:all_on_start]

data/lib/guard/jasmine/server.rb

@@ -1,5 +1,7 @@
 # coding: utf-8
 
+require 'socket'
+require 'timeout'
 require 'childprocess'
 
 module Guard
@@ -15,31 +17,36 @@ module Guard
 
         # Start the internal test server for getting the Jasmine runner.
         #
-        # @param [String] strategy the server strategy to use
-        # @param [Number] port the server port
-        # @param [String] environment the Rails environment
-        # @param [String] spec_dir the spec directory
+        # @param [Hash] options the server options
+        # @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 [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)
         #
-        def start(strategy, port, environment, spec_dir)
-          strategy = detect_server(spec_dir) if strategy == :auto
+        def start(options)
+          server  = options[:server]
+          server  = detect_server(options[:spec_dir]) if server == :auto
+          port    = options[:port]
+          timeout = options[:server_timeout]
 
-          case strategy
+          case server
           when :webrick, :mongrel, :thin, :unicorn
-            start_rack_server(port, environment, strategy)
+            start_rack_server(options)
           when :jasmine_gem
             start_rake_server(port, 'jasmine')
           else
-            start_rake_server(port, strategy.to_s) unless strategy == :none
+            start_rake_server(port, server.to_s) unless server == :none
           end
 
-          wait_for_server(port) unless strategy == :none
+          wait_for_server(port, timeout) unless server == :none
         end
 
         # Stop the server thread.
         #
         def stop
           if self.process
-            ::Guard::UI.info "Guard::Jasmine stops server."
+            ::Guard::UI.info 'Guard::Jasmine stops server.'
             self.process.stop(5)
           end
         end
@@ -50,14 +57,21 @@ module Guard
         # will simply start a server that uses the `config.ru`
         # in the current directory.
         #
-        # @param [Number] port the server port
-        # @param [String] environment the Rails environment
-        # @param [Symbol] server the rack server to use
+        # @param [Hash] options the server options
+        # @option options [Symbol] server the rack server to use
+        # @option options [String] server_env the Rails environment
+        # @option options [Number] port the server port
+        # @option options [String] rackup_config custom rackup config to use (i.e. spec/dummy/config.ru for mountable engines)
         #
-        def start_rack_server(port, environment, server)
+        def start_rack_server(options)
+          server        = options[:server]
+          environment   = options[:server_env]
+          port          = options[:port]
+          rackup_config = options[:rackup_config]
+
           ::Guard::UI.info "Guard::Jasmine starts #{ server } test server on port #{ port } in #{ environment } environment."
 
-          self.process = ChildProcess.build('rackup', '-E', environment.to_s, '-p', port.to_s, '-s', server.to_s)
+          self.process = ChildProcess.build(*['rackup', '-E', environment.to_s, '-p', port.to_s, '-s', server.to_s, rackup_config].compact)
           self.process.io.inherit! if ::Guard.respond_to?(:options) && ::Guard.options && ::Guard.options[:verbose]
           self.process.start
 
@@ -88,6 +102,14 @@ module Guard
         #
         def detect_server(spec_dir)
           if File.exists?('config.ru')
+            %w(unicorn thin mongrel).each do |server|
+              begin
+                require server
+                return server.to_sym
+              rescue LoadError
+                # Ignore missing server and try next
+              end
+            end
             :webrick
           elsif File.exists?(File.join(spec_dir, 'support', 'jasmine.yml'))
             :jasmine_gem
@@ -99,19 +121,23 @@ module Guard
         # Wait until the Jasmine test server is running.
         #
         # @param [Number] port the server port
+        # @param [Number] timeout the server wait timeout
         #
-        def wait_for_server(port)
-          require 'socket'
-
-          while true
-            begin
-              ::TCPSocket.new('127.0.0.1', port).close
-              break
-            rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
-              # Ignore, server still not available
+        def wait_for_server(port, timeout)
+          Timeout::timeout(timeout) do
+            while true
+              begin
+                ::TCPSocket.new('127.0.0.1', port).close
+                break
+              rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+                # Ignore, server still not available
+              end
+              sleep 0.1
             end
-            sleep 0.1
           end
+          
+        rescue Timeout::Error
+          ::Guard::UI.warning 'Timeout while waiting for the server startup.'
         end
 
       end

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.8.3'
+    VERSION = '1.9.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-jasmine
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-19 00:00:00.000000000 Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -139,7 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3730569496598151722
+      hash: 3448154215617801820
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: