rubyzip 3.0.0.rc1 → 3.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2840381c70e4bc8b3fbbfc003e4caf71dab05301621a411b44dc16cd962ca4fb
-  data.tar.gz: 75199ebb2cf53b8a53b930a0ef908773328b4cab2dadef4839fe8194fced289c
+  metadata.gz: 7a2a18261870066289dfb751472f788cf6cc3cecb119b14ddfe33b982823215e
+  data.tar.gz: 96db40d3eb0b9bd9ad96ae51c3f9ec0ca1fa290352aefd969c03a558c4f9dbe7
 SHA512:
-  metadata.gz: 1716ef6a03ee08773e4dba640be0fe0e294e4a955b2535d5049dd62c37cc82e161827c2e226c9b93c883f6789c9f275d30e267733038aee59e2c4a80f55193e1
-  data.tar.gz: b4b320f64167dd5f464e45d61d49b2e49619bc356cd2d59f617dfd8ebe7a1be5724e294bab2498186dde951cfd7453a5a4b09f15fd6f88f9872234956182241a
+  metadata.gz: e6dde3c07ee1a5949996cce233db30b51d96b5c3947ce590b1677bf6bb69f62a155253615b2c44d63af77264e0cbaf5c3be7e16996b6ad27674a5ac307fb1d0a
+  data.tar.gz: bf6b290da9be2332de71fe6ba13ba5491d3c4bdfdd92f67b7276790bce535195950631071ba96d02e0800b030bf8332020b96c93effe35a03287b63ad7f94400

data/Changelog.md

@@ -1,5 +1,6 @@
 # 3.0.0 (Next)
 
+- Fix de facto regression for input streams.
 - Fix `File#write_buffer` to always return the given `io`.
 - Add `Entry#absolute_time?` and `DOSTime#absolute_time?` methods.
 - Use explicit named parameters for `File` methods.
@@ -39,6 +40,7 @@
 
 Tooling/internal:
 
+- Add a test to ensure correct version number format.
 - Update the README with new Ruby version compatability information.
 - Fix various issues with JRuby tests.
 - Update gem dependency versions.

data/lib/zip/entry.rb

@@ -113,7 +113,7 @@ module Zip
     end
 
     def incomplete? # :nodoc:
-      gp_flags & 8 == 8
+      (gp_flags & 8 == 8) && (crc == 0 || size == 0 || compressed_size == 0)
     end
 
     # The uncompressed size of the entry.
@@ -343,24 +343,25 @@ module Zip
 
     def read_local_entry(io) # :nodoc:
       @dirty = false # No changes at this point.
-      @local_header_offset = io.tell
+      current_offset = io.tell
 
-      static_sized_fields_buf = io.read(::Zip::LOCAL_ENTRY_STATIC_HEADER_LENGTH) || ''
+      read_local_header_fields(io)
 
-      unless static_sized_fields_buf.bytesize == ::Zip::LOCAL_ENTRY_STATIC_HEADER_LENGTH
-        raise Error, 'Premature end of file. Not enough data for zip entry local header'
-      end
+      if @header_signature == SPLIT_FILE_SIGNATURE
+        raise SplitArchiveError if current_offset.zero?
 
-      unpack_local_entry(static_sized_fields_buf)
+        # Rewind, skipping the data descriptor, then try to read the local header again.
+        current_offset += 16
+        io.seek(current_offset)
+        read_local_header_fields(io)
+      end
 
       unless @header_signature == LOCAL_ENTRY_SIGNATURE
-        if @header_signature == SPLIT_FILE_SIGNATURE
-          raise SplitArchiveError
-        end
-
-        raise Error, "Zip local header magic not found at location '#{local_header_offset}'"
+        raise Error, "Zip local header magic not found at location '#{current_offset}'"
       end
 
+      @local_header_offset = current_offset
+
       set_time(@last_mod_date, @last_mod_time)
 
       @name = io.read(@name_length)
@@ -721,6 +722,16 @@ module Zip
 
     private
 
+    def read_local_header_fields(io) # :nodoc:
+      static_sized_fields_buf = io.read(::Zip::LOCAL_ENTRY_STATIC_HEADER_LENGTH) || ''
+
+      unless static_sized_fields_buf.bytesize == ::Zip::LOCAL_ENTRY_STATIC_HEADER_LENGTH
+        raise Error, 'Premature end of file. Not enough data for zip entry local header'
+      end
+
+      unpack_local_entry(static_sized_fields_buf)
+    end
+
     def set_time(binary_dos_date, binary_dos_time)
       @time = ::Zip::DOSTime.parse_binary_dos_format(binary_dos_date, binary_dos_time)
     rescue ArgumentError

data/lib/zip/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zip
-  VERSION = '3.0.0.rc1' # :nodoc:
+  VERSION = '3.0.0.rc2' # :nodoc:
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubyzip
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc1
+  version: 3.0.0.rc2
 platform: ruby
 authors:
 - Robert Haines
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-26 00:00:00.000000000 Z
+date: 2025-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -195,9 +195,9 @@ licenses:
 - BSD-2-Clause
 metadata:
   bug_tracker_uri: https://github.com/rubyzip/rubyzip/issues
-  changelog_uri: https://github.com/rubyzip/rubyzip/blob/v3.0.0.rc1/Changelog.md
-  documentation_uri: https://www.rubydoc.info/gems/rubyzip/3.0.0.rc1
-  source_code_uri: https://github.com/rubyzip/rubyzip/tree/v3.0.0.rc1
+  changelog_uri: https://github.com/rubyzip/rubyzip/blob/v3.0.0.rc2/Changelog.md
+  documentation_uri: https://www.rubydoc.info/gems/rubyzip/3.0.0.rc2
+  source_code_uri: https://github.com/rubyzip/rubyzip/tree/v3.0.0.rc2
   wiki_uri: https://github.com/rubyzip/rubyzip/wiki
   rubygems_mfa_required: 'true'
 post_install_message: