fakefs 0.4.1 → 0.4.2

data/fakefs.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fakefs"
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Wanstrath", "Scott Taylor", "Jeff Hodges", "Pat Nakajima"]
-  s.date = "2012-11-14"
+  s.date = "2012-11-24"
   s.description = "A fake filesystem. Use it in your tests."
   s.email = "chris@ozmm.org"
   s.extra_rdoc_files = [

data/lib/fakefs/file.rb

@@ -238,10 +238,14 @@ module FakeFS
 
     def self.chown(owner_int, group_int, filename)
       file = FileSystem.find(filename)
-      owner_int.is_a?(Fixnum) or raise TypeError, "can't convert String into Integer"
-      group_int.is_a?(Fixnum) or raise TypeError, "can't convert String into Integer"
-      file.uid = owner_int
-      file.gid = group_int
+      if owner_int && owner_int != -1
+        owner_int.is_a?(Fixnum) or raise TypeError, "can't convert String into Integer"
+        file.uid = owner_int
+      end
+      if group_int && group_int != -1
+        group_int.is_a?(Fixnum) or raise TypeError, "can't convert String into Integer"
+        file.gid = group_int
+      end
     end
 
     def self.umask
@@ -403,10 +407,14 @@ module FakeFS
     end
 
     def chown(owner_int, group_int)
-      owner_int.is_a?(Fixnum) or raise TypeError, "can't convert String into Integer"
-      group_int.is_a?(Fixnum) or raise TypeError, "can't convert String into Integer"
-      @file.uid = owner_int
-      @file.gid = group_int
+      if owner_int && owner_int != -1
+        owner_int.is_a?(Fixnum) or raise TypeError, "can't convert String into Integer"
+        @file.uid = owner_int
+      end
+      if group_int && group_int != -1
+        group_int.is_a?(Fixnum) or raise TypeError, "can't convert String into Integer"
+        @file.gid = group_int
+      end
     end
 
     if RUBY_VERSION >= "1.9"

data/lib/fakefs/fileutils.rb

@@ -115,6 +115,7 @@ module FakeFS
       Array(src).each do |path|
         if target = FileSystem.find(path)
           dest_path = File.directory?(dest) ? File.join(dest, File.basename(path)) : dest
+          FileSystem.delete(dest_path)
           FileSystem.add(dest_path, target.entry.clone)
           FileSystem.delete(path)
         else
@@ -127,8 +128,16 @@ module FakeFS
       list = Array(list)
       list.each do |f|
         if File.exists?(f)
-          uid = (user.to_s.match(/[0-9]+/) ? user.to_i : Etc.getpwnam(user).uid)
-          gid = (group.to_s.match(/[0-9]+/) ? group.to_i : Etc.getgrnam(group).gid)
+          uid = if user
+                  user.to_s.match(/[0-9]+/) ? user.to_i : Etc.getpwnam(user).uid
+                else
+                  nil
+                end
+          gid = if group
+                  group.to_s.match(/[0-9]+/) ? group.to_i : Etc.getgrnam(group).gid
+                else
+                  nil
+                end
           File.chown(uid, gid, f)
         else
           raise Errno::ENOENT, f

data/lib/fakefs/version.rb

@@ -1,6 +1,6 @@
 module FakeFS
   module Version
-    VERSION = "0.4.1"
+    VERSION = "0.4.2"
 
     def self.to_s
       VERSION

data/test/fakefs_test.rb

@@ -752,6 +752,17 @@ class FakeFSTest < Test::Unit::TestCase
     assert_raises(Errno::ENOENT) do
       FileUtils.chown(username, groupname, [good, bad])
     end
+
+    # FileUtils.chown with nil user and nil group should not change anything
+    FileUtils.chown(username, groupname, good)
+    assert_equal File.stat(good).uid, Process.uid
+    assert_equal File.stat(good).gid, Process.gid
+    assert_equal [good], FileUtils.chown(nil, nil, [good])
+    assert_equal File.stat(good).uid, Process.uid
+    assert_equal File.stat(good).gid, Process.gid
+    assert_raises(Errno::ENOENT) do
+      FileUtils.chown(nil, nil, [good, bad])
+    end
   end
 
   def test_can_chown_R_files
@@ -1093,6 +1104,13 @@ class FakeFSTest < Test::Unit::TestCase
     assert_equal 'bar', File.open('baz') { |f| f.read }
   end
 
+  def test_mv_overwrites_existing_files
+    File.open('foo', 'w') { |f| f.write 'bar' }
+    File.open('baz', 'w') { |f| f.write 'qux' }
+    FileUtils.mv 'foo', 'baz'
+    assert_equal 'bar', File.read('baz')
+  end
+
   def test_mv_works_with_options
     File.open('foo', 'w') {|f| f.write 'bar'}
     FileUtils.mv 'foo', 'baz', :force => true
@@ -2043,6 +2061,46 @@ class FakeFSTest < Test::Unit::TestCase
     assert_equal File.stat("bar").gid, 1338
   end
 
+  def test_file_chown_of_file_nil_user_group
+    FileUtils.touch "foo"
+    File.chown 1337, 1338, "foo"
+    File.chown nil, nil, "foo"
+    assert_equal File.stat("foo").uid, 1337
+    assert_equal File.stat("foo").gid, 1338
+  end
+
+  def test_file_chown_of_file_negative_user_group
+    FileUtils.touch "foo"
+    File.chown 1337, 1338, "foo"
+    File.chown -1, -1, "foo"
+    assert_equal File.stat("foo").uid, 1337
+    assert_equal File.stat("foo").gid, 1338
+  end
+
+  def test_file_instance_chown_nil_user_group
+    FileUtils.touch('foo')
+    File.chown(1337, 1338, 'foo')
+    assert_equal File.stat('foo').uid, 1337
+    assert_equal File.stat('foo').gid, 1338
+    file = File.open('foo')
+    file.chown nil, nil
+    assert_equal File.stat('foo').uid, 1337
+    assert_equal File.stat('foo').gid, 1338
+  end
+
+  def test_file_instance_chown_negative_user_group
+    FileUtils.touch('foo')
+    File.chown(1337, 1338, 'foo')
+    assert_equal File.stat('foo').uid, 1337
+    assert_equal File.stat('foo').gid, 1338
+    file = File.new('foo')
+    file.chown -1, -1
+    file.close
+    assert_equal File.stat('foo').uid, 1337
+    assert_equal File.stat('foo').gid, 1338
+  end
+
+
   def test_file_umask
     assert_equal File.umask, RealFile.umask
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fakefs
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2012-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -123,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4221533071311333318
+      hash: 4092255673165272959
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: