2 files changed, 30 insertions, 12 deletions
@@ -1608,13 +1608,13 @@ module FileUtils
 end
 private_module_function :fu_same?
- @fileutils_output = $stderr
- @fileutils_label = ''
-
 def fu_output_message(msg) #:nodoc:
- @fileutils_output ||= $stderr
- @fileutils_label ||= ''
- @fileutils_output.puts @fileutils_label + msg
 end
 private_module_function :fu_output_message
@@ -1695,8 +1695,6 @@ module FileUtils
 #
 module Verbose
 include FileUtils
- @fileutils_output = $stderr
- @fileutils_label = ''
 names = ::FileUtils.collect_method(:verbose)
 names.each do |name|
 module_eval(<<-EOS, __FILE__, __LINE__ + 1)
@@ -1720,8 +1718,6 @@ module FileUtils
 module NoWrite
 include FileUtils
 include LowMethods
- @fileutils_output = $stderr
- @fileutils_label = ''
 names = ::FileUtils.collect_method(:noop)
 names.each do |name|
 module_eval(<<-EOS, __FILE__, __LINE__ + 1)
@@ -1746,8 +1742,6 @@ module FileUtils
 module DryRun
 include FileUtils
 include LowMethods
- @fileutils_output = $stderr
- @fileutils_label = ''
 names = ::FileUtils.collect_method(:noop)
 names.each do |name|
 module_eval(<<-EOS, __FILE__, __LINE__ + 1)
@@ -6,6 +6,7 @@ require 'etc'
 require_relative 'fileasserts'
 require 'pathname'
 require 'tmpdir'
 require 'test/unit'
 class TestFileUtils < Test::Unit::TestCase
@@ -1673,6 +1674,29 @@ class TestFileUtils < Test::Unit::TestCase
 check_singleton :chdir
 end
 def test_getwd
 check_singleton :getwd
 end