Minor cleanup

[git-p4: depot-paths = "//src/ZenTest/dev/": change = 4016]

Manifest.txt

@@ -7,6 +7,7 @@ articles/getting_started_with_autotest.html
 articles/how_to_use_zentest.txt
 bin/autotest
 bin/multiruby
+bin/multiruby_setup
 bin/rails_test_audit
 bin/unit_diff
 bin/zentest
@@ -30,6 +31,7 @@ lib/autotest/kdenotify.rb
 lib/autotest/menu.rb
 lib/autotest/migrate.rb
 lib/autotest/notify.rb
+lib/autotest/once.rb
 lib/autotest/pretty.rb
 lib/autotest/rails.rb
 lib/autotest/rcov.rb
@@ -39,6 +41,7 @@ lib/autotest/shame.rb
 lib/autotest/snarl.rb
 lib/autotest/timestamp.rb
 lib/functional_test_matrix.rb
+lib/multiruby.rb
 lib/test/rails.rb
 lib/test/rails/controller_test_case.rb
 lib/test/rails/functional_test_case.rb

bin/multiruby_setup

@@ -1,11 +1,8 @@
 #!/usr/bin/env ruby -w
 
 require 'multiruby'
-require 'open-uri'
 
-root_dir = Multiruby.root_dir
-
-ARGV << "-h" if ARGV.empty?
+ARGV << "help" if ARGV.empty?
 
 ARGV.each do |spec|
   case spec

lib/multiruby.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'open-uri'
 
 ##
 # multiruby_setup is a script to help you manage multiruby.
@@ -33,7 +34,6 @@ module Multiruby
   TAGS     = %w(    1_8_6 1_8_7 1_9  ).map { |v| "tag:#{v}" }
   BRANCHES = %w(1_8 1_8_6 1_8_7 trunk).map { |v| "branch:#{v}" }
 
-
   def self.help
     File.readlines(__FILE__).each do |line|
       next unless line =~ /^#( |$)/
@@ -52,7 +52,7 @@ def self.list
 
   def self.rm name
     Multiruby.in_root_dir do
-      Fileutils.rm_rf Dir["*/#{name}"]
+      FileUtils.rm_rf Dir["*/#{name}"]
       File.unlink "versions/ruby-#{name}.tar.gz"
     end
   end
@@ -83,7 +83,7 @@ def self.clean
           system "rake clean"
         end
       else
-        Fileutils.rm_rf Dir.pwd
+        FileUtils.rm_rf Dir.pwd
       end
     end
   end
@@ -102,7 +102,7 @@ def self.update
         case dir
         when /mri_\d/ then
           system "svn cleanup" # just in case
-          Fileutils.rm_rf "../install/#{dir}" if `svn up` =~ /^[ADUCG] /
+          FileUtils.rm_rf "../install/#{dir}" if `svn up` =~ /^[ADUCG] /
         when /tag/
           warn "don't know how to update tags: #{dir}"
           # url = `svn info`[/^URL: (.*)/, 1]