fontist 3.0.18 → 3.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0215294c3d206af7354e6fd6f6f4fd0640e0ba68e53c6ef9891d09f646dfc34e'
-  data.tar.gz: 35757e455e568ec462f7c9fe9347104ac28b87a2b1140fde946847d5aa283fa1
+  metadata.gz: 439f0978a5d10a8e48403d57e994b299bb143f851f76144373431ab570734c0d
+  data.tar.gz: 142da201af7fcfb87516b2923087066503427d9109a666895c06ba619ad8e07f
 SHA512:
-  metadata.gz: cf6667f140b7437998eb2d5ae2828e98ca5265f326a274ac00519d7be8e274c59615a6a0ca7d94b425f58a6327367d6939d4c18783068d785cde2937ee99d32a
-  data.tar.gz: da9ef27ff12d6d8902f295bca6c8965bcf996f6aeb8a89c63c54b629aca16f34e5f9af8be776509dd35a14594ff7996884e0fc5992f7b4713755f4bb013aba42
+  metadata.gz: 2b14c5130d4e6b6b9fb6e4c385860763a83fd357f4aa1e78b9268eb4194b9de83c17551d51cdb0f4a4c9d6a1925c91892e712c1255806ad5db4507b8862f095a
+  data.tar.gz: 25d0691a0263605ac7de8d65865619cca478ce2085667de0d06275e49415acad4ba8b484727757d5b0303c71c12c879fba01727acee202db5aeb2de2e736793b

data/.rubocop.yml

@@ -3,7 +3,7 @@ inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/main/ci/rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
   SuggestExtensions: false
 
 plugins:

data/Gemfile

@@ -20,7 +20,8 @@ gem "webmock"
 
 # Optional YAML engine (consumer-side dependency; needs Ruby >= 3.0,
 # which is above fontist's gemspec floor, so it stays out of the
-# gemspec). When installed, model YAML parses route through it.
+# gemspec). Activated with FONTIST_YAML=yeptris; off by default
+# pending leptris/yeptris#863 (linux scalar-parity fix).
 gem "yeptris", require: false
 
 # Profiling tools (development only)

data/fontist.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
 
   spec.post_install_message = "Please run `fontist update` to fetch formulas."
 
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/fontist/fontist"

data/lib/fontist/repo.rb

@@ -1,4 +1,5 @@
 require "git"
+require "open3"
 require "paint"
 
 module Fontist
@@ -26,7 +27,7 @@ module Fontist
       repo = Git.open(path)
 
       {
-        url: repo.config["remote.origin.url"],
+        url: repo.config_get("remote.origin.url")&.value,
         revision: revision(repo),
         created: created(repo),
         updated: updated(repo),
@@ -42,19 +43,24 @@ module Fontist
     end
 
     def revision(repo)
-      repo.log.first.sha[0..6]
+      repo.gcommit("HEAD").sha[0..6]
     end
 
     def created(repo)
-      repo.gcommit(repo.log.last.sha).date
+      # git 6.0's Commands::Log clobbers the public Git::Log, breaking
+      # log#first/#last (ruby-git regression); ask the git binary for
+      # the root commit instead
+      root, _err = Open3.capture2("git", "-C", repo.dir.to_s,
+                                  "rev-list", "--max-parents=0", "HEAD")
+      repo.gcommit(root.lines.first.strip).date
     end
 
     def updated(repo)
-      repo.gcommit(repo.log.first.sha).date
+      repo.gcommit("HEAD").date
     end
 
     def dirty?(repo)
-      !repo.status.changed.empty?
+      !repo.status_info.changed.empty?
     end
   end
 
@@ -122,7 +128,8 @@ module Fontist
       rescue StandardError => e
         # Catch all git-related errors
         if e.class.name.include?("Git") || e.message.match?(/git|pull|repository/i)
-          handle_git_error(name, git.config["remote.origin.url"], e, :update)
+          url = git.config_get("remote.origin.url")&.value
+          handle_git_error(name, url, e, :update)
         else
           raise
         end
@@ -164,7 +171,7 @@ module Fontist
 
           begin
             git = Git.open(repo_path_obj)
-            existing_url = git.config["remote.origin.url"]
+            existing_url = git.config_get("remote.origin.url")&.value
             return repo_name if normalize_git_url(existing_url) == normalized_target
           rescue StandardError
             # Skip repos that can't be opened

data/lib/fontist/system_index.rb

@@ -559,19 +559,48 @@ stats:)
                                  verbose: verbose, stats: stats,
                                  num_workers: num_cores)
       else
