fontist 2.1.6 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05672d3a03b438efbe391225909a93826f3bc28796cce2e85a07594b5079e1f7
-  data.tar.gz: 4797833807c35169995bf31ad5b4141e03d21975a292b82bb3b0e9f075e18cbb
+  metadata.gz: 6948ddb57a14b1c4336d618e0acefbec39af45062ddae01eefedfe03f15ae5d3
+  data.tar.gz: be5a073f2f186b62c813183716d48dd80760f5f84d84494f364768b37ec63319
 SHA512:
-  metadata.gz: 9480bdbb4afd3b90dc3de5e7ea943d7284919f43daa4edea7a3e12559037472d2deea3eec932f4feb6aea29985c67992bab8de24703c09465a8201cca461b061
-  data.tar.gz: 423929c85c2525661fe196e62dce2f49141ec67be5e68daa0b2be8920846e18d95b2ea3206f32f2b8400633f46f6c17bb35db9968d00f547a313bd6669b20637
+  metadata.gz: 8a1fe40574d4854eb1ddba3b7c62b7d5f7e99868b2ca4a2c21876486621ba6cad887b19225bb5ee7b72e5a14fc77f60098afd712af93c5fc9cc8fdc4ab627109
+  data.tar.gz: 7291f52e6a601d25b55dece3cd3563e41fd3c388f506a0da6128562b221d9f9f8d6f211c0c10941e87bc758357a69220c4563e767e7840680cc6584ae1526a7a

data/.gitignore

@@ -8,6 +8,9 @@
 /tmp/
 Gemfile.lock
 
+# backup files
+*.orig
+
 # fonts
 /spec/fixtures/fonts/*
 /spec/fixtures/fonts/DejaVuSerif.ttf
@@ -33,4 +36,6 @@ CLAUDE.md
 # macOS font catalogs (downloaded via rake task)
 /spec/fixtures/macos_catalogs/com_apple_MobileAsset_Font*.xml
 
+CLAUDE.md
+/cache/
 .lycheecache

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-03-18 01:55:49 UTC using RuboCop version 1.85.1.
+# on 2026-03-18 07:11:54 UTC using RuboCop version 1.85.1.
 # 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
@@ -8,26 +8,33 @@
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
-Gemspec/RequireMFA:
+Layout/ElseAlignment:
   Exclude:
-    - 'docs/node_modules/speakingurl/speakingurl-rails.gemspec'
+    - 'script/validate_v5_urls.rb'
 
-# Offense count: 1
-Gemspec/RequiredRubyVersion:
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+Layout/EmptyLineAfterGuardClause:
   Exclude:
-    - 'docs/node_modules/speakingurl/speakingurl-rails.gemspec'
+    - 'lib/fontist/extract.rb'
+    - 'script/validate_v5_urls.rb'
 
-# Offense count: 1
+# Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
-Layout/ElseAlignment:
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: empty_lines, no_empty_lines
+Layout/EmptyLinesAroundBlockBody:
   Exclude:
-    - 'lib/fontist/font_path.rb'
+    - 'spec/fontist/import/v4_to_v5_migrator_spec.rb'
+    - 'spec/fontist/v5_integration_spec.rb'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
-Layout/EmptyLineAfterGuardClause:
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines, beginning_only, ending_only
+Layout/EmptyLinesAroundClassBody:
   Exclude:
-    - 'spec/fontist/font_spec.rb'
+    - 'lib/fontist/font_finder.rb'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
@@ -35,15 +42,24 @@ Layout/EmptyLineAfterGuardClause:
 # SupportedStylesAlignWith: keyword, variable, start_of_line
 Layout/EndAlignment:
   Exclude:
-    - 'lib/fontist/font_path.rb'
+    - 'script/validate_v5_urls.rb'
 
-# Offense count: 4
+# Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
 Layout/ExtraSpacing:
   Exclude:
-    - 'docs/node_modules/speakingurl/lib/speakingurl-rails.rb'
-    - 'docs/node_modules/speakingurl/speakingurl-rails.gemspec'
+    - 'lib/fontist/import/google/formula_builders/formula_builder_v4.rb'
+
+# Offense count: 15
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
+# SupportedHashRocketStyles: key, separator, table
+# SupportedColonStyles: key, separator, table
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Layout/HashAlignment:
+  Exclude:
+    - 'script/validate_v5_urls.rb'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
@@ -51,7 +67,7 @@ Layout/ExtraSpacing:
 # SupportedStylesAlignWith: start_of_line, relative_to_receiver
 Layout/IndentationWidth:
   Exclude:
-    - 'lib/fontist/font_path.rb'
+    - 'script/validate_v5_urls.rb'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
@@ -82,37 +98,20 @@ Layout/LineEndStringConcatenationIndentation:
   Exclude:
     - 'lib/fontist/errors.rb'
 
-# Offense count: 576
+# Offense count: 674
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Enabled: false
 
-# Offense count: 5
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator, EnforcedStyleForRationalLiterals.
-# SupportedStylesForExponentOperator: space, no_space
-# SupportedStylesForRationalLiterals: space, no_space
-Layout/SpaceAroundOperators:
-  Exclude:
-    - 'docs/node_modules/speakingurl/lib/speakingurl-rails.rb'
-    - 'docs/node_modules/speakingurl/speakingurl-rails.gemspec'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: final_newline, final_blank_line
-Layout/TrailingEmptyLines:
-  Exclude:
-    - 'spec/fontist/utils/github_url_spec.rb'
-
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowInHeredoc.
-Layout/TrailingWhitespace:
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: aligned, indented
+Layout/MultilineOperationIndentation:
   Exclude:
-    - 'spec/fontist/manifest_spec.rb'
+    - 'script/validate_v5_formulas.rb'
 
 # Offense count: 5
 # This cop supports safe autocorrection (--autocorrect).
@@ -148,11 +147,22 @@ Lint/EmptyBlock:
     - 'spec/fontist/resources/apple_cdn_resource_spec.rb'
     - 'spec/fontist/utils/file_ops_spec.rb'
 
-# Offense count: 28
+# Offense count: 1
+Lint/IneffectiveAccessModifier:
+  Exclude:
+    - 'lib/fontist/import/google/formula_builders/base_formula_builder.rb'
+
+# Offense count: 1
+Lint/NoReturnInBeginEndBlocks:
+  Exclude:
+    - 'lib/fontist/font_installer.rb'
+
+# Offense count: 31
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Lint/NonAtomicFileOperation:
   Exclude:
     - 'lib/fontist/cache/store.rb'
+    - 'lib/fontist/font_installer.rb'
     - 'spec/fontist/cache/manager_spec.rb'
     - 'spec/fontist/cache/store_spec.rb'
     - 'spec/fontist/indexes/directory_change_spec.rb'
@@ -167,54 +177,54 @@ Lint/NonAtomicFileOperation:
     - 'spec/support/system_fonts.rb'
     - 'spec/support/windows_test_helper.rb'
 
-# Offense count: 1
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+Lint/ScriptPermission:
+  Exclude:
+    - 'script/test_platform_license_skip.rb'
+    - 'script/validate_v5_urls.rb'
+
+# Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods, NotImplementedExceptions.
 # NotImplementedExceptions: NotImplementedError
 Lint/UnusedMethodArgument:
   Exclude:
     - 'lib/fontist/validator.rb'
+    - 'script/test_v5_install.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: ContextCreatingMethods, MethodCreatingMethods.
-Lint/UselessAccessModifier:
-  Exclude:
-    - 'lib/fontist/utils/downloader.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Lint/UselessAssignment:
-  Exclude:
-    - 'lib/fontist/cache/store.rb'
-
-# Offense count: 98
+# Offense count: 120
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
   Enabled: false
 
-# Offense count: 10
+# Offense count: 19
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 63
+  Max: 217
+
+# Offense count: 4
+# Configuration parameters: CountBlocks, CountModifierForms.
+Metrics/BlockNesting:
+  Max: 4
 
-# Offense count: 57
+# Offense count: 72
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/CyclomaticComplexity:
   Enabled: false
 
-# Offense count: 160
+# Offense count: 192
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 129
 
-# Offense count: 3
+# Offense count: 6
 # Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
 Metrics/ParameterLists:
-  Max: 6
+  Max: 7
 
-# Offense count: 46
+# Offense count: 55
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/PerceivedComplexity:
   Enabled: false
@@ -237,29 +247,36 @@ Naming/PredicateMethod:
     - 'lib/fontist/import/google/models/metadata.rb'
     - 'spec/fontist/memoizable_spec.rb'
 
-# Offense count: 4
+# Offense count: 1
+# Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros, UseSorbetSigs.
+# NamePrefix: is_, has_, have_, does_
+# ForbiddenPrefixes: is_, has_, have_, does_
+# AllowedMethods: is_a?
+# MethodDefinitionMacros: define_method, define_singleton_method
+Naming/PredicatePrefix:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/fontist/import/google/formula_builders/formula_builder_v5.rb'
+
+# Offense count: 5
 # Configuration parameters: MinSize.
 Performance/CollectionLiteralInLoop:
   Exclude:
     - 'lib/fontist/cache/manager.rb'
     - 'lib/fontist/import/otf/font_file.rb'
+    - 'script/test_v5_install.rb'
     - 'spec/fontist/import/create_formula_spec.rb'
 
-# Offense count: 16
+# Offense count: 23
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Performance/MapCompact:
+  Enabled: false
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Performance/TimesMap:
   Exclude:
-    - 'lib/fontist/font.rb'
-    - 'lib/fontist/formula.rb'
-    - 'lib/fontist/import/formula_builder.rb'
-    - 'lib/fontist/import/google/data_sources/github.rb'
-    - 'lib/fontist/import/google/font_database.rb'
-    - 'lib/fontist/import/google/metadata_adapter.rb'
-    - 'lib/fontist/indexes/incremental_scanner.rb'
-    - 'lib/fontist/macos/catalog/asset.rb'
-    - 'lib/fontist/system_index.rb'
-    - 'lib/fontist/validation.rb'
-    - 'lib/fontist/validator.rb'
+    - 'script/validate_v5_urls.rb'
 
 # Offense count: 2
 Security/MarshalLoad:
@@ -267,6 +284,14 @@ Security/MarshalLoad:
     - 'lib/fontist/cache/store.rb'
     - 'spec/fontist/cache/store_spec.rb'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, SingleLineConditionsOnly, IncludeTernaryExpressions.
+# SupportedStyles: assign_to_condition, assign_inside_condition
+Style/ConditionalAssignment:
+  Exclude:
+    - 'script/validate_v5_urls.rb'
+
 # Offense count: 4
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
@@ -274,14 +299,7 @@ Security/MarshalLoad:
 Style/EmptyStringInsideInterpolation:
   Exclude:
     - 'lib/fontist/import/import_display.rb'
-    - 'lib/fontist/import/macos.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-Style/ExpandPathArguments:
-  Exclude:
-    - 'docs/node_modules/speakingurl/lib/speakingurl-rails.rb'
-    - 'docs/node_modules/speakingurl/speakingurl-rails.gemspec'
+    - 'lib/fontist/import/macos_importer.rb'
 
 # Offense count: 12
 # This cop supports safe autocorrection (--autocorrect).
@@ -323,23 +341,19 @@ Style/HashLikeCase:
     - 'spec/support/platform_fonts.rb'
 
 # Offense count: 6
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
-# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
-# SupportedShorthandSyntax: always, never, either, consistent, either_consistent
-Style/HashSyntax:
-  Exclude:
-    - 'docs/node_modules/speakingurl/lib/speakingurl-rails.rb'
-    - 'spec/fontist/font_spec.rb'
-    - 'spec/fontist/formulas_isolation_spec.rb'
-    - 'spec/fontist/manifest_spec.rb'
-
-# Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/IdenticalConditionalBranches:
   Exclude:
     - 'lib/fontist/helpers.rb'
     - 'lib/fontist/import/import_display.rb'
+    - 'script/validate_v5_urls.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowIfModifier.
+Style/IfInsideElse:
+  Exclude:
+    - 'script/validate_v5_formulas.rb'
 
 # Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -349,23 +363,34 @@ Style/MapToHash:
     - 'lib/fontist/utils/downloader.rb'
     - 'spec/fontist/indexes/incremental_scanner_spec.rb'
 
-# Offense count: 1
+# Offense count: 22
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: literals, strict
-Style/MutableConstant:
+# Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns.
+# SupportedStyles: predicate, comparison
+Style/NumericPredicate:
   Exclude:
-    - 'lib/fontist/utils/github_url.rb'
+    - 'spec/**/*'
+    - 'script/test_platform_license_skip.rb'
+    - 'script/test_v5_install.rb'
+    - 'script/validate_v5_formulas.rb'
+    - 'script/validate_v5_urls.rb'
+
+# Offense count: 1
+# Configuration parameters: AllowedClasses.
+Style/OneClassPerFile:
+  Exclude:
+    - 'script/validate_v5_urls.rb'
 
 # Offense count: 1
 Style/OpenStructUse:
   Exclude:
     - 'spec/fontist/cache/store_spec.rb'
 
-# Offense count: 1
+# Offense count: 2
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/PartitionInsteadOfDoubleSelect:
   Exclude:
+    - 'script/validate_v5_urls.rb'
     - 'spec/fontist/import/google/data_sources/vf_spec.rb'
 
 # Offense count: 3
@@ -375,11 +400,18 @@ Style/ReduceToHash:
     - 'lib/fontist/import/google/font_database.rb'
     - 'lib/fontist/indexes/directory_snapshot.rb'
 
-# Offense count: 1
+# Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 Style/RedundantBegin:
   Exclude:
-    - 'spec/fontist/font_spec.rb'
+    - 'lib/fontist/font_installer.rb'
+    - 'script/validate_v5_urls.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantParentheses:
+  Exclude:
+    - 'script/validate_v5_urls.rb'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
@@ -387,19 +419,32 @@ Style/RedundantRegexpArgument:
   Exclude:
     - 'lib/fontist/repo.rb'
 
-# Offense count: 2
+# Offense count: 9
 # This cop supports safe autocorrection (--autocorrect).
 Style/RescueModifier:
   Exclude:
-    - 'lib/fontist/cache/store.rb'
+    - 'script/validate_v5_urls.rb'
 
-# Offense count: 1
+# Offense count: 11
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: implicit, explicit
 Style/RescueStandardError:
   Exclude:
-    - 'lib/fontist/cache/store.rb'
+    - 'script/test_platform_license_skip.rb'
+    - 'script/test_v5_install.rb'
+    - 'script/validate_v5_formulas.rb'
+    - 'script/validate_v5_urls.rb'
+
+# Offense count: 3
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods, MaxChainLength.
+# AllowedMethods: present?, blank?, presence, try, try!
+Style/SafeNavigation:
+  Exclude:
+    - 'script/test_v5_install.rb'
+    - 'script/validate_v5_formulas.rb'
+    - 'script/validate_v5_urls.rb'
 
 # Offense count: 1
 # Configuration parameters: Max.
@@ -408,34 +453,53 @@ Style/SafeNavigationChainLength:
     - 'lib/fontist/system_index.rb'
 
 # Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowModifier.
+Style/SoleNestedConditional:
+  Exclude:
+    - 'script/validate_v5_formulas.rb'
+    - 'script/validate_v5_urls.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/StderrPuts:
+  Exclude:
+    - 'script/validate_v5_urls.rb'
+
+# Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Mode.
 Style/StringConcatenation:
   Exclude:
-    - 'lib/fontist/cache/store.rb'
+    - 'script/validate_v5_formulas.rb'
     - 'spec/fontist/system_index_spec.rb'
 
-# Offense count: 5
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
-# SupportedStyles: single_quotes, double_quotes
-Style/StringLiterals:
-  Exclude:
-    - 'docs/node_modules/speakingurl/lib/speakingurl-rails.rb'
-    - 'docs/node_modules/speakingurl/speakingurl-rails.gemspec'
-
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 Style/SuperArguments:
   Exclude:
     - 'lib/fontist/import/google/models/font_family.rb'
 
-# Offense count: 6
+# Offense count: 3
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowMethodsWithArguments, AllowedMethods, AllowedPatterns, AllowComments.
+# AllowedMethods: define_method
+Style/SymbolProc:
+  Exclude:
+    - 'lib/fontist/font_installer.rb'
+    - 'lib/fontist/format_matcher.rb'
+    - 'script/validate_v5_formulas.rb'
+
+# Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyleForMultiline.
 # SupportedStylesForMultiline: comma, consistent_comma, diff_comma, no_comma
 Style/TrailingCommaInArguments:
   Exclude:
-    - 'lib/fontist/utils/github_url.rb'
-    - 'spec/fontist/system_index_spec.rb'
-    - 'spec/fontist/utils/github_url_spec.rb'
+    - 'spec/fontist/v5_integration_spec.rb'
+
+# Offense count: 4
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/ZeroLengthPredicate:
+  Exclude:
+    - 'script/validate_v5_urls.rb'

data/README.adoc

@@ -2117,7 +2117,7 @@ fontist import sil --import-cache /custom/path ...
 Fontist.import_cache_path = "/custom/import/cache"
 
 # Per-import setting
-Fontist::Import::Macos.new(
+Fontist::Import::MacosImporter.new(
   plist_path,
   import_cache: "/custom/cache"
 ).call