minitar 0.6 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 110bdb26f19a848935a086caa42ea6eb583601bb
-  data.tar.gz: 99b2ba5ae2238ed1aa3902287a8fd9520576323e
+  metadata.gz: 6f701b9b323414ca305fd29f288088f7b6656342
+  data.tar.gz: f0875b48ec987190fdd2a8c6e6d5785b87958af7
 SHA512:
-  metadata.gz: daadd21c3c02bfd11bb9a6d7294d0e7bac36410d1c391cc4e97a53b89d6c6cdbf5ee763dc777736460177dc88d9332d82370048bfc8470ca8f2edfd5872e73ee
-  data.tar.gz: 0541e16a13d4516494f4365c0c7e607996c837e192eb5d16754d4f36a21fd8fad847df9f233f59b358be7d164d2794c54fb7312b6e85866450f7147bf9eb9180
+  metadata.gz: b51ac6a3c8c9494f6d17392e6e7969836d2fae501e47f6083cbf0b3646dea93eb4838a25986b3723c071c791ac0ac770e8229276a77a5c06021398d82cbc4a0c
+  data.tar.gz: 9423c08b9f8426d415b3f77647c53cf744180dbdc328f4f40e15a9632171696810902a341fa654133f3e4c8ca6b84277dd93892426bb553ed309785f47114228

data/History.md

@@ -1,3 +1,11 @@
+## 0.6.1 / 2017-02-07
+
+*   Fixed issue [#24][] where streams were being improperly closed immediately
+    on open unless there was a block provided.
+
+*   Hopefully fixes issue [#23][] by releasing archive-tar-minitar after
+    minitar-cli is available.
+
 ## 0.6 / 2017-02-07
 
 *   Breaking Changes:
@@ -105,3 +113,5 @@
 [#13]: https://github.com/halostatue/minitar/issues/13
 [#14]: https://github.com/halostatue/minitar/issues/14
 [#16]: https://github.com/halostatue/minitar/issues/16
+[#23]: https://github.com/halostatue/minitar/issues/23
+[#24]: https://github.com/halostatue/minitar/issues/24

data/README.rdoc

@@ -5,9 +5,9 @@ code :: https://github.com/halostatue/minitar/
 bugs :: https://github.com/halostatue/minitar/issues
 rdoc :: http://rdoc.info/gems/minitar/
 cli  :: https://github.com/halostatue/minitar-cli
-continuous integration :: {<img src="https://travis-ci.org/halostatue/minitar.svg" />}[https://travis-ci.org/halostatue/minitar]
-                          {<img src="https://ci.appveyor.com/api/projects/status/bj4gqn3gp3gu45sa?svg=true" />}[https://ci.appveyor.com/project/halostatue/minitar]
-test coverage :: {<img src="https://coveralls.io/repos/halostatue/minitar/badge.svg" alt="Coverage Status" />}[https://coveralls.io/r/halostatue/minitar]
+travis :: {<img src="https://travis-ci.org/halostatue/minitar.svg" />}[https://travis-ci.org/halostatue/minitar]
+appveyor :: {<img src="https://ci.appveyor.com/api/projects/status/bj4gqn3gp3gu45sa?svg=true" />}[https://ci.appveyor.com/project/halostatue/minitar]
+coveralls :: {<img src="https://coveralls.io/repos/halostatue/minitar/badge.svg" alt="Coverage Status" />}[https://coveralls.io/r/halostatue/minitar]
 
 == Description
 

data/lib/archive/tar/minitar.rb

@@ -73,7 +73,7 @@ end
 #       tar.close
 #     end
 module Archive::Tar::Minitar
-  VERSION = '0.6'.freeze # :nodoc:
+  VERSION = '0.6.1'.freeze # :nodoc:
 
   # The base class for any minitar error.
   Error = Class.new(::StandardError)

data/lib/archive/tar/minitar/input.rb

@@ -20,9 +20,14 @@ module Archive::Tar::Minitar
     def self.open(input)
       stream = new(input)
       return stream unless block_given?
-      yield stream
-    ensure
-      stream.close
+
+      # This exception context must remain, otherwise the stream closes on open
+      # even if a block is not given.
+      begin
+        yield stream
+      ensure
+        stream.close
+      end
     end
 
     # Iterates over each entry in the provided input. This wraps the common
@@ -188,6 +193,11 @@ module Archive::Tar::Minitar
       end
     end
 
+    # Returns false if the wrapped data stream is open.
+    def closed?
+      @io.closed?
+    end
+
     # Returns the Reader object for direct access.
     attr_reader :tar
 

data/lib/archive/tar/minitar/output.rb

@@ -20,9 +20,14 @@ module Archive::Tar::Minitar
     def self.open(output)
       stream = new(output)
       return stream unless block_given?
-      yield stream
-    ensure
-      stream.close
+
+      # This exception context must remain, otherwise the stream closes on open
+      # even if a block is not given.
+      begin
+        yield stream
+      ensure
+        stream.close
+      end
     end
 
     # Output.tar is a wrapper for Output.open that yields the owned tar object
@@ -60,6 +65,11 @@ module Archive::Tar::Minitar
     # Returns the Writer object for direct access.
     attr_reader :tar
 
+    # Returns false if the wrapped data stream is open.
+    def closed?
+      @io.closed?
+    end
+
     # Closes the Writer object and the wrapped data stream.
     def close
       @tar.close

data/lib/archive/tar/minitar/reader.rb

@@ -13,6 +13,7 @@ module Archive::Tar::Minitar
       def read(*); raise ClosedStream; end
       def getc; raise ClosedStream; end
       def rewind; raise ClosedStream; end
+      def closed?; true; end
       # rubocop:enable Style/EmptyLineBetweenDefs
       # rubocop:enable Style/SingleLineMethods Style/EmptyLineBetweenDefs
     end
@@ -115,6 +116,11 @@ module Archive::Tar::Minitar
         end
       end
 
+      # Returns false if the entry stream is valid.
+      def closed?
+        false
+      end
+
       # Closes the entry.
       def close
         invalidate
@@ -135,9 +141,14 @@ module Archive::Tar::Minitar
     def self.open(io)
       reader = new(io)
       return reader unless block_given?
-      yield reader
-    ensure
-      reader.close
+
+      # This exception context must remain, otherwise the stream closes on open
+      # even if a block is not given.
+      begin
+        yield reader
+      ensure
+        reader.close
+      end
     end
 
     # Iterates over each entry in the provided input. This wraps the common
@@ -231,6 +242,11 @@ module Archive::Tar::Minitar
     end
     alias each each_entry
 
+    # Returns false if the reader is open (it never closes).
+    def closed?
+      false
+    end
+
     def close
     end
   end

data/lib/archive/tar/minitar/writer.rb

@@ -84,9 +84,14 @@ module Archive::Tar::Minitar
     def self.open(io) # :yields Writer:
       writer = new(io)
       return writer unless block_given?
-      yield writer
-    ensure
-      writer.close
+
+      # This exception context must remain, otherwise the stream closes on open
+      # even if a block is not given.
+      begin
+        yield writer
+      ensure
+        writer.close
+      end
     end
 
     # Creates and returns a new Writer object.
@@ -255,6 +260,11 @@ module Archive::Tar::Minitar
       @io.flush if @io.respond_to?(:flush)
     end
 
+    # Returns false if the writer is open.
+    def closed?
+      @closed
+    end
+
     # Closes the Writer. This does not close the underlying wrapped output
     # stream.
     def close

data/test/test_tar_input.rb

@@ -38,6 +38,15 @@ UTAKRsEoGAWjYBSMglEwCkbBKBgFo2AUjIJRMApGwSgYBaNgFIwCUgAAGnyo6wAoAAA=
     FileUtils.rm_rf('data__')
   end
 
+  def test_open_no_block
+    reader = Zlib::GzipReader.new(StringIO.new(TEST_TGZ))
+    input = Minitar::Input.open(reader)
+    refute input.closed?
+  ensure
+    input.close
+    assert input.closed?
+  end
+
   def test_each_works
     reader = Zlib::GzipReader.new(StringIO.new(TEST_TGZ))
     Minitar::Input.open(reader) do |stream|

data/test/test_tar_output.rb

@@ -19,6 +19,14 @@ class TestTarOutput < Minitest::Test
     FileUtils.rm_rf('data__')
   end
 
+  def test_open_no_block
+    output = Minitar::Output.open(@tarfile)
+    refute output.closed?
+  ensure
+    output.close
+    assert output.closed?
+  end
+
   def test_file_looks_good
     Minitar::Output.open(@tarfile) do |os|
       Dir.chdir('data__') do

data/test/test_tar_reader.rb

@@ -4,6 +4,19 @@ require 'minitar'
 require 'minitest_helper'
 
 class TestTarReader < Minitest::Test
+  def test_open_no_block
+    str = tar_file_header('lib/foo', '', 0o10644, 10) + "\0" * 512
+    str += tar_file_header('bar', 'baz', 0o644, 0)
+    str += tar_dir_header('foo', 'bar', 0o12345)
+    str += "\0" * 1024
+
+    reader = Minitar::Reader.open(StringIO.new(str))
+    refute reader.closed?
+  ensure
+    reader.close
+    refute reader.closed? # Reader doesn't actually close anything
+  end
+
   def test_multiple_entries
     str = tar_file_header('lib/foo', '', 0o10644, 10) + "\0" * 512
     str += tar_file_header('bar', 'baz', 0o644, 0)

data/test/test_tar_writer.rb

@@ -31,6 +31,15 @@ class TestTarWriter < Minitest::Test
     @os.close
   end
 
+  def test_open_no_block
+    writer = Minitar::Writer.open(@dummyos)
+    refute writer.closed?
+  ensure
+    writer.close
+    assert writer.closed?
+  end
+
+
   def test_add_file_simple
     @dummyos.reset
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minitar
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: 0.6.1
 platform: ruby
 authors:
 - Austin Ziegler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '5.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '5.10'
 - !ruby/object:Gem::Dependency
   name: hoe-doofus
   requirement: !ruby/object:Gem::Requirement