Rakefile in drake-0.9.0.0.3.0 vs Rakefile in drake-0.9.1.0.3.0

@@ -57,62 +57,28 @@
 SRC_RB = FileList['lib/**/*.rb']
 
 # The default task is run if rake is given no explicit arguments.
 
 desc "Default Task"
-task :default => "test:all"
+task :default => :test
 
 # Test Tasks ---------------------------------------------------------
 
-# Common Abbreviations ...
+task :test => [:test_serial, :test_parallel]
 
-task :ta => "test:all"
-task :tf => "test:functional"
-task :tu => "test:units"
-task :tc => "test:contribs"
-task :test => "test:units"
+TEST_FILES = FileList['test/helper.rb', 'test/test_*.rb']
 
-module TestFiles
-  UNIT = FileList['test/lib/*_test.rb']
-  FUNCTIONAL = FileList['test/functional/*_test.rb']
-  CONTRIB = FileList['test/contrib/test*.rb']
-  TOP = FileList['test/*_test.rb']
-  ALL = TOP + UNIT + FUNCTIONAL + CONTRIB
+Rake::TestTask.new :test_serial do |t|
+  t.test_files = ['test/setup_serial.rb'] + TEST_FILES
+  t.libs << "."
+  t.warning = true
 end
 
-namespace :test do
-  task :all => [:serial, :parallel]
-
-  Rake::TestTask.new(:serial) do |t|
-    t.test_files = ['test/serial_setup.rb'] + TestFiles::ALL
-    t.libs << "."
-    t.warning = true
-  end
-  
-  Rake::TestTask.new(:parallel) do |t|
-    t.test_files = ['test/parallel_setup.rb'] + TestFiles::ALL
-    t.libs << "."
-    t.warning = true
-  end
-
-  Rake::TestTask.new(:units) do |t|
-    t.test_files = TestFiles::UNIT
-    t.libs << "."
-    t.warning = true
-  end
-
-  Rake::TestTask.new(:functional) do |t|
-    t.test_files = TestFiles::FUNCTIONAL
-    t.libs << "."
-    t.warning = true
-  end
-
-  Rake::TestTask.new(:contribs) do |t|
-    t.test_files = TestFiles::CONTRIB
-    t.libs << "."
-    t.warning = true
-  end
+Rake::TestTask.new :test_parallel do |t|
+  t.test_files = ['test/setup_parallel.rb'] + TEST_FILES
+  t.libs << "."
+  t.warning = true
 end
 
 begin
   require 'rcov/rcovtask'
   IGNORE_COVERAGE_IN = FileList[
@@ -150,13 +116,11 @@
     puts "RCov is not available"
   end
 end
 
 directory 'testdata'
-["test:all", :test_units, :test_contribs, :test_functional].each do |t|
-  task t => ['testdata']
-end
+task :test => ['testdata']
 
 # CVS Tasks ----------------------------------------------------------
 
 # Install rake using the standard install.rb script.
 
@@ -226,10 +190,11 @@
 
     #### Dependencies and requirements.
     s.add_dependency('comp_tree', '>= 1.1.3')
 
     s.required_rubygems_version = '>= 1.3.2'
+    s.add_development_dependency 'minitest', '~> 2.1'
     s.add_development_dependency 'session', '~> 2.4'
     s.add_development_dependency 'flexmock', '~> 0.8.11'
 
     #### Which files are to be included in this gem?  Everything!  (Except CVS directories.)
 
@@ -354,10 +319,10 @@
 
 desc "Make a new release"
 task :release, [:rel, :reuse, :reltest] => [
     :prerelease,
     :clobber,
-    "test:all",
+    :test,
     :update_version,
     :package,
     :tag
   ] do
   announce