lib/turn.rb in turn-0.8.3 vs lib/turn.rb in turn-0.9.0

@@ -1,19 +1,28 @@
+#
 module Turn
-  # Returns +true+ if the ruby version supports minitest.
-  # Otherwise, +false+ is returned.
-  def self.minitest?
-    RUBY_VERSION >= '1.9'
+  # Are we using Test::Unit (1.x)?
+  def self.testunit?
+    defined?(Test::Unit) && !defined?(MiniTest)
   end
 end
 
+require 'fileutils'
+
+require 'turn/version'
 require 'turn/autoload'
+require 'turn/configuration'
+require 'turn/colorize'
+require 'turn/components'
+require 'turn/controller'
 
-unless defined?(Turn::Command)
-  if Turn.minitest?
-    require 'turn/autorun/minitest'
-    MiniTest::Unit.autorun
-  else
-    require 'turn/autorun/testunit'
-  end
+if Turn.testunit?
+  require 'turn/testunit'
+else
+  require 'turn/minitest'
 end
+
+#if ENV['autorun']
+#  warn "Use `require 'turn/autorun'` instead of `require 'turn'` for future versions."
+#  MiniTest::Unit.autorun
+#end