fontist 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 722a298384ffed9d696e836b150d354e874211c9927ff3482e68a6e0a26367fc
-  data.tar.gz: d8b57e7f9223bc56f0b83e0a4ef1b48db4a35e8a8fd41e9af2fe109e0ffda152
+  metadata.gz: 579975f05c71659ca72914f2e273dead08930e5943f230fbc4ad5029d19b5bad
+  data.tar.gz: c3529656ee99bbd27cd9b7c37025e79350c99ead6b5f222cb08773460b2e6feb
 SHA512:
-  metadata.gz: 63aed7061e821c6cc0d30f73de923f1dcf2badcee91855bd99e3618ab6bb859bb6a33935e77ed586be49ae640c97457bdaa148482f02a04fd5694e7c93bc1dfc
-  data.tar.gz: f682fc64dafb10898e5d6d676f35f7e2208f46c3fab1d58ddaf95b047fb9c94feacaffe293cdbb6cab951d47dfc28dc738e207d0eaa48b19ce1aac41be858c6a
+  metadata.gz: 7cffa6efd591fc625aff86d71774ef70aff09b6c0fe9d5cb53f4ff0fff81a80fb76950701267ecfd8bea637a26e046a1ce698111226c8972049d86cd0110dd7a
+  data.tar.gz: 8e0386ba63208db999567979f733521ff11b64b745bfd492436012761335a6a406b0fc0104176e05cecb283c4bd3924504e7668ab388a2937fd1596f6bfe8fa4

data/README.adoc

@@ -4,7 +4,17 @@ image:https://github.com/fontist/fontist/actions/workflows/test-and-release.yml/
 image:https://img.shields.io/gem/v/fontist.svg["Gem Version", link="https://rubygems.org/gems/fontist"]
 image:https://img.shields.io/github/issues-pr-raw/fontist/fontist.svg["Pull Requests", link="https://github.com/fontist/fontist/pulls"]
 
-A simple library to find and download fonts for Windows, Linux and Mac.
+Fontist lets you find and download fonts for Windows, Linux and Mac.
+
+Fontist is designed to facilitate automated and unattended management of font
+installations on modern operating systems.
+
+Fontist provides a repository of open
+https://github.com/fontist/formulas[Fontist Formulas] that can be easily
+installed, and also supports private font formula repositories for private or
+licensed commercial fonts.
+
+Learn more (and find your font) at https://www.fontist.org[fontist.org].
 
 :toc:
 
@@ -468,8 +478,8 @@ styles. You can do that by using:
 Fontist::Font.all
 ----
 
-The return values are `OpenStruct` objects, so you can easily do any other
-operation you would do in any ruby object.
+The return values are model objects, so you can easily access their properties
+and perform operations on them.
 
 === `Fontist::Formula`
 
@@ -518,8 +528,8 @@ what type fonts can be installed using that formula. Usages:
 Fontist::Formula.all
 ----
 
-The return values are `OpenStruct` objects, so you can easily do any other
-operation you would do in any ruby object.
+The return values are model objects, so you can easily access their properties
+and perform operations on them.
 
 === `Fontist::Manifest`
 
@@ -916,6 +926,62 @@ fontist create-formula https://www.latofonts.com/files/Lato2OFL.zip
 cp lato.yml ~/.fontist/formulas/Formulas/
 ----
 
+==== Options for `create-formula`
+
+The `create-formula` command supports several options to customize formula generation:
+
+`--name`::
+Specify a custom formula name instead of auto-detecting from fonts.
++
+[source,sh]
+----
+fontist create-formula https://example.com/fonts.zip --name "My Custom Fonts"
+----
+
+`--subdir`::
+Extract fonts only from a specific subdirectory within the archive.
+Uses `fnmatch` patterns.
++
+[source,sh]
+----
+fontist create-formula https://example.com/fonts.zip --subdir "fonts/otf"
+----
+
+`--file-pattern`::
+Filter font files by pattern. Uses `fnmatch` patterns.
++
+[source,sh]
+----
+fontist create-formula https://example.com/fonts.zip --file-pattern "*.otf"
+----
+
+`--name-prefix`::
+Add a prefix to all font family names in the generated formula. This is useful
+for distinguishing compatibility or replacement fonts from original proprietary
+fonts.
++
+[source,sh]
+----
+fontist create-formula https://dl.winehq.org/wine/source/10.x/wine-10.18.tar.xz \
+  --subdir fonts \
+  --file-pattern '*.ttf' \
+  --name-prefix 'Wine '
+----
++
+This will generate a formula where all fonts have names prefixed with `"Wine "`,
+such as "Wine Courier", "Wine Tahoma", "Wine Symbol", etc., making it clear
+these are Wine compatibility fonts rather than the original Microsoft fonts.
+
+`--mirror`::
+Specify mirror URLs for the font archive (can be used multiple times).
++
+[source,sh]
+----
+fontist create-formula https://example.com/fonts.zip \
+  --mirror https://mirror1.example.com/fonts.zip \
+  --mirror https://mirror2.example.com/fonts.zip
+----
+
 
 ==== Overriding font metadata in Fontist formulas
 

data/docs/guide/api-ruby.md

@@ -45,7 +45,7 @@ This might be useful if you want to know the name of the font or the available s
 Fontist::Font.all
 ```
 
-The return values are `OpenStruct` objects, so you can easily do any other operation you would do in any Ruby object.
+The return values are model objects, so you can easily access their properties and perform operations on them.
 
 ## Fontist::Formula
 
@@ -79,7 +79,7 @@ The `Fontist::Formula` interface exposes an interface to list all registered fon
 Fontist::Formula.all
 ```
 
-The return values are `OpenStruct` objects, so you can easily do any other operation you would do in any Ruby object.
+The return values are model objects, so you can easily access their properties and perform operations on them.
 
 ## Fontist::Manifest
 

data/fontist.gemspec

@@ -30,17 +30,17 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
 
   spec.add_dependency "down", "~> 5.0"
-  spec.add_dependency "extract_ttc", "~> 0.1"
+  spec.add_dependency "extract_ttc", "~> 0.3.7"
   spec.add_dependency "fuzzy_match", "~> 2.1"
   spec.add_dependency "json", "~> 2.0"
   spec.add_dependency "nokogiri", "~> 1.0"
   spec.add_dependency "mime-types", "~> 3.0"
   spec.add_dependency "sys-uname", "~> 1.2"
-  spec.add_dependency "thor", "~> 1.2", ">= 1.2.1"
+  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.4'
+  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.rb

@@ -178,6 +178,8 @@ module Fontist
       "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."
+    option :name_prefix, desc: "Prefix to add to all font family names, " \
+      "e.g. 'Wine ' for compatibility fonts"
     def create_formula(url)
       handle_class_options(options)
       require "fontist/import/create_formula"

data/lib/fontist/helpers.rb

@@ -1,9 +1,10 @@
-require "ostruct"
-
 module Fontist
   module Helpers
-    def self.parse_to_object(data)
-      JSON.parse(data.to_json, object_class: OpenStruct)
+    def self.url_object(request)
+      return request unless request.include?("\"url\"")
+
+      obj = JSON.parse(request.gsub("=>", ":"))
+      Struct.new(:url, :headers).new(obj["url"], obj["headers"])
     end
 
     def self.run(command)

data/lib/fontist/import/create_formula.rb

@@ -111,7 +111,8 @@ module Fontist
         @extractor ||=
           RecursiveExtraction.new(archive,
                                   subdir: @options[:subdir],
-                                  file_pattern: @options[:file_pattern])
+                                  file_pattern: @options[:file_pattern],
+                                  name_prefix: @options[:name_prefix])
       end
 
       def archive

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

@@ -8,8 +8,9 @@ module Fontist
       class CollectionFile
         attr_reader :fonts
 
-        def initialize(path)
+        def initialize(path, name_prefix: nil)
           @path = path
+          @name_prefix = name_prefix
           @fonts = read
           @extension = detect_extension
         end
@@ -25,26 +26,15 @@ module Fontist
         private
 
         def read
-          switch_to_temp_dir do |tmp_dir|
+          Dir.mktmpdir do |tmp_dir|
             extract_ttfs(tmp_dir)
-              .map { |path| Otf::FontFile.new(path) }
+              .map { |path| Otf::FontFile.new(path, name_prefix: @name_prefix) }
               .reject { |font_file| hidden_or_pua_encoded?(font_file) }
           end
         end
 
-        def switch_to_temp_dir
-          Dir.mktmpdir do |tmp_dir|
-            Dir.chdir(tmp_dir) do
-              yield tmp_dir
-            end
-          end
-        end
-
         def extract_ttfs(tmp_dir)
-          filenames = ExtractTtc.extract(@path)
-          filenames.map do |filename|
-            File.join(tmp_dir, filename)
-          end
+          ExtractTtc.extract(@path, output_dir: tmp_dir)
         end
 
         def hidden_or_pua_encoded?(font_file)

data/lib/fontist/import/font_style.rb

@@ -0,0 +1,22 @@
+module Fontist
+  module Import
+    class FontStyle
+      attr_reader :family_name, :style, :full_name, :post_script_name,
+                  :version, :description, :filename, :copyright,
+                  :preferred_family_name, :preferred_style
+
+      def initialize(attributes = {})
+        @family_name = attributes[:family_name]
+        @style = attributes[:style]
+        @full_name = attributes[:full_name]
+        @post_script_name = attributes[:post_script_name]
+        @version = attributes[:version]
+        @description = attributes[:description]
+        @filename = attributes[:filename]
+        @copyright = attributes[:copyright]
+        @preferred_family_name = attributes[:preferred_family_name]
+        @preferred_style = attributes[:preferred_style]
+      end
+    end
+  end
+end

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

@@ -21,8 +21,9 @@ module Fontist
 
         attr_reader :path
 
-        def initialize(path)
+        def initialize(path, name_prefix: nil)
           @path = path
+          @name_prefix = name_prefix
           @info = read
           @extension = detect_extension
         end
@@ -36,7 +37,8 @@ module Fontist
         end
 
         def family_name
-          info["Family"]
+          name = info["Family"]
+          @name_prefix ? "#{@name_prefix}#{name}" : name
         end
 
         def type
@@ -44,7 +46,10 @@ module Fontist
         end
 
         def preferred_family_name
-          info["Preferred family"]
+          name = info["Preferred family"]
+          return unless name
+
+          @name_prefix ? "#{@name_prefix}#{name}" : name
         end
 
         def preferred_type

data/lib/fontist/import/otf_style.rb

@@ -1,3 +1,5 @@
+require_relative "font_style"
+
 module Fontist
   module Import
     class OtfStyle
@@ -24,7 +26,7 @@ module Fontist
           style[:preferred_style] = @info["Preferred subfamily"]
         end
 
-        OpenStruct.new(style)
+        FontStyle.new(style)
       end
 
       private

data/lib/fontist/import/recursive_extraction.rb

@@ -8,10 +8,11 @@ module Fontist
       LICENSE_PATTERN =
         /(ofl\.txt|ufl\.txt|licenses?\.txt|license(\.md)?|copying)$/i.freeze
 
-      def initialize(archive, subdir: nil, file_pattern: nil)
+      def initialize(archive, subdir: nil, file_pattern: nil, name_prefix: nil)
         @archive = archive
         @subdir = subdir
         @file_pattern = file_pattern
+        @name_prefix = name_prefix
         @operations = {}
         @font_files = []
         @collection_files = []
@@ -80,10 +81,10 @@ module Fontist
       def match_font(path)
         case Files::FontDetector.detect(path)
         when :font
-          file = Otf::FontFile.new(path)
+          file = Otf::FontFile.new(path, name_prefix: @name_prefix)
           @font_files << file unless already_exist?(file)
         when :collection
-          @collection_files << Files::CollectionFile.new(path)
+          @collection_files << Files::CollectionFile.new(path, name_prefix: @name_prefix)
         end
       end
 
@@ -97,7 +98,11 @@ module Fontist
       end
 
       def font_candidate?(path)
-        font_directory?(path) && file_pattern?(path)
+        has_font_extension?(path) && font_directory?(path) && file_pattern?(path)
+      end
+
+      def has_font_extension?(path)
+        path.match?(/\.(ttf|otf|ttc|woff|woff2)$/i)
       end
 
       def font_directory?(path)

data/lib/fontist/resources/archive_resource.rb

@@ -33,10 +33,11 @@ module Fontist
       end
 
       def try_download_file(request, source)
-        info_log(request)
+        url = Helpers.url_object(request)
+        info_log(url)
 
         Fontist::Utils::Downloader.download(
-          request,
+          url,
           sha: source.sha256,
           file_size: source.file_size,
           progress_bar: !@options[:no_progress],

data/lib/fontist/utils/downloader.rb

@@ -102,13 +102,15 @@ module Fontist
       # rubocop:enable Metrics/MethodLength
 
       def url
-        @file.respond_to?(:url) ? @file.url : @file
+        obj = Helpers.url_object(@file)
+        obj.respond_to?(:url) ? obj.url : obj
       end
 
       def headers
-        @file.respond_to?(:headers) &&
-          @file.headers &&
-          @file.headers.to_h.map { |k, v| [k.to_s, v] }.to_h || # rubocop:disable Style/HashTransformKeys, Metrics/LineLength
+        obj = Helpers.url_object(@file)
+        obj.respond_to?(:headers) &&
+          obj.headers &&
+          obj.headers.to_h.map { |k, v| [k.to_s, v] }.to_h || # rubocop:disable Style/HashTransformKeys, Metrics/LineLength
           {}
       end
     end

data/lib/fontist/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-06 00:00:00.000000000 Z
+date: 2025-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.3.7
 - !ruby/object:Gem::Dependency
   name: fuzzy_match
   requirement: !ruby/object:Gem::Requirement
@@ -114,20 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +173,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -189,7 +183,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.8
 - !ruby/object:Gem::Dependency
   name: socksify
   requirement: !ruby/object:Gem::Requirement
@@ -288,6 +282,7 @@ files:
 - lib/fontist/import/files/collection_file.rb
 - lib/fontist/import/files/file_requirement.rb
 - lib/fontist/import/files/font_detector.rb
+- lib/fontist/import/font_style.rb
 - lib/fontist/import/formula_builder.rb
 - lib/fontist/import/formula_serializer.rb
 - lib/fontist/import/google.rb