rubyzip 1.2.1 → 2.0.0

data/samples/gtk_ruby_zip.rb

@@ -31,7 +31,7 @@ class MainApp < Gtk::Window
     sw.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC)
     box.pack_start(sw, true, true, 0)
 
-    @clist = Gtk::CList.new(%w(Name Size Compression))
+    @clist = Gtk::CList.new(%w[Name Size Compression])
     @clist.set_selection_mode(Gtk::SELECTION_BROWSE)
     @clist.set_column_width(0, 120)
     @clist.set_column_width(1, 120)

data/samples/qtzip.rb

@@ -65,7 +65,7 @@ class ZipDialog < ZipDialogUI
     end
     puts "selected_items.size = #{selected_items.size}"
     puts "unselected_items.size = #{unselected_items.size}"
-    items = selected_items.size > 0 ? selected_items : unselected_items
+    items = !selected_items.empty? ? selected_items : unselected_items
     puts "items.size = #{items.size}"
 
     d = Qt::FileDialog.get_existing_directory(nil, self)

data/samples/zipfind.rb

@@ -31,7 +31,7 @@ module Zip
   end
 end
 
-if __FILE__ == $0
+if $0 == __FILE__
   module ZipFindConsoleRunner
     PATH_ARG_INDEX = 0
     FILENAME_PATTERN_ARG_INDEX = 1
@@ -47,7 +47,7 @@ if __FILE__ == $0
     end
 
     def self.check_args(args)
-      if (args.size != 3)
+      if args.size != 3
         usage
         exit
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyzip
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Alexander Simonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2019-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.49.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.49.1
 description: 
 email:
 - alex@simonov.me
@@ -120,67 +134,15 @@ files:
 - 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
-- test/crypto/traditional_encryption_test.rb
-- test/data/WarnInvalidDate.zip
-- test/data/file1.txt
-- test/data/file1.txt.deflatedData
-- test/data/file2.txt
-- test/data/globTest.zip
-- test/data/globTest/foo.txt
-- test/data/globTest/foo/bar/baz/foo.txt
-- test/data/globTest/food.txt
-- 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
-- test/data/zipWithEncryption.zip
-- test/deflater_test.rb
-- test/encryption_test.rb
-- test/entry_set_test.rb
-- test/entry_test.rb
-- test/errors_test.rb
-- 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
-- test/filesystem/directory_test.rb
-- test/filesystem/file_mutating_test.rb
-- test/filesystem/file_nonmutating_test.rb
-- test/filesystem/file_stat_test.rb
-- test/gentestfiles.rb
-- test/inflater_test.rb
-- test/input_stream_test.rb
-- test/ioextras/abstract_input_stream_test.rb
-- test/ioextras/abstract_output_stream_test.rb
-- test/ioextras/fake_io_test.rb
-- test/local_entry_test.rb
-- 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
-- test/zip64_full_test.rb
-- test/zip64_support_test.rb
 homepage: http://github.com/rubyzip/rubyzip
 licenses:
 - BSD 2-Clause
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/rubyzip/rubyzip/issues
+  changelog_uri: https://github.com/rubyzip/rubyzip/blob/v2.0.0/Changelog.md
+  documentation_uri: https://www.rubydoc.info/gems/rubyzip/2.0.0
+  source_code_uri: https://github.com/rubyzip/rubyzip/tree/v2.0.0
+  wiki_uri: https://github.com/rubyzip/rubyzip/wiki
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -189,73 +151,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 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
-- test/crypto/traditional_encryption_test.rb
-- test/data/file1.txt
-- test/data/file1.txt.deflatedData
-- test/data/file2.txt
-- test/data/globTest/foo/bar/baz/foo.txt
-- test/data/globTest/foo.txt
-- test/data/globTest/food.txt
-- test/data/globTest.zip
-- 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
-- test/data/zipWithDirs.zip
-- test/data/zipWithEncryption.zip
-- test/deflater_test.rb
-- test/encryption_test.rb
-- test/entry_set_test.rb
-- test/entry_test.rb
-- test/errors_test.rb
-- 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
-- test/filesystem/directory_test.rb
-- test/filesystem/file_mutating_test.rb
-- test/filesystem/file_nonmutating_test.rb
-- test/filesystem/file_stat_test.rb
-- test/gentestfiles.rb
-- test/inflater_test.rb
-- test/input_stream_test.rb
-- test/ioextras/abstract_input_stream_test.rb
-- test/ioextras/abstract_output_stream_test.rb
-- test/ioextras/fake_io_test.rb
-- test/local_entry_test.rb
-- 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
-- test/zip64_full_test.rb
-- test/zip64_support_test.rb
+test_files: []

data/test/basic_zip_file_test.rb

@@ -1,60 +0,0 @@
-require 'test_helper'
-
-class BasicZipFileTest < MiniTest::Test
-  include AssertEntry
-
-  def setup
-    @zip_file = ::Zip::File.new(TestZipFile::TEST_ZIP2.zip_name)
-    @testEntryNameIndex = 0
-  end
-
-  def test_entries
-    assert_equal(TestZipFile::TEST_ZIP2.entry_names.sort,
-                 @zip_file.entries.entries.sort.map { |e| e.name })
-  end
-
-  def test_each
-    count = 0
-    visited = {}
-    @zip_file.each do |entry|
-      assert(TestZipFile::TEST_ZIP2.entry_names.include?(entry.name))
-      assert(!visited.include?(entry.name))
-      visited[entry.name] = nil
-      count = count.succ
-    end
-    assert_equal(TestZipFile::TEST_ZIP2.entry_names.length, count)
-  end
-
-  def test_foreach
-    count = 0
-    visited = {}
-    ::Zip::File.foreach(TestZipFile::TEST_ZIP2.zip_name) do |entry|
-      assert(TestZipFile::TEST_ZIP2.entry_names.include?(entry.name))
-      assert(!visited.include?(entry.name))
-      visited[entry.name] = nil
-      count = count.succ
-    end
-    assert_equal(TestZipFile::TEST_ZIP2.entry_names.length, count)
-  end
-
-  def test_get_input_stream
-    count = 0
-    visited = {}
-    @zip_file.each do |entry|
-      assert_entry(entry.name, @zip_file.get_input_stream(entry), entry.name)
-      assert(!visited.include?(entry.name))
-      visited[entry.name] = nil
-      count = count.succ
-    end
-    assert_equal(TestZipFile::TEST_ZIP2.entry_names.length, count)
-  end
-
-  def test_get_input_stream_block
-    fileAndEntryName = @zip_file.entries.first.name
-    @zip_file.get_input_stream(fileAndEntryName) do |zis|
-      assert_entry_contents_for_stream(fileAndEntryName,
-                                       zis,
-                                       fileAndEntryName)
-    end
-  end
-end

data/test/case_sensitivity_test.rb

@@ -1,69 +0,0 @@
-require 'test_helper'
-
-class ZipCaseSensitivityTest < MiniTest::Test
-  include CommonZipFileFixture
-
-  SRC_FILES = [['test/data/file1.txt', 'testfile.rb'],
-               ['test/data/file2.txt', 'testFILE.rb']]
-
-  def teardown
-    ::Zip.case_insensitive_match = false
-  end
-
-  # Ensure that everything functions normally when +case_insensitive_match = false+
-  def test_add_case_sensitive
-    ::Zip.case_insensitive_match = false
-
-    SRC_FILES.each { |fn, _en| assert(::File.exist?(fn)) }
-    zf = ::Zip::File.new(EMPTY_FILENAME, ::Zip::File::CREATE)
-
-    SRC_FILES.each { |fn, en| zf.add(en, fn) }
-    zf.close
-
-    zfRead = ::Zip::File.new(EMPTY_FILENAME)
-    assert_equal(SRC_FILES.size, zfRead.entries.length)
-    SRC_FILES.each_with_index { |a, i|
-      assert_equal(a.last, zfRead.entries[i].name)
-      AssertEntry.assert_contents(a.first,
-                                  zfRead.get_input_stream(a.last) { |zis| zis.read })
-    }
-  end
-
-  # Ensure that names are treated case insensitively when adding files and +case_insensitive_match = false+
-  def test_add_case_insensitive
-    ::Zip.case_insensitive_match = true
-
-    SRC_FILES.each { |fn, _en| assert(::File.exist?(fn)) }
-    zf = ::Zip::File.new(EMPTY_FILENAME, ::Zip::File::CREATE)
-
-    assert_raises Zip::EntryExistsError do
-      SRC_FILES.each { |fn, en| zf.add(en, fn) }
-    end
-  end
-
-  # Ensure that names are treated case insensitively when reading files and +case_insensitive_match = true+
-  def test_add_case_sensitive_read_case_insensitive
-    ::Zip.case_insensitive_match = false
-
-    SRC_FILES.each { |fn, _en| assert(::File.exist?(fn)) }
-    zf = ::Zip::File.new(EMPTY_FILENAME, ::Zip::File::CREATE)
-
-    SRC_FILES.each { |fn, en| zf.add(en, fn) }
-    zf.close
-
-    ::Zip.case_insensitive_match = true
-
-    zfRead = ::Zip::File.new(EMPTY_FILENAME)
-    assert_equal(SRC_FILES.collect { |_fn, en| en.downcase }.uniq.size, zfRead.entries.length)
-    assert_equal(SRC_FILES.last.last.downcase, zfRead.entries.first.name.downcase)
-    AssertEntry.assert_contents(SRC_FILES.last.first,
-                                zfRead.get_input_stream(SRC_FILES.last.last) { |zis| zis.read })
-  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_entry_contents(zf, entryName, filename) if File.exist?(filename)
-  end
-end

data/test/central_directory_entry_test.rb

@@ -1,69 +0,0 @@
-require 'test_helper'
-
-class ZipCentralDirectoryEntryTest < MiniTest::Test
-  def test_read_from_stream
-    File.open('test/data/testDirectory.bin', 'rb') do  |file|
-      entry = ::Zip::Entry.read_c_dir_entry(file)
-
-      assert_equal('longAscii.txt', entry.name)
-      assert_equal(::Zip::Entry::DEFLATED, entry.compression_method)
-      assert_equal(106_490, entry.size)
-      assert_equal(3784, entry.compressed_size)
-      assert_equal(0xfcd1799c, entry.crc)
-      assert_equal('', entry.comment)
-
-      entry = ::Zip::Entry.read_c_dir_entry(file)
-      assert_equal('empty.txt', entry.name)
-      assert_equal(::Zip::Entry::STORED, entry.compression_method)
-      assert_equal(0, entry.size)
-      assert_equal(0, entry.compressed_size)
-      assert_equal(0x0, entry.crc)
-      assert_equal('', entry.comment)
-
-      entry = ::Zip::Entry.read_c_dir_entry(file)
-      assert_equal('short.txt', entry.name)
-      assert_equal(::Zip::Entry::STORED, entry.compression_method)
-      assert_equal(6, entry.size)
-      assert_equal(6, entry.compressed_size)
-      assert_equal(0xbb76fe69, entry.crc)
-      assert_equal('', entry.comment)
-
-      entry = ::Zip::Entry.read_c_dir_entry(file)
-      assert_equal('longBinary.bin', entry.name)
-      assert_equal(::Zip::Entry::DEFLATED, entry.compression_method)
-      assert_equal(1_000_024, entry.size)
-      assert_equal(70_847, entry.compressed_size)
-      assert_equal(0x10da7d59, entry.crc)
-      assert_equal('', entry.comment)
-
-      entry = ::Zip::Entry.read_c_dir_entry(file)
-      assert_nil(entry)
-      # Fields that are not check by this test:
-      #          version made by                 2 bytes
-      #          version needed to extract       2 bytes
-      #          general purpose bit flag        2 bytes
-      #          last mod file time              2 bytes
-      #          last mod file date              2 bytes
-      #          compressed size                 4 bytes
-      #          uncompressed size               4 bytes
-      #          disk number start               2 bytes
-      #          internal file attributes        2 bytes
-      #          external file attributes        4 bytes
-      #          relative offset of local header 4 bytes
-
-      #          file name (variable size)
-      #          extra field (variable size)
-      #          file comment (variable size)
-    end
-  end
-
-  def test_read_entry_from_truncated_zip_file
-    fragment = ''
-    File.open('test/data/testDirectory.bin') { |f| fragment = f.read(12) } # cdir entry header is at least 46 bytes
-    fragment.extend(IOizeString)
-    entry = ::Zip::Entry.new
-    entry.read_c_dir_entry(fragment)
-    fail 'ZipError expected'
-  rescue ::Zip::Error
-  end
-end

data/test/central_directory_test.rb

