rubyzip 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f37f5862f1890546a9ceb653b406beea7daec34
-  data.tar.gz: 124b547d2a2999a5fb6cd99597721d8dd45347aa
+  metadata.gz: f1b8a6d42ff819b19645f78ce2afb3c9fc7f6e36
+  data.tar.gz: 7319bb5eb51c46fdd78fffb43ead4452f2e3d947
 SHA512:
-  metadata.gz: a2daaac5e981f3aada2d3426bb51f81e60f61f5e8807efe9a339286923722f7ee0b5b4f5d42f366cfe90d486491f070402b5583d77141c544ea01893da6f40b3
-  data.tar.gz: 9d8efdb1540364455f36610c8d0d7c31f785458d5666176778ce6d1d1fb568902eb87369d6393fa9875177a164b8444a452bcfd7ae2811785be6c89475fa5c6e
+  metadata.gz: 5e59f7e789b618c7e7746efac11152c2272ced20cb63977c045bbbf3dd75ce4fe8bfe1b7da75d490bd7a9bbcddfa1ec93f2924c5f6e7ebcdf94c45ddd23e7042
+  data.tar.gz: 97fbb6781a474c5ba51b586033f0da491044687e32f40fe5dcec253305ff55e0ab49d9c22a5732616eaa8203c1e5b768b9d661a77ec0692fa298b89a6598974c

data/lib/zip/file.rb

@@ -97,7 +97,6 @@ module Zip
         return zf unless block_given?
         begin
           yield zf
-          zf
         ensure
           zf.close
         end

data/lib/zip/version.rb

@@ -1,3 +1,3 @@
 module Zip
-  VERSION = '1.1.5'
+  VERSION = '1.1.6'
 end

data/test/file_test.rb

@@ -38,18 +38,6 @@ class ZipFileTest < MiniTest::Unit::TestCase
     assert_equal(2, zfRead.entries.length)
   end
 
-  def test_open_with_block_returns_zip_file
-    srcFile = "test/data/file2.txt"
-    entryName = "newEntryName.rb"
-    assert(::File.exist?(srcFile))
-    created_file = ::Zip::File.open(EMPTY_FILENAME, ::Zip::File::CREATE) do |zf|
-      zf.add(entryName, srcFile)
-    end
-
-    zfRead = ::Zip::File.new(EMPTY_FILENAME)
-    assert_equal(created_file, zfRead)
-  end
-
   def test_get_output_stream
     entryCount = nil
     ::Zip::File.open(TEST_ZIP.zip_name) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubyzip
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Alexander Simonov
@@ -17,13 +17,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- samples/example.rb
-- samples/example_filesystem.rb
-- samples/example_recursive.rb
-- samples/gtkRubyzip.rb
-- samples/qtzip.rb
-- samples/write_simple.rb
-- samples/zipfind.rb
+- README.md
+- Rakefile
+- TODO
+- lib/zip.rb
 - lib/zip/central_directory.rb
 - lib/zip/compressor.rb
 - lib/zip/constants.rb
@@ -33,20 +30,20 @@ files:
 - lib/zip/entry.rb
 - lib/zip/entry_set.rb
 - lib/zip/errors.rb
+- lib/zip/extra_field.rb
 - lib/zip/extra_field/generic.rb
 - lib/zip/extra_field/old_unix.rb
 - lib/zip/extra_field/universal_time.rb
 - lib/zip/extra_field/unix.rb
 - lib/zip/extra_field/zip64.rb
 - lib/zip/extra_field/zip64_placeholder.rb
-- lib/zip/extra_field.rb
 - lib/zip/file.rb
 - lib/zip/filesystem.rb
 - lib/zip/inflater.rb
 - lib/zip/input_stream.rb
+- lib/zip/ioextras.rb
 - lib/zip/ioextras/abstract_input_stream.rb
 - lib/zip/ioextras/abstract_output_stream.rb
