kabosu 0.6.11.2-aarch64-linux → 0.6.11.4-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6310222bef7890fd2ae5882d39f312a656d2bbfbb115d41a9dff80ac94b11932
-  data.tar.gz: f6d831203d5a58c208f7fee1b21f0036b9d0c344fc16652f8cf1e5fe7ef38e46
+  metadata.gz: f280c805cbd2980833e2209d61058c86491e825f3effa0b0d00fe12dc1c29b36
+  data.tar.gz: 6fb1f2755f2d49ff2c6e28ba529dfe2339a21479475167b3863f07705526e913
 SHA512:
-  metadata.gz: f945a86f63e3694fb8bb4a199dbb83470977ed77f1e0d0ae41f66482986e9ff4d9acf148affb77e7e7a4487f512924f54884f92d0155d85cb0787494dd9d825f
-  data.tar.gz: 3a85e6084607c95ff81d0a1807813c625b1a4d9d84ae28c21626ae97d8b501b1a38131306cd38b8cd2939d1fb0e8acbe763cb415c9cb7fc80c44d5a027b775fc
+  metadata.gz: a5f0e29a22aedd8414662ac4d57469e6285454d7a45d7531d509231ea9062f7eeb77f07fb3ab36c768af81565d7c40f5f2fc60c4bf21b08ba76bfab288331b84
+  data.tar.gz: a23470c82e400dba78b37c799958cf7e945ce4331d5b76999fcf28e49b895cde282326c6c6de54a91e6db9f801218f4bca942edba459e81318e46cc9dd0b8c1e

data/lib/kabosu/dict_manager.rb

@@ -58,19 +58,17 @@ module Kabosu
       raise DownloadError, "No downloadable assets for #{version}/#{edition}" if sources.empty?
 
       sources.each do |source|
-        begin
-          download(source.fetch(:url), source.fetch(:archive_path))
-          extract(source.fetch(:archive_path), dest_dir, edition: edition)
-          FileUtils.rm_f(source.fetch(:archive_path))
-          break
-        rescue DownloadError => e
-          FileUtils.rm_f(source.fetch(:archive_path)) if File.exist?(source.fetch(:archive_path))
-          # Try the next candidate (e.g. wheel if the zip 404s). If this was
-          # the last one, surface the original error.
-          raise if sources.last.equal?(source)
-
-          warn "  falling back: #{e.message}"
-        end
+        download(source.fetch(:url), source.fetch(:archive_path))
+        extract(source.fetch(:archive_path), dest_dir, edition: edition)
+        FileUtils.rm_f(source.fetch(:archive_path))
+        break
+      rescue DownloadError => e
+        FileUtils.rm_f(source.fetch(:archive_path))
+        # Try the next candidate (e.g. wheel if the zip 404s). If this was
+        # the last one, surface the original error.
+        raise if sources.last.equal?(source)
+
+        warn "  falling back: #{e.message}"
       end
 
       raise DownloadError, "Expected #{dic_path} after extraction, but file not found" unless File.exist?(dic_path)
@@ -214,7 +212,8 @@ module Kabosu
     def pick_release_sources(version, edition)
       candidates = []
       zip = release_asset_url(version, edition)
-      candidates << { url: zip, archive_path: File.join(@dir, "sudachi-dictionary-#{version}-#{edition}.zip"), format: :zip }
+      candidates << { url: zip, archive_path: File.join(@dir, "sudachi-dictionary-#{version}-#{edition}.zip"),
+                      format: :zip }
 
       begin
         release = fetch_release(version)
@@ -317,25 +316,28 @@ module Kabosu
       warn "Extracting..."
       Zip::File.open(zip_path) do |archive|
         archive.each do |entry|
-          # Wheels (`sudachidict_{edition}/resources/system.dic`) carry the
-          # edition in the top-level directory; legacy zips name the file
-          # `system_{edition}.dic` already. When the entry is a `system.dic`
-          # inside a wheel and `edition:` was passed, land it at
-          # `dest_dir/system_{edition}.dic` so `find`/`installed` keep working
-          # without a separate code path.
-          target_name = entry.name
-          if edition && File.basename(entry.name) == "system.dic"
-            target_name = "system_#{edition}.dic"
-          end
-
-          target = File.join(dest_dir, target_name)
-          # Guard against zip-slip — refuse entries that escape dest_dir.
-          unless File.expand_path(target).start_with?(File.expand_path(dest_dir) + File::SEPARATOR)
-            raise DownloadError, "Refusing to extract entry outside dest_dir: #{entry.name}"
-          end
-
-          FileUtils.mkdir_p(File.dirname(target))
-          entry.extract(target) { true } # overwrite existing
+          # Both layouts are flattened into dest_dir, which is already
+          # `sudachi-dictionary-{version}`.
+          #
+          # Legacy zips nest their contents under a `sudachi-dictionary-{version}/`
+          # directory of their own, so joining the entry name to dest_dir landed
+          # the dictionary at `sudachi-dictionary-{version}/sudachi-dictionary-{version}/system_core.dic`
+          # and every install of a pre-v20260723 release failed with "expected
+          # ... after extraction, but file not found". It went unnoticed because a
+          # machine that already had a dictionary never re-installs one.
+          #
+          # Wheels nest differently again (`sudachidict_{edition}/resources/system.dic`)
+          # and name the file `system.dic`, so that one is renamed to carry the
+          # edition. Taking the basename handles both, and there is nothing in
+          # these archives whose structure is worth keeping: a `.dic`, a LEGAL and
+          # a licence.
+          target_name = File.basename(entry.name)
+          target_name = "system_#{edition}.dic" if edition && target_name == "system.dic"
+
+          next if entry.directory?
+
+          FileUtils.mkdir_p(dest_dir)
+          entry.extract(target_name, destination_directory: dest_dir) { true }
         end
       end
     rescue Zip::Error => e

data/lib/kabosu/version.rb

@@ -1,3 +1,3 @@
 module Kabosu
-  VERSION = "0.6.11.2".freeze
+  VERSION = "0.6.11.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kabosu
 version: !ruby/object:Gem::Version
-  version: 0.6.11.2
+  version: 0.6.11.4
 platform: aarch64-linux
 authors:
 - davafons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-08-20 00:00:00.000000000 Z
+date: 2026-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: benchmark
   requirement: !ruby/object:Gem::Requirement