guard-test 0.3.0.rc2 → 0.3.0.rc3

data/README.md

@@ -7,8 +7,7 @@ If you have any questions/issues about Guard or Guard::Test, please join us on o
 ## Features
 
 - Compatible with Test::Unit >= 2.2 and Minitest (Ruby 1.9).
-- Auto-detection of the `turn` gem (notification is still missing though).
-- Tested on Ruby 1.8.6, 1.8.7, 1.9.2, REE, Rubinius and JRuby.
+- Tested on Ruby 1.8.7, 1.9.2, REE, Rubinius and JRuby.
 
 ## Install
 
@@ -86,7 +85,7 @@ Available options:
 :rvm            => ['1.8.7', '1.9.2'] # directly run your specs on multiple Rubies, default: nil
 :bundler        => false              # don't use "bundle exec" to run the test command, default: true if a you have a Gemfile
 :runner         => 'fastfail'         # default: 'default'
-:cli            => "-v"               # pass arbitrary CLI arguments to the Ruby/Turn command that runs the tests, default: nil
+:cli            => "-v"               # pass arbitrary CLI arguments to the Ruby command that runs the tests, default: nil
 :notification   => false              # don't display Growl (or Libnotify) notification after the specs are done running, default: true
 :all_on_start   => false              # don't run all the tests at startup, default: true
 :all_after_pass => false              # don't run all tests after changed tests pass, default: true

data/lib/guard/test/runner.rb

@@ -26,11 +26,21 @@ module Guard
       end
 
       def rvm?
-        @rvm ||= @options[:rvm] && @options[:rvm].respond_to?(:join)
+        if @rvm.nil?
+          @rvm = @options[:rvm] && @options[:rvm].respond_to?(:join)
+        end
+        @rvm
       end
 
       def turn?
-        @turn ||= Object.const_defined?('Turn')
+        if @turn.nil?
+          @turn = begin
+            require 'turn'
+          rescue LoadError => ex
+            false
+          end
+        end
+        @turn
       end
 
     private
@@ -38,21 +48,20 @@ module Guard
       def test_unit_command(paths)
         cmd_parts = []
         cmd_parts << "rvm #{@options[:rvm].join(',')} exec" if rvm?
-        cmd_parts << "bundle exec" if @options[:bundler]
-        cmd_parts << "#{turn? ? 'turn' : 'ruby'} -Itest -rubygems"
-        cmd_parts << "-r bundler/setup" if @options[:bundler]
+        cmd_parts << "bundle exec" if @options[:bundler] && !turn?
+        cmd_parts << "#{turn? ? 'turn' : 'ruby'} -Itest"
+        cmd_parts << "-r bundler/setup" if @options[:bundler] && !turn?
 
         unless turn?
           cmd_parts << "-r #{File.expand_path("../runners/#{@runner_name}_guard_test_runner", __FILE__)}"
           cmd_parts << "-e \"GUARD_TEST_NOTIFY=#{@options[:notification]}\""
         end
 
-        paths.each { |path| cmd_parts << "-r ./#{path}" }
-        cmd_parts << "--"
+        paths.each { |path| cmd_parts << "\"./#{path}\"" }
         cmd_parts << "--runner=guard-#{@runner_name}" unless turn?
-        cmd_parts << @options[:cli] if @options[:cli]
+        cmd_parts << @options[:cli]
 
-        cmd_parts.join(' ')
+        cmd_parts.compact.join(' ')
       end
 
     end