Merge pull request #39 from jeremyevans/windows-fix-cp_r-symlink-dev

Fix a Couple Windows Issues

Author: hsbt

lib/fileutils.rb

@@ -488,7 +488,11 @@ def cp_r(src, dest, preserve: nil, noop: nil, verbose: nil,
   # If +remove_destination+ is true, this method removes each destination file before copy.
   #
   def copy_entry(src, dest, preserve = false, dereference_root = false, remove_destination = false)
-    Entry_.new(src, nil, dereference_root).wrap_traverse(proc do |ent|
+    if dereference_root
+      src = File.realpath(src)
+    end
+
+    Entry_.new(src, nil, false).wrap_traverse(proc do |ent|
       destent = Entry_.new(dest, ent.rel, false)
       File.unlink destent.path if remove_destination && (File.file?(destent.path) || File.symlink?(destent.path))
       ent.copy destent.path

test/fileutils/test_fileutils.rb

@@ -450,11 +450,11 @@ def test_cp_r_fifo
 
   def test_cp_r_dev
     devs = Dir['/dev/*']
-    chardev = Dir['/dev/*'].find{|f| File.chardev?(f)}
-    blockdev = Dir['/dev/*'].find{|f| File.blockdev?(f)}
+    chardev = devs.find{|f| File.chardev?(f)}
+    blockdev = devs.find{|f| File.blockdev?(f)}
     Dir.mkdir('tmp/cpr_dest')
-    assert_raise(RuntimeError) { cp_r chardev, 'tmp/cpr_dest/cd' }
-    assert_raise(RuntimeError) { cp_r blockdev, 'tmp/cpr_dest/bd' }
+    assert_raise(RuntimeError) { cp_r chardev, 'tmp/cpr_dest/cd' } if chardev
+    assert_raise(RuntimeError) { cp_r blockdev, 'tmp/cpr_dest/bd' } if blockdev
   end
 
   begin