rubyzip 1.1.7 → 1.2.4

data/test/filesystem/dir_iterator_test.rb

@@ -2,8 +2,7 @@ require 'test_helper'
 require 'zip/filesystem'
 
 class ZipFsDirIteratorTest < MiniTest::Test
-
-  FILENAME_ARRAY = [ "f1", "f2", "f3", "f4", "f5", "f6"  ]
+  FILENAME_ARRAY = %w[f1 f2 f3 f4 f5 f6]
 
   def setup
     @dirIt = ::Zip::FileSystem::ZipFsDirIterator.new(FILENAME_ARRAY)
@@ -11,22 +10,21 @@ class ZipFsDirIteratorTest < MiniTest::Test
 
   def test_close
     @dirIt.close
-    assert_raises(IOError, "closed directory") {
+    assert_raises(IOError, 'closed directory') do
       @dirIt.each { |e| p e }
-    }
-    assert_raises(IOError, "closed directory") {
+    end
+    assert_raises(IOError, 'closed directory') do
       @dirIt.read
-    }
-    assert_raises(IOError, "closed directory") {
+    end
+    assert_raises(IOError, 'closed directory') do
       @dirIt.rewind
-    }
-    assert_raises(IOError, "closed directory") {
+    end
+    assert_raises(IOError, 'closed directory') do
       @dirIt.seek(0)
-    }
-    assert_raises(IOError, "closed directory") {
+    end
+    assert_raises(IOError, 'closed directory') do
       @dirIt.tell
-    }
-
+    end
   end
 
   def test_each
@@ -35,10 +33,9 @@ class ZipFsDirIteratorTest < MiniTest::Test
   end
 
   def test_read
-    FILENAME_ARRAY.size.times {
-      |i|
+    FILENAME_ARRAY.size.times do |i|
       assert_equal(FILENAME_ARRAY[i], @dirIt.read)
-    }
+    end
   end
 
   def test_rewind
@@ -58,5 +55,4 @@ class ZipFsDirIteratorTest < MiniTest::Test
     @dirIt.seek(pos)
     assert_equal(valAtPos, @dirIt.read)
   end
-
 end

data/test/filesystem/directory_test.rb

@@ -2,130 +2,138 @@ require 'test_helper'
 require 'zip/filesystem'
 
 class ZipFsDirectoryTest < MiniTest::Test
-  TEST_ZIP = "test/data/generated/zipWithDirs_copy.zip"
+  TEST_ZIP = 'test/data/generated/zipWithDirs_copy.zip'
+  GLOB_TEST_ZIP = 'test/data/globTest.zip'
 
   def setup
-    FileUtils.cp("test/data/zipWithDirs.zip", TEST_ZIP)
+    FileUtils.cp('test/data/zipWithDirs.zip', TEST_ZIP)
   end
 
   def test_delete
-    ::Zip::File.open(TEST_ZIP) {
-      |zf|
-      assert_raises(Errno::ENOENT, "No such file or directory - NoSuchFile.txt") {
-        zf.dir.delete("NoSuchFile.txt")
-      }
-      assert_raises(Errno::EINVAL, "Invalid argument - file1") {
-        zf.dir.delete("file1")
-      }
-      assert(zf.file.exists?("dir1"))
-      zf.dir.delete("dir1")
-      assert(! zf.file.exists?("dir1"))
-    }
+    ::Zip::File.open(TEST_ZIP) do |zf|
+      assert_raises(Errno::ENOENT, 'No such file or directory - NoSuchFile.txt') do
+        zf.dir.delete('NoSuchFile.txt')
+      end
+      assert_raises(Errno::EINVAL, 'Invalid argument - file1') do
+        zf.dir.delete('file1')
+      end
+      assert(zf.file.exists?('dir1'))
+      zf.dir.delete('dir1')
+      assert(!zf.file.exists?('dir1'))
+    end
   end
 
   def test_mkdir
-    ::Zip::File.open(TEST_ZIP) {
-      |zf|
-      assert_raises(Errno::EEXIST, "File exists - dir1") {
-        zf.dir.mkdir("file1")
-      }
-      assert_raises(Errno::EEXIST, "File exists - dir1") {
-        zf.dir.mkdir("dir1")
-      }
-      assert(!zf.file.exists?("newDir"))
-      zf.dir.mkdir("newDir")
-      assert(zf.file.directory?("newDir"))
-      assert(!zf.file.exists?("newDir2"))
-      zf.dir.mkdir("newDir2", 3485)
-      assert(zf.file.directory?("newDir2"))
-    }
+    ::Zip::File.open(TEST_ZIP) do |zf|
+      assert_raises(Errno::EEXIST, 'File exists - dir1') do
+        zf.dir.mkdir('file1')
+      end
+      assert_raises(Errno::EEXIST, 'File exists - dir1') do
+        zf.dir.mkdir('dir1')
+      end
+      assert(!zf.file.exists?('newDir'))
+      zf.dir.mkdir('newDir')
+      assert(zf.file.directory?('newDir'))
+      assert(!zf.file.exists?('newDir2'))
+      zf.dir.mkdir('newDir2', 3485)
+      assert(zf.file.directory?('newDir2'))
+    end
   end
 
   def test_pwd_chdir_entries
-    ::Zip::File.open(TEST_ZIP) {
-      |zf|
-      assert_equal("/", zf.dir.pwd)
-
-      assert_raises(Errno::ENOENT, "No such file or directory - no such dir") {
-        zf.dir.chdir "no such dir"
-      }
-
-      assert_raises(Errno::EINVAL, "Invalid argument - file1") {
-        zf.dir.chdir "file1"
-      }
-
-      assert_equal(["dir1", "dir2", "file1"].sort, zf.dir.entries(".").sort)
-      zf.dir.chdir "dir1"
-      assert_equal("/dir1", zf.dir.pwd)
-      assert_equal(["dir11", "file11", "file12"], zf.dir.entries(".").sort)
-
-      zf.dir.chdir "../dir2/dir21"
-      assert_equal("/dir2/dir21", zf.dir.pwd)
-      assert_equal(["dir221"].sort, zf.dir.entries(".").sort)
-    }
+    ::Zip::File.open(TEST_ZIP) do |zf|
+      assert_equal('/', zf.dir.pwd)
+
+      assert_raises(Errno::ENOENT, 'No such file or directory - no such dir') do
+        zf.dir.chdir 'no such dir'
+      end
+
+      assert_raises(Errno::EINVAL, 'Invalid argument - file1') do
+        zf.dir.chdir 'file1'
+      end
+
+      assert_equal(%w[dir1 dir2 file1].sort, zf.dir.entries('.').sort)
+      zf.dir.chdir 'dir1'
+      assert_equal('/dir1', zf.dir.pwd)
+      assert_equal(%w[dir11 file11 file12], zf.dir.entries('.').sort)
+
+      zf.dir.chdir '../dir2/dir21'
+      assert_equal('/dir2/dir21', zf.dir.pwd)
+      assert_equal(['dir221'].sort, zf.dir.entries('.').sort)
+    end
   end
 
   def test_foreach
-    ::Zip::File.open(TEST_ZIP) {
-      |zf|
-
+    ::Zip::File.open(TEST_ZIP) do |zf|
       blockCalled = false
-      assert_raises(Errno::ENOENT, "No such file or directory - noSuchDir") {
-        zf.dir.foreach("noSuchDir") { |e| blockCalled = true }
-      }
-      assert(! blockCalled)
+      assert_raises(Errno::ENOENT, 'No such file or directory - noSuchDir') do
+        zf.dir.foreach('noSuchDir') { |_e| blockCalled = true }
+      end
+      assert(!blockCalled)
 
-      assert_raises(Errno::ENOTDIR, "Not a directory - file1") {
-        zf.dir.foreach("file1") { |e| blockCalled = true }
-      }
-      assert(! blockCalled)
+      assert_raises(Errno::ENOTDIR, 'Not a directory - file1') do
+        zf.dir.foreach('file1') { |_e| blockCalled = true }
+      end
+      assert(!blockCalled)
 
       entries = []
-      zf.dir.foreach(".") { |e| entries << e }
-      assert_equal(["dir1", "dir2", "file1"].sort, entries.sort)
+      zf.dir.foreach('.') { |e| entries << e }
+      assert_equal(%w[dir1 dir2 file1].sort, entries.sort)
 
       entries = []
-      zf.dir.foreach("dir1") { |e| entries << e }
-      assert_equal(["dir11", "file11", "file12"], entries.sort)
-    }
+      zf.dir.foreach('dir1') { |e| entries << e }
+      assert_equal(%w[dir11 file11 file12], entries.sort)
+    end
   end
 
   def test_chroot
-    ::Zip::File.open(TEST_ZIP) {
-      |zf|
-      assert_raises(NotImplementedError) {
+    ::Zip::File.open(TEST_ZIP) do |zf|
+      assert_raises(NotImplementedError) do
         zf.dir.chroot
-      }
-    }
+      end
+    end
   end
 
-  # Globbing not supported yet
-  #def test_glob
-  #  # test alias []-operator too
-  #  fail "implement test"
-  #end
+  def test_glob
+    globbed_files = [
+      'globTest/foo/bar/baz/foo.txt',
+      'globTest/foo.txt',
+      'globTest/food.txt'
+    ]
+
+    ::Zip::File.open(GLOB_TEST_ZIP) do |zf|
+      zf.dir.glob('**/*.txt') do |f|
+        assert globbed_files.include?(f.name)
+      end
+
+      zf.dir.glob('globTest/foo/**/*.txt') do |f|
+        assert_equal globbed_files[0], f.name
+      end
+
+      zf.dir.chdir('globTest/foo')
+      zf.dir.glob('**/*.txt') do |f|
+        assert_equal globbed_files[0], f.name
+      end
+    end
+  end
 
   def test_open_new
-    ::Zip::File.open(TEST_ZIP) {
-      |zf|
+    ::Zip::File.open(TEST_ZIP) do |zf|
+      assert_raises(Errno::ENOTDIR, 'Not a directory - file1') do
+        zf.dir.new('file1')
+      end
 
-      assert_raises(Errno::ENOTDIR, "Not a directory - file1") {
-        zf.dir.new("file1")
-      }
+      assert_raises(Errno::ENOENT, 'No such file or directory - noSuchFile') do
+        zf.dir.new('noSuchFile')
+      end
 
-      assert_raises(Errno::ENOENT, "No such file or directory - noSuchFile") {
-        zf.dir.new("noSuchFile")
-      }
-
-      d = zf.dir.new(".")
-      assert_equal(["file1", "dir1", "dir2"].sort, d.entries.sort)
+      d = zf.dir.new('.')
+      assert_equal(%w[file1 dir1 dir2].sort, d.entries.sort)
       d.close
 
-      zf.dir.open("dir1") {
-        |dir|
-        assert_equal(["dir11", "file11", "file12"].sort, dir.entries.sort)
-      }
-    }
+      zf.dir.open('dir1') do |dir|
+        assert_equal(%w[dir11 file11 file12].sort, dir.entries.sort)
+      end
+    end
   end
-
 end

data/test/filesystem/file_mutating_test.rb

@@ -2,13 +2,12 @@ require 'test_helper'
 require 'zip/filesystem'
 
 class ZipFsFileMutatingTest < MiniTest::Test
-  TEST_ZIP = "test/data/generated/zipWithDirs_copy.zip"
+  TEST_ZIP = 'test/data/generated/zipWithDirs_copy.zip'
   def setup
-    FileUtils.cp("test/data/zipWithDirs.zip", TEST_ZIP)
+    FileUtils.cp('test/data/zipWithDirs.zip', TEST_ZIP)
   end
 
-  def teardown
-  end
+  def teardown; end
 
   def test_delete
     do_test_delete_or_unlink(:delete)
@@ -19,82 +18,70 @@ class ZipFsFileMutatingTest < MiniTest::Test
   end
 
   def test_open_write
-    ::Zip::File.open(TEST_ZIP) {
-      |zf|
-
-      zf.file.open("test_open_write_entry", "w") {
-        |f|
+    ::Zip::File.open(TEST_ZIP) do |zf|
+      zf.file.open('test_open_write_entry', 'w') do |f|
         f.write "This is what I'm writing"
-      }
+      end
       assert_equal("This is what I'm writing",
-                    zf.file.read("test_open_write_entry"))
+                   zf.file.read('test_open_write_entry'))
 
       # Test with existing entry
-      zf.file.open("file1", "wb") { #also check that 'b' option is ignored
-        |f|
+      zf.file.open('file1', 'wb') do |f| # also check that 'b' option is ignored
         f.write "This is what I'm writing too"
-      }
+      end
       assert_equal("This is what I'm writing too",
-                    zf.file.read("file1"))
-    }
+                   zf.file.read('file1'))
+    end
   end
 
   def test_rename
-    ::Zip::File.open(TEST_ZIP) {
-      |zf|
-      assert_raises(Errno::ENOENT, "") {
-        zf.file.rename("NoSuchFile", "bimse")
-      }
-      zf.file.rename("file1", "newNameForFile1")
-    }
-
-    ::Zip::File.open(TEST_ZIP) {
-      |zf|
-      assert(! zf.file.exists?("file1"))
-      assert(zf.file.exists?("newNameForFile1"))
-    }
+    ::Zip::File.open(TEST_ZIP) do |zf|
+      assert_raises(Errno::ENOENT, '') do
+        zf.file.rename('NoSuchFile', 'bimse')
+      end
+      zf.file.rename('file1', 'newNameForFile1')
+    end
+
+    ::Zip::File.open(TEST_ZIP) do |zf|
+      assert(!zf.file.exists?('file1'))
+      assert(zf.file.exists?('newNameForFile1'))
+    end
   end
 
   def test_chmod
-    ::Zip::File.open(TEST_ZIP) {
-      |zf|
+    ::Zip::File.open(TEST_ZIP) do |zf|
+      zf.file.chmod(0o765, 'file1')
+    end
 
-      zf.file.chmod(0765, "file1")
-    }
-
-    ::Zip::File.open(TEST_ZIP) {
-      |zf|
-      assert_equal(0100765,  zf.file.stat("file1").mode)
-    }
+    ::Zip::File.open(TEST_ZIP) do |zf|
+      assert_equal(0o100765, zf.file.stat('file1').mode)
+    end
   end
 
   def do_test_delete_or_unlink(symbol)
-    ::Zip::File.open(TEST_ZIP) {
-      |zf|
-      assert(zf.file.exists?("dir2/dir21/dir221/file2221"))
-      zf.file.send(symbol, "dir2/dir21/dir221/file2221")
-      assert(! zf.file.exists?("dir2/dir21/dir221/file2221"))
-
-      assert(zf.file.exists?("dir1/file11"))
-      assert(zf.file.exists?("dir1/file12"))
-      zf.file.send(symbol, "dir1/file11", "dir1/file12")
-      assert(! zf.file.exists?("dir1/file11"))
-      assert(! zf.file.exists?("dir1/file12"))
-
-      assert_raises(Errno::ENOENT) { zf.file.send(symbol, "noSuchFile") }
-      assert_raises(Errno::EISDIR) { zf.file.send(symbol, "dir1/dir11") }
-      assert_raises(Errno::EISDIR) { zf.file.send(symbol, "dir1/dir11/") }
-    }
-
-    ::Zip::File.open(TEST_ZIP) {
-      |zf|
-      assert(! zf.file.exists?("dir2/dir21/dir221/file2221"))
-      assert(! zf.file.exists?("dir1/file11"))
-      assert(! zf.file.exists?("dir1/file12"))
-
-      assert(zf.file.exists?("dir1/dir11"))
-      assert(zf.file.exists?("dir1/dir11/"))
-    }
+    ::Zip::File.open(TEST_ZIP) do |zf|
+      assert(zf.file.exists?('dir2/dir21/dir221/file2221'))
+      zf.file.send(symbol, 'dir2/dir21/dir221/file2221')
+      assert(!zf.file.exists?('dir2/dir21/dir221/file2221'))
+
+      assert(zf.file.exists?('dir1/file11'))
+      assert(zf.file.exists?('dir1/file12'))
+      zf.file.send(symbol, 'dir1/file11', 'dir1/file12')
+      assert(!zf.file.exists?('dir1/file11'))
+      assert(!zf.file.exists?('dir1/file12'))
+
+      assert_raises(Errno::ENOENT) { zf.file.send(symbol, 'noSuchFile') }
+      assert_raises(Errno::EISDIR) { zf.file.send(symbol, 'dir1/dir11') }
+      assert_raises(Errno::EISDIR) { zf.file.send(symbol, 'dir1/dir11/') }
+    end
+
+    ::Zip::File.open(TEST_ZIP) do |zf|
+      assert(!zf.file.exists?('dir2/dir21/dir221/file2221'))
+      assert(!zf.file.exists?('dir1/file11'))
+      assert(!zf.file.exists?('dir1/file12'))
+
+      assert(zf.file.exists?('dir1/dir11'))
+      assert(zf.file.exists?('dir1/dir11/'))
+    end
   end
-
 end

data/test/filesystem/file_nonmutating_test.rb

@@ -3,71 +3,68 @@ require 'zip/filesystem'
 
 class ZipFsFileNonmutatingTest < MiniTest::Test
   def setup
-    @zipsha = Digest::SHA1.file("test/data/zipWithDirs.zip")
-    @zip_file = ::Zip::File.new("test/data/zipWithDirs.zip")
+    @zipsha = Digest::SHA1.file('test/data/zipWithDirs.zip')
+    @zip_file = ::Zip::File.new('test/data/zipWithDirs.zip')
   end
 
   def teardown
     @zip_file.close if @zip_file
-    assert_equal(@zipsha, Digest::SHA1.file("test/data/zipWithDirs.zip"))
+    assert_equal(@zipsha, Digest::SHA1.file('test/data/zipWithDirs.zip'))
   end
 
   def test_umask
     assert_equal(::File.umask, @zip_file.file.umask)
-    @zip_file.file.umask(0006)
+    @zip_file.file.umask(0o006)
   end
 
   def test_exists?
-    assert(! @zip_file.file.exists?("notAFile"))
-    assert(@zip_file.file.exists?("file1"))
-    assert(@zip_file.file.exists?("dir1"))
-    assert(@zip_file.file.exists?("dir1/"))
-    assert(@zip_file.file.exists?("dir1/file12"))
-    assert(@zip_file.file.exist?("dir1/file12")) # notice, tests exist? alias of exists? !
+    assert(!@zip_file.file.exists?('notAFile'))
+    assert(@zip_file.file.exists?('file1'))
+    assert(@zip_file.file.exists?('dir1'))
+    assert(@zip_file.file.exists?('dir1/'))
+    assert(@zip_file.file.exists?('dir1/file12'))
+    assert(@zip_file.file.exist?('dir1/file12')) # notice, tests exist? alias of exists? !
 
-    @zip_file.dir.chdir "dir1/"
-    assert(!@zip_file.file.exists?("file1"))
-    assert(@zip_file.file.exists?("file12"))
+    @zip_file.dir.chdir 'dir1/'
+    assert(!@zip_file.file.exists?('file1'))
+    assert(@zip_file.file.exists?('file12'))
   end
 
   def test_open_read
     blockCalled = false
-    @zip_file.file.open("file1", "r") {
-      |f|
+    @zip_file.file.open('file1', 'r') do |f|
       blockCalled = true
       assert_equal("this is the entry 'file1' in my test archive!",
-        f.readline.chomp)
-    }
+                   f.readline.chomp)
+    end
     assert(blockCalled)
 
     blockCalled = false
-    @zip_file.file.open("file1", "rb") { # test binary flag is ignored
-      |f|
+    @zip_file.file.open('file1', 'rb') do |f| # test binary flag is ignored
       blockCalled = true
       assert_equal("this is the entry 'file1' in my test archive!",
-        f.readline.chomp)
-    }
+                   f.readline.chomp)
+    end
     assert(blockCalled)
 
     blockCalled = false
-    @zip_file.dir.chdir "dir2"
-    @zip_file.file.open("file21", "r") {
-      |f|
+    @zip_file.dir.chdir 'dir2'
+    @zip_file.file.open('file21', 'r') do |f|
       blockCalled = true
       assert_equal("this is the entry 'dir2/file21' in my test archive!",
-        f.readline.chomp)
-    }
+                   f.readline.chomp)
+    end
     assert(blockCalled)
-    @zip_file.dir.chdir "/"
+    @zip_file.dir.chdir '/'
 
-    assert_raises(Errno::ENOENT) {
-      @zip_file.file.open("noSuchEntry")
-    }
+    assert_raises(Errno::ENOENT) do
+      @zip_file.file.open('noSuchEntry')
+    end
 
     begin
-      is = @zip_file.file.open("file1")
+      is = @zip_file.file.open('file1')
       assert_equal("this is the entry 'file1' in my test archive!",
-        is.readline.chomp)
+                   is.readline.chomp)
     ensure
       is.close if is
     end
@@ -75,109 +72,107 @@ class ZipFsFileNonmutatingTest < MiniTest::Test
 
   def test_new
     begin
-      is = @zip_file.file.new("file1")
+      is = @zip_file.file.new('file1')
       assert_equal("this is the entry 'file1' in my test archive!",
-        is.readline.chomp)
+                   is.readline.chomp)
     ensure
       is.close if is
     end
     begin
-      is = @zip_file.file.new("file1") {
-  fail "should not call block"
-      }
+      is = @zip_file.file.new('file1') do
+        fail 'should not call block'
+      end
     ensure
       is.close if is
     end
   end
 
   def test_symlink
-    assert_raises(NotImplementedError) {
-      @zip_file.file.symlink("file1", "aSymlink")
-    }
+    assert_raises(NotImplementedError) do
+      @zip_file.file.symlink('file1', 'aSymlink')
+    end
   end
 
   def test_size
-    assert_raises(Errno::ENOENT) { @zip_file.file.size("notAFile") }
-    assert_equal(72, @zip_file.file.size("file1"))
-    assert_equal(0, @zip_file.file.size("dir2/dir21"))
+    assert_raises(Errno::ENOENT) { @zip_file.file.size('notAFile') }
+    assert_equal(72, @zip_file.file.size('file1'))
+    assert_equal(0, @zip_file.file.size('dir2/dir21'))
 
-    assert_equal(72, @zip_file.file.stat("file1").size)
-    assert_equal(0, @zip_file.file.stat("dir2/dir21").size)
+    assert_equal(72, @zip_file.file.stat('file1').size)
+    assert_equal(0, @zip_file.file.stat('dir2/dir21').size)
   end
 
   def test_size?
-    assert_equal(nil, @zip_file.file.size?("notAFile"))
-    assert_equal(72, @zip_file.file.size?("file1"))
-    assert_equal(nil, @zip_file.file.size?("dir2/dir21"))
+    assert_nil(@zip_file.file.size?('notAFile'))
+    assert_equal(72, @zip_file.file.size?('file1'))
+    assert_nil(@zip_file.file.size?('dir2/dir21'))
 
-    assert_equal(72, @zip_file.file.stat("file1").size?)
-    assert_equal(nil, @zip_file.file.stat("dir2/dir21").size?)
+    assert_equal(72, @zip_file.file.stat('file1').size?)
+    assert_nil(@zip_file.file.stat('dir2/dir21').size?)
   end
 
-
   def test_file?
-    assert(@zip_file.file.file?("file1"))
-    assert(@zip_file.file.file?("dir2/file21"))
-    assert(! @zip_file.file.file?("dir1"))
-    assert(! @zip_file.file.file?("dir1/dir11"))
+    assert(@zip_file.file.file?('file1'))
+    assert(@zip_file.file.file?('dir2/file21'))
+    assert(!@zip_file.file.file?('dir1'))
+    assert(!@zip_file.file.file?('dir1/dir11'))
 
-    assert(@zip_file.file.stat("file1").file?)
-    assert(@zip_file.file.stat("dir2/file21").file?)
-    assert(! @zip_file.file.stat("dir1").file?)
-    assert(! @zip_file.file.stat("dir1/dir11").file?)
+    assert(@zip_file.file.stat('file1').file?)
+    assert(@zip_file.file.stat('dir2/file21').file?)
+    assert(!@zip_file.file.stat('dir1').file?)
+    assert(!@zip_file.file.stat('dir1/dir11').file?)
   end
 
   include ExtraAssertions
 
   def test_dirname