-        # Measured on 600 system fonts: single thread 2.3s, 8 threads
-        # 3.3s (GVL-bound, mutex contention), 8 processes 0.6s. The
-        # silent build path therefore forks instead of threading
-        results = Parallel.map(sorted_paths, in_processes: num_cores) do |path|
-          detect_font_with_cache(path, existing_fonts_by_path[path],
-                                 stats: nil)
+        # Threads, not forked processes: a silent scan runs from inside
+        # long-lived host processes (e.g. metanorma, whose heap reaches
+        # hundreds of MB by the time fonts are looked up). Each fork
+        # inherits that heap, and its RSS is charged to the process group
+        # while it lives, so an 8-process scan transiently multiplies the
+        # host's footprint by up to 9x — measured 3.6GB against a 0.9GB
+        # parent during a metanorma compile (OOMs under cgroup caps).
+        # The ~1s-per-600-fonts scan penalty is bounded and paid only on
+        # cache-miss rebuilds. split_paths_by_reuse keeps cached entries
+        # in the parent: see its comment for the marshal constraint.
+        to_scan, cached_results = split_paths_by_reuse(
+          sorted_paths,
+          existing_fonts_by_path)
+
+        results = Parallel.map(to_scan, in_threads: num_cores) do |path|
+          detect_fonts(path, stats: nil)
         end.flatten.compact
 
-        stats&.total_fonts = results.size
-        results
+        stats&.total_fonts = cached_results.size + results.size
+        cached_results + results
       end
     end
 
+    # The stat-only reuse check runs in the parent: cached entries can
+    # carry backrefs to their SystemIndexFontCollection (whose
+    # paths_loader is a Proc), and worker results are Marshal.dump'ed
+    # back across the fork boundary — crossing it with cached
+    # collections raises "no _dump_data is defined for class Proc".
+    # Workers therefore receive only to-scan paths, and the block
+    # handed to Parallel closes over nothing but its argument.
+    def split_paths_by_reuse(sorted_paths, existing_fonts_by_path)
+      unchanged, to_scan = sorted_paths.partition do |path|
+        cached = existing_fonts_by_path[path]
+        cached&.any? && file_unchanged?(path, cached.first)
+      end
+      cached_results = unchanged.flat_map do |path|
+        existing_fonts_by_path[path].to_a
+      end
+
+      [to_scan, cached_results]
+    end
+
     def process_paths_in_threads(sorted_paths, existing_fonts_by_path,
 verbose:, stats:, num_workers:)
       progress = ScanProgress.new(sorted_paths.size, verbose: verbose) do |count, path|

data/lib/fontist/update.rb

@@ -32,14 +32,14 @@ module Fontist
               Git.open(Fontist.formulas_repo_path)
             else
               Git.init(Fontist.formulas_repo_path.to_s).tap do |g|
-                g.add_remote("origin", Fontist.formulas_repo_url)
+                g.remote_add("origin", Fontist.formulas_repo_url)
               end
             end
 
       return git.pull("origin", @branch) if git.current_branch == @branch
 
-      git.config("remote.origin.fetch",
-                 "+refs/heads/#{@branch}:refs/remotes/origin/#{@branch}")
+      git.config_set("remote.origin.fetch",
+                     "+refs/heads/#{@branch}:refs/remotes/origin/#{@branch}")
       git.fetch
       git.checkout(@branch)
       git.pull("origin", @branch)

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "3.0.18".freeze
+  VERSION = "3.0.20".freeze
 end

data/lib/fontist/yaml_backend.rb

@@ -3,20 +3,21 @@
 module Fontist
   # Model YAML engine selection.
   #
-  # When the yeptris gem is available, model YAML (formula and index
-  # documents, via lutaml-model) is parsed through its native loader -
-  # measured 4x faster than Psych on those artifacts. The gem is an
-  # optional consumer-side dependency (it needs Ruby >= 3.0, above
-  # fontist's floor), so absence falls back to Psych silently.
-  # FONTIST_YAML=psych forces the standard engine.
+  # The yeptris engine (native loader, measured 4x faster than Psych on
+  # large documents) activates only when explicitly enabled with
+  # FONTIST_YAML=yeptris. It is off by default because the yeptris
+  # x86_64-linux and Windows builds currently mis-parse some plain
+  # scalars as single-element Arrays (leptris/yeptris#863); flip the
+  # default once that parity fix lands.
   module YamlBackend
     ENV_KEY = "FONTIST_YAML"
+    ENABLED_VALUE = "yeptris"
 
     class << self
       # Returns the activated adapter class, or nil when the standard
-      # engine stays in place (flag set, or yeptris unavailable)
+      # engine stays in place (flag unset, or yeptris unavailable)
       def activate!
-        return nil if forced_standard?
+        return nil unless enabled?
         return nil unless yeptris_available?
 
         adapter = Yaml::YeptrisAdapter
@@ -25,8 +26,8 @@ module Fontist
         adapter
       end
 
-      def forced_standard?
-        ENV[ENV_KEY] == "psych"
+      def enabled?
+        ENV[ENV_KEY] == ENABLED_VALUE
       end
 
       def yeptris_available?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 3.0.18
+  version: 3.0.20
 platform: ruby
 authors:
 - Ribose Inc.
@@ -536,7 +536,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="