rubyzip 1.1.6 → 1.1.7

data/test/output_stream_test.rb

@@ -1,10 +1,10 @@
 require 'test_helper'
 
-class ZipOutputStreamTest < MiniTest::Unit::TestCase
+class ZipOutputStreamTest < MiniTest::Test
   include AssertEntry
 
   TEST_ZIP = TestZipFile::TEST_ZIP2.clone
-  TEST_ZIP.zip_name = "output.zip"
+  TEST_ZIP.zip_name = "test/data/generated/output.zip"
 
   def test_new
     zos = ::Zip::OutputStream.new(TEST_ZIP.zip_name)
@@ -32,6 +32,21 @@ class ZipOutputStreamTest < MiniTest::Unit::TestCase
     assert_test_zip_contents(TEST_ZIP)
   end
 
+  def test_write_buffer_with_temp_file
+    tmp_file = Tempfile.new('')
+
+    ::Zip::OutputStream.write_buffer(tmp_file) do |zos|
+      zos.comment = TEST_ZIP.comment
+      write_test_zip(zos)
+    end
+
+    tmp_file.rewind
+    File.open(TEST_ZIP.zip_name, 'wb') { |f| f.write(tmp_file.read) }
+    tmp_file.unlink
+
+    assert_test_zip_contents(TEST_ZIP)
+  end
+
   def test_writingToClosedStream
     assert_i_o_error_in_closed_stream { |zos| zos << "hello world" }
     assert_i_o_error_in_closed_stream { |zos| zos.puts "hello world" }
@@ -99,7 +114,7 @@ class ZipOutputStreamTest < MiniTest::Unit::TestCase
 
   def assert_i_o_error_in_closed_stream
     assert_raises(IOError) {
-      zos = ::Zip::OutputStream.new("test_putOnClosedStream.zip")
+      zos = ::Zip::OutputStream.new("test/data/generated/test_putOnClosedStream.zip")
       zos.close
       yield zos
     }

data/test/pass_thru_compressor_test.rb

@@ -1,10 +1,10 @@
 require 'test_helper'
 
-class PassThruCompressorTest < MiniTest::Unit::TestCase
+class PassThruCompressorTest < MiniTest::Test
   include CrcTest
 
   def test_size