-    assert_forwarded(File, :dirname, "retVal", "a/b/c/d") {
-      @zip_file.file.dirname("a/b/c/d")
-    }
+    assert_forwarded(File, :dirname, 'retVal', 'a/b/c/d') do
+      @zip_file.file.dirname('a/b/c/d')
+    end
   end
 
   def test_basename
-    assert_forwarded(File, :basename, "retVal", "a/b/c/d") {
-      @zip_file.file.basename("a/b/c/d")
-    }
+    assert_forwarded(File, :basename, 'retVal', 'a/b/c/d') do
+      @zip_file.file.basename('a/b/c/d')
+    end
   end
 
   def test_split
-    assert_forwarded(File, :split, "retVal", "a/b/c/d") {
-      @zip_file.file.split("a/b/c/d")
-    }
+    assert_forwarded(File, :split, 'retVal', 'a/b/c/d') do
+      @zip_file.file.split('a/b/c/d')
+    end
   end
 
   def test_join
-    assert_equal("a/b/c", @zip_file.file.join("a/b", "c"))
-    assert_equal("a/b/c/d", @zip_file.file.join("a/b", "c/d"))
-    assert_equal("/c/d", @zip_file.file.join("", "c/d"))
-    assert_equal("a/b/c/d", @zip_file.file.join("a", "b", "c", "d"))
+    assert_equal('a/b/c', @zip_file.file.join('a/b', 'c'))
+    assert_equal('a/b/c/d', @zip_file.file.join('a/b', 'c/d'))
+    assert_equal('/c/d', @zip_file.file.join('', 'c/d'))
+    assert_equal('a/b/c/d', @zip_file.file.join('a', 'b', 'c', 'd'))
   end
 
   def test_utime
     t_now = ::Zip::DOSTime.now
-    t_bak = @zip_file.file.mtime("file1")
-    @zip_file.file.utime(t_now, "file1")
-    assert_equal(t_now, @zip_file.file.mtime("file1"))
-    @zip_file.file.utime(t_bak, "file1")
-    assert_equal(t_bak, @zip_file.file.mtime("file1"))
+    t_bak = @zip_file.file.mtime('file1')
+    @zip_file.file.utime(t_now, 'file1')
+    assert_equal(t_now, @zip_file.file.mtime('file1'))
+    @zip_file.file.utime(t_bak, 'file1')
+    assert_equal(t_bak, @zip_file.file.mtime('file1'))
   end
 
-
   def assert_always_false(operation)
-    assert(! @zip_file.file.send(operation, "noSuchFile"))
-    assert(! @zip_file.file.send(operation, "file1"))
-    assert(! @zip_file.file.send(operation, "dir1"))
-    assert(! @zip_file.file.stat("file1").send(operation))
-    assert(! @zip_file.file.stat("dir1").send(operation))
+    assert(!@zip_file.file.send(operation, 'noSuchFile'))
+    assert(!@zip_file.file.send(operation, 'file1'))
+    assert(!@zip_file.file.send(operation, 'dir1'))
+    assert(!@zip_file.file.stat('file1').send(operation))
+    assert(!@zip_file.file.stat('dir1').send(operation))
   end
 
   def assert_true_if_entry_exists(operation)
-    assert(! @zip_file.file.send(operation, "noSuchFile"))
-    assert(@zip_file.file.send(operation, "file1"))
-    assert(@zip_file.file.send(operation, "dir1"))
-    assert(@zip_file.file.stat("file1").send(operation))
-    assert(@zip_file.file.stat("dir1").send(operation))
+    assert(!@zip_file.file.send(operation, 'noSuchFile'))
+    assert(@zip_file.file.send(operation, 'file1'))
+    assert(@zip_file.file.send(operation, 'dir1'))
+    assert(@zip_file.file.stat('file1').send(operation))
+    assert(@zip_file.file.stat('dir1').send(operation))
   end
 
   def test_pipe?
@@ -201,167 +196,164 @@ class ZipFsFileNonmutatingTest < MiniTest::Test
   end
 
   def test_truncate
-    assert_raises(StandardError, "truncate not supported") {
-      @zip_file.file.truncate("file1", 100)
-    }
+    assert_raises(StandardError, 'truncate not supported') do
+      @zip_file.file.truncate('file1', 100)
+    end
   end
 
-  def assert_e_n_o_e_n_t(operation, args = ["NoSuchFile"])
-    assert_raises(Errno::ENOENT) {
+  def assert_e_n_o_e_n_t(operation, args = ['NoSuchFile'])
+    assert_raises(Errno::ENOENT) do
       @zip_file.file.send(operation, *args)
-    }
+    end
   end
 
   def test_ftype
     assert_e_n_o_e_n_t(:ftype)
-    assert_equal("file", @zip_file.file.ftype("file1"))
-    assert_equal("directory", @zip_file.file.ftype("dir1/dir11"))
-    assert_equal("directory", @zip_file.file.ftype("dir1/dir11/"))
+    assert_equal('file', @zip_file.file.ftype('file1'))
+    assert_equal('directory', @zip_file.file.ftype('dir1/dir11'))
+    assert_equal('directory', @zip_file.file.ftype('dir1/dir11/'))
   end
 
   def test_link
-    assert_raises(NotImplementedError) {
-      @zip_file.file.link("file1", "someOtherString")
-    }
+    assert_raises(NotImplementedError) do
+      @zip_file.file.link('file1', 'someOtherString')
+    end
   end
 
   def test_directory?
-    assert(! @zip_file.file.directory?("notAFile"))
-    assert(! @zip_file.file.directory?("file1"))
-    assert(! @zip_file.file.directory?("dir1/file11"))
-    assert(@zip_file.file.directory?("dir1"))
-    assert(@zip_file.file.directory?("dir1/"))
-    assert(@zip_file.file.directory?("dir2/dir21"))
+    assert(!@zip_file.file.directory?('notAFile'))
+    assert(!@zip_file.file.directory?('file1'))
+    assert(!@zip_file.file.directory?('dir1/file11'))
+    assert(@zip_file.file.directory?('dir1'))
+    assert(@zip_file.file.directory?('dir1/'))
+    assert(@zip_file.file.directory?('dir2/dir21'))
 
-    assert(! @zip_file.file.stat("file1").directory?)
-    assert(! @zip_file.file.stat("dir1/file11").directory?)
-    assert(@zip_file.file.stat("dir1").directory?)
-    assert(@zip_file.file.stat("dir1/").directory?)
-    assert(@zip_file.file.stat("dir2/dir21").directory?)
+    assert(!@zip_file.file.stat('file1').directory?)
+    assert(!@zip_file.file.stat('dir1/file11').directory?)
+    assert(@zip_file.file.stat('dir1').directory?)
+    assert(@zip_file.file.stat('dir1/').directory?)
+    assert(@zip_file.file.stat('dir2/dir21').directory?)
   end
 
   def test_chown
-    assert_equal(2, @zip_file.file.chown(1,2, "dir1", "file1"))
-    assert_equal(1, @zip_file.file.stat("dir1").uid)
-    assert_equal(2, @zip_file.file.stat("dir1").gid)
-    assert_equal(2, @zip_file.file.chown(nil, nil, "dir1", "file1"))
+    assert_equal(2, @zip_file.file.chown(1, 2, 'dir1', 'file1'))
+    assert_equal(1, @zip_file.file.stat('dir1').uid)
+    assert_equal(2, @zip_file.file.stat('dir1').gid)
+    assert_equal(2, @zip_file.file.chown(nil, nil, 'dir1', 'file1'))
   end
 
   def test_zero?
-    assert(! @zip_file.file.zero?("notAFile"))
-    assert(! @zip_file.file.zero?("file1"))
-    assert(@zip_file.file.zero?("dir1"))
+    assert(!@zip_file.file.zero?('notAFile'))
+    assert(!@zip_file.file.zero?('file1'))
+    assert(@zip_file.file.zero?('dir1'))
     blockCalled = false
-    ::Zip::File.open("test/data/generated/5entry.zip") {
-      |zf|
+    ::Zip::File.open('test/data/generated/5entry.zip') do |zf|
       blockCalled = true
-      assert(zf.file.zero?("test/data/generated/empty.txt"))
-    }
+      assert(zf.file.zero?('test/data/generated/empty.txt'))
+    end
     assert(blockCalled)
 
-    assert(! @zip_file.file.stat("file1").zero?)
-    assert(@zip_file.file.stat("dir1").zero?)
+    assert(!@zip_file.file.stat('file1').zero?)
+    assert(@zip_file.file.stat('dir1').zero?)
     blockCalled = false
-    ::Zip::File.open("test/data/generated/5entry.zip") {
-      |zf|
+    ::Zip::File.open('test/data/generated/5entry.zip') do |zf|
       blockCalled = true
-      assert(zf.file.stat("test/data/generated/empty.txt").zero?)
-    }
+      assert(zf.file.stat('test/data/generated/empty.txt').zero?)
+    end
     assert(blockCalled)
   end
 
   def test_expand_path
-    ::Zip::File.open("test/data/zipWithDirs.zip") {
-      |zf|
-      assert_equal("/", zf.file.expand_path("."))
-      zf.dir.chdir "dir1"
-      assert_equal("/dir1", zf.file.expand_path("."))
-      assert_equal("/dir1/file12", zf.file.expand_path("file12"))
-      assert_equal("/", zf.file.expand_path(".."))
-      assert_equal("/dir2/dir21", zf.file.expand_path("../dir2/dir21"))
-    }
+    ::Zip::File.open('test/data/zipWithDirs.zip') do |zf|
+      assert_equal('/', zf.file.expand_path('.'))
+      zf.dir.chdir 'dir1'
+      assert_equal('/dir1', zf.file.expand_path('.'))
+      assert_equal('/dir1/file12', zf.file.expand_path('file12'))
+      assert_equal('/', zf.file.expand_path('..'))
+      assert_equal('/dir2/dir21', zf.file.expand_path('../dir2/dir21'))
+    end
   end
 
   def test_mtime
-    assert_equal(::Zip::DOSTime.at(1027694306),
-      @zip_file.file.mtime("dir2/file21"))
-    assert_equal(::Zip::DOSTime.at(1027690863),
-      @zip_file.file.mtime("dir2/dir21"))
-    assert_raises(Errno::ENOENT) {
-      @zip_file.file.mtime("noSuchEntry")
-    }
+    assert_equal(::Zip::DOSTime.at(1_027_694_306),
+                 @zip_file.file.mtime('dir2/file21'))
+    assert_equal(::Zip::DOSTime.at(1_027_690_863),
+                 @zip_file.file.mtime('dir2/dir21'))
+    assert_raises(Errno::ENOENT) do
+      @zip_file.file.mtime('noSuchEntry')
+    end
 
-    assert_equal(::Zip::DOSTime.at(1027694306),
-      @zip_file.file.stat("dir2/file21").mtime)
-    assert_equal(::Zip::DOSTime.at(1027690863),
-      @zip_file.file.stat("dir2/dir21").mtime)
+    assert_equal(::Zip::DOSTime.at(1_027_694_306),
+                 @zip_file.file.stat('dir2/file21').mtime)
+    assert_equal(::Zip::DOSTime.at(1_027_690_863),
+                 @zip_file.file.stat('dir2/dir21').mtime)
   end
 
   def test_ctime
-    assert_nil(@zip_file.file.ctime("file1"))
-    assert_nil(@zip_file.file.stat("file1").ctime)
+    assert_nil(@zip_file.file.ctime('file1'))
+    assert_nil(@zip_file.file.stat('file1').ctime)
   end
 
   def test_atime
-    assert_nil(@zip_file.file.atime("file1"))
-    assert_nil(@zip_file.file.stat("file1").atime)
+    assert_nil(@zip_file.file.atime('file1'))
+    assert_nil(@zip_file.file.stat('file1').atime)
   end
 
   def test_ntfs_time
