Rantfile in rant-0.3.4 vs Rantfile in rant-0.3.6

@@ -1,38 +1,41 @@
 
 # Rantfile for Rant :)
 
-import %w(rubytest rubydoc rubypackage)
+import %w(rubytest rubydoc rubypackage autoclean)
 
 task :default => :test
 
 lib_files = sys["lib/**/*.rb"]
 dist_files = sys["{bin,lib,test,doc}/**/*"].shun("html", "coverage") +
 	sys["*"].no_dir.exclude("InstalledFiles", "Session.vim")
 bin_files = sys["bin/*"]
+rdoc_opts = %w(-S -c UTF-8 --title Rant --main README)
 
 gen RubyPackage, "rant" do |t|
     t.version = `#{Env::RUBY} run_rant --version`.split[1]
     t.summary = "Rant is a Ruby based build tool."
     t.files = dist_files
     t.bindir = "bin"
     t.executable %w(rant rant-import)
     t.author = "Stefan Lang"
     t.email = "[e-mail]"
     t.rubyforge_project = "make"
-    t.gem_extra_rdoc_files = sys["**/README", "NEWS"].no_dir("pkg").no_dir("test") + sys["doc/**/*.rdoc"]
     t.homepage = "http://make.rubyforge.org"
+    t.gem_extra_rdoc_files = sys["**/README", "NEWS"].no_dir("pkg").no_dir("test") + sys["doc/**/*.rdoc"]
+    t.gem_rdoc_options = rdoc_opts
     desc "Create packages for distribution."
     t.package_task
 end
 
 desc "Generate documentation."
 gen RubyDoc do |g|
+    g.verbose = true
     g.dir = "doc/html"
-    g.files.concat FileList["NEWS", "**/README"].no_dir("pkg").no_dir("test")
-    g.files.concat FileList["doc/**/*.rdoc"]
-    g.opts = %w(-S -c UTF-8 --title Rant --main README)
+    g.files.concat sys["NEWS", "**/README"].no_dir("pkg").no_dir("test")
+    g.files.concat sys["doc/**/*.rdoc"]
+    g.opts = rdoc_opts + %w(-T doc/jamis.rb)
 end
 
 desc "Run basic tests."
 gen RubyTest do |g|
     g.libs << "test"
@@ -75,23 +78,34 @@
 gen RubyTest, :tsubdirs do |t|
     t.libs << "test"
     t.test_files = sys["test/subdirs/test_*.rb"]
 end
 
+desc "Test rant-import command."
+gen RubyTest, :trimport do |t|
+    t.libs << "test"
+    t.test_files = sys["test/rant-import/test_*.rb"]
+end
+
+desc "Test import/ libraries."
+gen RubyTest, :timport do |t|
+    t.libs << "test"
+    t.test_files = sys["test/import/**/test_*.rb"]
+end
+
 desc "Run all tests."
 gen RubyTest, :tall do |g|
     g.libs << "test"
     g.test_files = sys["test/**/test_*.rb"]
 end
 task :testall => %w(test testp1 testp2 testrb1 testplugins)
 
 desc "Remove autogenerated files."
-task :clean do
-    sys.rm_f %w(InstalledFiles .config bench-rant bench-depsearch)
-    sys.rm_rf %w(doc/html pkg test/coverage)
-    sys.rm_f sys["bin/*.cmd"]
-end
+gen AutoClean, :clean
+var[:clean].include %w(
+    InstalledFiles .config bench-rant bench-depsearch test/coverage
+)
 
 desc "Publish html docs on make.rubyfore.org.",
      "Note: scp will prompt for rubyforge password."
 task "publish-docs" => :doc do
     sys "scp -r doc/html/* [e-mail]:/var/www/gforge-projects/make/"
@@ -129,13 +143,7 @@
 	    }
 	end
 	install << cmd
     }
 end
-
-# for quich rant testing
-#plugin :Configure
-
-# mainly for rant testing
-#source 'rantmethods.rb'
 
 # vim:ft=ruby: