rubyzip-bzip2 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 568ccb1b7481eecd0f87a943b4b8a44bab0daef37739e0eefb01bdf5719d92b8
-  data.tar.gz: 59b1efa8e578d6334399745bedf424f13d1b9a1e4a4902c890902388f29afa71
+  metadata.gz: 20db3e6e7b08091759198d63dad3a626792e58d9425f4e4907d5ffcf623b0e83
+  data.tar.gz: 2e136c6ee2a45fd12ef88146e0c8efe7e86e8e12c55e7a254a65af46707caf13
 SHA512:
-  metadata.gz: a789417a9bcc5ffe6ced70e29dbf2e6b64af2c522105201e8f77bf494be2d333f1178e09e949664a015d53cf1c5fe171bb8a056bcab46391e7bbc21b4fc64176
-  data.tar.gz: 6f88e4f8e236c676c733f663f2fe5040cc89a4cd72aaa69ab8d3e6b51e365a0661a9a657a678e83525263d92ce06b41ac5e6dc13335320746d239ac303a35933
+  metadata.gz: f02c13f70d11881913bbd3f94bb03d930e921ef625a1f2793c472bc6c2367fe0541ba2c375614f9ccda01a905217f8d1a43a646e25204ab5120fe0e4c3a20e90
+  data.tar.gz: 180fa7d30af2d8b14fcb58946d02221469e532a837d5c31077bad5d3dfd2708628e6b12909c792fa51aa34471cc0d7b1b41169a1f52afff165ecfd57b885c6d3

data/.github/workflows/lint.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Install and set up ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.4
+        ruby-version: '3.0'
         bundler-cache: true
 
     - name: Rubocop

data/.github/workflows/tests.yml

@@ -8,12 +8,12 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu]
-        ruby: ['2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4', head, jruby, jruby-head, truffleruby, truffleruby-head]
+        ruby: ['3.0', '3.1', '3.2', '3.3', '3.4', head, jruby, jruby-head, truffleruby, truffleruby-head]
         include:
           - os: macos
-            ruby: '2.6'
+            ruby: '3.0'
           - os: windows
-            ruby: '2.4.10'
+            ruby: '3.0'
     runs-on: ${{ matrix.os }}-latest
     continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.os == 'windows' }}
     steps:
@@ -30,8 +30,15 @@ jobs:
     - name: Install bzip2 library
       if: matrix.os == 'windows'
       run: |
-        wget https://github.com/philr/bzip2-windows/releases/download/v1.0.8.0/bzip2-dll-1.0.8.0-win-x64.zip
-        Expand-Archive -Path bzip2-dll-1.0.8.0-win-x64.zip -DestinationPath C:\hostedtoolcache\windows\Ruby\${{ matrix.ruby }}\x64\bin
+          Invoke-WebRequest `
+            -Uri https://github.com/philr/bzip2-windows/releases/download/v1.0.8.0/bzip2-dll-1.0.8.0-win-x64.zip `
+            -OutFile bzip2.zip `
+            -MaximumRetryCount 10 `
+            -RetryIntervalSec 2
+          $RubyBinPath = Split-Path (Get-Command ${{ startsWith(matrix.ruby, 'jruby') && 'j' || '' }}ruby.exe).Path
+          Write-Host $RubyBinPath
+          Expand-Archive -Path bzip2.zip -DestinationPath $RubyBinPath -Force
+          Get-Command bzip2.exe | Format-List
 
     - name: Run the tests
       env:

data/.rubocop.yml

@@ -1,5 +1,16 @@
+require:
+  - rubocop-performance
+  - rubocop-rake
+
+# Set this to the minimum supported ruby in the gemspec. Otherwise
+# we get errors if our ruby version doesn't match.
 AllCops:
-  TargetRubyVersion: 2.4
+  SuggestExtensions: false
+  TargetRubyVersion: 3.0
+  NewCops: enable
+
+Gemspec/DevelopmentDependencies:
+  EnforcedStyle: gemspec
 
 Layout/LineLength:
   Max: 120

data/.simplecov

@@ -17,6 +17,6 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
 )
 
 SimpleCov.start do
-  # enable_coverage :branch   <-- Re-enable this when we move to ruby ~> 2.5.
+  enable_coverage :branch
   add_filter ['/test/', '/samples/']
 end

data/Changelog.md

@@ -1,4 +1,28 @@
-# X.X.X (Next)
+# 2.0.0 (2025-08-22)
+
+* Bump version number for RubyZip v3.0 support.
+* Update to use RubyZip ~> 3.0.0.
+* Update README with requirements for version 2.
+
+
+## Tooling and internal changes
+
+* Enable branch coverage analysis.
+* Update Rubocop and add extensions.
+* Prefer `require_relative` where appropriate.
+* Deal with Rubocop offences in gemspec.
+* Fix Style/RedundantReturn Rubocop offences.
+* Fix Style/OptionalBooleanParameter Rubocop offences.
+* Fix Performance/UnfreezeString Rubocop offences.
+* Fix Layout/LineContinuationSpacing Rubocop offences.
+* Fix Style/FileRead Rubocop offences.
+* Fix Layout/LeadingCommentSpace Rubocop offences.
+* Update GitHub Actions to use rubies >= 3.0.
+* Update Minitest and properly use it.
+* Remove use of JRuby object space in tests.
+* Update installation of bzip2 in windows tests.
+
+# 1.0.0 (2025-02-07)
 
 * Fix automatic require
 * Fix the Libbz2::finalizer method.

data/README.md

@@ -4,7 +4,7 @@
 [![Tests](https://github.com/rubyzip/rubyzip-bzip2/actions/workflows/tests.yml/badge.svg)](https://github.com/rubyzip/rubyzip-bzip2/actions/workflows/tests.yml)
 [![Linter](https://github.com/rubyzip/rubyzip-bzip2/actions/workflows/lint.yml/badge.svg)](https://github.com/rubyzip/rubyzip-bzip2/actions/workflows/lint.yml)
 [![Code Climate](https://codeclimate.com/github/rubyzip/rubyzip-bzip2.svg)](https://codeclimate.com/github/rubyzip/rubyzip-bzip2)
-[![Coverage Status](https://img.shields.io/coveralls/rubyzip/rubyzip-bzip2.svg)](https://coveralls.io/r/rubyzip/rubyzip-bzip2?branch=master)
+[![Coverage Status](https://img.shields.io/coveralls/rubyzip/rubyzip-bzip2.svg)](https://coveralls.io/r/rubyzip/rubyzip-bzip2?branch=main)
 
 The rubyzip-bzip2 gem provides an extension of the rubyzip gem for reading zip files compressed with bzip2 compression.
 
@@ -12,7 +12,14 @@ The rubyzip-bzip2 gem provides an extension of the rubyzip gem for reading zip f
 http://github.com/rubyzip/rubyzip-bzip2
 
 ## Requirements
-- Ruby 2.4 or greater
+
+Version 2.x of this library:
+* Ruby 3.0 or greater
+* Rubyzip 3.0.x
+
+Version 1.x of this library:
+* Ruby 2.4 or greater
+* Rubyzip 2.4.x
 
 ## Installation
 The rubyzip-bzip2 gem is available on RubyGems:
@@ -28,7 +35,7 @@ gem 'rubyzip-bzip2'
 ```
 
 ## Usage
-Reading a zip file with bzip2 compression is not different from reading
+Reading a zip file with bzip2 compression is no different from reading
 any other zip file using rubyzip:
 
 ```ruby

data/Rakefile

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
 require 'bundler/gem_tasks'
-require 'rake/testtask'
+require 'minitest/test_task'
+require 'rubocop/rake_task'
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.libs << 'lib'
-  t.test_files = FileList['test/**/*_test.rb']
+task default: :test
+
+Minitest::TestTask.create do |test|
+  test.framework = 'require "simplecov"'
+  test.test_globs = 'test/**/*_test.rb'
 end
 
-task default: :test
+RuboCop::RakeTask.new

data/lib/zip/bzip2/decompress.rb

@@ -1,24 +1,24 @@
 # frozen_string_literal: true
 
-require 'zip/bzip2/libbz2'
+require_relative 'libbz2'
 
 module Zip
   module Bzip2
-    class Decompress #:nodoc:
+    class Decompress # :nodoc:
       OUTPUT_BUFFER_SIZE = 4096
 
       def initialize(options = {})
         small = options[:small]
 
         @libbz2 = Libbz2.new.tap do |libbz2|
-          libbz2.decompress_init!(small)
+          libbz2.decompress_init!(small: small)
         end
 
         @finished = false
       end
 
       def decompress(data)
-        result = ''.dup
+        result = +''
 
         with_input_buffer(data) do |input_buffer|
           @libbz2.input_buffer = input_buffer

data/lib/zip/bzip2/decompressor.rb

@@ -1,19 +1,18 @@
 # frozen_string_literal: true
 
-require 'zip'
-require 'zip/bzip2/decompress'
+require_relative 'decompress'
 
-module Zip #:nodoc:
+module Zip # :nodoc:
   module Bzip2
-    class Decompressor < ::Zip::Decompressor #:nodoc:
+    class Decompressor < ::Zip::Decompressor # :nodoc:
       def initialize(*args)
         super
 
-        @buffer = ''.dup
+        @buffer = +''
         @bzip2_ffi_decompressor = ::Zip::Bzip2::Decompress.new
       end
 
-      def read(length = nil, outbuf = ''.dup)
+      def read(length = nil, outbuf = +'')
         return return_value_on_eof(length) if eof
 
         fill_buffer(length)
@@ -30,7 +29,7 @@ module Zip #:nodoc:
       private
 
       def return_value_on_eof(length)
-        return '' if length.nil? || length.zero?
+        '' if length.nil? || length.zero?
       end
 
       def fill_buffer(min_length)

data/lib/zip/bzip2/errors.rb

@@ -11,7 +11,7 @@ module Zip
       # Initializes a new instance of MemError.
       #
       # @private
-      def initialize #:nodoc:
+      def initialize # :nodoc:
         super('Could not allocate enough memory to perform this request')
       end
     end
@@ -23,10 +23,10 @@ module Zip
       #
       # @param message [String] Exception message (overrides the default).
       # @private
-      def initialize(message = nil) #:nodoc:
+      def initialize(message = nil) # :nodoc:
         super(
           message ||
-            'Data integrity error detected (mismatch between stored and computed CRCs, '\
+            'Data integrity error detected (mismatch between stored and computed CRCs, ' \
             'or other anomaly in the compressed data)',
         )
       end
@@ -38,7 +38,7 @@ module Zip
       # Initializes a new instance of MagicDataError.
       #
       # @private
-      def initialize #:nodoc:
+      def initialize # :nodoc:
         super('Compressed data does not start with the correct magic bytes (\'BZh\')')
       end
     end
@@ -48,7 +48,7 @@ module Zip
       # Initializes a new instance of ConfigError.
       #
       # @private
-      def initialize #:nodoc:
+      def initialize # :nodoc:
         super('libbz2 has been improperly compiled on your platform')
       end
     end
@@ -59,7 +59,7 @@ module Zip
       #
       # @param error_code [Integer] The error_code reported by libbz2.
       # @private
-      def initialize(error_code) #:nodoc:
+      def initialize(error_code) # :nodoc:
         super("An unexpected error was detected (error code: #{error_code})")
       end
     end

data/lib/zip/bzip2/ffi/libbz2.rb

@@ -34,7 +34,7 @@ module Zip
       # See bzlib.h and http://bzip.org/docs.html.
       #
       # @private
-      module Libbz2 #:nodoc:
+      module Libbz2 # :nodoc:
         extend ::FFI::Library
 
         ffi_lib ['bz2', 'libbz2.so.1', 'libbz2.dll']
@@ -62,7 +62,7 @@ module Zip
         callback :bzfree, %i[pointer pointer], :void
 
         # typedef struct { ... } bz_stream;
-        class BzStream < ::FFI::Struct #:nodoc:
+        class BzStream < ::FFI::Struct # :nodoc:
           layout :next_in,       :pointer,
                  :avail_in,      :uint,
                  :total_in_lo32, :uint,

data/lib/zip/bzip2/libbz2.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
-require 'ffi'
-require 'zip/bzip2/errors'
-require 'zip/bzip2/ffi/libbz2'
+require_relative 'errors'
+require_relative 'ffi/libbz2'
 
 module Zip
   module Bzip2
-    class Libbz2 #:nodoc:
+    class Libbz2 # :nodoc:
       def self.finalizer(stream)
         lambda do |_id|
           FFI::Libbz2::BZ2_bzDecompressEnd(stream)
@@ -28,7 +27,7 @@ module Zip
         @stream = FFI::Libbz2::BzStream.new
       end
 
-      def decompress_init!(small = false)
+      def decompress_init!(small: false)
         result = FFI::Libbz2::BZ2_bzDecompressInit(@stream, 0, small ? 1 : 0)
         check_error(result)
 

data/lib/zip/bzip2/version.rb

@@ -2,6 +2,6 @@
 
 module Zip
   module Bzip2
-    VERSION = '1.0.0'
+    VERSION = '2.0.0'
   end
 end

data/lib/zip/bzip2.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require 'zip'
-require 'zip/bzip2/version'
-require 'zip/bzip2/decompressor'
+require_relative 'bzip2/version'
+require_relative 'bzip2/decompressor'
 
 module Zip
   # The Zip::Bzip2 module extends Rubyzip with support for the bzip2 compression method.

data/rubyzip-bzip2.gemspec

@@ -1,25 +1,23 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('lib', __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'zip/bzip2/version'
+require_relative 'lib/zip/bzip2/version'
 
 Gem::Specification.new do |spec|
   spec.name = 'rubyzip-bzip2'
-  spec.version = ::Zip::Bzip2::VERSION
+  spec.version = Zip::Bzip2::VERSION
   spec.authors = [
     'Jan-Joost Spanjers', 'Robert Haines'
   ]
 
   spec.summary = 'Extension of rubyzip to read bzip2 compressed files'
   spec.description =
-    'The rubyzip-bzip2 gem provides an extension of the rubyzip gem '\
+    'The rubyzip-bzip2 gem provides an extension of the rubyzip gem ' \
     'for reading zip files compressed with bzip2 compression'
   spec.homepage = 'http://github.com/rubyzip/rubyzip-bzip2'
   spec.license = 'BSD 2-Clause'
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.4'
+  spec.required_ruby_version = '>= 3.0'
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -35,11 +33,13 @@ Gem::Specification.new do |spec|
   }
 
   spec.add_dependency 'ffi', '~> 1.0'
-  spec.add_dependency 'rubyzip', '~> 2.4', '< 3.0'
+  spec.add_dependency 'rubyzip', '~> 3.0.0'
 
-  spec.add_development_dependency 'minitest', '~> 5.15'
+  spec.add_development_dependency 'minitest', '~> 5.25'
   spec.add_development_dependency 'rake', '~> 13.2'
-  spec.add_development_dependency 'rubocop', '~> 0.79.0'
+  spec.add_development_dependency 'rubocop', '~> 1.61.0'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.20.0'
+  spec.add_development_dependency 'rubocop-rake', '~> 0.6.0'
   spec.add_development_dependency 'simplecov', '~> 0.18.0'
   spec.add_development_dependency 'simplecov-lcov', '~> 0.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubyzip-bzip2
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jan-Joost Spanjers
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-07 00:00:00.000000000 Z
+date: 2025-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -31,34 +31,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.15'
+        version: '5.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.15'
+        version: '5.25'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -79,14 +73,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 1.61.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.61.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.20.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.20.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -147,9 +169,9 @@ licenses:
 - BSD 2-Clause
 metadata:
   bug_tracker_uri: https://github.com/rubyzip/rubyzip-bzip2/issues
-  changelog_uri: https://github.com/rubyzip/rubyzip-bzip2/blob/v1.0.0/Changelog.md
-  documentation_uri: https://www.rubydoc.info/gems/rubyzip-bzip2/1.0.0
-  source_code_uri: https://github.com/rubyzip/rubyzip-bzip2/tree/v1.0.0
+  changelog_uri: https://github.com/rubyzip/rubyzip-bzip2/blob/v2.0.0/Changelog.md
+  documentation_uri: https://www.rubydoc.info/gems/rubyzip-bzip2/2.0.0
+  source_code_uri: https://github.com/rubyzip/rubyzip-bzip2/tree/v2.0.0
   wiki_uri: https://github.com/rubyzip/rubyzip-bzip2/wiki
   rubygems_mfa_required: 'true'
 post_install_message:
@@ -160,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="