From: nobu@...
Date: 2004-08-04T16:57:33+09:00
Subject: [ruby-dev:24018] Re: 1.8.2-preview2?

なかだです。

At Fri, 30 Jul 2004 01:16:59 +0900,
Minero Aoki wrote in [ruby-dev:23993]:
> * fileutils に関して、[ruby-talk:101077] と [ruby-talk:106434] が
>   未調査です。

[ruby-talk:101077]はこんなところでどうでしょうか。dot fileのこ
とを考えれば、こういう場合は FileUtils.cp_r(source+"/.", dest)
のほうがいいとは思いますが。


Index: lib/fileutils.rb
===================================================================
RCS file: /cvs/ruby/src/ruby/lib/fileutils.rb,v
retrieving revision 1.43
diff -u -2 -p -r1.43 fileutils.rb
--- lib/fileutils.rb	7 May 2004 13:08:12 -0000	1.43
+++ lib/fileutils.rb	4 Aug 2004 07:55:11 -0000
@@ -353,4 +353,5 @@ module FileUtils
     return if options[:noop]
 
+    mkdir_p(dest) if src.is_a?(Array)
     fu_each_src_dest(src, dest) do |s,d|
       if File.directory?(s)
@@ -734,15 +735,13 @@ module FileUtils
 
   def fu_each_src_dest0(src, dest)
-    if src.is_a?(Array)
-      src.each do |s|
-        s = File.path(s)
-        yield s, File.join(dest, File.basename(s))
-      end
-    else
-      src = File.path(src)
+    unless src.is_a?(Array)
+      src = [src]
+    end
+    src.each do |s|
+      s = File.path(s)
       if File.directory?(dest)
-        yield src, File.join(dest, File.basename(src))
+        yield s, File.join(dest, File.basename(s))
       else
-        yield src, File.path(dest)
+        yield s, File.path(dest)
       end
     end