omnizip 0.4.7 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f958a6bde5f52729231c66fcc680ecaf30bd3bb3e3a04f59bd843a63f5d664ec
-  data.tar.gz: c35f940965b7776bbab14f41258917bf4ae444899ec70d4c0713a36a12d5c05b
+  metadata.gz: 11fd728c2550d26fff721df376386c0f1b33bee6a025895770b214c0fe49e7a0
+  data.tar.gz: fa48858d122fb3a16460681678fa8db9f96382c2a5272dfab90b73b128a9baca
 SHA512:
-  metadata.gz: 6e219d9d7052b667c112709d0ebaa4a4e3b6925e374694f1fd646114e6ab7d2157e255a07a8e05b9a42a9234b4e61841617ce4682b6e79727ee6a4381a4e2b35
-  data.tar.gz: f6921e7de8606e19dd28e62d4a00a8bec55b2f0bc6f4a4478805df6299f88b912aa6b8ea56fbf774f6df42a7f29cc707d709c4dc250c702a5d3b4ca91d785601
+  metadata.gz: b30e1ee39bd3eef72f02c06ae5a4fe10e84c3b71dc7efb5528593c8f092129572b43a6ca1e1a80469d528b8bc5692a3ef3bc9aff0e1a57245b2cb5a99017578c
+  data.tar.gz: 53b3fd01e1976a9cf6dba5d3c3745cd5a9994be42a98be4b7e6fe95ba60b2ba0282fe2a5a6936a4fa9486d4711b3bdf3b644451b014659c0a35ef80104c7f100

data/.rubocop_todo.yml

@@ -138,6 +138,9 @@ Metrics/AbcSize:
 # AllowedMethods: refine
 Metrics/BlockLength:
   Max: 81
+  Exclude:
+    - "lib/tasks/platform_gems.rake"
+    - "spec/omnizip/archive_handlers/rust_tier_handlers_spec.rb"
 
 # Offense count: 5
 # Configuration parameters: CountBlocks, CountModifierForms.

data/CHANGELOG.md

@@ -7,6 +7,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+- RPM archive-tier readiness: the dylib requirement is
+  **0.21.112**, not 0.21.111 — 0.21.111's `./`-stripping was half the
+  fix (the Ruby handler's names are ABSOLUTE, from the header's
+  DIRNAMES/BASENAMES; 0.21.112 normalizes the cpio names to
+  `/usr/…`). The tier spec version-guards accordingly, and with
+  0.21.112 the rpm tier is fully active (list stays Ruby by design;
+  read_entry is accelerated). Ships with the rubocop exclusion for
+  the tier spec that a CI-skipped merge dropped.
+
+### Added
+- Archive-level tier for every handler: tar, cpio, iso, xar, 7z and
+  rar3/4/5 (with `password:` passthrough) route list(names) and
+  read_entry through the cdylib's whole-archive surface, falling back
+  to the Ruby readers on any Rust error or a missing library. rpm
+  rides the tier for read_entry once the dylib is ≥ 0.21.111 (which
+  strips the cpio `./` prefix so its entry names match the Ruby
+  handler's); rpm list and OLE stay pure-Ruby — OLE is a pinned model
+  divergence (Ruby lists top-level entries, Rust flattens the storage
+  tree), documented in the capability matrix and pinned by the new
+  cross-implementation differential spec.
+
 ### Added
 - Prebuilt-binary distribution (parsanol model): platform gems
   (x86_64/aarch64/arm Linux glibc+musl, arm64/x86_64 macOS,

data/lib/omnizip/archive_handlers/cpio_handler.rb

@@ -20,6 +20,11 @@ module Omnizip
       end
 
       def list(path, details: false, **_)
+        unless details
+          tier_names = Omnizip::Backends.archive_entry_names(path)
+          return tier_names if tier_names
+        end
+
         entries = Omnizip::Formats::Cpio.list(path)
         if details
           entries.map do |e|
@@ -32,6 +37,9 @@ module Omnizip
       end
 
       def read_entry(path, entry_name, **_)
+        tier = Omnizip::Backends.archive_read_entry(path, entry_name)
+        return tier unless tier.nil?
+
         entry = Omnizip::Formats::Cpio.list(path)
           .find { |e| e.name == entry_name }
         unless entry

data/lib/omnizip/archive_handlers/iso_handler.rb

@@ -20,6 +20,11 @@ module Omnizip
       end
 
       def list(path, details: false, **_)
+        unless details
+          tier_names = Omnizip::Backends.archive_entry_names(path)
+          return tier_names if tier_names
+        end
+
         entries = Omnizip::Formats::Iso.list(path)
         if details
           entries.map do |e|
@@ -32,6 +37,9 @@ module Omnizip
       end
 
       def read_entry(path, entry_name, **_)
+        tier = Omnizip::Backends.archive_read_entry(path, entry_name)
+        return tier unless tier.nil?
+
         entry = Omnizip::Formats::Iso.list(path)
           .find { |e| e.full_path == entry_name }
         unless entry

data/lib/omnizip/archive_handlers/rar_handler.rb

@@ -29,6 +29,11 @@ module Omnizip
       end
 
       def list(path, details: false, **_)
+        unless details
+          tier_names = Omnizip::Backends.archive_entry_names(path)
+          return tier_names if tier_names
+        end
+
         reader = Omnizip::Formats::Rar::Reader.new(path).open
         entries = reader.list_files
         if details
@@ -43,6 +48,9 @@ module Omnizip
       end
 
       def read_entry(path, entry_name, password: nil, **_)
+        tier = Omnizip::Backends.archive_read_entry(path, entry_name, password: password)
+        return tier unless tier.nil?
+
         Dir.mktmpdir("omnizip-rar-entry") do |dir|
           dest = File.join(dir, "entry")
           Omnizip::Formats::Rar::Decompressor.extract_entry(

data/lib/omnizip/archive_handlers/rpm_handler.rb

@@ -29,6 +29,9 @@ module Omnizip
       end
 
       def read_entry(path, entry_name, **_)
+        tier = Omnizip::Backends.archive_read_entry(path, entry_name)
+        return tier unless tier.nil?
+
         Dir.mktmpdir("omnizip-rpm-entry") do |dir|
           Omnizip::Formats::Rpm.extract(path, dir)
           dest = File.join(dir, entry_name)

data/lib/omnizip/archive_handlers/seven_zip_handler.rb

@@ -25,6 +25,11 @@ module Omnizip
       end
 
       def list(path, details: false, **options)
+        unless details
+          tier_names = Omnizip::Backends.archive_entry_names(path, password: options[:password])
+          return tier_names if tier_names
+        end
+
         with_reader(path, options) do |reader|
           entries = reader.list_files
           if details
@@ -40,6 +45,9 @@ module Omnizip
       end
 
       def read_entry(path, entry_name, **options)
+        tier = Omnizip::Backends.archive_read_entry(path, entry_name, password: options[:password])
+        return tier unless tier.nil?
+
         with_reader(path, options) do |reader|
           entry = reader.list_files.find { |e| e.name == entry_name }
           raise Errno::ENOENT, "Entry not found: #{entry_name}" unless entry

data/lib/omnizip/archive_handlers/tar_handler.rb

@@ -22,6 +22,11 @@ module Omnizip
       end
 
       def list(path, details: false, **_)
+        unless details
+          tier_names = Omnizip::Backends.archive_entry_names(path)
+          return tier_names if tier_names
+        end
+
         entries = Omnizip::Formats::Tar.list(path)
         if details
           entries.map do |entry|
@@ -58,7 +63,10 @@ module Omnizip
         end
       end
 
-      def read_entry(path, entry_name)
+      def read_entry(path, entry_name, **_)
+        tier = Omnizip::Backends.archive_read_entry(path, entry_name)
+        return tier unless tier.nil?
+
         data = nil
         Omnizip::Formats::Tar.open(path) do |reader|
           entry = reader.entries.find { |e| e.name == entry_name }

data/lib/omnizip/archive_handlers/xar_handler.rb

@@ -21,6 +21,11 @@ module Omnizip
       end
 
       def list(path, details: false, **_)
+        unless details
+          tier_names = Omnizip::Backends.archive_entry_names(path)
+          return tier_names if tier_names
+        end
+
         entries = Omnizip::Formats::Xar.list(path)
         if details
           entries.map do |e|
@@ -33,6 +38,9 @@ module Omnizip
       end
 
       def read_entry(path, entry_name, **_)
+        tier = Omnizip::Backends.archive_read_entry(path, entry_name)
+        return tier unless tier.nil?
+
         Dir.mktmpdir("omnizip-xar-entry") do |dir|
           Omnizip::Formats::Xar.extract(path, dir)
           dest = File.join(dir, entry_name)

data/lib/omnizip/backends.rb

@@ -96,15 +96,18 @@ module Omnizip
 
       # Whole-archive tier helpers: nil means "Rust unavailable or
       # entry not found — caller falls back to the Ruby reader".
-      def archive_entry_names(path)
-        Omnizip::Implementations::Rust::Archive.open(File.binread(path)) { |a| return a.entry_names }
+      # Encrypted formats (rar, 7z) pass password:.
+      def archive_entry_names(path, password: nil)
+        Omnizip::Implementations::Rust::Archive.open(File.binread(path), password: password) do |a|
+          return a.entry_names
+        end
       rescue Omnizip::Implementations::Rust::Archive::LibraryMissing, Omnizip::Implementations::Rust::Error, StandardError
         nil
       end
 
       # rubocop:disable-next Lint/ReturnInVoidContext
-      def archive_read_entry(path, entry_name)
-        Omnizip::Implementations::Rust::Archive.open(File.binread(path)) do |a|
+      def archive_read_entry(path, entry_name, password: nil)
+        Omnizip::Implementations::Rust::Archive.open(File.binread(path), password: password) do |a|
           idx = a.entry_names.index(entry_name)
           return nil if idx.nil?
 

data/lib/omnizip/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Omnizip
-  VERSION = "0.4.7"
+  VERSION = "0.4.9"
 end

data/lib/tasks/platform_gems.rake

@@ -42,26 +42,72 @@ namespace :platform_gems do
   desc "Build platform gems for every tarball in DIR=libomnizip_ffi-<target>.tar.gz"
   task :build do
     dir = ENV.fetch("DIR") { abort "DIR=<artifacts dir> required" }
+    # Snapshot the pristine file list once. Gem::Specification.load
+    # caches by path and returns the SAME object on every call, so a
+    # per-call load + files += would leak the previous platform's
+    # cdylib into the next gem.
+    gem_root = File.expand_path("../..", __dir__)
+    base_spec = Gem::Specification.load(File.join(gem_root, "omnizip.gemspec"))
+    abort "omnizip.gemspec failed to load" unless base_spec
+    base_files = base_spec.files.select { |rel| File.file?(File.join(gem_root, rel)) }.freeze
+
     Dir.glob(File.join(dir, "libomnizip_ffi-*.tar.gz")).each do |tarball|
       target = File.basename(tarball, ".tar.gz").delete_prefix("libomnizip_ffi-")
       platform = PLATFORM_GEM_TARGETS[target] or abort "no rubygems platform mapping for #{target}"
       require "tmpdir"
       Dir.mktmpdir do |tmp|
         binary = extract_binary(tarball, tmp)
-        out = build_platform_gem(platform, binary)
+        out = build_platform_gem(platform, binary, base_files)
         puts "built: #{out} (#{File.size(out)} bytes)"
       end
     end
   end
 
+  desc "Push every already-built platform gem under pkg/ to rubygems (idempotent)"
+  task :release do
+    require "rake"
+    require "rubygems/package"
+    gem_root = File.expand_path("../..", __dir__)
+    pkg = File.join(gem_root, "pkg")
+    gems = Dir.glob(File.join(pkg, "omnizip-*.gem"))
+    abort "no platform gems under #{pkg} — run platform_gems:build first" if gems.empty?
+
+    # Pushes only what's already built in pkg/. Invoked by the
+    # platform-gem push job, which dispatches the trusted
+    # release.yml with next_version=skip + release_command override
+    # so the cimas reusable workflow authenticates via the
+    # already-trusted OIDC configuration and runs this task verbatim.
+    #
+    # Idempotent against re-push of an already-published version
+    # (cimas reusable handles "already been pushed" via the
+    # gem-idempotent-push-guard action).
+    gems.each do |path|
+      puts "pushing #{File.basename(path)}"
+      run_gem_push(path)
+    end
+  end
+
   def extract_binary(tarball, tmp)
     system("tar", "-xzf", tarball, "-C", tmp) or abort "tar failed for #{tarball}"
     Dir.glob(File.join(tmp, "*")).first or abort "empty tarball #{tarball}"
   end
 
+  def run_gem_push(path)
+    require "rubygems/command/push_command"
+    cmd = Gem::Command::PushCommand.new
+    cmd.invoke("push", path)
+  rescue StandardError => e
+    raise if !/already been pushed|Repushing of gem versions is not allowed/i.match?(e.message)
+
+    warn "skip (already published): #{File.basename(path)}"
+  end
+
   # Stage the tracked gem files plus the vendored cdylib, flip the
-  # gemspec platform, and build.
-  def build_platform_gem(platform, dylib)
+  # gemspec platform, and build. `base_files` is the pristine
+  # gemspec file list (frozen); we ASSIGN a fresh list every call
+  # rather than mutating via +=, because Gem::Specification.load
+  # hands back a cached object.
+  def build_platform_gem(platform, dylib, base_files = nil)
     require "fileutils"
     require "rubygems/package"
     require "tmpdir"
@@ -69,31 +115,25 @@ namespace :platform_gems do
     gem_root = File.expand_path("../..", __dir__)
     spec = Gem::Specification.load(File.join(gem_root, "omnizip.gemspec"))
     abort "omnizip.gemspec failed to load" unless spec
+    base_files ||= spec.files.select { |rel| File.file?(File.join(gem_root, rel)) }
 
     Dir.mktmpdir do |tmp|
       stage = File.join(tmp, "stage")
-      spec.files.each do |rel|
-        src = File.join(gem_root, rel)
-        next unless File.file?(src)
-
+      base_files.each do |rel|
         dst = File.join(stage, rel)
         FileUtils.mkdir_p(File.dirname(dst))
-        FileUtils.cp(src, dst)
+        FileUtils.cp(File.join(gem_root, rel), dst)
       end
 
       vendored = "vendor/libomnizip_ffi#{File.extname(dylib)}"
       FileUtils.mkdir_p(File.join(stage, "vendor"))
       FileUtils.cp(dylib, File.join(stage, vendored))
+      abort "staged cdylib missing: #{vendored}" unless File.file?(File.join(stage, vendored))
 
       spec.platform = Gem::Platform.new(platform)
-      spec.files += [vendored]
+      spec.files = base_files + [vendored]
       spec.test_files = []
 
-      gemspec_path = File.join(stage, "omnizip.gemspec")
-      File.write(gemspec_path, spec.to_ruby)
-
-      pkg = File.join(tmp, "pkg")
-      FileUtils.mkdir_p(pkg)
       Dir.chdir(stage) do
         Gem::Package.build(spec)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omnizip
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.9
 platform: ruby
 authors:
 - Ribose Inc.