@@ -1,100 +0,0 @@
-require 'test_helper'
-
-class ZipCentralDirectoryTest < MiniTest::Test
-  def teardown
-    ::Zip.reset!
-  end
-
-  def test_read_from_stream
-    ::File.open(TestZipFile::TEST_ZIP2.zip_name, 'rb') do |zipFile|
-      cdir = ::Zip::CentralDirectory.read_from_stream(zipFile)
-
-      assert_equal(TestZipFile::TEST_ZIP2.entry_names.size, cdir.size)
-      assert(cdir.entries.sort.compare_enumerables(TestZipFile::TEST_ZIP2.entry_names.sort) do |cdirEntry, testEntryName|
-        cdirEntry.name == testEntryName
-      end)
-      assert_equal(TestZipFile::TEST_ZIP2.comment, cdir.comment)
-    end
-  end
-
-  def test_read_from_invalid_stream
-    File.open('test/data/file2.txt', 'rb') do |zipFile|
-      cdir = ::Zip::CentralDirectory.new
-      cdir.read_from_stream(zipFile)
-    end
-    fail 'ZipError expected!'
-  rescue ::Zip::Error
-  end
-
-  def test_read_from_truncated_zip_file
-    fragment = ''
-    File.open('test/data/testDirectory.bin', 'rb') { |f| fragment = f.read }
-    fragment.slice!(12) # removed part of first cdir entry. eocd structure still complete
-    fragment.extend(IOizeString)
-    entry = ::Zip::CentralDirectory.new
-    entry.read_from_stream(fragment)
-    fail 'ZipError expected'
-  rescue ::Zip::Error
-  end
-
-  def test_write_to_stream
-    entries = [::Zip::Entry.new('file.zip', 'flimse', 'myComment', 'somethingExtra'),
-               ::Zip::Entry.new('file.zip', 'secondEntryName'),
-               ::Zip::Entry.new('file.zip', 'lastEntry.txt', 'Has a comment too')]
-    cdir = ::Zip::CentralDirectory.new(entries, 'my zip comment')
-    File.open('test/data/generated/cdirtest.bin', 'wb') { |f| cdir.write_to_stream(f) }
-    cdirReadback = ::Zip::CentralDirectory.new
-    File.open('test/data/generated/cdirtest.bin', 'rb') { |f| cdirReadback.read_from_stream(f) }
-
-    assert_equal(cdir.entries.sort, cdirReadback.entries.sort)
-  end
-
-  def test_write64_to_stream
-    ::Zip.write_zip64_support = true
-    entries = [::Zip::Entry.new('file.zip', 'file1-little', 'comment1', '', 200, 101, ::Zip::Entry::STORED, 200),
-               ::Zip::Entry.new('file.zip', 'file2-big', 'comment2', '', 18_000_000_000, 102, ::Zip::Entry::DEFLATED, 20_000_000_000),
-               ::Zip::Entry.new('file.zip', 'file3-alsobig', 'comment3', '', 15_000_000_000, 103, ::Zip::Entry::DEFLATED, 21_000_000_000),
-               ::Zip::Entry.new('file.zip', 'file4-little', 'comment4', '', 100, 104, ::Zip::Entry::DEFLATED, 121)]
-    [0, 250, 18_000_000_300, 33_000_000_350].each_with_index do |offset, index|
-      entries[index].local_header_offset = offset
-    end
-    cdir = ::Zip::CentralDirectory.new(entries, 'zip comment')
-    File.open('test/data/generated/cdir64test.bin', 'wb') { |f| cdir.write_to_stream(f) }
-    cdirReadback = ::Zip::CentralDirectory.new
-    File.open('test/data/generated/cdir64test.bin', 'rb') { |f| cdirReadback.read_from_stream(f) }
-
-    assert_equal(cdir.entries.sort, cdirReadback.entries.sort)
-    assert_equal(::Zip::VERSION_NEEDED_TO_EXTRACT_ZIP64, cdirReadback.instance_variable_get(:@version_needed_for_extract))
-  end
-
-  def test_equality
-    cdir1 = ::Zip::CentralDirectory.new([::Zip::Entry.new('file.zip', 'flimse', nil,
-                                                          'somethingExtra'),
-                                         ::Zip::Entry.new('file.zip', 'secondEntryName'),
-                                         ::Zip::Entry.new('file.zip', 'lastEntry.txt')],
-                                        'my zip comment')
-    cdir2 = ::Zip::CentralDirectory.new([::Zip::Entry.new('file.zip', 'flimse', nil,
-                                                          'somethingExtra'),
-                                         ::Zip::Entry.new('file.zip', 'secondEntryName'),
-                                         ::Zip::Entry.new('file.zip', 'lastEntry.txt')],
-                                        'my zip comment')
-    cdir3 = ::Zip::CentralDirectory.new([::Zip::Entry.new('file.zip', 'flimse', nil,
-                                                          'somethingExtra'),
-                                         ::Zip::Entry.new('file.zip', 'secondEntryName'),
-                                         ::Zip::Entry.new('file.zip', 'lastEntry.txt')],
-                                        'comment?')
-    cdir4 = ::Zip::CentralDirectory.new([::Zip::Entry.new('file.zip', 'flimse', nil,
-                                                          'somethingExtra'),
-                                         ::Zip::Entry.new('file.zip', 'lastEntry.txt')],
-                                        'comment?')
-    assert_equal(cdir1, cdir1)
-    assert_equal(cdir1, cdir2)
-
-    assert(cdir1 != cdir3)
-    assert(cdir2 != cdir3)
-    assert(cdir2 != cdir3)
-    assert(cdir3 != cdir4)
-
-    assert(cdir3 != 'hello')
-  end
-end