rubyzip 1.1.7 → 1.2.1

data/test/settings_test.rb

@@ -1,10 +1,10 @@
 require 'test_helper'
 
 class ZipSettingsTest < MiniTest::Test
-  # TODO Refactor out into common test module
+  # TODO: Refactor out into common test module
   include CommonZipFileFixture
 
-  TEST_OUT_NAME = "test/data/generated/emptyOutDir"
+  TEST_OUT_NAME = 'test/data/generated/emptyOutDir'
 
   def setup
     super
@@ -18,27 +18,26 @@ class ZipSettingsTest < MiniTest::Test
   end
 
   def open_zip(&aProc)
-    assert(aProc != nil)
+    assert(!aProc.nil?)
     ::Zip::File.open(TestZipFile::TEST_ZIP4.zip_name, &aProc)
   end
 
   def extract_test_dir(&aProc)
-    open_zip {
-        |zf|
+    open_zip do |zf|
       zf.extract(TestFiles::EMPTY_TEST_DIR, TEST_OUT_NAME, &aProc)
-    }
+    end
   end
 
   def test_true_on_exists_proc
     Zip.on_exists_proc = true
-    File.open(TEST_OUT_NAME, "w") { |f| f.puts "something" }
+    File.open(TEST_OUT_NAME, 'w') { |f| f.puts 'something' }
     extract_test_dir
     assert(File.directory?(TEST_OUT_NAME))
   end
 
   def test_false_on_exists_proc
     Zip.on_exists_proc = false
-    File.open(TEST_OUT_NAME, "w") { |f| f.puts "something" }
+    File.open(TEST_OUT_NAME, 'w') { |f| f.puts 'something' }
     assert_raises(Zip::DestinationFileExistsError) { extract_test_dir }
   end
 
@@ -47,7 +46,7 @@ class ZipSettingsTest < MiniTest::Test
 
     assert_raises(::Zip::EntryExistsError) do
       ::Zip::File.open(TEST_ZIP.zip_name) do |zf|
-        zf.add(zf.entries.first.name, "test/data/file2.txt")
+        zf.add(zf.entries.first.name, 'test/data/file2.txt')
       end
     end
   end
@@ -59,11 +58,11 @@ class ZipSettingsTest < MiniTest::Test
 
     ::Zip::File.open(TEST_ZIP.zip_name) do |zf|
       replacedEntry = zf.entries.first.name
-      zf.add(replacedEntry, "test/data/file2.txt")
+      zf.add(replacedEntry, 'test/data/file2.txt')
     end
 
     ::Zip::File.open(TEST_ZIP.zip_name) do |zf|
-      assert_contains(zf, replacedEntry, "test/data/file2.txt")
+      assert_contains(zf, replacedEntry, 'test/data/file2.txt')
     end
   end
 
@@ -71,7 +70,9 @@ class ZipSettingsTest < MiniTest::Test
     test_file = File.join(File.dirname(__FILE__), 'data', 'WarnInvalidDate.zip')
     Zip.warn_invalid_date = false
 
-    ::Zip::File.open(test_file) do |zf|
+    assert_output('', '') do
+      ::Zip::File.open(test_file) do |_zf|
+      end
     end
   end
 
@@ -79,14 +80,16 @@ class ZipSettingsTest < MiniTest::Test
     test_file = File.join(File.dirname(__FILE__), 'data', 'WarnInvalidDate.zip')
     Zip.warn_invalid_date = true
 
-    ::Zip::File.open(test_file) do |zf|
+    assert_output('', /Invalid date\/time in zip entry/) do
+      ::Zip::File.open(test_file) do |_zf|
+      end
     end
   end
 
-
   private
+
   def assert_contains(zf, entryName, filename = entryName)
     assert(zf.entries.detect { |e| e.name == entryName } != nil, "entry #{entryName} not in #{zf.entries.join(', ')} in zip file #{zf}")
-    assert_entryContents(zf, entryName, filename) if File.exist?(filename)
+    assert_entry_contents(zf, entryName, filename) if File.exist?(filename)
   end
 end

data/test/test_helper.rb

@@ -9,6 +9,11 @@ require 'gentestfiles'
 TestFiles.create_test_files
 TestZipFile.create_test_zips
 
+if defined? JRUBY_VERSION
+  require 'jruby'
+  JRuby.objectspace = true
+end
+
 ::MiniTest.after_run do
   FileUtils.rm_rf('test/data/generated')
 end
@@ -21,7 +26,7 @@ module IOizeString
     count = size unless count
     retVal = slice(@tell, count)
     @tell += count
-    return retVal
+    retVal
   end
 
   def seek(index, offset)
@@ -34,12 +39,12 @@ module IOizeString
     when IO::SEEK_CUR
       newPos = @tell + index
     else
-      raise "Error in test method IOizeString::seek"
+      raise 'Error in test method IOizeString::seek'
     end
-    if (newPos < 0 || newPos >= size)
+    if newPos < 0 || newPos >= size
       raise Errno::EINVAL
     else
-      @tell=newPos
+      @tell = newPos
     end
   end
 
@@ -51,7 +56,7 @@ end
 module DecompressorTests
   # expects @refText, @refLines and @decompressor
 
-  TEST_FILE = "test/data/file1.txt"
+  TEST_FILE = 'test/data/file1.txt'
 
   def setup
     @refText = ''
@@ -59,11 +64,11 @@ module DecompressorTests
     @refLines = @refText.split($/)
   end
 
-  def test_readEverything
+  def test_read_everything
     assert_equal(@refText, @decompressor.sysread)
   end
 
-  def test_readInChunks
+  def test_read_in_chunks
     chunkSize = 5
     while (decompressedChunk = @decompressor.sysread(chunkSize))
       assert_equal(@refText.slice!(0, chunkSize), decompressedChunk)
@@ -71,22 +76,19 @@ module DecompressorTests
     assert_equal(0, @refText.size)
   end
 
-  def test_mixingReadsAndProduceInput
+  def test_mixing_reads_and_produce_input
     # Just some preconditions to make sure we have enough data for this test
     assert(@refText.length > 1000)
     assert(@refLines.length > 40)
 
-
     assert_equal(@refText[0...100], @decompressor.sysread(100))
 
     assert(!@decompressor.input_finished?)
     buf = @decompressor.produce_input
-    assert_equal(@refText[100...(100+buf.length)], buf)
+    assert_equal(@refText[100...(100 + buf.length)], buf)
   end
 end
 
-
-
 module AssertEntry
   def assert_next_entry(filename, zis)
     assert_entry(filename, zis, zis.get_next_entry.name)
@@ -94,33 +96,32 @@ module AssertEntry
 
   def assert_entry(filename, zis, entryName)
     assert_equal(filename, entryName)
-    assert_entryContentsForStream(filename, zis, entryName)
+    assert_entry_contents_for_stream(filename, zis, entryName)
   end
 
-  def assert_entryContentsForStream(filename, zis, entryName)
-    File.open(filename, "rb") {
-        |file|
+  def assert_entry_contents_for_stream(filename, zis, entryName)
+    File.open(filename, 'rb') do |file|
       expected = file.read
       actual = zis.read
       if (expected != actual)
-        if ((expected && actual) && (expected.length > 400 || actual.length > 400))
-          zipEntryFilename=entryName+".zipEntry"
-          File.open(zipEntryFilename, "wb") { |entryfile| entryfile << actual }
+        if (expected && actual) && (expected.length > 400 || actual.length > 400)
+          zipEntryFilename = entryName + '.zipEntry'
+          File.open(zipEntryFilename, 'wb') { |entryfile| entryfile << actual }
           fail("File '#{filename}' is different from '#{zipEntryFilename}'")
         else
           assert_equal(expected, actual)
         end
       end
-    }
+    end
   end
 
-  def AssertEntry.assert_contents(filename, aString)
-    fileContents = ""
-    File.open(filename, "rb") { |f| fileContents = f.read }
+  def self.assert_contents(filename, aString)
+    fileContents = ''
+    File.open(filename, 'rb') { |f| fileContents = f.read }
     if (fileContents != aString)
-      if (fileContents.length > 400 || aString.length > 400)
-        stringFile = filename + ".other"
-        File.open(stringFile, "wb") { |f| f << aString }
+      if fileContents.length > 400 || aString.length > 400
+        stringFile = filename + '.other'
+        File.open(stringFile, 'wb') { |f| f << aString }
         fail("File '#{filename}' is different from contents of string stored in '#{stringFile}'")
       else
         assert_equal(fileContents, aString)
@@ -129,11 +130,11 @@ module AssertEntry
   end
 
   def assert_stream_contents(zis, testZipFile)
-    assert(zis != nil)
+    assert(!zis.nil?)
     testZipFile.entry_names.each do |entryName|
       assert_next_entry(entryName, zis)
     end
-    assert_equal(nil, zis.get_next_entry)
+    assert_nil(zis.get_next_entry)
   end
 
   def assert_test_zip_contents(testZipFile)
@@ -142,27 +143,25 @@ module AssertEntry
     end
   end
 
-  def assert_entryContents(zipFile, entryName, filename = entryName.to_s)
+  def assert_entry_contents(zipFile, entryName, filename = entryName.to_s)
     zis = zipFile.get_input_stream(entryName)
-    assert_entryContentsForStream(filename, zis, entryName)
+    assert_entry_contents_for_stream(filename, zis, entryName)
   ensure
     zis.close if zis
   end
 end
 
-
 module CrcTest
-
   class TestOutputStream
     include ::Zip::IOExtras::AbstractOutputStream
 
     attr_accessor :buffer
 
     def initialize
-      @buffer = ""
+      @buffer = ''
     end
 
-    def << (data)
+    def <<(data)
       @buffer << data
       self
     end
@@ -178,26 +177,23 @@ module CrcTest
   end
 end
 
-
 module Enumerable
   def compare_enumerables(otherEnumerable)
     otherAsArray = otherEnumerable.to_a
-    each_with_index {
-        |element, index|
+    each_with_index do |element, index|
       return false unless yield(element, otherAsArray[index])
-    }
-    return self.size == otherAsArray.size
+    end
+    size == otherAsArray.size
   end
 end
 
-
 module CommonZipFileFixture
   include AssertEntry
 
-  EMPTY_FILENAME = "emptyZipFile.zip"
+  EMPTY_FILENAME = 'emptyZipFile.zip'
 
   TEST_ZIP = TestZipFile::TEST_ZIP2.clone
-  TEST_ZIP.zip_name = "test/data/generated/5entry_copy.zip"
+  TEST_ZIP.zip_name = 'test/data/generated/5entry_copy.zip'
 
   def setup
     File.delete(EMPTY_FILENAME) if File.exist?(EMPTY_FILENAME)
@@ -205,9 +201,7 @@ module CommonZipFileFixture
   end
 end
 
-
 module ExtraAssertions
-
   def assert_forwarded(anObject, method, retVal, *expectedArgs)
     callArgs = nil
     setCallArgsProc = proc { |args| callArgs = args }
@@ -224,5 +218,17 @@ module ExtraAssertions
   ensure
     anObject.instance_eval "undef #{method}; alias #{method} #{method}_org"
   end
+end
 
+module ZipEntryData
+  TEST_ZIPFILE = 'someZipFile.zip'
+  TEST_COMMENT = 'a comment'
+  TEST_COMPRESSED_SIZE = 1234
+  TEST_CRC = 325_324
+  TEST_EXTRA = 'Some data here'
+  TEST_COMPRESSIONMETHOD = ::Zip::Entry::DEFLATED
+  TEST_NAME = 'entry name'
+  TEST_SIZE = 8432
+  TEST_ISDIRECTORY = false
+  TEST_TIME = Time.now
 end

data/test/unicode_file_names_and_comments_test.rb

@@ -3,12 +3,11 @@
 require 'test_helper'
 
 class ZipUnicodeFileNamesAndComments < MiniTest::Test
-
-  FILENAME = File.join(File.dirname(__FILE__), "test1.zip")
+  FILENAME = File.join(File.dirname(__FILE__), 'test1.zip')
 
   def test_unicode_file_name
-    file_entrys = ["текстовыйфайл.txt", "Résumé.txt", "슬레이어스휘.txt"]
-    directory_entrys = ["папка/текстовыйфайл.txt", "Résumé/Résumé.txt", "슬레이어스휘/슬레이어스휘.txt"]
+    file_entrys = ['текстовыйфайл.txt', 'Résumé.txt', '슬레이어스휘.txt']
+    directory_entrys = ['папка/текстовыйфайл.txt', 'Résumé/Résumé.txt', '슬레이어스휘/슬레이어스휘.txt']
     stream = ::Zip::OutputStream.open(FILENAME) do |io|
       file_entrys.each do |filename|
         io.put_next_entry(filename)
@@ -24,13 +23,13 @@ class ZipUnicodeFileNamesAndComments < MiniTest::Test
       file_entrys.each do |filename|
         entry = io.get_next_entry
         entry_name = entry.name
-        entry_name = entry_name.force_encoding("UTF-8")
+        entry_name = entry_name.force_encoding('UTF-8')
         assert(filename == entry_name)
       end
       directory_entrys.each do |filepath|
         entry = io.get_next_entry
         entry_name = entry.name
-        entry_name = entry_name.force_encoding("UTF-8")
+        entry_name = entry_name.force_encoding('UTF-8')
         assert(filepath == entry_name)
       end
     end
@@ -48,5 +47,4 @@ class ZipUnicodeFileNamesAndComments < MiniTest::Test
     end
     ::File.unlink(FILENAME)
   end
-
 end

data/test/zip64_full_test.rb

@@ -4,32 +4,32 @@ if ENV['FULL_ZIP64_TEST']
   require 'fileutils'
   require 'zip'
 
-# test zip64 support for real, by actually exceeding the 32-bit size/offset limits
-# this test does not, of course, run with the normal unit tests! ;)
+  # test zip64 support for real, by actually exceeding the 32-bit size/offset limits
+  # this test does not, of course, run with the normal unit tests! ;)
 
   class Zip64FullTest < MiniTest::Test
     def teardown
       ::Zip.reset!
     end
 
