archive_r_ruby 0.1.7 → 0.1.9

data/ext/archive_r/vendor/archive_r/src/traverser.cc

@@ -3,9 +3,9 @@
 
 #include "archive_r/traverser.h"
 #include "archive_r/entry.h"
+#include "archive_r/entry_fault.h"
 #include "archive_r/path_hierarchy.h"
 #include "archive_r/path_hierarchy_utils.h"
-#include "archive_r/entry_fault.h"
 #include "archive_stack_orchestrator.h"
 #include "archive_type.h"
 #include "entry_fault_error.h"
@@ -31,7 +31,7 @@ archive_r::ArchiveOption to_archive_option(const TraverserOptions &options) {
   archive_r::ArchiveOption converted;
   converted.passphrases = options.passphrases;
   converted.formats = options.formats;
-  converted.metadata_keys = options.metadata_keys;
+  converted.metadata_keys.insert(options.metadata_keys.begin(), options.metadata_keys.end());
   return converted;
 }
 
@@ -48,14 +48,13 @@ Traverser::Traverser(std::vector<PathHierarchy> paths, TraverserOptions options)
       throw std::invalid_argument("path hierarchy cannot be empty");
     }
   }
-
 }
 
 Traverser::Traverser(PathHierarchy path, TraverserOptions options)
-    : Traverser(std::vector<PathHierarchy>{std::move(path)}, std::move(options)) {}
+    : Traverser(std::vector<PathHierarchy>{ std::move(path) }, std::move(options)) {}
 
 Traverser::Traverser(const std::string &path, TraverserOptions options)
-    : Traverser(std::vector<PathHierarchy>{make_single_path(path)}, std::move(options)) {}
+    : Traverser(std::vector<PathHierarchy>{ make_single_path(path) }, std::move(options)) {}
 
 Traverser::~Traverser() = default;
 
@@ -65,7 +64,7 @@ Traverser::~Traverser() = default;
 
 class Traverser::Iterator::Impl {
 public:
-    Impl(std::vector<PathHierarchy> paths, bool at_end, const TraverserOptions &traverser_options)
+  Impl(std::vector<PathHierarchy> paths, bool at_end, const TraverserOptions &traverser_options)
       : _paths(std::move(paths))
       , _at_end(at_end)
       , _archive_options(to_archive_option(traverser_options))
@@ -73,14 +72,9 @@ public:
     if (_at_end) {
       return;
     }
-    if (_paths.empty()) {
-      throw std::invalid_argument("paths cannot be empty");
-    }
     ensure_shared_orchestrator();
-    
-    if (!advance_to_next_root()) {
-      _at_end = true;
-    }
+
+    _at_end = !advance_to_next_root();
   }
 
   Entry &get_entry() {
@@ -100,7 +94,7 @@ public:
     if (_current_entry->depth() == 0 && request_descend_into_archive && !_current_entry->is_directory()) {
       request_descend_into_archive = false;
       attempt_descend_into_root(_current_entry->path_hierarchy());
-    } 
+    }
     _current_entry.reset();
 
     if (fetch_from_archive(request_descend_into_archive)) {
@@ -114,13 +108,13 @@ public:
     if (advance_to_next_root()) {
       return;
     }
-    
+
     descend_pending_multi_volumes();
-    
+
     if (fetch_from_archive(false)) {
       return;
     }
-    
+
     _at_end = true;
   }
 
@@ -128,10 +122,7 @@ public:
     if (this == other) {
       return true;
     }
-    if (!other) {
-      return false;
-    }
-    return _at_end && other->_at_end;
+    return other && _at_end && other->_at_end;
   }
 
 private:
@@ -143,9 +134,6 @@ private:
   }
 
   std::string normalize_path_string(const std::string &value) {
-    if (value.empty()) {
-      return value;
-    }
     std::filesystem::path path_value(value);
     return path_value.lexically_normal().string();
   }
@@ -169,14 +157,9 @@ private:
     }
     ArchiveStackOrchestrator &orchestrator = *ensure_shared_orchestrator();
 
-    try {
-      if (orchestrator.advance(request_descend_into_archive)) {
-        set_current_entry(orchestrator.current_entry_hierarchy());
-        return true;
-      }
-    } catch (const EntryFaultError &error) {
-      EntryFault fault = enrich_orchestrator_error(error, orchestrator);
-      handle_orchestrator_error(fault);
+    if (orchestrator.advance(request_descend_into_archive)) {
+      set_current_entry(orchestrator.current_entry_hierarchy());
+      return true;
     }
     return false;
   }
@@ -224,13 +207,9 @@ private:
     }
   }
 
-  void set_current_entry(PathHierarchy hierarchy) {
-    _current_entry = Entry::create(std::move(hierarchy), ensure_shared_orchestrator(), _default_descent);
-  }
+  void set_current_entry(PathHierarchy hierarchy) { _current_entry = Entry::create(std::move(hierarchy), ensure_shared_orchestrator(), _default_descent); }
 
-  void handle_orchestrator_error(const EntryFault &fault) {
-    dispatch_registered_fault(fault);
-  }
+  void handle_orchestrator_error(const EntryFault &fault) { dispatch_registered_fault(fault); }
 
   void reset_source_state() {
     reset_directory_traversal();
@@ -251,9 +230,6 @@ private:
     if (fault.hierarchy.empty()) {
       fault.hierarchy = orchestrator.current_entry_hierarchy();
     }
-    if (fault.message.empty() && error.what()) {
-      fault.message = error.what();
-    }
     return fault;
   }
 
@@ -273,7 +249,7 @@ private:
 // ============================================================================
 
 Traverser::Iterator::Iterator(std::unique_ptr<Impl> impl)
-  : _impl(std::move(impl)) {}
+    : _impl(std::move(impl)) {}
 
 Traverser::Iterator::~Iterator() = default;
 

data/lib/archive_r.rb

@@ -35,7 +35,11 @@ rescue LoadError
 end
 
 module Archive_r
-  VERSION = "0.1.7"
+  version_path = File.expand_path('../VERSION', __dir__)
+  unless File.exist?(version_path)
+    version_path = File.expand_path('../../../VERSION', __dir__)
+  end
+  VERSION = File.read(version_path).strip
   # Common archive formats excluding libarchive's mtree/raw pseudo formats
   STANDARD_FORMATS = %w[
     7zip ar cab cpio empty iso9660 lha rar tar warc xar zip

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: archive_r_ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - raizo.tcs
+autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -48,11 +49,14 @@ extensions:
 - ext/archive_r/extconf.rb
 extra_rdoc_files: []
 files:
-- LICENSE.txt
+- LICENSE
+- NOTICE
 - README.md
+- VERSION
 - ext/archive_r/archive_r_ext.cc
 - ext/archive_r/extconf.rb
-- ext/archive_r/vendor/archive_r/LICENSE.txt
+- ext/archive_r/vendor/archive_r/LICENSE
+- ext/archive_r/vendor/archive_r/NOTICE
 - ext/archive_r/vendor/archive_r/include/archive_r/data_stream.h
 - ext/archive_r/vendor/archive_r/include/archive_r/entry.h
 - ext/archive_r/vendor/archive_r/include/archive_r/entry_fault.h
@@ -92,6 +96,7 @@ metadata:
   source_code_uri: https://github.com/raizo-tcs/archive_r
   bug_tracker_uri: https://github.com/raizo-tcs/archive_r/issues
   changelog_uri: https://github.com/raizo-tcs/archive_r/releases
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -106,7 +111,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.1
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: 'Ruby bindings for archive_r: libarchive-based streaming traversal for recursive
   nested archives (no temp files, no large in-memory buffers)'

data/LICENSE.txt

@@ -1,97 +0,0 @@
-archive_r License
-Version: 0.1.7 (2025-12-16)
-
-----------------------------------------
-Primary License
-----------------------------------------
-
-MIT License
-
-Copyright (c) 2025 archive_r Team
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-----------------------------------------
-Third-Party Notices
-----------------------------------------
-
-This distribution bundles or links against the following third-party
-components. Their respective license terms apply in addition to the MIT
-License shown above.
-
-1. libarchive
-   - Purpose: core archive reading and writing functionality for the C++
-     library and language bindings.
-   - License: New BSD License (https://www.libarchive.org/)
-
-2. pybind11
-   - Purpose: header-only binding generator for the Python extension module.
-   - License: BSD-style License (https://github.com/pybind/pybind11)
-
-The following components are redistributed only because libarchive (bundled with archive_r) depends on them at runtime:
-
-3. zlib
-   - Purpose: libarchive dependency providing DEFLATE compression; bundled inside archive_r binaries and wheels because libarchive requires it.
-   - License: zlib License (https://zlib.net/zlib_license.html)
-
-4. bzip2
-   - Purpose: libarchive dependency providing bzip2 compression support; distributed with archive_r artifacts.
-   - License: BSD-style license (https://sourceware.org/bzip2/)
-
-5. liblzma (XZ Utils)
-   - Purpose: libarchive dependency providing LZMA/XZ compression; included with archive_r packages.
-   - License: Public Domain + GNU LGPLv2.1+ (https://tukaani.org/xz/)
-
-6. libxml2
-   - Purpose: libarchive dependency used for archive formats such as xar; distributed alongside archive_r.
-   - License: MIT-style License (http://xmlsoft.org/)
-
-7. zstd
-   - Purpose: libarchive dependency providing Zstandard compression; shipped within archive_r binaries.
-   - License: BSD License (https://github.com/facebook/zstd)
-
-8. Nettle
-   - Purpose: libarchive dependency providing cryptographic support (macOS/Linux); bundled with archive_r binaries.
-   - License: GNU LGPLv3+ or GNU GPLv2+ (https://www.lysator.liu.se/~nisse/nettle/)
-
-9. mini-gmp
-   - Purpose: Nettle dependency for arithmetic operations (macOS/Linux); bundled with archive_r binaries.
-   - License: GNU LGPLv3+ or GNU GPLv2+ (https://gmplib.org/)
-
-10. OpenSSL 3
-   - Purpose: libarchive dependency providing cryptographic support (Windows); bundled with archive_r Windows wheels.
-    - License: Apache License 2.0 with OpenSSL exception (https://www.openssl.org/source/license.html)
-
-11. lz4
-   - Purpose: libarchive dependency providing LZ4 compression; shipped with archive_r artifacts when required.
-   - License: BSD 2-Clause (https://github.com/lz4/lz4)
-
-12. libb2 (BLAKE2)
-   - Purpose: libarchive dependency providing BLAKE2 hashing; bundled when archive formats require it.
-   - License: CC0 1.0 Universal (https://github.com/BLAKE2/libb2)
-
-13. libattr
-   - Purpose: libarchive dependency providing extended attribute support on POSIX platforms; included in POSIX builds only.
-   - License: LGPL-2.1-or-later for the library (https://savannah.nongnu.org/projects/attr)
-
-14. libacl
-   - Purpose: libarchive dependency providing POSIX ACL support; included in POSIX builds only.
-   - License: LGPL-2.1-or-later for the library (https://savannah.nongnu.org/projects/acl)
-Users of archive_r should review the linked third-party licenses to ensure
-compliance with their terms when redistributing this software.

data/ext/archive_r/vendor/archive_r/LICENSE.txt

@@ -1,97 +0,0 @@
-archive_r License
-Version: 0.1.7 (2025-12-16)
-
-----------------------------------------
-Primary License
-----------------------------------------
-
-MIT License
-
-Copyright (c) 2025 archive_r Team
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-----------------------------------------
-Third-Party Notices
-----------------------------------------
-
-This distribution bundles or links against the following third-party
-components. Their respective license terms apply in addition to the MIT
-License shown above.
-
-1. libarchive
-   - Purpose: core archive reading and writing functionality for the C++
-     library and language bindings.
-   - License: New BSD License (https://www.libarchive.org/)
-
-2. pybind11
-   - Purpose: header-only binding generator for the Python extension module.
-   - License: BSD-style License (https://github.com/pybind/pybind11)
-
-The following components are redistributed only because libarchive (bundled with archive_r) depends on them at runtime:
-
-3. zlib
-   - Purpose: libarchive dependency providing DEFLATE compression; bundled inside archive_r binaries and wheels because libarchive requires it.
-   - License: zlib License (https://zlib.net/zlib_license.html)
-
-4. bzip2
-   - Purpose: libarchive dependency providing bzip2 compression support; distributed with archive_r artifacts.
-   - License: BSD-style license (https://sourceware.org/bzip2/)
-
-5. liblzma (XZ Utils)
-   - Purpose: libarchive dependency providing LZMA/XZ compression; included with archive_r packages.
-   - License: Public Domain + GNU LGPLv2.1+ (https://tukaani.org/xz/)
-
-6. libxml2
-   - Purpose: libarchive dependency used for archive formats such as xar; distributed alongside archive_r.
-   - License: MIT-style License (http://xmlsoft.org/)
-
-7. zstd
-   - Purpose: libarchive dependency providing Zstandard compression; shipped within archive_r binaries.
-   - License: BSD License (https://github.com/facebook/zstd)
-
-8. Nettle
-   - Purpose: libarchive dependency providing cryptographic support (macOS/Linux); bundled with archive_r binaries.
-   - License: GNU LGPLv3+ or GNU GPLv2+ (https://www.lysator.liu.se/~nisse/nettle/)
-
-9. mini-gmp
-   - Purpose: Nettle dependency for arithmetic operations (macOS/Linux); bundled with archive_r binaries.
-   - License: GNU LGPLv3+ or GNU GPLv2+ (https://gmplib.org/)
-
-10. OpenSSL 3
-   - Purpose: libarchive dependency providing cryptographic support (Windows); bundled with archive_r Windows wheels.
-    - License: Apache License 2.0 with OpenSSL exception (https://www.openssl.org/source/license.html)
-
-11. lz4
-   - Purpose: libarchive dependency providing LZ4 compression; shipped with archive_r artifacts when required.
-   - License: BSD 2-Clause (https://github.com/lz4/lz4)
-
-12. libb2 (BLAKE2)
-   - Purpose: libarchive dependency providing BLAKE2 hashing; bundled when archive formats require it.
-   - License: CC0 1.0 Universal (https://github.com/BLAKE2/libb2)
-
-13. libattr
-   - Purpose: libarchive dependency providing extended attribute support on POSIX platforms; included in POSIX builds only.
-   - License: LGPL-2.1-or-later for the library (https://savannah.nongnu.org/projects/attr)
-
-14. libacl
-   - Purpose: libarchive dependency providing POSIX ACL support; included in POSIX builds only.
-   - License: LGPL-2.1-or-later for the library (https://savannah.nongnu.org/projects/acl)
-Users of archive_r should review the linked third-party licenses to ensure
-compliance with their terms when redistributing this software.