*** empty log message ***

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3409 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

instruby.rb

@@ -46,11 +46,17 @@ end
 
 parse_args()
 
-include FileUtils::Verbose
+include FileUtils
 include FileUtils::NoWrite if $dryrun
 @fileutils_output = STDOUT
 @fileutils_label = ''
 alias makelink ln_sf
+class << self
+  body = proc {|*args|super(*args<<:verbose)}
+  for func in [:install, :makedirs, :makelink]
+    define_method(func, body)
+  end
+end
 
 exeext = CONFIG["EXEEXT"]
 

lib/fileutils.rb

@@ -776,17 +776,16 @@ module FileUtils
     @fileutils_label   = 'fileutils.'
     @fileutils_verbose = true
 
-    FileUtils::OPT_TABLE.each do |name, opts|
+    body = proc do |*args|
-      next unless opts.include? 'verbose'
-      module_eval(<<-End, __FILE__, __LINE__ + 1)
-          def #{name}( *args )
       unless defined? @fileutils_verbose
         @fileutils_verbose = true
       end
       args.push :verbose if @fileutils_verbose
       super(*args)
     end
-      End
+    FileUtils::OPT_TABLE.each do |name, opts|
+      next unless opts.include? 'verbose'
+      define_method(name, body)
     end
 
     extend self
@@ -807,17 +806,16 @@ module FileUtils
     @fileutils_label   = 'fileutils.'
     @fileutils_nowrite = true
 
-    FileUtils::OPT_TABLE.each do |name, opts|
+    body = proc do |*args|
-      next unless opts.include? 'noop'
-      module_eval(<<-End, __FILE__, __LINE__ + 1)
-          def #{name}( *args )
       unless defined? @fileutils_nowrite
         @fileutils_nowrite = true
       end
       args.push :noop if @fileutils_nowrite
       super(*args)
     end
-      End
+    FileUtils::OPT_TABLE.each do |name, opts|
+      next unless opts.include? 'noop'
+      define_method(name, body)
     end
 
     extend self