Added RakeFileUtils methods to list of private methods (to avoid leak…

…ing into

Object as public methods).


git-svn-id: svn+ssh://rubyforge.org/var/svn/rake/trunk@579 5af023f1-ac1a-0410-98d6-829a145c37ef

CHANGES

@@ -28,6 +28,7 @@
   VanderWerf)
 * Added a protected 'require "rubygems"' to test/test_application to
   unbreak cruisecontrol.rb.
+* Added the handful of RakeFileUtils to the private method as well.
 
 == Version 0.7.1
 

lib/rake.rb

@@ -942,8 +942,8 @@ def rake_check_options(options, *optdecl)
 # define methods on other objects.
 
 include RakeFileUtils
-#private(*FileUtils.instance_methods(false))
-private(*FileUtils::OPT_TABLE.keys) 
+private(*FileUtils.instance_methods(false))
+private(*RakeFileUtils.instance_methods(false))
 
 ######################################################################
 module Rake

test/functional.rb

@@ -2,7 +2,7 @@
 
 begin
   require 'rubygems'
-  require_gem 'session'
+  gem 'session'
 rescue LoadError
   puts "UNABLE TO RUN FUNCTIONAL TESTS"
   puts "No Session Found"

test/test_fileutils.rb

@@ -106,9 +106,16 @@ def test_nowrite
     assert_equal false, nowrite
   end
 
+  def test_file_utils_methods_are_available_at_top_level
+    create_file("testdata/a")
+    rm_rf "testdata/a"
+    assert ! File.exist?("testdata/a")
+  end
+
   def test_fileutils_methods_dont_leak
     obj = Object.new
-    assert_raise(NoMethodError){ obj.copy }
+    assert_raise(NoMethodError) { obj.copy } # from FileUtils
+    assert_raise(NoMethodError) { obj.ruby } # from RubyFileUtils
   end
 
   def test_sh
@@ -209,7 +216,7 @@ def test_split_all
     assert_equal ['/', 'a', 'b'], RakeFileUtils.split_all('/a/b')
     assert_equal ['..', 'a', 'b'], RakeFileUtils.split_all('../a/b')
   end
-  
+
   private
 
   def redirect_stderr