fontist 3.0.16 → 3.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3871228b469c6c8ee43f6bd04d6b9726feddac6fb2245f3f2bf5533b05a2baf9
-  data.tar.gz: 9e6d136e1ceaa16dd7a3907fe346bbc0a90f46a51458334a5192b5a2dea085e9
+  metadata.gz: '0215294c3d206af7354e6fd6f6f4fd0640e0ba68e53c6ef9891d09f646dfc34e'
+  data.tar.gz: 35757e455e568ec462f7c9fe9347104ac28b87a2b1140fde946847d5aa283fa1
 SHA512:
-  metadata.gz: a201906009471c3844a708096fea687db8aa5a8eb56efc3e13076580dfefd1fea95e12edbbe2707928f5b3ed77db326a5147bf6e043965033fc5b27586166dc2
-  data.tar.gz: b4ff402ff006a766f1daee41ffbed825f826b24c88997e9ea92a91c435fcf88545ffdf921f7091371a247b489a2dc4d0ee92faad6b11a1dfae5f2967ddcd038d
+  metadata.gz: cf6667f140b7437998eb2d5ae2828e98ca5265f326a274ac00519d7be8e274c59615a6a0ca7d94b425f58a6327367d6939d4c18783068d785cde2937ee99d32a
+  data.tar.gz: da9ef27ff12d6d8902f295bca6c8965bcf996f6aeb8a89c63c54b629aca16f34e5f9af8be776509dd35a14594ff7996884e0fc5992f7b4713755f4bb013aba42

data/Gemfile

@@ -18,6 +18,11 @@ gem "simplecov"
 gem "vcr"
 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.
+gem "yeptris", require: false
+
 # Profiling tools (development only)
 # gem "ruby-prof", "~> 1.7"
 # stackprof uses Unix-specific system calls and doesn't compile on Windows

data/lib/fontist/system_index.rb

@@ -100,6 +100,39 @@ module Fontist
     end
   end
 
+  # Thread-safe progress display for parallel index scans
+  class ScanProgress
+    SPINNER_CHARS = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"].freeze
+
+    def initialize(total, verbose:, &on_step)
+      @total = total
+      @verbose = verbose
+      @on_step = on_step
+      @mutex = Mutex.new
+      @processed = 0
+      # Show minimal progress for large collections even in non-verbose mode
+      @minimal = !verbose && total > 100
+      @interval = total > 1000 ? 100 : 50
+    end
+
+    def step(path)
+      @mutex.synchronize do
+        @processed += 1
+        if @verbose
+          @on_step&.call(@processed, path)
+        elsif @minimal && report?
+          Fontist.ui.say("Scanning fonts: #{@processed}/#{@total}...")
+        end
+      end
+    end
+
+    private
+
+    def report?
+      (@processed % @interval).zero? || @processed == @total
+    end
+  end
+
   # {:path=>"/Library/Fonts/Arial Unicode.ttf",
   # :full_name=>"Arial Unicode MS",
   # :family_name=>"Arial Unicode MS",
@@ -518,33 +551,38 @@ stats:)
       if verbose
         puts Paint["Using parallel processing with #{num_cores} cores",
                    :cyan]
-      end
-
-      # Thread-safe progress tracking
-      progress_mutex = Mutex.new
-      processed_count = 0
-      spinner_chars = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"]
 
-      # Show minimal progress for large collections even in non-verbose mode
-      show_minimal_progress = !verbose && sorted_paths.size > 100
-      progress_interval = sorted_paths.size > 1000 ? 100 : 50
+        # Verbose runs keep threads so live progress and per-font stats
+        # stay visible; fontisan parsing is GVL-bound, so this mode is
+        # slow, but it is the human-attended path
+        process_paths_in_threads(sorted_paths, existing_fonts_by_path,
+                                 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)
+        end.flatten.compact
+
+        stats&.total_fonts = results.size
+        results
+      end
+    end
 
-      results = Parallel.map(sorted_paths, in_threads: num_cores) do |path|
-        cached = existing_fonts_by_path[path]
-        result = detect_font_with_cache(path, cached, stats: stats)
-
-        # Update progress (thread-safe)
-        progress_mutex.synchronize do
-          processed_count += 1
-          if verbose && stats
-            display_progress(processed_count, sorted_paths.size, path,
-                             spinner_chars)
-          elsif show_minimal_progress && ((processed_count % progress_interval).zero? || processed_count == sorted_paths.size)
-            # Show minimal progress every N fonts or at the end
-            Fontist.ui.say("Scanning fonts: #{processed_count}/#{sorted_paths.size}...")
-          end
-        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|
+        display_progress(count, sorted_paths.size, path,
+                         ScanProgress::SPINNER_CHARS)
+      end
 
+      results = Parallel.map(sorted_paths, in_threads: num_workers) do |path|
+        result = detect_font_with_cache(path, existing_fonts_by_path[path],
+                                        stats: stats)
+        progress.step(path)
         result
       end.flatten.compact
 

data/lib/fontist/version.rb

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

data/lib/fontist/yaml/yeptris_adapter.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Fontist
+  module Yaml
+    # Model YAML parsing through yeptris's native loader. Measured 4x
+    # faster than Psych on formula and index documents (442KB index:
+    # 47ms vs 202ms), with parse results verified identical across the
+    # full formulas corpus. Dumping stays on the standard adapter.
+    class YeptrisAdapter < Lutaml::Yaml::Adapter::StandardAdapter
+      def self.parse(yaml, _options = {})
+        Yeptris::YAML.load(yaml)
+      end
+    end
+  end
+end

data/lib/fontist/yaml.rb

@@ -0,0 +1,5 @@
+module Fontist
+  module Yaml
+    autoload :YeptrisAdapter, "#{__dir__}/yaml/yeptris_adapter"
+  end
+end

data/lib/fontist/yaml_backend.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+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.
+  module YamlBackend
+    ENV_KEY = "FONTIST_YAML"
+
+    class << self
+      # Returns the activated adapter class, or nil when the standard
+      # engine stays in place (flag set, or yeptris unavailable)
+      def activate!
+        return nil if forced_standard?
+        return nil unless yeptris_available?
+
+        adapter = Yaml::YeptrisAdapter
+        Lutaml::Model::AdapterResolver.set_adapter_class(:yaml, adapter)
+
+        adapter
+      end
+
+      def forced_standard?
+        ENV[ENV_KEY] == "psych"
+      end
+
+      def yeptris_available?
+        require "yeptris"
+        true
+      rescue LoadError
+        false
+      end
+    end
+  end
+end

data/lib/fontist.rb

@@ -11,6 +11,8 @@ require_relative "fontist/from_file_cache"
 require_relative "fontist/memoizable"
 require_relative "fontist/path_scanning"
 require_relative "fontist/utils"
+require_relative "fontist/yaml"
+require_relative "fontist/yaml_backend"
 
 module Fontist
   # Core classes
@@ -282,3 +284,5 @@ module Fontist
     true
   end
 end
+
+Fontist::YamlBackend.activate!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 3.0.16
+  version: 3.0.18
 platform: ruby
 authors:
 - Ribose Inc.
@@ -512,6 +512,9 @@ files:
 - lib/fontist/version.rb
 - lib/fontist/windows_fod_metadata.rb
 - lib/fontist/windows_import_source.rb
+- lib/fontist/yaml.rb
+- lib/fontist/yaml/yeptris_adapter.rb
+- lib/fontist/yaml_backend.rb
 - lib/tasks/system_fonts.rake
 - script/capture_system_fonts
 - script/download_system_indexes