omnizip 0.3.32 → 0.3.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a20cd2785f3068dabfe29b7cb3e9b88503b151839ea076fd4d4c727708e5a440
-  data.tar.gz: 7db78180133b7b7d3e62dff82588036c73dabc80c1957d892ffbff96fd83e657
+  metadata.gz: ad5f2e41132ed61e2e80173f7550d75f3f0c8711d264e36a605fbee28e4a322e
+  data.tar.gz: 6d2b1989b06bb359cf48f2a5d24e8eea4b697cde22404c144cfef72357fdfb2d
 SHA512:
-  metadata.gz: 601948e2be2303a5c82573728118fe4fdb6bd123ce983f6f92776373e3215e96c1b29ab02217356353a8978335af54233093ede1aeb9aa8665a57f1f189a9525
-  data.tar.gz: ac68a261028b8a92a948bb0f93caed9997e5e3d13c885962d1857104c65f16d2da2eba38996aac90fb0a17da57d9fa8b7e1c806956e22d65d36765ebcf9f84c7
+  metadata.gz: 38afce515d452d0dd4b1ace8b32608b59ff72e86d76d7d0ccfe3985f2d8cae6c24f4e657dc2e48d92b1b9194de2bca7e6d38eedb499255f1b8dcc3da5e2660db
+  data.tar.gz: dab546e8c4db730e7d257d29c89e903768e2112e858a87ef55daf3ac64305e584c715b3042a60e5caef7428357a8b12d4c2609e8ed2baa15612a5ada53ed3337

data/CHANGELOG.md

@@ -7,6 +7,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+- `Omnizip.compress_directory` to `.7z` and `.tar` (both documented)
+  works now: the 7z handler treats directory entries as the no-op
+  they are in the format (7z derives the tree from file paths;
+  nested paths verified against `7zz`), and the Tar handler routes
+  bare directory entries to the writer's `add_directory` instead of
+  misreading them as CWD-relative paths. Both round-trip nested
+  subdirectories through `extract_archive`.
+
+## [0.3.33] - 2026-08-27
+
+### Fixed
+- The convenience API (`compress_file`, `compress_directory`,
+  `extract_archive`, `list_archive`, `read_from_archive`,
+  `add_to_archive`, `remove_from_archive`) now routes archive
+  formats by extension: `.tar` writes/reads real TAR (previously a
+  mislabeled ZIP), `.7z` writes/reads real 7z via a new
+  `ArchiveHandlers::SevenZipHandler` (previously a mislabeled ZIP;
+  archives verify with `7zz`), and read-only formats (`.rar`,
+  `.iso`, `.cpio`) raise `UnsupportedFormatError` instead of
+  silently writing a ZIP under a foreign name. Extensionless
+  outputs keep the ZIP default; an explicit `format:` still wins.
+
+## [0.3.32] - 2026-08-27
+
 ### Fixed
 - The `omnizip` executable crashed on every invocation
   (`uninitialized constant Omnizip::Cli`): the `Cli` autoload was

data/lib/omnizip/archive_handler.rb

@@ -69,6 +69,7 @@ module Omnizip
     LAZY_LOAD_TRIGGERS = {
       zip: -> { Omnizip::ArchiveHandlers::ZipHandler },
       tar: -> { Omnizip::ArchiveHandlers::TarHandler },
+      seven_zip: -> { Omnizip::ArchiveHandlers::SevenZipHandler },
     }.freeze
     private_constant :LAZY_LOAD_TRIGGERS
   end

data/lib/omnizip/archive_handlers/seven_zip_handler.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Omnizip
+  module ArchiveHandlers
+    # Adapter that exposes the canonical +create+/+extract_to+/+list+
+    # interface for the 7z format. Wraps +Omnizip::Formats::SevenZip+.
+    class SevenZipHandler
+      # Creates a .7z archive. The yielded proxy only supports
+      # +add(name, source_path)+ for files — directory entries are not
+      # part of the single-file convenience flow.
+      def create(path, &block)
+        Omnizip::Formats::SevenZip.create(path) do |writer|
+          block&.call(FileProxy.new(writer))
+        end
+      end
+
+      def extract_to(path, output_dir, **options)
+        Omnizip::Formats::SevenZip.open(path, options) do |reader|
+          reader.extract_all(output_dir)
+        end
+      end
+
+      def list(path, details: false, **options)
+        Omnizip::Formats::SevenZip.open(path, options) do |reader|
+          files = reader.list_files
+          return details ? files.map { |f| { name: f } } : files
+        end
+      end
+
+      def read_entry(_path, _entry_name)
+        raise NotImplementedError,
+              "read_from_archive for .7z is not wired; use " \
+              "Formats::SevenZip.open"
+      end
+
+      # Translates the generic +add(name, source_path)+ interface to
+      # the 7z writer's +add_file(file_path, archive_path)+.
+      class FileProxy
+        def initialize(writer)
+          @writer = writer
+        end
+
+        # Directory entries are a no-op: 7z archives derive the
+        # directory tree from the files' archive paths ("sub/f.txt"
+        # implies "sub/"), and the writer/reader handle slashed
+        # paths (verified against 7zz).
+        def add(name, source_path = nil)
+          return if source_path.nil?
+
+          @writer.add_file(source_path, name)
+        end
+      end
+    end
+  end
+end
+
+Omnizip::ArchiveHandler.register(:seven_zip,
+                                 Omnizip::ArchiveHandlers::SevenZipHandler.new)

data/lib/omnizip/archive_handlers/tar_handler.rb

@@ -6,7 +6,9 @@ module Omnizip
     # /+list+ interface for the TAR format. Wraps +Omnizip::Formats::Tar+.
     class TarHandler
       def create(path, &block)
-        Omnizip::Formats::Tar.create(path, &block)
+        Omnizip::Formats::Tar.create(path) do |writer|
+          block&.call(EntryProxy.new(writer))
+        end
       end
 
       def open(path, &block)
@@ -34,6 +36,22 @@ module Omnizip
         end
       end
 
+      # Translates the generic +add(name, source_path)+ interface:
+      # a bare +add(name)+ is a directory ENTRY (no source on disk
+      # relative to the caller), which the Tar writer's own +add+
+      # would misread as a CWD-relative path.
+      class EntryProxy
+        def initialize(writer)
+          @writer = writer
+        end
+
+        def add(name, source_path = nil)
+          return @writer.add_directory(name) if source_path.nil?
+
+          @writer.add(name, source_path)
+        end
+      end
+
       def read_entry(path, entry_name)
         data = nil
         Omnizip::Formats::Tar.open(path) do |reader|

data/lib/omnizip/archive_handlers.rb

@@ -7,5 +7,6 @@ module Omnizip
   module ArchiveHandlers
     autoload :ZipHandler, "omnizip/archive_handlers/zip_handler"
     autoload :TarHandler, "omnizip/archive_handlers/tar_handler"
+    autoload :SevenZipHandler, "omnizip/archive_handlers/seven_zip_handler"
   end
 end

data/lib/omnizip/convenience.rb

@@ -40,7 +40,7 @@ module Omnizip
         return output_path
       end
 
-      Omnizip::ArchiveHandler.for(format).create(output_path) do |archive|
+      Omnizip::ArchiveHandler.for(resolve_archive_format(output_path, format)).create(output_path) do |archive|
         archive.add(::File.basename(input_path), input_path)
       end
 
@@ -69,7 +69,7 @@ module Omnizip
         apply_profile(first_file, options)
       end
 
-      Omnizip::ArchiveHandler.for(format).create(output_path) do |archive|
+      Omnizip::ArchiveHandler.for(resolve_archive_format(output_path, format)).create(output_path) do |archive|
         add_directory_contents(archive, input_dir, "", recursive: recursive)
       end
 
@@ -87,7 +87,7 @@ module Omnizip
     def extract_archive(archive_path, output_dir, format: DEFAULT_FORMAT,
                         overwrite: false, **options)
       require_archive!(archive_path)
-      Omnizip::ArchiveHandler.for(format)
+      Omnizip::ArchiveHandler.for(resolve_archive_format(archive_path, format))
         .extract_to(archive_path, output_dir,
                     overwrite: overwrite, **options)
     end
@@ -102,7 +102,7 @@ module Omnizip
     def list_archive(archive_path, format: DEFAULT_FORMAT, details: false,
                      **options)
       require_archive!(archive_path)
-      Omnizip::ArchiveHandler.for(format)
+      Omnizip::ArchiveHandler.for(resolve_archive_format(archive_path, format))
         .list(archive_path, details: details, **options)
     end
 
@@ -114,7 +114,7 @@ module Omnizip
     # @return [String] Entry contents
     def read_from_archive(archive_path, entry_name, format: DEFAULT_FORMAT)
       require_archive!(archive_path)
-      Omnizip::ArchiveHandler.for(format).read_entry(archive_path, entry_name)
+      Omnizip::ArchiveHandler.for(resolve_archive_format(archive_path, format)).read_entry(archive_path, entry_name)
     end
 
     # Add a file to an existing archive.
@@ -131,7 +131,7 @@ module Omnizip
         raise Errno::ENOENT, "Source file not found: #{source_path}"
       end
 
-      handler = Omnizip::ArchiveHandler.for(format)
+      handler = Omnizip::ArchiveHandler.for(resolve_archive_format(archive_path, format))
       # allowed: handler is a registered duck; missing add_entry raises below
       if handler.respond_to?(:add_entry)
         handler.add_entry(archive_path, entry_name, source_path)
@@ -151,7 +151,7 @@ module Omnizip
     # @return [String] +archive_path+
     def remove_from_archive(archive_path, entry_name, format: DEFAULT_FORMAT)
       require_archive!(archive_path)
-      handler = Omnizip::ArchiveHandler.for(format)
+      handler = Omnizip::ArchiveHandler.for(resolve_archive_format(archive_path, format))
       # allowed: handler is a registered duck; missing remove_entry raises below
       unless handler.respond_to?(:remove_entry)
         raise Omnizip::UnsupportedFormatError,
@@ -172,6 +172,20 @@ module Omnizip
     # Extension -> single-file compressor map. Each lambda takes
     # (input_path, output_path, options). These formats are streams,
     # not archives, so they bypass ArchiveHandler.
+    # Extensions naming archive formats with a registered handler;
+    # routed when the caller did not pass an explicit +format:+.
+    ARCHIVE_FORMAT_EXTENSIONS = {
+      ".zip" => :zip,
+      ".tar" => :tar,
+      ".7z" => :seven_zip,
+    }.freeze
+
+    # Extensions naming real formats this gem can READ but not write
+    # through the convenience API. Writing them a ZIP under a foreign
+    # name was silent corruption; failing truthfully is the only
+    # honest behavior.
+    READ_ONLY_FORMAT_EXTENSIONS = [".rar", ".iso", ".cpio"].freeze
+
     SINGLE_FILE_COMPRESSORS = {
       ".gz" => lambda do |input, output, options|
         Omnizip::Formats::Gzip.compress(input, output, options)
@@ -206,6 +220,26 @@ module Omnizip
       SINGLE_FILE_COMPRESSORS[ext]
     end
 
+    # Archive format for a path: an explicit +format+ wins unless it
+    # is the default; otherwise the extension routes. Known-but-
+    # unwritable extensions raise instead of receiving a mislabeled
+    # ZIP.
+    def resolve_archive_format(path, format)
+      return format unless format == DEFAULT_FORMAT
+
+      ext = ::File.extname(path).downcase
+      routed = ARCHIVE_FORMAT_EXTENSIONS[ext]
+      return routed if routed
+
+      if READ_ONLY_FORMAT_EXTENSIONS.include?(ext)
+        raise Omnizip::UnsupportedFormatError,
+              "#{ext} archives cannot be written by the convenience " \
+              "API (read-only support); use the format-specific reader"
+      end
+
+      DEFAULT_FORMAT
+    end
+
     private
 
     def require_archive!(archive_path)

data/lib/omnizip/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omnizip
 version: !ruby/object:Gem::Version
-  version: 0.3.32
+  version: 0.3.34
 platform: ruby
 authors:
 - Ribose Inc.
@@ -321,6 +321,7 @@ files:
 - lib/omnizip/algorithms/zstandard/xxhash.rb
 - lib/omnizip/archive_handler.rb
 - lib/omnizip/archive_handlers.rb
+- lib/omnizip/archive_handlers/seven_zip_handler.rb
 - lib/omnizip/archive_handlers/tar_handler.rb
 - lib/omnizip/archive_handlers/zip_handler.rb
 - lib/omnizip/buffer.rb