fontist 2.0.2 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 579975f05c71659ca72914f2e273dead08930e5943f230fbc4ad5029d19b5bad
-  data.tar.gz: c3529656ee99bbd27cd9b7c37025e79350c99ead6b5f222cb08773460b2e6feb
+  metadata.gz: c046b85f916e1f47e83f3746758d88b1c7cd326a0f68853cb1ac74df166c4733
+  data.tar.gz: b61d9a397e865391aff213ffb8a806dea2a8363c91fcb80342cf046e6df3a099
 SHA512:
-  metadata.gz: 7cffa6efd591fc625aff86d71774ef70aff09b6c0fe9d5cb53f4ff0fff81a80fb76950701267ecfd8bea637a26e046a1ce698111226c8972049d86cd0110dd7a
-  data.tar.gz: 8e0386ba63208db999567979f733521ff11b64b745bfd492436012761335a6a406b0fc0104176e05cecb283c4bd3924504e7668ab388a2937fd1596f6bfe8fa4
+  metadata.gz: 50077b4c82967138b4b208bbf7a068b40374870776fa0d3c82a8d3336c997ffa10f5eec09a527e53c5d6ac89ddba02ba3450749255b14daaefac324b6fa9ba50
+  data.tar.gz: 8a070a7a8d71125e3bbdf12b77414a82f8b3b30502616ce29fd7ecd7a442579dcf0f1a7a275d3e537cd93e0b5d370283b48f3cee3da710415033d25dc261059a

data/.rubocop.yml

@@ -1,6 +1,10 @@
 inherit_from:
-  - 'https://raw.githubusercontent.com/fontist/oss-guides/master/ci/rubocop.yml'
+  - .rubocop_todo.yml
+  - https://raw.githubusercontent.com/riboseinc/oss-guides/main/ci/rubocop.yml
 
 AllCops:
   TargetRubyVersion: 2.7
   SuggestExtensions: false
+
+plugins:
+  - rubocop-performance

data/.rubocop_todo.yml

@@ -0,0 +1,76 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2025-11-09 10:17:46 UTC using RuboCop version 1.81.7.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 63
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
+# URISchemes: http, https
+Layout/LineLength:
+  Enabled: false
+
+# Offense count: 1
+# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches, IgnoreDuplicateElseBranch.
+Lint/DuplicateBranch:
+  Exclude:
+    - 'lib/fontist/helpers.rb'
+
+# Offense count: 10
+# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
+Metrics/AbcSize:
+  Exclude:
+    - 'lib/fontist/cli.rb'
+    - 'lib/fontist/font.rb'
+    - 'lib/fontist/import/google_fonts_importer.rb'
+    - 'lib/fontist/import/google_importer.rb'
+    - 'lib/fontist/import/otf_style.rb'
+    - 'lib/fontist/indexes/index_mixin.rb'
+    - 'lib/fontist/manifest_request.rb'
+    - 'lib/fontist/update.rb'
+    - 'test-transform.rb'
+
+# Offense count: 4
+# Configuration parameters: AllowedMethods, AllowedPatterns, Max.
+Metrics/CyclomaticComplexity:
+  Exclude:
+    - 'lib/fontist/cli.rb'
+    - 'lib/fontist/import/google_importer.rb'
+    - 'spec/fontist/import/create_formula_spec.rb'
+    - 'test-transform.rb'
+
+# Offense count: 23
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
+Metrics/MethodLength:
+  Max: 44
+
+# Offense count: 4
+# Configuration parameters: AllowedMethods, AllowedPatterns, Max.
+Metrics/PerceivedComplexity:
+  Exclude:
+    - 'lib/fontist/cli.rb'
+    - 'lib/fontist/cli/thor_ext.rb'
+    - 'lib/fontist/import/google_importer.rb'
+    - 'test-transform.rb'
+
+# Offense count: 1
+# Configuration parameters: MinSize.
+Performance/CollectionLiteralInLoop:
+  Exclude:
+    - 'lib/fontist/import/otf/font_file.rb'
+
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/IdenticalConditionalBranches:
+  Exclude:
+    - 'lib/fontist/helpers.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: Mode.
+Style/StringConcatenation:
+  Exclude:
+    - 'spec/fontist/system_index_spec.rb'

data/Gemfile

@@ -3,13 +3,14 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in fontist.gemspec
 gemspec
 
-gem "pry"
 gem "bundler"
+gem "pry"
 gem "rake"
 gem "rspec"
 gem "rspec-benchmark"
 gem "rubocop"
-gem "rubocop-rails"
 gem "rubocop-performance"
+gem "rubocop-rails"
+gem "rubocop-rake"
 gem "vcr"
-gem "webmock"
+gem "webmock"

data/fontist.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Ribose Inc."]
   spec.email         = ["open.source@ribose.com"]
 
-  spec.summary       = %q{Install openly-licensed fonts on Windows, Linux and Mac!}
-  spec.description   = %q{Install openly-licensed fonts on Windows, Linux and Mac!}
+  spec.summary       = "Install openly-licensed fonts on Windows, Linux and Mac!"
+  spec.description   = "Install openly-licensed fonts on Windows, Linux and Mac!"
   spec.homepage      = "https://github.com/fontist/fontist"
   spec.license       = "BSD-2-Clause"
 
@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/fontist/fontist"
   spec.metadata["changelog_uri"] = "https://github.com/fontist/fontist"
+  spec.metadata["rubygems_mfa_required"] = "true"
 
   spec.require_paths = ["lib"]
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
@@ -27,20 +28,19 @@ Gem::Specification.new do |spec|
   end
   spec.bindir        = "exe"
   spec.executables   = ["fontist"]
-  spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
 
   spec.add_dependency "down", "~> 5.0"
+  spec.add_dependency "excavate", "~> 0.3", ">= 0.3.8"
   spec.add_dependency "extract_ttc", "~> 0.3.7"
   spec.add_dependency "fuzzy_match", "~> 2.1"
+  spec.add_dependency "git", "~> 2.0"
   spec.add_dependency "json", "~> 2.0"
-  spec.add_dependency "nokogiri", "~> 1.0"
+  spec.add_dependency "lutaml-model", "~> 0.7"
   spec.add_dependency "mime-types", "~> 3.0"
+  spec.add_dependency "nokogiri", "~> 1.0"
+  spec.add_dependency "plist", "~> 3.0"
+  spec.add_dependency "socksify", "~> 1.7"
   spec.add_dependency "sys-uname", "~> 1.2"
   spec.add_dependency "thor", "~> 1.4"
-  spec.add_dependency "git", "~> 1.0"
   spec.add_dependency "ttfunk", "~> 1.6"
-  spec.add_dependency "plist", "~> 3.0"
-  spec.add_dependency "excavate", "~> 0.3", '>= 0.3.8'
-  spec.add_dependency "socksify", "~> 1.7"
-  spec.add_dependency "lutaml-model", "~> 0.7"
 end

data/lib/fontist/cli/thor_ext.rb

@@ -37,7 +37,7 @@ module Fontist
 
       def start(given_args = ARGV, config = {})
         config[:shell] ||= Thor::Base.shell.new
-        handle_help_switches(given_args) do |args|
+        handle_version_and_help_switches(given_args) do |args|
           dispatch(nil, args, nil, config)
         end
       rescue StandardError => e
@@ -47,7 +47,15 @@ module Fontist
       private
 
       # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
-      def handle_help_switches(given_args)
+      def handle_version_and_help_switches(given_args)
+        # Handle version flags before Thor processes them
+        # Only intercept --version if it's used as a global flag (first arg or no command before it)
+        if given_args.include?("--version") &&
+            (given_args.first == "--version" || !given_args.first&.match?(/^[a-z]/))
+          yield(["version"])
+          return
+        end
+
         yield(given_args.dup)
       rescue Thor::UnknownArgumentError => e
         retry_with_args = []

data/lib/fontist/cli.rb

@@ -63,6 +63,37 @@ module Fontist
       false
     end
 
+    desc "version", "Show fontist version"
+    def version
+      handle_class_options(options)
+      Fontist.ui.say("fontist: #{Fontist::VERSION}")
+
+      # Show formulas repository information if available
+      if Dir.exist?(Fontist.formulas_repo_path)
+        begin
+          require "git"
+          repo = Git.open(Fontist.formulas_repo_path)
+          repo_url = repo.config["remote.origin.url"] || Fontist.formulas_repo_url
+          branch = repo.current_branch
+          # Use execute.first for git gem ~> 4.0 compatibility
+          log_entry = repo.log(1).execute.first
+          revision = log_entry.sha[0..6]
+          updated = repo.gcommit(log_entry.sha).date.strftime("%Y-%m-%d")
+
+          Fontist.ui.say("formulas:")
+          Fontist.ui.say("  repo: #{repo_url}")
+          Fontist.ui.say("  version: #{Fontist.formulas_version}")
+          Fontist.ui.say("  branch: #{branch}")
+          Fontist.ui.say("  commit: #{revision}")
+          Fontist.ui.say("  updated: #{updated}")
+        rescue StandardError => e
+          Fontist.ui.debug("Could not read formulas repository info: #{e.message}")
+        end
+      end
+
+      STATUS_SUCCESS
+    end
+
     desc "install FONT", "Install font"
     option :force, type: :boolean, aliases: :f,
                    desc: "Install even if already installed in system"
@@ -112,7 +143,10 @@ module Fontist
     def status(font = nil)
       handle_class_options(options)
       paths = Fontist::Font.status(font)
-      return error("No font is installed.", STATUS_MISSING_FONT_ERROR) if paths.empty?
+      if paths.empty?
+        return error("No font is installed.",
+                     STATUS_MISSING_FONT_ERROR)
+      end
 
       success
     rescue Fontist::Errors::GeneralError => e
@@ -175,11 +209,11 @@ module Fontist
     option :name, desc: "Example: Times New Roman"
     option :mirror, repeatable: true
     option :subdir, desc: "Subdirectory to take fonts from, starting with the " \
-      "root dir, e.g.: stixfonts-2.10/fonts/static_otf. May include `fnmatch` patterns."
+                          "root dir, e.g.: stixfonts-2.10/fonts/static_otf. May include `fnmatch` patterns."
     option :file_pattern, desc: "File pattern, e.g. '*.otf'. " \
-      "Uses `fnmatch` patterns."
+                                "Uses `fnmatch` patterns."
     option :name_prefix, desc: "Prefix to add to all font family names, " \
-      "e.g. 'Wine ' for compatibility fonts"
+                               "e.g. 'Wine ' for compatibility fonts"
     def create_formula(url)
       handle_class_options(options)
       require "fontist/import/create_formula"

data/lib/fontist/config.rb

@@ -103,7 +103,10 @@ module Fontist
     def persist
       config_model = self.class.new
       @custom_values.each do |key, value|
-        config_model.send("#{key}=", value) if config_model.respond_to?("#{key}=")
+        if config_model.respond_to?("#{key}=")
+          config_model.send("#{key}=",
+                            value)
+        end
       end
 
       FileUtils.mkdir_p(File.dirname(Fontist.config_path))

data/lib/fontist/font.rb

@@ -343,7 +343,7 @@ module Fontist
     end
 
     def map_to_hash(elements)
-      elements.map { |e| [e, yield(e)] }.to_h
+      elements.to_h { |e| [e, yield(e)] }
     end
 
     def requested_fonts(fonts)

data/lib/fontist/font_installer.rb

@@ -107,11 +107,11 @@ module Fontist
     end
 
     def subdirectory_pattern
-      @subdirectory_pattern ||= "*" + subdirectories.first.chomp("/") unless subdirectories.empty?
+      @subdirectory_pattern ||= "*#{subdirectories.first.chomp('/')}" unless subdirectories.empty?
     end
 
     def subdirectories
-      @subdirectories ||= [@formula.extract].flatten.compact.map(&:options).compact.map(&:fonts_sub_dir).compact
+      @subdirectories ||= [@formula.extract].flatten.compact.filter_map(&:options).filter_map(&:fonts_sub_dir)
     end
 
     def install_font_file(source)

data/lib/fontist/font_model.rb

@@ -10,6 +10,5 @@ module Fontist
       map "name", to: :name
       map "styles", to: :styles
     end
-
   end
 end

data/lib/fontist/helpers.rb

@@ -21,7 +21,7 @@ module Fontist
 
     def self.silence_stream(stream)
       old_stream = stream.dup
-      stream.reopen(RbConfig::CONFIG["host_os"] =~ /mswin|mingw/ ? "NUL:" : "/dev/null") # rubocop:disable Performance/RegexpMatch, Metrics/LineLength
+      stream.reopen(RbConfig::CONFIG["host_os"] =~ /mswin|mingw/ ? File::NULL : File::NULL) # rubocop:disable Performance/RegexpMatch, Layout/LineLength
       stream.sync = true
       yield
     ensure

data/lib/fontist/import/convert_formulas.rb

@@ -54,7 +54,7 @@ module Fontist
       def yaml_formula_path(formula)
         name = formula_path(formula).match(/formulas\/(.*)_fonts?.rb/)[1]
 
-        Fontist.formulas_path.join(name + ".yml")
+        Fontist.formulas_path.join("#{name}.yml")
       end
 
       def stringify_keys(hash)

data/lib/fontist/import/files/collection_file.rb

@@ -16,7 +16,7 @@ module Fontist
         end
 
         def filename
-          File.basename(@path, ".*") + "." + @extension
+          "#{File.basename(@path, '.*')}.#{@extension}"
         end
 
         def source_filename

data/lib/fontist/import/formula_builder.rb

@@ -24,7 +24,7 @@ module Fontist
       end
 
       def formula
-        formula_attributes.map { |name| [name, send(name)] }.to_h.compact
+        formula_attributes.to_h { |name| [name, send(name)] }.compact
       end
 
       def save
@@ -87,7 +87,7 @@ module Fontist
       end
 
       def homepage
-        @options[:homepage] || both_fonts.map(&:homepage).compact.first
+        @options[:homepage] || both_fonts.filter_map(&:homepage).first
       end
 
       def resources
@@ -138,11 +138,11 @@ module Fontist
       end
 
       def copyright
-        both_fonts.map(&:copyright).compact.first
+        both_fonts.filter_map(&:copyright).first
       end
 
       def license_url
-        both_fonts.map(&:license_url).compact.first
+        both_fonts.filter_map(&:license_url).first
       end
 
       def requires_license_agreement

data/lib/fontist/import/formula_serializer.rb

@@ -103,7 +103,7 @@ module Fontist
         standalone.empty? ? nil : standalone
       end
 
-      # rubocop:disable Metrics/MethodLength, Metrics/LineLength
+      # rubocop:disable Metrics/MethodLength, Layout/LineLength
       def extract_type(code)
         case code
         when /def extract.+exe_extract.+cab_extract.+ppviewer\.cab/m
@@ -119,7 +119,7 @@ module Fontist
           raise NotImplementedError, "Please implement an extract format"
         end
       end
-      # rubocop:enable Metrics/MethodLength, Metrics/LineLength
+      # rubocop:enable Metrics/MethodLength, Layout/LineLength
 
       def requires_license_agreement(formula)
         formula.license if formula.license && formula.license_required?

data/lib/fontist/import/google.rb

@@ -14,13 +14,13 @@ module Fontist
       end
 
       def self.formula_path(name)
-        filename = name.downcase.gsub(" ", "_") + ".yml"
+        filename = "#{name.downcase.gsub(' ', '_')}.yml"
         Fontist.formulas_path.join("google", filename)
       end
 
       def self.digest(path)
         checksums = Dir.glob(File.join(path,
-                             "*.{[t|T][t|T][f|F],[o|O][t|T][f|F],[t|T][t|T][c|C]}"))
+                                       "*.{[t|T][t|T][f|F],[o|O][t|T][f|F],[t|T][t|T][c|C]}"))
           .sort
           .map { |x| Digest::SHA256.file(x).to_s }
 

data/lib/fontist/import/google_import.rb

@@ -91,7 +91,7 @@ module Fontist
 
       def formula_dir
         @formula_dir ||= Fontist.formulas_path.join("google").tap do |path|
-          FileUtils.mkdir_p(path) unless File.exist?(path)
+          FileUtils.mkdir_p(path)
         end
       end
 

data/lib/fontist/import/macos.rb

@@ -60,7 +60,7 @@ module Fontist
 
       def formula_dir
         @formula_dir ||= Fontist.formulas_path.join("macos").tap do |path|
-          FileUtils.mkdir_p(path) unless File.exist?(path)
+          FileUtils.mkdir_p(path)
         end
       end
     end

data/lib/fontist/import/otf/font_file.rb

@@ -29,11 +29,11 @@ module Fontist
         end
 
         def to_style
-          STYLE_ATTRIBUTES.map { |name| [name, send(name)] }.to_h.compact
+          STYLE_ATTRIBUTES.to_h { |name| [name, send(name)] }.compact
         end
 
         def to_collection_style
-          COLLECTION_ATTRIBUTES.map { |name| [name, send(name)] }.to_h.compact
+          COLLECTION_ATTRIBUTES.to_h { |name| [name, send(name)] }.compact
         end
 
         def family_name
@@ -108,8 +108,7 @@ module Fontist
             .split("\n")
             .select { |x| x.include?(":") }
             .map { |x| x.split(":", 2) }
-            .map { |x| x.map { |y| Fontist::Import::TextHelper.cleanup(y) } }
-            .to_h
+            .to_h { |x| x.map { |y| Fontist::Import::TextHelper.cleanup(y) } }
         end
 
         def detect_extension

data/lib/fontist/import/otf_parser.rb

@@ -19,8 +19,7 @@ module Fontist
         text.split("\n")
           .select { |x| x.include?(":") }
           .map { |x| x.split(":", 2) }
-          .map { |x| x.map { |y| Fontist::Import::TextHelper.cleanup(y) } }
-          .to_h
+          .to_h { |x| x.map { |y| Fontist::Import::TextHelper.cleanup(y) } }
       end
     end
   end

data/lib/fontist/import/otfinfo/otfinfo_requirement.rb

@@ -7,9 +7,9 @@ module Fontist
         def initialize
           otfinfo_path = `which otfinfo`
           if otfinfo_path.empty?
-            abort "otfinfo is not available. (Or is PATH not setup properly?)"\
-              " You must install otfinfo."\
-              " On macOS it can be installed via `brew install lcdf-typetools`."
+            abort "otfinfo is not available. (Or is PATH not setup properly?) " \
+                  "You must install otfinfo. " \
+                  "On macOS it can be installed via `brew install lcdf-typetools`."
           end
         end
 

data/lib/fontist/import/recursive_extraction.rb

@@ -84,7 +84,8 @@ module Fontist
           file = Otf::FontFile.new(path, name_prefix: @name_prefix)
           @font_files << file unless already_exist?(file)
         when :collection
-          @collection_files << Files::CollectionFile.new(path, name_prefix: @name_prefix)
+          @collection_files << Files::CollectionFile.new(path,
+                                                         name_prefix: @name_prefix)
         end
       end
 
@@ -112,7 +113,7 @@ module Fontist
       end
 
       def subdirectory_pattern
-        @subdirectory_pattern ||= "*" + @subdir.chomp("/") if @subdir
+        @subdirectory_pattern ||= "*#{@subdir.chomp('/')}" if @subdir
       end
 
       def file_pattern?(path)

data/lib/fontist/import/sil_import.rb

@@ -37,7 +37,8 @@ module Fontist
       end
 
       def create_formula_by_archive_url(url)
-        path = Fontist::Import::CreateFormula.new(url, formula_dir: formula_dir).call
+        path = Fontist::Import::CreateFormula.new(url,
+                                                  formula_dir: formula_dir).call
         Fontist.ui.success("Formula has been successfully created: #{path}")
 
         path
@@ -75,11 +76,15 @@ module Fontist
 
       def find_archive_link(document)
         links = document.css("a.btn-download")
-        download_links = links.select { |tag| tag.content.include?("DOWNLOAD CURRENT VERSION") }
+        download_links = links.select do |tag|
+          tag.content.include?("DOWNLOAD CURRENT VERSION")
+        end
         return download_links.first unless download_links.empty?
 
         links = document.css("a")
-        download_links = links.select { |tag| tag.content.match?(/Download.*\.zip/) }
+        download_links = links.select do |tag|
+          tag.content.match?(/Download.*\.zip/)
+        end
         download_links.first
       end
 
@@ -91,7 +96,7 @@ module Fontist
 
       def formula_dir
         @formula_dir ||= Fontist.formulas_path.join("sil").tap do |path|
-          FileUtils.mkdir_p(path) unless File.exist?(path)
+          FileUtils.mkdir_p(path)
         end
       end
     end

data/lib/fontist/import.rb

@@ -2,7 +2,7 @@ module Fontist
   module Import
     class << self
       def name_to_filename(name)
-        name.downcase.gsub(" ", "_") + ".yml"
+        "#{name.downcase.gsub(' ', '_')}.yml"
       end
     end
   end

data/lib/fontist/indexes/default_family_font_index.rb

@@ -19,6 +19,7 @@ module Fontist
     # - pclinuxos_webcore_fonts.yml
     class DefaultFamilyFontIndex < Lutaml::Model::Collection
       include IndexMixin
+
       instances :entries, FormulaKeyToPath
 
       key_value do

data/lib/fontist/indexes/filename_index.rb

@@ -18,6 +18,7 @@ module Fontist
     # - adobe_reader_19.yml
     class FilenameIndex < Lutaml::Model::Collection
       include IndexMixin
+
       instances :entries, FormulaKeyToPath
 
       key_value do

data/lib/fontist/indexes/formula_key_to_path.rb

@@ -1,4 +1,3 @@
-
 module Fontist
   module Indexes
     class FormulaKeyToPath < Lutaml::Model::Serializable

data/lib/fontist/indexes/index_mixin.rb

@@ -6,7 +6,7 @@ module Fontist
       end
 
       module ClassMethods
-        def from_file(file_path = self.path)
+        def from_file(file_path = path)
           Fontist.ui.debug("Index: #{file_path}")
 
           Fontist.formulas_repo_path_exists!
@@ -16,7 +16,8 @@ module Fontist
           file_content = File.read(file_path).strip
 
           if file_content.empty?
-            raise Fontist::Errors::FontIndexCorrupted, "Index file is empty: #{file_path}"
+            raise Fontist::Errors::FontIndexCorrupted,
+                  "Index file is empty: #{file_path}"
           end
 
           from_yaml(file_content)
@@ -51,7 +52,8 @@ module Fontist
       end
 
       def index_key_for_style(_style)
-        raise NotImplementedError, "index_key_for_style(style) must be implemented in including class"
+        raise NotImplementedError,
+              "index_key_for_style(style) must be implemented in including class"
       end
 
       def add_index_formula(style, formula_path)

data/lib/fontist/indexes/preferred_family_font_index.rb

@@ -19,6 +19,7 @@ module Fontist
     # - pclinuxos_webcore_fonts.yml
     class PreferredFamilyFontIndex < Lutaml::Model::Collection
       include IndexMixin
+
       instances :entries, FormulaKeyToPath
 
       key_value do

data/lib/fontist/manifest.rb

@@ -100,7 +100,7 @@ module Fontist
     def self.from_hash(data, options = {})
       locations = options.delete(:locations) || false
 
-      model = super(data, options)
+      model = super
 
       model.to_response(locations: locations)
     end

data/lib/fontist/repo.rb

@@ -75,7 +75,7 @@ module Fontist
         git.pull("origin", git.current_branch)
 
         Index.rebuild
-      rescue Git::GitExecuteError => e
+      rescue Git::Error => e
         raise Errors::RepoCouldNotBeUpdatedError.new(<<~MSG.chomp)
           Formulas repo '#{name}' could not be updated.
           Please consider reinitializing it with:

data/lib/fontist/system_index.rb

@@ -78,9 +78,14 @@ module Fontist
     end
 
     def find(font, style)
-      found_fonts = index.select do |file|
-        file.family_name.casecmp?(font) &&
-          (style.nil? || file.type.casecmp?(style))
+      current_fonts = index
+
+      if style.nil?
+        found_fonts = current_fonts.select { |file| file.family_name&.casecmp?(font) }
+      else
+        found_fonts = current_fonts.select do |file|
+          file.family_name&.casecmp?(font) && file.type&.casecmp?(style)
+        end
       end
 
       found_fonts.empty? ? nil : found_fonts
@@ -96,7 +101,12 @@ module Fontist
     end
 
     def index_changed?
-      fonts.nil? || fonts.empty? || font_paths != (@paths_loader&.call || []).sort.uniq
+      return true if fonts.nil? || fonts.empty?
+
+      current_paths = (@paths_loader&.call&.sort&.uniq || [])
+      excluded_paths_in_current = current_paths.select { |path| excluded?(path) }
+
+      current_paths != (font_paths + excluded_paths_in_current).uniq.sort
     end
 
     def update
@@ -136,9 +146,14 @@ module Fontist
     end
 
     def detect_paths(paths)
-      # paths are file paths to font files
+      existing_fonts_by_path = fonts&.group_by(&:path) || {}
+
       paths.sort.uniq.flat_map do |path|
-        detect_fonts(path)
+        if existing_fonts_by_path[path]&.any?
+          existing_fonts_by_path[path]
+        else
+          detect_fonts(path)
+        end
       end.compact
     end
 
@@ -215,15 +230,23 @@ module Fontist
     include Utils::Locking
 
     def self.system_index
+      current_path = Fontist.system_index_path
+      return @system_index if !@system_index.nil? && @system_index_path == current_path
+
+      @system_index_path = current_path
       @system_index = SystemIndexFontCollection.from_file(
-        path: Fontist.system_index_path,
+        path: current_path,
         paths_loader: -> { SystemFont.font_paths },
       )
     end
 
     def self.fontist_index
+      current_path = Fontist.fontist_index_path
+      return @fontist_index if !@fontist_index.nil? && @fontist_index_path == current_path
+
+      @fontist_index_path = current_path
       @fontist_index = SystemIndexFontCollection.from_file(
-        path: Fontist.fontist_index_path,
+        path: current_path,
         paths_loader: -> { SystemFont.fontist_font_paths },
       )
     end

data/lib/fontist/update.rb

@@ -19,7 +19,7 @@ module Fontist
 
     def update_main_repo
       dir = File.dirname(Fontist.formulas_repo_path)
-      FileUtils.mkdir_p(dir) unless File.exist?(dir)
+      FileUtils.mkdir_p(dir)
 
       unless Dir.exist?(Fontist.formulas_repo_path)
         return Git.clone(Fontist.formulas_repo_url,

data/lib/fontist/utils/downloader.rb

@@ -94,9 +94,9 @@ module Fontist
               progress_bar.total = content_length
             end
           },
-          progress_proc: -> (progress) {
+          progress_proc: ->(progress) {
             progress_bar.increment(progress)
-          }
+          },
         )
       end
       # rubocop:enable Metrics/MethodLength
@@ -118,7 +118,7 @@ module Fontist
     class ProgressBar
       def initialize(total)
         @counter = 0
-        @total  = total
+        @total = total
         @printed_percent = -1
         @printed_size = -1
         @start = Time.now
@@ -137,7 +137,8 @@ module Fontist
       def finish
         print
 
-        Fontist.ui.print(format(", %<mb_per_second>.2f MiB/s, done.\n", mb_per_second: mb_per_second))
+        Fontist.ui.print(format(", %<mb_per_second>.2f MiB/s, done.\n",
+                                mb_per_second: mb_per_second))
       end
 
       private
@@ -204,7 +205,8 @@ module Fontist
       end
 
       def print_size
-        Fontist.ui.print(format("\r\e[0KDownloading: %<downloaded>4d MiB", downloaded: counter_mb))
+        Fontist.ui.print(format("\r\e[0KDownloading: %<downloaded>4d MiB",
+                                downloaded: counter_mb))
       end
 
       def mb_per_second

data/lib/fontist/utils/locking.rb

@@ -3,7 +3,7 @@ module Fontist
     module Locking
       def lock(lock_path)
         File.dirname(lock_path).tap do |dir|
-          FileUtils.mkdir_p(dir) unless File.exist?(dir)
+          FileUtils.mkdir_p(dir)
         end
 
         f = File.open(lock_path, File::CREAT)

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "2.0.2".freeze
+  VERSION = "2.0.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-18 00:00:00.000000000 Z
+date: 2025-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -25,105 +25,111 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: extract_ttc
+  name: excavate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.8
 - !ruby/object:Gem::Dependency
-  name: fuzzy_match
+  name: extract_ttc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 0.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 0.3.7
 - !ruby/object:Gem::Dependency
-  name: json
+  name: fuzzy_match
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: sys-uname
+  name: lutaml-model
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: git
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -137,81 +143,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: ttfunk
+  name: plist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: plist
+  name: socksify
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: excavate
+  name: sys-uname
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: socksify
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: lutaml-model
+  name: ttfunk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.6'
 description: Install openly-licensed fonts on Windows, Linux and Mac!
 email:
 - open.source@ribose.com
@@ -230,6 +230,7 @@ files:
 - ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - Gemfile
 - LICENSE.txt
 - README.adoc
@@ -339,6 +340,7 @@ metadata:
   homepage_uri: https://github.com/fontist/fontist
   source_code_uri: https://github.com/fontist/fontist
   changelog_uri: https://github.com/fontist/fontist
+  rubygems_mfa_required: 'true'
 post_install_message: Please run `fontist update` to fetch formulas.
 rdoc_options: []
 require_paths: