guard-test 0.2.0 → 0.3.0.rc2

data/lib/guard/test/runner.rb

@@ -1,44 +1,60 @@
+# encoding: utf-8
 module Guard
   class Test
-    module Runner
-      class << self
+    class Runner
 
-        def available_runners
-          @available_runners ||= Dir.open(File.join(File.dirname(__FILE__), 'runners')).map do |filename|
-            filename[/^(\w+)_test_unit_runner\.rb$/, 1]
-          end.compact
-        end
+      def self.runners
+        @runners ||= Dir.open(File.expand_path('../runners', __FILE__)).map { |filename| filename[/^(\w+)_guard_test_runner\.rb$/, 1] }.compact
+      end
 
-        def set_test_unit_runner(options={})
-          @test_unit_runner = available_runners.include?(options[:runner]) ? options[:runner] : available_runners[0]
-        end
+      def initialize(options={})
+        @runner_name = self.class.runners.detect { |runner| runner == options[:runner] } || self.class.runners[0]
+        @options     = {
+          :notification => true,
+          :bundler      => File.exist?("#{Dir.pwd}/Gemfile"),
+          :rvm          => nil,
+          :cli          => nil
+        }.merge(options)
+      end
 
-        def run(paths, options={})
-          message = options[:message] || "Running (#{@test_unit_runner} runner): #{paths.join(' ') }"
-          UI.info(message, :reset => true)
-          system(test_unit_command(paths, options))
-        end
+      def run(paths, options={})
+        return true if paths.empty?
 
-      private
+        message = options[:message] || "Running (#{@runner_name} runner): #{paths.join(' ') }"
+        ::Guard::UI.info(message, :reset => true)
+        system(test_unit_command(paths))
+      end
 
-        def bundler?
-          @bundler ||= File.exist?("#{Dir.pwd}/Gemfile")
-        end
+      def rvm?
+        @rvm ||= @options[:rvm] && @options[:rvm].respond_to?(:join)
+      end
+
+      def turn?
+        @turn ||= Object.const_defined?('Turn')
+      end
+
+    private
 
-        def test_unit_command(files, options={})
-          cmd_parts = []
-          cmd_parts << "rvm #{options[:rvm].join(',')} exec" if options[:rvm].respond_to?(:join)
-          cmd_parts << "bundle exec" if bundler? && options[:bundler] != false
-          cmd_parts << "ruby -rubygems"
-          cmd_parts << "-r#{File.dirname(__FILE__)}/runners/#{@test_unit_runner}_test_unit_runner"
-          cmd_parts << "-Ilib:test"
-          cmd_parts << "-e \"%w[#{files.join(' ')}].each { |f| load f }\""
-          cmd_parts << files.map { |f| "\"#{f}\"" }.join(' ')
-          cmd_parts << "--runner=guard-#{@test_unit_runner}"
-          cmd_parts.join(' ')
+      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]
+
+        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 << "--"
+        cmd_parts << "--runner=guard-#{@runner_name}" unless turn?
+        cmd_parts << @options[:cli] if @options[:cli]
+
+        cmd_parts.join(' ')
       end
+
     end
   end
 end

data/lib/guard/test/runner.rbc

@@ -1,5 +1,5 @@
 !RBIX
-10937318184790222022
+17831730954501249321
 x
 M
 1
@@ -124,16 +124,17 @@ x
 4
 Test
 i
-28
+29
 5
 66
 99
 7
 0
+1
 65
 49
 1
-2
+3
 13
 99
 12
@@ -168,11 +169,11 @@ x
 6
 Runner
 x
-11
-open_module
+10
+open_class
 x
-15
-__module_init__
+14
+__class_init__
 M
 1
 n
@@ -181,135 +182,92 @@ x
 6
 Runner
 i
-28
+87
 5
 66
-5
 99
-12
-49
+7
 0
-1
-13
-99
-12
 7
 1
-12
-7
-2
-12
 65
-12
+5
 49
-3
+2
 4
 15
-54
-50
-1
-0
-11
-I
-6
-I
-0
-I
-0
-I
-0
-n
-p
-4
-x
-16
-object_metaclass
-x
-18
-__metaclass_init__
-M
-1
-n
-n
-x
-18
-__metaclass_init__
-i
-76
-5
-66
 99
 7
-0
+3
 7
-1
+4
 65
 67
 49
-2
+5
 0
 49
-3
+6
 4
 15
 99
 7
-4
 7
-5
+7
+8
 65
 67
 49
-2
+5
 0
 49
-3
+6
 4
 15
 99
 7
-6
-7
+9
 7
+10
 65
 67
 49
-2
+5
 0
 49
-3
+6
 4
 15
-5
-48
-8
-15
 99
 7
-9
+11
 7
-10
+12
 65
 67
 49
-2
+5
 0
 49
-3
+6
 4
 15
+5
+48
+13
+15
 99
 7
-11
+14
 7
-12
+15
 65
 67
 49
-2
+5
 0
 49
-3
+6
 4
 11
 I
@@ -322,24 +280,24 @@ I
 0
 n
 p
-13
+16
 x
-17
-available_runners
+7
+runners
 M
 1
 n
 n
 x
-17
-available_runners
+7
+runners
 i
-42
+36
 39
 0
 13
 10
-41
+35
 15
 45
 1
@@ -347,32 +305,26 @@ i
 45
 3
 4
-45
-3
+7
 5
+64
 65
 49
 6
 0
 49
 7
-1
-7
-8
-64
-49
-9
 2
 49
-10
+8
 1
 56
-11
+9
 50
-12
+10
 0
 49
-13
+11
 0
 38
 0
@@ -387,10 +339,10 @@ I
 0
 n
 p
-14
+12
 x
-18
-@available_runners
+8
+@runners
 x
 3
 Dir
@@ -399,19 +351,15 @@ x
 4
 File
 n
-n
+s
+10
+../runners
 x
 11
 active_path
 x
-7
-dirname
-s
-7
-runners
-x
-4
-join
+11
+expand_path
 x
 4
 open
@@ -425,8 +373,8 @@ for_block
 t
 n
 x
-17
-available_runners
+7
+runners
 i
 29
 57
@@ -474,8 +422,8 @@ x
 6
 Regexp
 s
-28
-^(\w+)_test_unit_runner\.rb$
+29
+^(\w+)_guard_test_runner\.rb$
 x
 3
 new
@@ -483,16 +431,12 @@ x
 2
 []
 p
-5
+3
 I
 0
 I
 7
 I
-4
-I
-8
-I
 1d
 x
 75
@@ -509,7 +453,7 @@ x
 7
 compact
 p
-7
+5
 I
 -1
 I
@@ -517,36 +461,29 @@ I
 I
 0
 I
-9
-I
-6
-I
 7
 I
-2a
+24
 x
 75
 /Users/remy/Development/Ruby/Gems/guard/guard-test/lib/guard/test/runner.rb
 p
 0
 x
-17
-method_visibility
-x
-15
-add_defn_method
+13
+attach_method
 x
-20
-set_test_unit_runner
+10
+initialize
 M
 1
 n
 n
 x
-20
-set_test_unit_runner
+10
+initialize
 i
-48
+110
 23
 0
 10
@@ -562,83 +499,281 @@ i
 0
 15
 5
-48
+49
 2
-20
 0
-7
-3
 49
+3
+0
+56
 4
-1
-49
+50
 5
-1
-9
-38
-20
 0
-7
-3
-49
-4
-1
-8
-45
+13
+10
+41
+15
 5
-48
+49
 2
+0
+49
+3
+0
 78
 49
-4
+6
 1
 38
-6
-11
-I
+7
+15
+44
+43
+0
 4
-I
+4
+49
 1
-I
-0
-I
 1
-n
-p
+13
 7
-x
-4
-Hash
-x
-16
-new_from_literal
-x
-17
-available_runners
-x
-6
-runner
-x
-2
-[]
-x
 8