-    def prepareTestFile(test_filename)
+    def prepare_test_file(test_filename)
       ::File.delete(test_filename) if ::File.exist?(test_filename)
-      return test_filename
+      test_filename
     end
 
-    def test_largeZipFile
+    def test_large_zip_file
       ::Zip.write_zip64_support = true
       first_text = 'starting out small'
       last_text = 'this tests files starting after 4GB in the archive'
-      test_filename = prepareTestFile('huge.zip')
+      test_filename = prepare_test_file('huge.zip')
       ::Zip::OutputStream.open(test_filename) do |io|
         io.put_next_entry('first_file.txt')
         io.write(first_text)
 
         # write just over 4GB (stored, so the zip file exceeds 4GB)
-        buf = 'blah' * 16384
+        buf = 'blah' * 16_384
         io.put_next_entry('huge_file', nil, nil, ::Zip::Entry::STORED)
-        65537.times { io.write(buf) }
+        65_537.times { io.write(buf) }
 
         io.put_next_entry('last_file.txt')
         io.write(last_text)
@@ -44,10 +44,8 @@ if ENV['FULL_ZIP64_TEST']
       # note: if this fails, be sure you have UnZip version 6.0 or newer
       # as this is the first version to support zip64 extensions
       # but some OSes (*cough* OSX) still bundle a 5.xx release
-      assert system("unzip -t #{test_filename}"), "third-party zip validation failed"
+      assert system("unzip -t #{test_filename}"), 'third-party zip validation failed'
     end
-
   end
 
 end
-

data/test/zip64_support_test.rb

@@ -11,5 +11,4 @@ class Zip64SupportTest < MiniTest::Test
     assert(test_rb.size == 482)
     assert(test_rb.compressed_size == 229)
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyzip
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.2.1
 platform: ruby
 authors:
 - Alexander Simonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,34 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - alex@simonov.me
@@ -144,11 +116,12 @@ files:
 - samples/example.rb
 - samples/example_filesystem.rb
 - samples/example_recursive.rb
-- samples/gtkRubyzip.rb
+- samples/gtk_ruby_zip.rb
 - samples/qtzip.rb
 - samples/write_simple.rb
 - samples/zipfind.rb
 - test/basic_zip_file_test.rb
+- test/case_sensitivity_test.rb
 - test/central_directory_entry_test.rb
 - test/central_directory_test.rb
 - test/crypto/null_encryption_test.rb
@@ -164,8 +137,10 @@ files:
 - test/data/mimetype
 - test/data/notzippedruby.rb
 - test/data/ntfs.zip
+- test/data/oddExtraField.zip
 - test/data/rubycode.zip
 - test/data/rubycode2.zip
+- test/data/test.xls
 - test/data/testDirectory.bin
 - test/data/zip64-sample.zip
 - test/data/zipWithDirs.zip
@@ -178,6 +153,7 @@ files:
 - test/extra_field_test.rb
 - test/file_extract_directory_test.rb
 - test/file_extract_test.rb
+- test/file_permissions_test.rb
 - test/file_split_test.rb
 - test/file_test.rb
 - test/filesystem/dir_iterator_test.rb
@@ -195,6 +171,7 @@ files:
 - test/output_stream_test.rb
 - test/pass_thru_compressor_test.rb
 - test/pass_thru_decompressor_test.rb
+- test/samples/example_recursive_test.rb
 - test/settings_test.rb
 - test/test_helper.rb
 - test/unicode_file_names_and_comments_test.rb
@@ -220,12 +197,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: rubyzip is a ruby module for reading and writing zip files
 test_files:
 - test/basic_zip_file_test.rb
+- test/case_sensitivity_test.rb
 - test/central_directory_entry_test.rb
 - test/central_directory_test.rb
 - test/crypto/null_encryption_test.rb
@@ -240,8 +218,10 @@ test_files:
 - test/data/mimetype
 - test/data/notzippedruby.rb
 - test/data/ntfs.zip
+- test/data/oddExtraField.zip
 - test/data/rubycode.zip
 - test/data/rubycode2.zip
+- test/data/test.xls
 - test/data/testDirectory.bin
 - test/data/WarnInvalidDate.zip
 - test/data/zip64-sample.zip
@@ -255,6 +235,7 @@ test_files:
 - test/extra_field_test.rb
 - test/file_extract_directory_test.rb
 - test/file_extract_test.rb
+- test/file_permissions_test.rb
 - test/file_split_test.rb
 - test/file_test.rb
 - test/filesystem/dir_iterator_test.rb
@@ -272,6 +253,7 @@ test_files:
 - test/output_stream_test.rb
 - test/pass_thru_compressor_test.rb
 - test/pass_thru_decompressor_test.rb
+- test/samples/example_recursive_test.rb
 - test/settings_test.rb
 - test/test_helper.rb
 - test/unicode_file_names_and_comments_test.rb