-- lib/zip/ioextras.rb
 - lib/zip/null_compressor.rb
 - lib/zip/null_decompressor.rb
 - lib/zip/null_input_stream.rb
@@ -56,22 +53,23 @@ files:
 - lib/zip/streamable_directory.rb
 - lib/zip/streamable_stream.rb
 - lib/zip/version.rb
-- lib/zip.rb
-- README.md
-- TODO
-- Rakefile
-- test/alltests.rb
+- samples/example.rb
+- samples/example_filesystem.rb
+- samples/example_recursive.rb
+- samples/gtkRubyzip.rb
+- samples/qtzip.rb
+- samples/write_simple.rb
+- samples/zipfind.rb
 - test/basic_zip_file_test.rb
 - test/central_directory_entry_test.rb
 - test/central_directory_test.rb
 - test/data/file1.txt
 - test/data/file1.txt.deflatedData
 - test/data/file2.txt
-- test/data/file2.txt.other
-- test/data/globTest/foo/bar/baz/foo.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/globTest.zip
 - test/data/mimetype
 - test/data/notzippedruby.rb
 - test/data/rubycode.zip
@@ -100,13 +98,10 @@ files:
 - test/ioextras/abstract_input_stream_test.rb
 - test/ioextras/abstract_output_stream_test.rb
 - test/ioextras/fake_io_test.rb
-- test/ioextrastest.rb
 - test/local_entry_test.rb
-- test/odt_test_fix.rb
 - test/output_stream_test.rb
 - test/pass_thru_compressor_test.rb
 - test/pass_thru_decompressor_test.rb
-- test/sample.odt
 - test/settings_test.rb
 - test/test_helper.rb
 - test/unicode_file_names_and_comments_test.rb
@@ -122,29 +117,27 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: rubyzip is a ruby module for reading and writing zip files
 test_files:
-- test/alltests.rb
 - test/basic_zip_file_test.rb
 - test/central_directory_entry_test.rb
 - test/central_directory_test.rb
 - test/data/file1.txt
 - test/data/file1.txt.deflatedData
 - test/data/file2.txt
-- test/data/file2.txt.other
 - test/data/globTest/foo/bar/baz/foo.txt
 - test/data/globTest/foo.txt
 - test/data/globTest/food.txt
@@ -177,13 +170,10 @@ test_files:
 - test/ioextras/abstract_input_stream_test.rb
 - test/ioextras/abstract_output_stream_test.rb
 - test/ioextras/fake_io_test.rb
-- test/ioextrastest.rb
 - test/local_entry_test.rb
-- test/odt_test_fix.rb
 - test/output_stream_test.rb
 - test/pass_thru_compressor_test.rb
 - test/pass_thru_decompressor_test.rb
-- test/sample.odt
 - test/settings_test.rb
 - test/test_helper.rb
 - test/unicode_file_names_and_comments_test.rb

data/test/alltests.rb

@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-require 'simplecov'
-require 'coveralls'
-
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-]
-SimpleCov.start do
-  add_filter '/test'
-end
-Dir.chdir File.join(File.dirname(__FILE__))
-
-$VERBOSE = true
-
-require 'ioextrastest'
-require 'ziptest'
-require 'zipfilesystemtest'

data/test/ioextrastest.rb