-include?
-x
-17
-@test_unit_runner
-p
-5
-I
--1
-I
-c
-I
+2
+49
+9
+2
+15
+13
+7
+10
+45
+11
+12
+45
+13
+14
+49
+15
+0
+47
+101
+16
+7
+17
+63
+2
+49
+18
+1
+49
+9
+2
+15
+13
+7
+19
+1
+49
+9
+2
+15
+13
+7
+20
+1
+49
+9
+2
+15
+20
+0
+49
+21
+1
+38
+22
+11
+I
+7
+I
+1
+I
+0
+I
+1
+n
+p
+23
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+5
+class
+x
+7
+runners
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+10
+initialize
+i
+17
+57
+19
+0
+15
+20
+0
+21
+1
+0
+7
+0
+49
+1
+1
+83
+2
+11
+I
+5
+I
+1
+I
+1
+I
+1
+n
+p
+3
+x
+6
+runner
+x
+2
+[]
+x
+2
+==
+p
+3
+I
+0
+I
+b
+I
+11
+x
+75
+/Users/remy/Development/Ruby/Gems/guard/guard-test/lib/guard/test/runner.rb
+p
+1
+x
+6
+runner
+x
+6
+detect
+x
+2
+[]
+x
+12
+@runner_name
+x
+12
+notification
+x
+3
+[]=
+x
+7
+bundler
+x
+4
+File
+n
+x
+3
+Dir
+n
+x
+3
+pwd
+x
+4
+to_s
+s
+8
+/Gemfile
+x
+6
+exist?
+x
+3
+rvm
+x
+3
+cli
+x
+5
+merge
+x
+8
+@options
+p
+19
+I
+-1
+I
+a
+I
 e
 I
+b
+I
+2c
+I
+11
+I
+35
+I
 d
 I
-30
+3d
+I
+e
+I
+57
+I
+f
+I
+5f
+I
+10
+I
+66
+I
+11
+I
+6b
+I
+c
+I
+6e
 x
 75
 /Users/remy/Development/Ruby/Gems/guard/guard-test/lib/guard/test/runner.rb
@@ -648,6 +783,12 @@ x
 7
 options
 x
+17
+method_visibility
+x
+15
+add_defn_method
+x
 3
 run
 M
@@ -658,7 +799,7 @@ x
 3
 run
 i
-89
+102
 23
 1
 10
@@ -674,44 +815,59 @@ i
 1
 15
 20
+0
+49
+2
+0
+9
+25
+2
+11
+8
+26
+1
+15
+20
 1
 7
-2
-49
 3
+49
+4
 1
 13
 10
-47
+60
 15
 7
-4
-39
 5
+39
+6
 47
 101
-6
 7
 7
+8
 20
 0
 7
-8
+9
 64
 49
-9
+10
 1
 47
 101
-6
+7
 63
 4
 19
 2
 15
-45
-10
+44
+43
 11
+43
+12
 20
 2
 44
@@ -723,29 +879,27 @@ i
 1
 13
 7
-12
+13
 2
 49
-13
+14
 2
 15
 49
-14
+15
 2
 15
 5
 5
 20
 0
-20
-1
 47
 49
-15
-2
+16
+1
 47
 49
-16
+17
 1
 11
 I
@@ -758,7 +912,7 @@ I
 2
 n
 p
-17
+18
 x
 4
 Hash
@@ -766,6 +920,9 @@ x
 16
 new_from_literal
 x
+6
+empty?
+x
 7
 message
 x
@@ -775,8 +932,8 @@ s
 9
 Running (
 x
-17
-@test_unit_runner
+12
+@runner_name
 x
 4
 to_s
@@ -790,9 +947,11 @@ x
 4
 join
 x
+5
+Guard
+x
 2
 UI
-n
 x
 5
 reset
@@ -809,25 +968,33 @@ x
 6
 system
 p
-9
+13
 I
 -1
 I
-10
+14
 I
 e
 I
-11
+15
 I
-32
+1a
 I
-12
+0
 I
-4a
+1b
 I
-13
+17
+I
+3f
+I
+18
 I
 59
+I
+19
+I
+66
 x
 75
 /Users/remy/Development/Ruby/Gems/guard/guard-test/lib/guard/test/runner.rb
@@ -843,50 +1010,127 @@ x
 7
 message
 x
+4
+rvm?
+M
+1
+n
+n
+x
+4
+rvm?
+i
+32
+39
+0
+13
+10
+31
+15
+39
+1
 7
-private
+2
+49
+3
+1
+13
+9
+29
+15
+39
+1
+7
+2
+49
+3
+1
+7
+4
+49
+5
+1
+38
+0
+11
+I
+2
+I
+0
+I
+0
+I
+0
+n
+p
+6
+x
+4
+@rvm
 x
 8
-bundler?
+@options
+x
+3
+rvm
+x
+2
+[]
+x
+4
+join
+x
+11
+respond_to?
+p
+5
+I
+-1
+I
+1c
+I
+0
+I
+1d
+I
+20
+x
+75
+/Users/remy/Development/Ruby/Gems/guard/guard-test/lib/guard/test/runner.rb
+p
+0
+x
+5
+turn?
 M
 1
 n
 n
 x
-8
-bundler?
+5
+turn?
 i
-28
+18
 39
 0
 13
 10
-27
+17
 15
 45
 1
 2
-45
-3
-4
-49
-5
-0
-47
-101
-6
-7
 7
-63
-2
+3
+64
 49
-8
+4
 1
 38
 0
 11
 I
-3
+2
 I
 0
 I
@@ -895,48 +1139,41 @@ I
 0
 n
 p
-9
-x
-8
-@bundler
+5
 x
-4
-File
-n
+5
+@turn
 x
-3
-Dir
+6
+Object
 n
-x
-3
-pwd
-x
-4
-to_s
 s
-8
-/Gemfile
+4
+Turn
 x
-6
-exist?
+14
+const_defined?
 p
 5
 I
 -1
 I
-18
+20
 I
 0
 I
-19
+21
 I
-1c
+12
 x
 75
 /Users/remy/Development/Ruby/Gems/guard/guard-test/lib/guard/test/runner.rb
 p
 0
 x
+7
+private
+x
 17
 test_unit_command
 M
@@ -947,263 +1184,296 @@ x
 17
 test_unit_command
 i
-219
-23
-1
-10
-14
-44
-43
+255
+35
 0
-78
-49
-1
-1
 19
 1
 15
-35
+5
+47
+49
 0
-19
-2
-15
+0
+9
+41
 20
 1
 7
-2
-49
-3
-1
-7
-4
-49
-5
 1
-9
-62
-20
+39
 2
 7
-6
-20
-1
-7
-2
-49
 3
+49
+4
 1
 7
-7
+5
 64
 49
-4
+6
 1
 47
 101
-8
 7
-9
+7
+8
 63
 3
 49
+9
+1
+8
+42
+1
+15
+39
+2
+7
 10
+49
+4
+1
+9
+62
+20
+1
+7
+11
+64
+49
+9
 1
 8
 63
 1
 15
+20
+1
 5
 47
 49
-11
+12
 0
-13
 9
-89
+78
+7
+13
+64
+8
+81
+7
+14
+64
+47
+101
+7
+7
 15
-20
+63
+2
+49
+9
 1
+15
+39
+2
 7
-12
+10
 49
-3
+4
 1
-3
-83
-13
-10
-88
-2
-8
-89
-3
 9
-101
+111
 20
-2
+1
 7
-14
+16
 64
 49
-10
+9
 1
 8
-102
+112
 1
 15
-20
-2
-7
-15
-64
+5
+47
 49
-10
+12
+0
+9
+123
 1
-15
+8
+178
 20
-2
+1
 7
-16
-45
 17
+45
 18
-65
-49
 19
-0
-49
+7
 20
-1
+39
+21
 47
 101
-8
 7
-21
-39
+7
 22
+63
+3
+65
+49
+23
+0
+49
+24
+2
 47
 101
-8
 7
-23
 63
-5
+2
 49
-10
+9
 1
 15
 20
+1
+7
+25
+39
 2
 7
-24
-64
+26
 49
-10
+4
 1
-15
-20
-2
+47
+101
 7
-25
+7
+27
+63
+3
+49
+9
+1
+15
 20
 0
+56
+28
+50
+29
+0
+15
+20
+1
 7
-26
+30
 64
 49
-4
+9
+1
+15
+5
+47
+49
+12
+0
+9
+206
+1
+8
+220
+20
 1
+7
+31
+39
+21
 47
 101
-8
 7
-27
 63
-3
+2
 49
-10
+9
 1
 15
-20
+39
 2
-20
-0
-56
-28
-50
-29
-0
 7
-26
-64
+32
 49
 4
 1
-49
-10
-1
-15
+9
+244
 20
-2
-7
-30
+1
 39
-22
-47
-101
-8
-63
 2
+7
+32
 49
-10
+4
+1
+49
+9
+1
+8
+245
 1
 15
 20
-2
+1
 7
-26
+33
 64
 49
-4
+6
 1
 11
 I
-9
+8
 I
-3
+2
 I
 1
 I
-2
+1
 n
 p
-31
+34
 x
 4
-Hash
+rvm?
+s
+4
+rvm 
 x
-16
-new_from_literal
+8
+@options
 x
 3
 rvm
 x
 2
 []
-x
-4
-join
-x
-11
-respond_to?
-s
-4
-rvm 
 s
 1
 ,
 x
 4
+join
+x
+4
 to_s
 s
 5
@@ -1212,54 +1482,57 @@ x
 2
 <<
 x
-8
-bundler?
-x
 7
 bundler
-x
-2
-==
 s
 11
 bundle exec
+x
+5
+turn?
 s
-14
-ruby -rubygems
+4
+turn
 s
-2
--r
+4
+ruby
+s
+17
+ -Itest -rubygems
+s
+16
+-r bundler/setup
+s
+3
+-r 
 x
 4
 File
 n
+s
+11
+../runners/
+x
+12
+@runner_name
+s
+18
+_guard_test_runner
 x
 11
 active_path
 x
-7
-dirname
+11
+expand_path
 s
-9
-/runners/
+22
+-e "GUARD_TEST_NOTIFY=
 x
-17
-@test_unit_runner
-s
-17
-_test_unit_runner
-s
-10
--Ilib:test
-s
-7
--e "%w[
+12
+notification
 s
 1
- 
-s
-22
-].each { |f| load f }"
+"
 M
 1
 p
