guard-test 0.3.1 → 0.4.0

data/lib/guard/test/runner.rb

@@ -1,60 +1,75 @@
 # encoding: utf-8
+
 module Guard
   class Test
     class Runner
 
-      def self.runners
-        @runners ||= Dir.open(File.expand_path('../runners', __FILE__)).map { |filename| filename[/^(\w+)_guard_test_runner\.rb$/, 1] }.compact
-      end
-
-      def initialize(options={})
-        @runner_name = self.class.runners.detect { |runner| runner == options[:runner] } || self.class.runners[0]
-        @options     = {
-          :bundler      => File.exist?("#{Dir.pwd}/Gemfile"),
-          :rvm          => nil,
-          :cli          => nil
+      def initialize(options = {})
+        @options = {
+          :bundler => File.exist?("#{Dir.pwd}/Gemfile"),
+          :rvm     => [],
+          :drb     => false,
+          :cli     => ""
         }.merge(options)
       end
 
-      def run(paths, options={})
+      def run(paths, options = {})
         return true if paths.empty?
 
-        message = options[:message] || "Running (#{@runner_name} runner): #{paths.join(' ') }"
-        ::Guard::UI.info(message, :reset => true)
+        ::Guard::UI.info(options[:message] || "Running: #{paths.join(' ')}", :reset => true)
+
         system(test_unit_command(paths))
       end
 
-      def rvm?
-        @rvm ||= @options[:rvm] && @options[:rvm].respond_to?(:join)
+      def bundler?
+        if @bundler.nil?
+          @bundler = @options[:bundler] && !drb?
+        end
+        @bundler
       end
 
-      def turn?
-        @turn ||= begin
-          require 'turn'
-        rescue LoadError
-          false
+      def drb?
+        if @drb.nil?
+          @drb = @options[:drb]
+          begin
+            require 'spork-testunit'
+          rescue LoadError
+          end
+          ::Guard::UI.info("Using testdrb to run the tests") if @drb
         end
+        @drb
       end
 
     private
 
       def test_unit_command(paths)
         cmd_parts = []
-        cmd_parts << "rvm #{@options[:rvm].join(',')} exec" if rvm?
-        cmd_parts << "bundle exec" if @options[:bundler] && !turn?
-        cmd_parts << "#{turn? ? 'turn' : 'ruby'} -Itest"
-        cmd_parts << "-r bundler/setup" if @options[:bundler] && !turn?
+        cmd_parts << "rvm #{@options[:rvm].join(',')} exec" unless @options[:rvm].empty?
+        cmd_parts << "bundle exec" if bundler?
+        cmd_parts << case true
+                     when drb?
+                       "testdrb"
+                     else
+                       "ruby"
+                     end
+        cmd_parts << "-Itest"
+        cmd_parts << "-r bundler/setup" if bundler?
 
-        unless turn?
-          cmd_parts << "-r #{File.expand_path("../runners/#{@runner_name}_guard_test_runner", __FILE__)}"
+        unless drb?
+          cmd_parts << "-r #{File.expand_path("../guard_test_runner", __FILE__)}"
           cmd_parts << "-e \"%w[#{paths.join(' ')}].each { |p| load p }\""
         end
 
         paths.each { |path| cmd_parts << "\"./#{path}\"" }
-        cmd_parts << "--runner=guard-#{@runner_name}" unless turn?
+
+        unless drb?
+          cmd_parts << "--use-color"
+          cmd_parts << "--runner=guard"
+        end
+
         cmd_parts << @options[:cli]
 
-        cmd_parts.compact.join(' ')
+        cmd_parts.compact.join(' ').strip
       end
 
     end