rubyzip 3.0.0.rc1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2840381c70e4bc8b3fbbfc003e4caf71dab05301621a411b44dc16cd962ca4fb
-  data.tar.gz: 75199ebb2cf53b8a53b930a0ef908773328b4cab2dadef4839fe8194fced289c
+  metadata.gz: 85e587f39028c9a48d66047083046fee73e8ef3c88d9748ce5b8088044e81037
+  data.tar.gz: abfced9c6032e1d153739f18edb891a0087d8832b1e39ea33bc39c9f0c540777
 SHA512:
-  metadata.gz: 1716ef6a03ee08773e4dba640be0fe0e294e4a955b2535d5049dd62c37cc82e161827c2e226c9b93c883f6789c9f275d30e267733038aee59e2c4a80f55193e1
-  data.tar.gz: b4b320f64167dd5f464e45d61d49b2e49619bc356cd2d59f617dfd8ebe7a1be5724e294bab2498186dde951cfd7453a5a4b09f15fd6f88f9872234956182241a
+  metadata.gz: bd01df0aba8c04064474e5b4a91253af88d2d5c826d7722c1ab8b266e98e6fff9d6d7cb233029715d0f7408ff30f14d5f1a2ce0477305a447833938bff7705cd
+  data.tar.gz: 6f107c538e0e28a1a52bb410b9f25f0d21b6bd0257537af3590b3102998114123bd29372107cdc04be620d4b6f586fa7f21f28b8775d110d0240059b1a455c62

data/Changelog.md

@@ -1,5 +1,6 @@
-# 3.0.0 (Next)
+# 3.0.0 (2025-07-28)
 
+- 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,8 @@
 
 Tooling/internal:
 
+- No longer test setting `$\` in tests.
+- 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/README.md

@@ -394,10 +394,10 @@ Rubyzip 2.3 is known to work on MRI 2.4 to 3.4 on Linux and Mac, and JRuby and T
 
 Please see the table below for what we think the current situation is. Note: an empty cell means "unknown", not "does not work".
 
-| OS/Ruby | 3.0 | 3.1 | 3.2 | 3.3 | 3.4 | Head | JRuby 9.4.9.0 | JRuby Head | Truffleruby 24.1.1 | Truffleruby Head |
+| OS/Ruby | 3.0 | 3.1 | 3.2 | 3.3 | 3.4 | Head | JRuby 10.0.1.0 | JRuby Head | Truffleruby 24.2.1 | Truffleruby Head |
 |---------|-----|-----|-----|-----|-----|------|---------------|------------|--------------------|------------------|
-|Ubuntu 22.04| CI | CI | CI | CI | CI | ci | CI | ci | CI | ci |
-|Mac OS 14.7.2| CI | CI | CI | CI | CI | ci | x |  | x |  |
+|Ubuntu 24.04| CI | CI | CI | CI | CI | ci | CI | ci | CI | ci |
+|Mac OS 14.7.6| CI | CI | CI | CI | CI | ci | x |  | x |  |
 |Windows Server 2022| CI |  |  |  | CI&nbsp;mswin</br>CI&nbsp;ucrt |  |  |  |  |  |
 
 Key: `CI` - tested in CI, should work; `ci` - tested in CI, might fail; `x` - known working; `o` - known failing.
@@ -449,14 +449,3 @@ See https://github.com/rubyzip/rubyzip/graphs/contributors for a comprehensive l
 ## License
 
 Rubyzip is distributed under the same license as Ruby. In practice this means you can use it under the terms of the Ruby License or the 2-Clause BSD License. See https://www.ruby-lang.org/en/about/license.txt and LICENSE.md for details.
-
-## Research notice
-Please note that this repository is participating in a study into sustainability
- of open source projects. Data will be gathered about this repository for
- approximately the next 12 months, starting from June 2021.
-
-Data collected will include number of contributors, number of PRs, time taken to
- close/merge these PRs, and issues closed.
-
-For more information, please visit
-[our informational page](https://sustainable-open-science-and-software.github.io/) or download our [participant information sheet](https://sustainable-open-science-and-software.github.io/assets/PIS_sustainable_software.pdf).

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' # :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
 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-07-28 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/Changelog.md
+  documentation_uri: https://www.rubydoc.info/gems/rubyzip/3.0.0
+  source_code_uri: https://github.com/rubyzip/rubyzip/tree/v3.0.0
   wiki_uri: https://github.com/rubyzip/rubyzip/wiki
   rubygems_mfa_required: 'true'
 post_install_message:
@@ -211,9 +211,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.4.1
 signing_key: