guard-jasmine 2.0.0 → 2.0.1

data/lib/guard/jasmine/server.rb

@@ -7,15 +7,13 @@ require 'jasmine'
 
 module Guard
   class Jasmine
-
     # Start and stop a Jasmine test server for requesting the specs
     # from PhantomJS.
     #
     module Server
       class << self
-
         attr_accessor :process
-
+        attr_accessor :cmd
         # Start the internal test server for getting the Jasmine runner.
         #
         # @param [Hash] options the server options
@@ -32,14 +30,14 @@ module Guard
           timeout = options[:server_timeout]
 
           case server
-            when :webrick, :mongrel, :thin, :puma
-              start_rack_server(server, port, options)
-            when :unicorn
-              start_unicorn_server(port, options)
-            when :jasmine_gem
-              start_rake_server(port, 'jasmine', options)
-            else
-              start_rake_server(port, server.to_s, options) unless server == :none
+          when :webrick, :mongrel, :thin, :puma
+            start_rack_server(server, port, options)
+          when :unicorn
+            start_unicorn_server(port, options)
+          when :jasmine_gem
+            start_rake_server(port, 'jasmine', options)
+          else
+            start_rake_server(port, server.to_s, options) unless server == :none
           end
 
           wait_for_server(port, timeout) unless server == :none
@@ -48,9 +46,9 @@ module Guard
         # Stop the server thread.
         #
         def stop
-          if self.process
+          if process
             ::Guard::UI.info 'Guard::Jasmine stops server.'
-            self.process.stop(5)
+            process.stop(5)
           end
         end
 
@@ -72,9 +70,9 @@ module Guard
         # @return [Symbol] the server strategy
         #
         def detect_server(spec_dir)
-          if spec_dir && File.exists?(File.join(spec_dir, 'support','jasmine.yml'))
+          if spec_dir && File.exist?(File.join(spec_dir, 'support', 'jasmine.yml'))
             :jasmine_gem
-          elsif File.exists?('config.ru')
+          elsif File.exist?('config.ru')
             %w(unicorn thin mongrel puma).each do |server|
               begin
                 require server
@@ -108,15 +106,7 @@ module Guard
           coverage      = options[:coverage] ? 'on' : 'off'
 
           ::Guard::UI.info "Guard::Jasmine starts #{ server } spec server on port #{ port } in #{ environment } environment (coverage #{ coverage })."
-
-          self.process = ChildProcess.build(*['rackup', '-E', environment.to_s, '-p', port.to_s, '-s', server.to_s, rackup_config].compact)
-          self.process.environment['COVERAGE'] = options[:coverage].to_s
-          self.process.environment['IGNORE_INSTRUMENTATION'] = options[:ignore_instrumentation].to_s
-          self.process.io.inherit! if options[:verbose]
-          self.process.start
-
-        rescue => e
-          ::Guard::UI.error "Cannot start Rack server: #{ e.message }"
+          execute(options, ['rackup', '-E', environment.to_s, '-p', port.to_s, '-s', server.to_s, rackup_config])
         end
 
         # Start the Rack server of the current project. This
@@ -132,14 +122,7 @@ module Guard
           coverage    = options[:coverage] ? 'on' : 'off'
 
           ::Guard::UI.info "Guard::Jasmine starts Unicorn spec server on port #{ port } in #{ environment } environment (coverage #{ coverage })."
-
-          self.process = ChildProcess.build('unicorn_rails', '-E', environment.to_s, '-p', port.to_s)
-          self.process.environment['COVERAGE'] = options[:coverage].to_s
-          self.process.io.inherit! if options[:verbose]
-          self.process.start
-
-        rescue => e
-          ::Guard::UI.error "Cannot start Unicorn server: #{ e.message }"
+          execute(options, ['unicorn_rails', '-E', environment.to_s, '-p', port.to_s])
         end
 
         # Start the Jasmine gem server of the current project.
@@ -149,15 +132,27 @@ module Guard
         # @option options [Symbol] server the rack server to use
         #
         def start_rake_server(port, task, options)
-
           ::Guard::UI.info "Guard::Jasmine starts Jasmine Gem test server on port #{ port }."
+          execute(options, ['rake', task, "JASMINE_PORT=#{ port }"])
+        end
 
-          self.process = ChildProcess.build('ruby', '-S', 'rake', task, "JASMINE_PORT=#{ port }")
-          self.process.io.inherit! if options[:verbose]
-          self.process.start
-
+        # Builds a child process with the given command and arguments
+        # @param [Array<string>] array of arguments to send to ChildProcess
+        def execute(options, cmd)
+          if RUBY_PLATFORM == "java"
+            cmd.unshift("jruby", "-S")
+          else
+            cmd.unshift("ruby", "-S")
+          end
+          self.cmd = cmd
+          self.process = ChildProcess.build(*cmd.compact)
+          process.environment['COVERAGE'] = options[:coverage].to_s
+          process.environment['IGNORE_INSTRUMENTATION'] = options[:ignore_instrumentation].to_s
+          process.io.inherit! if options[:verbose]
+          process.start
         rescue => e
-          ::Guard::UI.error "Cannot start Rake task server: #{ e.message }"
+          ::Guard::UI.error "Cannot start server using command #{ cmd.join(' ') }."
+          ::Guard::UI.error "Error was: #{ e.message }"
         end
 
         # Wait until the Jasmine test server is running.
@@ -166,8 +161,8 @@ module Guard
         # @param [Number] timeout the server wait timeout
         #
         def wait_for_server(port, timeout)
-          Timeout::timeout(timeout) do
-            while true
+          Timeout.timeout(timeout) do
+            loop do
               begin
                 ::TCPSocket.new('127.0.0.1', port).close
                 break
@@ -179,12 +174,16 @@ module Guard
           end
 
         rescue Timeout::Error
-          ::Guard::UI.warning 'Timeout while waiting for the server startup. You may need to increase the `:server_timeout` option.'
+          ::Guard::UI.warning "Timeout while waiting for the server to startup"
+          ::Guard::UI.warning "Most likely there is a configuration error that's preventing the server from starting"
+          ::Guard::UI.warning "You may need to increase the `:server_timeout` option."
+          ::Guard::UI.warning "The commandline that was used to start the server was:"
+          ::Guard::UI.warning cmd.join(' ')
+          ::Guard::UI.warning "You should attempt to run that and see if any errors occur"
+
           throw :task_has_failed
         end
-
       end
     end
-
   end
 end

data/lib/guard/jasmine/task.rb

@@ -6,12 +6,10 @@ require 'rake/tasklib'
 require 'guard/jasmine/cli'
 
 module Guard
-
   # Provides a method to define a Rake task that
   # runs the Jasmine specs.
   #
   class JasmineTask < ::Rake::TaskLib
-
     # Name of the main, top level task
     attr_accessor :name
 
@@ -39,14 +37,13 @@ module Guard
           rescue SystemExit => e
             case e.status
             when 1
-              fail 'Some specs have failed'
+              raise 'Some specs have failed'
             when 2
-              fail "The spec couldn't be run: #{ e.message }'"
+              raise "The spec couldn't be run: #{ e.message }'"
             end
           end
         end
       end
     end
-
   end
 end

data/lib/guard/jasmine/util.rb

@@ -4,11 +4,9 @@ require 'guard/jasmine/formatter'
 
 module Guard
   class Jasmine
-
     # Provider of some shared utility methods.
     #
     module Util
-
       # Verifies if the Jasmine test runner is available.
       # If the runner is not available within 15 seconds, then
       # the availability check will cancel.
@@ -40,7 +38,7 @@ module Guard
             available
           end
 
-        rescue Timeout::Error => e
+        rescue Timeout::Error
           ::Guard::Jasmine::Formatter.error 'Timeout waiting for the Jasmine test runner.'
           false
 
@@ -110,8 +108,6 @@ module Guard
 
         nil
       end
-
     end
-
   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 = '2.0.0'
+    VERSION = '2.0.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-jasmine
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Michael Kessler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-06 00:00:00.000000000 Z
+date: 2014-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -25,6 +25,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: guard-compat
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: jasmine
   requirement: !ruby/object:Gem::Requirement
@@ -137,62 +151,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-coffeescript
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-shell
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement