diff -r -u rake-0.3.1/bin/rake rake.new/bin/rake
--- rake-0.3.1/bin/rake	2003-11-29 20:35:29.000000000 +0100
+++ rake.new/bin/rake	2004-04-02 02:12:21.000000000 +0200
@@ -1,3 +1,9 @@
+#!/usr/bin/env ruby
+
+require 'rpa'
+RPA.version = "0.0"
+
+
 begin
   require 'rake'
 rescue LoadError
diff -r -u rake-0.3.1/install.rb rake.new/install.rb
--- rake-0.3.1/install.rb	2003-11-28 06:11:13.000000000 +0100
+++ rake.new/install.rb	2004-04-02 02:12:21.000000000 +0200
@@ -1,88 +1,28 @@
-require 'rbconfig'
-require 'find'
-require 'ftools'
+require 'rpa/install'
 
-include Config
-
-$ruby = CONFIG['ruby_install_name']
-
-##
-# Install a binary file. We patch in on the way through to
-# insert a #! line. If this is a Unix install, we name
-# the command (for example) 'rake' and let the shebang line
-# handle running it. Under windows, we add a '.rb' extension
-# and let file associations to their stuff
-#
-
-def installBIN(from, opfile)
-
-  tmp_dir = nil
-  for t in [".", "/tmp", "c:/temp", $bindir]
-    stat = File.stat(t) rescue next
-    if stat.directory? and stat.writable?
-      tmp_dir = t
-      break
-    end
-  end
-
-  fail "Cannot find a temporary directory" unless tmp_dir
-  tmp_file = File.join(tmp_dir, "_tmp")
-    
-  File.open(from) do |ip|
-    File.open(tmp_file, "w") do |op|
-      ruby = File.join($realbindir, $ruby)
-      op.puts "#!#{ruby} -w"
-      op.write ip.read
+class Install_rake < RPA::Install::Application
+    name "rake"
+    version "0.3.1-1"
+    classification Application.Devel
+    build do
+        rdocfiles = %w[README MIT-LICENSE TODO TODO]
+        rdocfiles += Dir['lib/**/*.rb'].to_a
+        rdocfiles += Dir['doc/**/*.rdoc'].to_a.reject{|x| x =~ /\bcontrib\b/}
+        installrdoc(rdocfiles)
+        skip_default Installdocs
+        installexamples(Dir['doc/example/*.c'] + Dir['doc/example/Rake*']) 
     end
-  end
-
-  opfile += ".rb" if CONFIG["target_os"] =~ /mswin/i
-  File::install(tmp_file, File.join($bindir, opfile), 0755, true)
-  File::unlink(tmp_file)
-end
+    description <<EOF
+A simple ruby build program with capabilities similar to make
 
-$sitedir = CONFIG["sitelibdir"]
-unless $sitedir
-  version = CONFIG["MAJOR"]+"."+CONFIG["MINOR"]
-  $libdir = File.join(CONFIG["libdir"], "ruby", version)
-  $sitedir = $:.find {|x| x =~ /site_ruby/}
-  if !$sitedir
-    $sitedir = File.join($libdir, "site_ruby")
-  elsif $sitedir !~ Regexp.quote(version)
-    $sitedir = File.join($sitedir, version)
-  end
+Rake has the following features:
+* Rakefiles (rake's version of Makefiles) are completely defined in
+  standard Ruby syntax. No XML files to edit. No quirky Makefile
+  syntax to worry about (is that a tab or a space?)
+* Users can specify tasks with prerequisites.
+* Rake supports rule patterns to sythesize implicit tasks.
+* Rake is lightweight. It can be distributed with other projects as a
+  single file. Projects that depend upon rake do not require that rake
+  be installed on target systems.
+EOF
 end
-
-$bindir =  CONFIG["bindir"]
-
-$realbindir = $bindir
-
-bindir = CONFIG["bindir"]
-if (destdir = ENV['DESTDIR'])
-  $bindir  = destdir + $bindir
-  $sitedir = destdir + $sitedir
-  
-  File::makedirs($bindir)
-  File::makedirs($sitedir)
-end
-
-rake_dest = File.join($sitedir, "rake")
-File::makedirs(rake_dest, true)
-File::chmod(0755, rake_dest)
-
-# The library files
-
-files = Dir.chdir('lib') { Dir['**/*.rb'] }
-
-for fn in files
-  fn_dir = File.dirname(fn)
-  target_dir = File.join($sitedir, fn_dir)
-  if ! File.exist?(target_dir)
-    File.makedirs(target_dir)
-  end
-  File::install(File.join('lib', fn), File.join($sitedir, fn), 0644, true)
-end
-
-# and the executable
-
-installBIN("bin/rake", "rake")
diff -r -u rake-0.3.1/test/contrib/testsys.rb rake.new/test/contrib/testsys.rb
--- rake-0.3.1/test/contrib/testsys.rb	2003-11-09 07:32:24.000000000 +0100
+++ rake.new/test/contrib/testsys.rb	2004-04-02 02:12:21.000000000 +0200
@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 
 require 'test/unit'
+require 'rpa'
+RPA.version = "0.0"
 require 'test/filecreation'
 require 'rake/contrib/sys'
 
diff -r -u rake-0.3.1/test/testclean.rb rake.new/test/testclean.rb
--- rake-0.3.1/test/testclean.rb	2003-11-09 07:39:45.000000000 +0100
+++ rake.new/test/testclean.rb	2004-04-02 02:12:21.000000000 +0200
@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 
 require 'test/unit'
+require 'rpa'
+RPA.version = "0.0"
 require 'rake/clean'
 
 class TestClean < Test::Unit::TestCase
diff -r -u rake-0.3.1/test/testfilelist.rb rake.new/test/testfilelist.rb
--- rake-0.3.1/test/testfilelist.rb	2003-11-29 18:11:51.000000000 +0100
+++ rake.new/test/testfilelist.rb	2004-04-02 02:12:21.000000000 +0200
@@ -58,8 +58,8 @@
   
   def test_match
     fl = FileList.new
-    fl.include('test/test*.rb')
-    assert fl.include?("test/testfilelist.rb")
+    fl.include('test*.rb')
+    assert fl.include?("testfilelist.rb")
     assert fl.size > 3
     fl.each { |fn| assert_match /\.rb$/, fn }
   end
@@ -67,10 +67,10 @@
   def test_add_matching
     fl = FileList.new
     fl << "a.java"
-    fl.include("test/*.rb")
+    fl.include("*.rb")
     assert_equal "a.java", fl[0]
     assert fl.size > 2
-    assert fl.include?("test/testfilelist.rb")
+    assert fl.include?("testfilelist.rb")
   end
 
   def test_multiple_patterns
diff -r -u rake-0.3.1/test/testfileutils.rb rake.new/test/testfileutils.rb
--- rake-0.3.1/test/testfileutils.rb	2003-11-12 06:58:38.000000000 +0100
+++ rake.new/test/testfileutils.rb	2004-04-02 02:12:21.000000000 +0200
@@ -1,12 +1,24 @@
 #!/usr/bin/env ruby
 
 require 'test/unit'
-require 'test/filecreation'
+require 'rpa'
+RPA.version = "0.0"
+require 'rake'
+require 'filecreation'
 require 'fileutils'
 
 class TestFileUtils < Test::Unit::TestCase
   include FileCreation
 
+  def setup
+      FileUtils.rm_rf "testdata"
+      FileUtils.mkdir "testdata"
+  end
+
+  def teardown
+      FileUtils.rm_rf "testdata"
+  end
+
   def test_rm_one_file
     create_file("testdata/a")
     FileUtils.rm_r "testdata/a"
diff -r -u rake-0.3.1/test/testftp.rb rake.new/test/testftp.rb
--- rake-0.3.1/test/testftp.rb	2003-11-09 07:39:45.000000000 +0100
+++ rake.new/test/testftp.rb	2004-04-02 02:12:21.000000000 +0200
@@ -2,6 +2,8 @@
 
 require 'date'
 require 'test/unit'
+require 'rpa'
+RPA.version = "0.0"
 require 'rake/contrib/ftptools'
 
 class FakeDate
diff -r -u rake-0.3.1/test/testpackagetask.rb rake.new/test/testpackagetask.rb
--- rake-0.3.1/test/testpackagetask.rb	2003-11-28 22:37:06.000000000 +0100
+++ rake.new/test/testpackagetask.rb	2004-04-02 02:12:21.000000000 +0200
@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 
 require 'test/unit'
+require 'rpa'
+RPA.version = "0.0"
 require 'rake/gempackagetask'
 
 class TestPackageTask < Test::Unit::TestCase
@@ -22,7 +24,9 @@
       p.need_zip = true
     }
     assert_equal "pkg", pkg.package_dir
-    assert pkg.package_files.include?("bin/rake")
+    #assert pkg.package_files.include?("bin/rake")
+    # that depends on Rubygems' packaging style, where everything goes
+    # under one dir
     assert "pkgr", pkg.name
     assert "1.2.3", pkg.version
     assert Task[:package]
diff -r -u rake-0.3.1/test/testtasks.rb rake.new/test/testtasks.rb
--- rake-0.3.1/test/testtasks.rb	2003-11-28 06:05:39.000000000 +0100
+++ rake.new/test/testtasks.rb	2004-04-02 02:12:21.000000000 +0200
@@ -2,8 +2,10 @@
 
 require 'test/unit'
 require 'fileutils'
+require 'rpa'
+RPA.version = "0.0"
 require 'rake'
-require 'test/filecreation'
+require 'filecreation'
 
 ######################################################################
 class TestTask < Test::Unit::TestCase
@@ -81,6 +83,11 @@
     @runs = Array.new
     FileUtils.rm_f NEWFILE
     FileUtils.rm_f OLDFILE
+    File.mkdir "testdata" rescue nil
+  end
+
+  def teardown 
+    FileUtils.rm_rf "testdata"
   end
 
   def test_file_need
@@ -154,7 +161,7 @@
 ######################################################################
 class TestDirectoryTask < Test::Unit::TestCase
   def setup
-    rm_r "testdata", :verbose=>false
+      FileUtils.rm_rf "testdata"
   end
 
   def test_create
@@ -176,6 +183,11 @@
 
   def setup
     Task.clear
+    File.mkdir "testdata"
+  end
+
+  def teardown 
+    FileUtils.rm_rf "testdata"
   end
 
   def test_task
@@ -255,6 +267,11 @@
   def setup
     Task.clear
     @runs = []
+    File.mkdir "testdata"
+  end
+
+  def teardown 
+    FileUtils.rm_rf "testdata"
   end
 
   def test_multiple_rules1