style tweaks

test/fakefs_test.rb

@@ -65,9 +65,9 @@ class FakeFSTest < Test::Unit::TestCase
     FileUtils.ln_s(target, "/path/to/link")
     assert_kind_of FakeSymlink, FileSystem.fs['path']['to']['link']
 
-    assert_raises(Errno::EEXIST) {
+    assert_raises(Errno::EEXIST) do
       FileUtils.ln_s(target, '/path/to/link')
-    }
+    end
   end
 
   def test_can_follow_symlinks
@@ -171,7 +171,8 @@ class FakeFSTest < Test::Unit::TestCase
     bad = 'nofile.txt'
     File.open(good,'w') { |f| f.write "foo" }
 
-    assert_equal [good], FileUtils.chown('noone', 'nogroup', good, :verbose => true)
+    out = FileUtils.chown('noone', 'nogroup', good, :verbose => true)
+    assert_equal [good], out
     assert_raises(Errno::ENOENT) do
       FileUtils.chown('noone', 'nogroup', bad, :verbose => true)
     end
@@ -433,9 +434,9 @@ class FakeFSTest < Test::Unit::TestCase
     assert_equal 'footext', File.open('baz/subdir/foo') { |f| f.read }
 
     # To a subdirectory of a directory that does not exist
-    assert_raises(Errno::ENOENT) {
+    assert_raises(Errno::ENOENT) do
       FileUtils.cp_r('subdir', 'nope/something')
-    }
+    end
   end
 
   def test_cp_r_only_copies_into_directories
@@ -527,15 +528,15 @@ class FakeFSTest < Test::Unit::TestCase
   end
 
   def test_touch_does_not_work_if_the_dir_path_cannot_be_found
-    assert_raises(Errno::ENOENT) {
+    assert_raises(Errno::ENOENT) do
       FileUtils.touch('this/path/should/not/be/here')
-    }
+    end
     FileUtils.mkdir_p('subdir')
     list = ['subdir/foo', 'nosubdir/bar']
 
-    assert_raises(Errno::ENOENT) {
+    assert_raises(Errno::ENOENT) do
       FileUtils.touch(list)
-    }
+    end
   end
 
   def test_extname
@@ -546,15 +547,15 @@ class FakeFSTest < Test::Unit::TestCase
   def test_new_directory
     FileUtils.mkdir_p('/this/path/should/be/here')
 
-    assert_nothing_raised {
+    assert_nothing_raised do
       Dir.new('/this/path/should/be/here')
-    }
+    end
   end
 
   def test_new_directory_does_not_work_if_dir_path_cannot_be_found
-    assert_raises(Errno::ENOENT) {
+    assert_raises(Errno::ENOENT) do
       Dir.new('/this/path/should/not/be/here')
-    }
+    end
   end
 
   def test_directory_close
@@ -562,9 +563,9 @@ class FakeFSTest < Test::Unit::TestCase
     dir = Dir.new('/this/path/should/be/here')
     assert dir.close.nil?
 
-    assert_raises(IOError) {
+    assert_raises(IOError) do
       dir.each { |dir| dir }
-    }
+    end
   end
 
   def test_directory_each
@@ -589,7 +590,8 @@ class FakeFSTest < Test::Unit::TestCase
 
   def test_directory_path
     FileUtils.mkdir_p('/this/path/should/be/here')
-     assert Dir.new('/this/path/should/be/here').path == '/this/path/should/be/here'
+    good_path = '/this/path/should/be/here'
+    assert_equal good_path, Dir.new('/this/path/should/be/here').path
   end
 
   def test_directory_pos