-    File.open("test/dummy.txt", "wb") {
+    File.open("test/data/generated/dummy.txt", "wb") {
         |file|
       compressor = ::Zip::PassThruCompressor.new(file)
 

data/test/pass_thru_decompressor_test.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
-class PassThruDecompressorTest < MiniTest::Unit::TestCase
+class PassThruDecompressorTest < MiniTest::Test
   include DecompressorTests
 
   def setup

data/test/settings_test.rb

@@ -1,9 +1,10 @@
 require 'test_helper'
 
-class ZipSettingsTest < MiniTest::Unit::TestCase
+class ZipSettingsTest < MiniTest::Test
   # TODO Refactor out into common test module
   include CommonZipFileFixture
-  TEST_OUT_NAME = "emptyOutDir"
+
+  TEST_OUT_NAME = "test/data/generated/emptyOutDir"
 
   def setup
     super
@@ -12,6 +13,10 @@ class ZipSettingsTest < MiniTest::Unit::TestCase
     File.delete(TEST_OUT_NAME) if File.exist? TEST_OUT_NAME
   end
 
+  def teardown
+    ::Zip.reset!
+  end
+
   def open_zip(&aProc)
     assert(aProc != nil)
     ::Zip::File.open(TestZipFile::TEST_ZIP4.zip_name, &aProc)
@@ -62,6 +67,22 @@ class ZipSettingsTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_false_warn_invalid_date
+    test_file = File.join(File.dirname(__FILE__), 'data', 'WarnInvalidDate.zip')
+    Zip.warn_invalid_date = false
+
+    ::Zip::File.open(test_file) do |zf|
+    end
+  end
+
+  def test_true_warn_invalid_date
+    test_file = File.join(File.dirname(__FILE__), 'data', 'WarnInvalidDate.zip')
+    Zip.warn_invalid_date = true
+
+    ::Zip::File.open(test_file) do |zf|
+    end
+  end
+
 
   private
   def assert_contains(zf, entryName, filename = entryName)

data/test/test_helper.rb

@@ -9,7 +9,7 @@ require 'gentestfiles'
 TestFiles.create_test_files
 TestZipFile.create_test_zips
 
-::MiniTest::Unit.after_tests do
+::MiniTest.after_run do
   FileUtils.rm_rf('test/data/generated')
 end
 

data/test/unicode_file_names_and_comments_test.rb

@@ -2,11 +2,11 @@
 
 require 'test_helper'
 
-class ZipUnicodeFileNamesAndComments < MiniTest::Unit::TestCase
+class ZipUnicodeFileNamesAndComments < MiniTest::Test
 
   FILENAME = File.join(File.dirname(__FILE__), "test1.zip")
 
-  def test_unicode
+  def test_unicode_file_name
     file_entrys = ["текстовыйфайл.txt", "Résumé.txt", "슬레이어스휘.txt"]
     directory_entrys = ["папка/текстовыйфайл.txt", "Résumé/Résumé.txt", "슬레이어스휘/슬레이어스휘.txt"]
     stream = ::Zip::OutputStream.open(FILENAME) do |io|
@@ -24,17 +24,29 @@ class ZipUnicodeFileNamesAndComments < MiniTest::Unit::TestCase
       file_entrys.each do |filename|
         entry = io.get_next_entry
         entry_name = entry.name
-        entry_name = entry_name.force_encoding("UTF-8") if RUBY_VERSION >= '1.9'
+        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") if RUBY_VERSION >= '1.9'
+        entry_name = entry_name.force_encoding("UTF-8")
         assert(filepath == entry_name)
       end
     end
     ::File.unlink(FILENAME)
   end
 
+  def test_unicode_comment
+    str = '渠道升级'
+    ::Zip::File.open(FILENAME, Zip::File::CREATE) do |z|
+      z.comment = str
+    end
+
+    ::Zip::File.open(FILENAME) do |z|
+      assert(z.comment.force_encoding('UTF-8') == str)
+    end
+    ::File.unlink(FILENAME)
+  end
+
 end

data/test/zip64_full_test.rb

@@ -7,7 +7,11 @@ if ENV['FULL_ZIP64_TEST']
 # 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::Unit::TestCase
+  class Zip64FullTest < MiniTest::Test
+    def teardown
+      ::Zip.reset!
+    end
+
     def prepareTestFile(test_filename)
       ::File.delete(test_filename) if ::File.exist?(test_filename)
       return test_filename

data/test/zip64_support_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class Zip64SupportTest < MiniTest::Unit::TestCase
+class Zip64SupportTest < MiniTest::Test
   TEST_FILE = File.join(File.dirname(__FILE__), 'data', 'zip64-sample.zip')
 
   def test_open_zip64_file

metadata

@@ -1,15 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: rubyzip
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Alexander Simonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
-dependencies: []
+date: 2015-02-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.3'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.4'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !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
@@ -24,6 +108,9 @@ files:
 - lib/zip/central_directory.rb
 - lib/zip/compressor.rb
 - lib/zip/constants.rb
+- lib/zip/crypto/encryption.rb
+- lib/zip/crypto/null_encryption.rb
+- lib/zip/crypto/traditional_encryption.rb
 - lib/zip/decompressor.rb
 - lib/zip/deflater.rb
 - lib/zip/dos_time.rb
@@ -32,6 +119,7 @@ files:
 - lib/zip/errors.rb
 - lib/zip/extra_field.rb
 - lib/zip/extra_field/generic.rb
+- lib/zip/extra_field/ntfs.rb
 - lib/zip/extra_field/old_unix.rb
 - lib/zip/extra_field/universal_time.rb
 - lib/zip/extra_field/unix.rb
@@ -63,6 +151,9 @@ files:
 - test/basic_zip_file_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
@@ -72,13 +163,15 @@ files:
 - test/data/globTest/food.txt
 - test/data/mimetype
 - test/data/notzippedruby.rb
+- test/data/ntfs.zip
 - test/data/rubycode.zip
 - test/data/rubycode2.zip
 - test/data/testDirectory.bin
 - test/data/zip64-sample.zip
 - test/data/zipWithDirs.zip
+- test/data/zipWithEncryption.zip
 - test/deflater_test.rb
-- test/dummy.txt
+- test/encryption_test.rb
 - test/entry_set_test.rb
 - test/entry_test.rb
 - test/errors_test.rb
@@ -127,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: rubyzip is a ruby module for reading and writing zip files
@@ -135,6 +228,8 @@ test_files:
 - test/basic_zip_file_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
@@ -144,13 +239,16 @@ test_files:
 - test/data/globTest.zip
 - test/data/mimetype
 - test/data/notzippedruby.rb
+- test/data/ntfs.zip
 - test/data/rubycode.zip
 - test/data/rubycode2.zip
 - 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/dummy.txt
+- test/encryption_test.rb
 - test/entry_set_test.rb
 - test/entry_test.rb
 - test/errors_test.rb

data/test/dummy.txt

@@ -1 +0,0 @@
-hello worldbingo