@@ -1,233 +0,0 @@
-#!/usr/bin/env ruby
-
-$VERBOSE = true
-
-$LOAD_PATH << '../lib'
-
-require 'test/unit'
-require 'zip/ioextras'
-
-include ::Zip::IOExtras
-
-class FakeIOTest < Test::Unit::TestCase
-  class FakeIOUsingClass
-    include FakeIO
-  end
-
-  def test_kind_of?
-    obj = FakeIOUsingClass.new
-
-    assert(obj.kind_of?(Object))
-    assert(obj.kind_of?(FakeIOUsingClass))
-    assert(obj.kind_of?(IO))
-    assert(!obj.kind_of?(Fixnum))
-    assert(!obj.kind_of?(String))
-  end
-end
-
-class AbstractInputStreamTest < Test::Unit::TestCase
-  # AbstractInputStream subclass that provides a read method
-
-  TEST_LINES = ["Hello world#{$INPUT_RECORD_SEPARATOR}",
-    "this is the second line#{$INPUT_RECORD_SEPARATOR}",
-    'this is the last line']
-  TEST_STRING = TEST_LINES.join
-  class TestAbstractInputStream
-    include AbstractInputStream
-    def initialize(aString)
-      super()
-      @contents = aString
-      @readPointer = 0
-    end
-
-    def sysread(charsToRead, _buf = nil)
-      retVal = @contents[@readPointer, charsToRead]
-      @readPointer += charsToRead
-      retVal
-    end
-
-    def produce_input
-      sysread(100)
-    end
-
-    def input_finished?
-      @contents[@readPointer].nil?
-    end
-  end
-
-  def setup
-    @io = TestAbstractInputStream.new(TEST_STRING)
-  end
-
-  def test_gets
-    assert_equal(TEST_LINES[0], @io.gets)
-    assert_equal(1, @io.lineno)
-    assert_equal(TEST_LINES[0].length, @io.pos)
-    assert_equal(TEST_LINES[1], @io.gets)
-    assert_equal(2, @io.lineno)
-    assert_equal(TEST_LINES[2], @io.gets)
-    assert_equal(3, @io.lineno)
-    assert_equal(nil, @io.gets)
-    assert_equal(4, @io.lineno)
-  end
-
-  def test_getsMultiCharSeperator
-    assert_equal('Hell', @io.gets('ll'))
-    assert_equal("o world#{$INPUT_RECORD_SEPARATOR}this is the second l", @io.gets('d l'))
-  end
-
-  LONG_LINES = [
-    'x' * 48 + "\r\n",
-    'y' * 49 + "\r\n",
-    'rest',
-  ]
-  def test_getsMulitCharSeperator_split
-    io = TestAbstractInputStream.new(LONG_LINES.join)
-    assert_equal(LONG_LINES[0], io.gets("\r\n"))
-    assert_equal(LONG_LINES[1], io.gets("\r\n"))
-    assert_equal(LONG_LINES[2], io.gets("\r\n"))
-  end
-
-  def test_getsWithSepAndIndex
-    io = TestAbstractInputStream.new(LONG_LINES.join)
-    assert_equal('x', io.gets("\r\n", 1))
-    assert_equal('x' * 47 + "\r", io.gets("\r\n", 48))
-    assert_equal("\n", io.gets(nil, 1))
-    assert_equal('yy', io.gets(nil, 2))
-  end
-
-  def test_getsWithIndex
-    assert_equal(TEST_LINES[0], @io.gets(100))
-    assert_equal('this', @io.gets(4))
-  end
-
-  def test_each_line
-    lineNumber = 0
-    @io.each_line {
-      |line|
-      assert_equal(TEST_LINES[lineNumber], line)
-      lineNumber += 1
-    }
-  end
-
-  def test_readlines
-    assert_equal(TEST_LINES, @io.readlines)
-  end
-
-  def test_readline
-    test_gets
-    begin
-      @io.readline
-      fail 'EOFError expected'
-      rescue EOFError
-    end
-  end
-end
-
-class AbstractOutputStreamTest < Test::Unit::TestCase
-  class TestOutputStream
-    include AbstractOutputStream
-
-    attr_accessor :buffer
-
-    def initialize
-      @buffer = ''
-    end
-
-    def <<(data)
-      @buffer << data
-      self
-    end
-  end
-
-  def setup
-    @output_stream = TestOutputStream.new
-
-    @origCommaSep = $OUTPUT_FIELD_SEPARATOR
-    @origOutputSep = $OUTPUT_RECORD_SEPARATOR
-  end
-
-  def teardown
-    $, = @origCommaSep
-    $\ = @origOutputSep
-  end
-
-  def test_write
-    count = @output_stream.write('a little string')
-    assert_equal('a little string', @output_stream.buffer)
-    assert_equal('a little string'.length, count)
-
-    count = @output_stream.write('. a little more')
-    assert_equal('a little string. a little more', @output_stream.buffer)
-    assert_equal('. a little more'.length, count)
-  end
-
-  def test_print
-    $\ = nil # record separator set to nil
-    @output_stream.print('hello')
-    assert_equal('hello', @output_stream.buffer)
-
-    @output_stream.print(' world.')
-    assert_equal('hello world.', @output_stream.buffer)
-
-    @output_stream.print(' You ok ',  'out ', 'there?')
-    assert_equal('hello world. You ok out there?', @output_stream.buffer)
-
-    $\ = "\n"
-    @output_stream.print
-    assert_equal("hello world. You ok out there?\n", @output_stream.buffer)
-
-    @output_stream.print('I sure hope so!')
-    assert_equal("hello world. You ok out there?\nI sure hope so!\n", @output_stream.buffer)
-
-    $, = 'X'
-    @output_stream.buffer = ''
-    @output_stream.print('monkey', 'duck', 'zebra')
-    assert_equal("monkeyXduckXzebra\n", @output_stream.buffer)
-
-    $\ = nil
-    @output_stream.buffer = ''
-    @output_stream.print(20)
-    assert_equal('20', @output_stream.buffer)
-  end
-
-  def test_printf
-    @output_stream.printf('%d %04x', 123, 123)
-    assert_equal('123 007b', @output_stream.buffer)
-  end
-
-  def test_putc
-    @output_stream.putc('A')
-    assert_equal('A', @output_stream.buffer)
-    @output_stream.putc(65)
-    assert_equal('AA', @output_stream.buffer)
-  end
-
-  def test_puts
-    @output_stream.puts
-    assert_equal("\n", @output_stream.buffer)
-
-    @output_stream.puts('hello', 'world')
-    assert_equal("\nhello\nworld\n", @output_stream.buffer)
-
-    @output_stream.buffer = ''
-    @output_stream.puts("hello\n", "world\n")
-    assert_equal("hello\nworld\n", @output_stream.buffer)
-
-    @output_stream.buffer = ''
-    @output_stream.puts(["hello\n", "world\n"])
-    assert_equal("hello\nworld\n", @output_stream.buffer)
-
-    @output_stream.buffer = ''
-    @output_stream.puts(["hello\n", "world\n"], 'bingo')
-    assert_equal("hello\nworld\nbingo\n", @output_stream.buffer)
-
-    @output_stream.buffer = ''
-    @output_stream.puts(16, 20, 50, 'hello')
-    assert_equal("16\n20\n50\nhello\n", @output_stream.buffer)
-  end
-end
-
-# Copyright (C) 2002-2004 Thomas Sondergaard
-# rubyzip is free software; you can redistribute it and/or
-# modify it under the terms of the ruby license.

data/test/odt_test_fix.rb

@@ -1,30 +0,0 @@
-require 'rubygems'
-require 'zip'
-
-file_name    = 'sample.odt'
-content_file = 'content.xml'
-
-def extract_and_compress(file, dir, content_file)
-  cont = "#{dir}/#{content_file}"
-  Zip::File.open(file) do |z|
-    z.extract(content_file, cont)
-    z.replace(content_file, cont)
-  end
-  FileUtils.remove cont
-end
-
-dir     = File.expand_path File.dirname(__FILE__)
-tmpdir  = "#{dir}/#{Time.now.to_i}"
-FileUtils.mkdir tmpdir
-
-file    = "#{dir}/#{file_name}"
-file_cp = "#{tmpdir}/sample_1.odt"
-FileUtils.cp file, file_cp
-
-extract_and_compress file_cp, tmpdir, content_file
-
-file    = "#{tmpdir}/sample_1.odt"
-file_cp = "#{tmpdir}/sample_2.odt"
-FileUtils.cp file, file_cp
-
-extract_and_compress file_cp, tmpdir, content_file