@@ -1273,11 +1546,14 @@ x
 17
 test_unit_command
 i
-16
+20
 57
 19
 0
 15
+21
+1
+1
 7
 0
 20
@@ -1285,10 +1561,11 @@ i
 47
 101
 1
-7
-0
 63
-3
+2
+49
+2
+1
 11
 I
 5
@@ -1300,141 +1577,182 @@ I
 1
 n
 p
-2
+3
 s
-1
-"
+5
+-r ./
 x
 4
 to_s
+x
+2
+<<
 p
 3
 I
 0
 I
-24
+32
 I
-10
+14
 x
 75
 /Users/remy/Development/Ruby/Gems/guard/guard-test/lib/guard/test/runner.rb
 p
 1
 x
-1
-f
+4
+path
 x
-3
-map
+4
+each
+s
+2
+--
 s
 15
 --runner=guard-
+x
+3
+cli
+s
+1
+ 
 p
-23
+45
 I
 -1
 I
-1c
+26
 I
-e
+0
 I
-1d
+27
 I
-13
+5
+I
+28
+I
+2a
+I
+0
+I
+2b
+I
+29
 I
-1e
+3f
+I
+0
 I
 40
 I
-1f
+2a
 I
-67
+51
 I
-20
+0
+I
+58
+I
+2a
+I
+5c
+I
+2b
 I
 70
 I
-21
+0
 I
-90
+71
 I
-22
+2d
 I
-99
+7b
 I
-23
+2e
 I
-b0
+9d
 I
-24
+2f
 I
-c3
+b2
 I
-25
+0
 I
-d2
+b3
 I
-26
+32
+I
+bb
+I
+33
+I
+c4
+I
+34
+I
+dc
+I
+0
+I
+dd
+I
+35
+I
+f5
+I
+0
+I
+f6
+I
+37
 I
-db
+ff
 x
 75
 /Users/remy/Development/Ruby/Gems/guard/guard-test/lib/guard/test/runner.rb
 p
-3
+2
 x
 5
-files
-x
-7
-options
+paths
 x
 9
 cmd_parts
 p
-13
+15
 I
 2
 I
 6
 I
-10
-I
-c
+d
 I
-1e
+a
 I
-10
+1b
 I
-2c
+14
 I
-16
+29
 I
-30
+1c
 I
-18
+37
 I
-3e
+20
 I
-1c
+45
 I
-4c
-x
-75
-/Users/remy/Development/Ruby/Gems/guard/guard-test/lib/guard/test/runner.rb
-p
-0
-x
-13
-attach_method
-p
-3
+24
 I
-2
+49
 I
-4
+26
 I
-1c
+57
 x
 75
 /Users/remy/Development/Ruby/Gems/guard/guard-test/lib/guard/test/runner.rb
@@ -1448,9 +1766,9 @@ p
 I
 2
 I
-3
+4
 I
-1c
+1d
 x
 75
 /Users/remy/Development/Ruby/Gems/guard/guard-test/lib/guard/test/runner.rb
@@ -1464,7 +1782,7 @@ p
 I
 2
 I
-2
+3
 I
 1d
 x
@@ -1480,7 +1798,7 @@ p
 I
 0
 I
-1
+2
 I
 1c
 x