-    ::Zip::File.open("test/data/ntfs.zip") do |zf|
-      t = ::Zip::DOSTime.at(1410496497.405178)
-      assert_equal(zf.file.mtime("data.txt"), t)
-      assert_equal(zf.file.atime("data.txt"), t)
-      assert_equal(zf.file.ctime("data.txt"), t)
+    ::Zip::File.open('test/data/ntfs.zip') do |zf|
+      t = ::Zip::DOSTime.at(1_410_496_497.405178)
+      assert_equal(zf.file.mtime('data.txt'), t)
+      assert_equal(zf.file.atime('data.txt'), t)
+      assert_equal(zf.file.ctime('data.txt'), t)
     end
   end
 
   def test_readable?
-    assert(! @zip_file.file.readable?("noSuchFile"))
-    assert(@zip_file.file.readable?("file1"))
-    assert(@zip_file.file.readable?("dir1"))
-    assert(@zip_file.file.stat("file1").readable?)
-    assert(@zip_file.file.stat("dir1").readable?)
+    assert(!@zip_file.file.readable?('noSuchFile'))
+    assert(@zip_file.file.readable?('file1'))
+    assert(@zip_file.file.readable?('dir1'))
+    assert(@zip_file.file.stat('file1').readable?)
+    assert(@zip_file.file.stat('dir1').readable?)
   end
 
   def test_readable_real?
-    assert(! @zip_file.file.readable_real?("noSuchFile"))
-    assert(@zip_file.file.readable_real?("file1"))
-    assert(@zip_file.file.readable_real?("dir1"))
-    assert(@zip_file.file.stat("file1").readable_real?)
-    assert(@zip_file.file.stat("dir1").readable_real?)
+    assert(!@zip_file.file.readable_real?('noSuchFile'))
+    assert(@zip_file.file.readable_real?('file1'))
+    assert(@zip_file.file.readable_real?('dir1'))
+    assert(@zip_file.file.stat('file1').readable_real?)
+    assert(@zip_file.file.stat('dir1').readable_real?)
   end
 
   def test_writable?
-    assert(! @zip_file.file.writable?("noSuchFile"))
-    assert(@zip_file.file.writable?("file1"))
-    assert(@zip_file.file.writable?("dir1"))
-    assert(@zip_file.file.stat("file1").writable?)
-    assert(@zip_file.file.stat("dir1").writable?)
+    assert(!@zip_file.file.writable?('noSuchFile'))
+    assert(@zip_file.file.writable?('file1'))
+    assert(@zip_file.file.writable?('dir1'))
+    assert(@zip_file.file.stat('file1').writable?)
+    assert(@zip_file.file.stat('dir1').writable?)
   end
 
   def test_writable_real?
-    assert(! @zip_file.file.writable_real?("noSuchFile"))
-    assert(@zip_file.file.writable_real?("file1"))
-    assert(@zip_file.file.writable_real?("dir1"))
-    assert(@zip_file.file.stat("file1").writable_real?)
-    assert(@zip_file.file.stat("dir1").writable_real?)
+    assert(!@zip_file.file.writable_real?('noSuchFile'))
+    assert(@zip_file.file.writable_real?('file1'))
+    assert(@zip_file.file.writable_real?('dir1'))
+    assert(@zip_file.file.stat('file1').writable_real?)
+    assert(@zip_file.file.stat('dir1').writable_real?)
   end
 
   def test_executable?
-    assert(! @zip_file.file.executable?("noSuchFile"))
-    assert(! @zip_file.file.executable?("file1"))
-    assert(@zip_file.file.executable?("dir1"))
-    assert(! @zip_file.file.stat("file1").executable?)
-    assert(@zip_file.file.stat("dir1").executable?)
+    assert(!@zip_file.file.executable?('noSuchFile'))
+    assert(!@zip_file.file.executable?('file1'))
+    assert(@zip_file.file.executable?('dir1'))
+    assert(!@zip_file.file.stat('file1').executable?)
+    assert(@zip_file.file.stat('dir1').executable?)
   end
 
   def test_executable_real?
-    assert(! @zip_file.file.executable_real?("noSuchFile"))
-    assert(! @zip_file.file.executable_real?("file1"))
-    assert(@zip_file.file.executable_real?("dir1"))
-    assert(! @zip_file.file.stat("file1").executable_real?)
-    assert(@zip_file.file.stat("dir1").executable_real?)
+    assert(!@zip_file.file.executable_real?('noSuchFile'))
+    assert(!@zip_file.file.executable_real?('file1'))
+    assert(@zip_file.file.executable_real?('dir1'))
+    assert(!@zip_file.file.stat('file1').executable_real?)
+    assert(@zip_file.file.stat('dir1').executable_real?)
   end
 
   def test_owned?
@@ -385,37 +377,37 @@ class ZipFsFileNonmutatingTest < MiniTest::Test
   end
 
   def test_readlink
-    assert_raises(NotImplementedError) {
-      @zip_file.file.readlink("someString")
-    }
+    assert_raises(NotImplementedError) do
+      @zip_file.file.readlink('someString')
+    end
   end
 
   def test_stat
-    s = @zip_file.file.stat("file1")
+    s = @zip_file.file.stat('file1')
     assert(s.kind_of?(File::Stat)) # It pretends
-    assert_raises(Errno::ENOENT, "No such file or directory - noSuchFile") {
-      @zip_file.file.stat("noSuchFile")
-    }
+    assert_raises(Errno::ENOENT, 'No such file or directory - noSuchFile') do
+      @zip_file.file.stat('noSuchFile')
+    end
   end
 
   def test_lstat
-    assert(@zip_file.file.lstat("file1").file?)
+    assert(@zip_file.file.lstat('file1').file?)
   end
 
   def test_pipe
-    assert_raises(NotImplementedError) {
+    assert_raises(NotImplementedError) do
       @zip_file.file.pipe
-    }
+    end
   end
 
   def test_foreach
-    ::Zip::File.open("test/data/generated/zipWithDir.zip") do |zf|
+    ::Zip::File.open('test/data/generated/zipWithDir.zip') do |zf|
       ref = []
-      File.foreach("test/data/file1.txt") { |e| ref << e }
+      File.foreach('test/data/file1.txt') { |e| ref << e }
       index = 0
 
-      zf.file.foreach("test/data/file1.txt") do |l|
-        #Ruby replaces \n with \r\n automatically on windows
+      zf.file.foreach('test/data/file1.txt') do |l|
+        # Ruby replaces \n with \r\n automatically on windows
         newline = Zip::RUNNING_ON_WINDOWS ? l.gsub(/\r\n/, "\n") : l
         assert_equal(ref[index], newline)
         index = index.next
@@ -423,13 +415,13 @@ class ZipFsFileNonmutatingTest < MiniTest::Test
       assert_equal(ref.size, index)
     end
 
-    ::Zip::File.open("test/data/generated/zipWithDir.zip") do |zf|
+    ::Zip::File.open('test/data/generated/zipWithDir.zip') do |zf|
       ref = []
-      File.foreach("test/data/file1.txt", " ") { |e| ref << e }
+      File.foreach('test/data/file1.txt', ' ') { |e| ref << e }
       index = 0
 
-      zf.file.foreach("test/data/file1.txt", " ") do |l|
-        #Ruby replaces \n with \r\n automatically on windows
+      zf.file.foreach('test/data/file1.txt', ' ') do |l|
+        # Ruby replaces \n with \r\n automatically on windows
         newline = Zip::RUNNING_ON_WINDOWS ? l.gsub(/\r\n/, "\n") : l
         assert_equal(ref[index], newline)
         index = index.next
@@ -443,27 +435,27 @@ class ZipFsFileNonmutatingTest < MiniTest::Test
       {
         'globTest/foo.txt' => ['globTest/foo.txt'],
         '*/foo.txt' => ['globTest/foo.txt'],
-        '**/foo.txt' => ['globTest/foo.txt','globTest/foo/bar/baz/foo.txt'],
+        '**/foo.txt' => ['globTest/foo.txt', 'globTest/foo/bar/baz/foo.txt'],
         '*/foo/**/*.txt' => ['globTest/foo/bar/baz/foo.txt']
-      }.each do |spec,expected_results|
+      }.each do |spec, expected_results|
         results = zf.glob(spec)
-        assert results.all?{|entry| entry.is_a? ::Zip::Entry }
+        assert results.all? { |entry| entry.is_a? ::Zip::Entry }
 
         result_strings = results.map(&:to_s)
         missing_matches = expected_results - result_strings
         extra_matches = result_strings - expected_results
 
-        assert extra_matches.empty?, %Q{spec #{spec.inspect} has extra results #{extra_matches.inspect}}
-        assert missing_matches.empty?, %Q{spec #{spec.inspect} missing results #{missing_matches.inspect}}
+        assert extra_matches.empty?, "spec #{spec.inspect} has extra results #{extra_matches.inspect}"
+        assert missing_matches.empty?, "spec #{spec.inspect} missing results #{missing_matches.inspect}"
       end
     end
 
     ::Zip::File.open('test/data/globTest.zip') do |zf|
       results = []
       zf.glob('**/foo.txt') do |match|
-        results << "<#{match.class.name}: #{match.to_s}>"
+        results << "<#{match.class.name}: #{match}>"
       end
-      assert((not results.empty?), 'block not run, or run out of context')
+      assert(!results.empty?, 'block not run, or run out of context')
       assert_equal 2, results.size
       assert_operator results, :include?, '<Zip::Entry: globTest/foo.txt>'
       assert_operator results, :include?, '<Zip::Entry: globTest/foo/bar/baz/foo.txt>'
@@ -472,8 +464,8 @@ class ZipFsFileNonmutatingTest < MiniTest::Test
 
   def test_popen
     if Zip::RUNNING_ON_WINDOWS
-      #This is pretty much projectile vomit but it allows the test to be
-      #run on windows also
+      # This is pretty much projectile vomit but it allows the test to be
+      # run on windows also
       system_dir = ::File.popen('dir') { |f| f.read }.gsub(/Dir\(s\).*$/, '')
       zipfile_dir = @zip_file.file.popen('dir') { |f| f.read }.gsub(/Dir\(s\).*$/, '')
       assert_equal(system_dir, zipfile_dir)
@@ -483,17 +475,17 @@ class ZipFsFileNonmutatingTest < MiniTest::Test
     end
   end
 
-# Can be added later
-#  def test_select
-#    fail "implement test"
-#  end
+  # Can be added later
+  #  def test_select
+  #    fail "implement test"
+  #  end
 
   def test_readlines
-    ::Zip::File.open("test/data/generated/zipWithDir.zip") do |zf|
-      orig_file = ::File.readlines("test/data/file1.txt")
-      zip_file = zf.file.readlines("test/data/file1.txt")
+    ::Zip::File.open('test/data/generated/zipWithDir.zip') do |zf|
+      orig_file = ::File.readlines('test/data/file1.txt')
+      zip_file = zf.file.readlines('test/data/file1.txt')
 
-      #Ruby replaces \n with \r\n automatically on windows
+      # Ruby replaces \n with \r\n automatically on windows
       zip_file.each { |l| l.gsub!(/\r\n/, "\n") } if Zip::RUNNING_ON_WINDOWS
 
       assert_equal(orig_file, zip_file)
@@ -501,14 +493,16 @@ class ZipFsFileNonmutatingTest < MiniTest::Test
   end
 
   def test_read
-    ::Zip::File.open("test/data/generated/zipWithDir.zip") do |zf|
-      orig_file = ::File.read("test/data/file1.txt")
-
-      #Ruby replaces \n with \r\n automatically on windows
-      zip_file = Zip::RUNNING_ON_WINDOWS ? \
-          zf.file.read("test/data/file1.txt").gsub(/\r\n/, "\n") : zf.file.read("test/data/file1.txt")
+    ::Zip::File.open('test/data/generated/zipWithDir.zip') do |zf|
+      orig_file = ::File.read('test/data/file1.txt')
+
+      # Ruby replaces \n with \r\n automatically on windows
+      zip_file = if Zip::RUNNING_ON_WINDOWS
+                   zf.file.read('test/data/file1.txt').gsub(/\r\n/, "\n")
+                 else
+                   zf.file.read('test/data/file1.txt')
+                 end
       assert_equal(orig_file, zip_file)
     end
   end
-
 end