fontist 1.21.4 → 2.0.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.21.4
+  version: 2.0.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-07-24 00:00:00.000000000 Z
+date: 2025-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -205,145 +205,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: lutaml-model
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-benchmark
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.22.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.22.1
-- !ruby/object:Gem::Dependency
-  name: rubocop-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.9'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :development
+        version: '0.7'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
 description: Install openly-licensed fonts on Windows, Linux and Mac!
 email:
 - open.source@ribose.com
@@ -382,6 +256,8 @@ files:
 - docs/reference/index.md
 - exe/fontist
 - fontist.gemspec
+- formula_filename_index.yml
+- formula_index.yml
 - lib/fontist.rb
 - lib/fontist/cache_cli.rb
 - lib/fontist/cli.rb
@@ -392,10 +268,14 @@ files:
 - lib/fontist/config_cli.rb
 - lib/fontist/errors.rb
 - lib/fontist/exclude.yml
+- lib/fontist/extract.rb
 - lib/fontist/font.rb
+- lib/fontist/font_collection.rb
 - lib/fontist/font_file.rb
 - lib/fontist/font_installer.rb
+- lib/fontist/font_model.rb
 - lib/fontist/font_path.rb
+- lib/fontist/font_style.rb
 - lib/fontist/fontconfig.rb
 - lib/fontist/fontconfig_cli.rb
 - lib/fontist/formula.rb
@@ -431,15 +311,15 @@ files:
 - lib/fontist/import/text_helper.rb
 - lib/fontist/import_cli.rb
 - lib/fontist/index.rb
-- lib/fontist/indexes/base_index.rb
 - lib/fontist/indexes/default_family_font_index.rb
 - lib/fontist/indexes/filename_index.rb
 - lib/fontist/indexes/font_index.rb
-- lib/fontist/indexes/index_formula.rb
+- lib/fontist/indexes/formula_key_to_path.rb
+- lib/fontist/indexes/index_mixin.rb
 - lib/fontist/indexes/preferred_family_font_index.rb
 - lib/fontist/manifest.rb
-- lib/fontist/manifest/install.rb
-- lib/fontist/manifest/locations.rb
+- lib/fontist/manifest_request.rb
+- lib/fontist/manifest_response.rb
 - lib/fontist/repo.rb
 - lib/fontist/repo_cli.rb
 - lib/fontist/resources/archive_resource.rb

data/lib/fontist/indexes/base_index.rb

@@ -1,92 +0,0 @@
-require_relative "index_formula"
-
-module Fontist
-  module Indexes
-    class BaseIndex
-      def self.from_yaml
-        @from_yaml ||= begin
-          unless Dir.exist?(Fontist.formulas_repo_path)
-            raise Errors::MainRepoNotFoundError.new(
-              "Please fetch formulas with `fontist update`.",
-            )
-          end
-
-          rebuild unless File.exist?(path)
-
-          data = YAML.load_file(path)
-          new(data)
-        end
-      end
-
-      def self.path
-        raise NotImplementedError, "Please define path of an index"
-      end
-
-      def self.reset_cache
-        @from_yaml = nil
-      end
-
-      def self.rebuild
-        index = new
-        index.build
-        index.to_yaml
-      end
-
-      def initialize(data = {})
-        @index = {}
-
-        data.each_pair do |key, paths|
-          paths.each do |path|
-            add_index_formula(key, IndexFormula.new(path))
-          end
-        end
-      end
-
-      def build
-        Formula.all.each do |formula|
-          add_formula(formula)
-        end
-      end
-
-      def add_formula(_formula)
-        raise NotImplementedError, "Please define how to add formula to an index, use #add_index_formula"
-      end
-
-      def add_index_formula(key_raw, index_formula)
-        key = normalize_key(key_raw)
-        @index[key] ||= []
-        @index[key] << index_formula unless @index[key].include?(index_formula)
-      end
-
-      def load_formulas(key)
-        index_formulas(key).map(&:to_full)
-      end
-
-      def load_index_formulas(key)
-        index_formulas(key)
-      end
-
-      def to_yaml
-        dir = File.dirname(self.class.path)
-        FileUtils.mkdir_p(dir) unless File.exist?(dir)
-        File.write(self.class.path, YAML.dump(to_h))
-      end
-
-      def to_h
-        @index.map do |key, index_formulas|
-          [key, index_formulas.map(&:to_s)]
-        end.to_h
-      end
-
-      private
-
-      def index_formulas(key)
-        @index[normalize_key(key)] || []
-      end
-
-      def normalize_key(key)
-        key
-      end
-    end
-  end
-end

data/lib/fontist/indexes/index_formula.rb

@@ -1,36 +0,0 @@
-module Fontist
-  module Indexes
-    class IndexFormula
-      def initialize(path)
-        @path = path
-      end
-
-      def name
-        normalized.sub(/\.yml$/, "")
-      end
-
-      def to_s
-        normalized
-      end
-
-      def to_full
-        Formula.new_from_file(full_path)
-      end
-
-      def ==(other)
-        to_s == other.to_s
-      end
-
-      private
-
-      def normalized
-        escaped = Regexp.escape(Fontist.formulas_path.to_s + "/")
-        @path.sub(Regexp.new("^" + escaped), "")
-      end
-
-      def full_path
-        Fontist.formulas_path.join(normalized).to_s
-      end
-    end
-  end
-end

data/lib/fontist/manifest/install.rb

@@ -1,35 +0,0 @@
-require_relative "locations"
-
-module Fontist
-  module Manifest
-    class Install < Locations
-      def initialize(manifest, confirmation: "no", hide_licenses: false, no_progress: false)
-        super(manifest)
-        @confirmation = confirmation
-        @hide_licenses = hide_licenses
-        @no_progress = no_progress
-      end
-
-      private
-
-      def file_paths(font, style)
-        paths = find_font_with_name(font, style)
-        return paths unless paths.nil?
-
-        install_font(font)
-
-        find_font_with_name(font, style)
-      end
-
-      def install_font(font)
-        Fontist::Font.install(
-          font,
-          force: true,
-          confirmation: @confirmation,
-          hide_licenses: @hide_licenses,
-          no_progress: @no_progress
-        )
-      end
-    end
-  end
-end

data/lib/fontist/manifest/locations.rb

@@ -1,84 +0,0 @@
-module Fontist
-  module Manifest
-    class Locations
-      def initialize(manifest)
-        Fontist.ui.debug("Manifest: #{manifest}")
-
-        @manifest = manifest
-      end
-
-      def self.from_file(file, **keywords)
-        raise Fontist::Errors::ManifestCouldNotBeFoundError unless File.exist?(file)
-
-        manifest = YAML.load_file(file)
-        raise Fontist::Errors::ManifestCouldNotBeReadError unless manifest.is_a?(Hash)
-
-        from_hash(manifest, **keywords)
-      end
-
-      def self.from_hash(manifest, **keywords)
-        if keywords.empty?
-          new(manifest).call
-        else
-          new(manifest, **keywords).call
-        end
-      end
-
-      def call
-        font_names.zip(font_paths).to_h
-      end
-
-      private
-
-      attr_reader :manifest
-
-      def font_names
-        manifest.keys
-      end
-
-      def font_paths
-        manifest.map do |font, styles|
-          styles_to_ary = [styles].flatten
-          style_paths_map(font, styles_to_ary)
-        end
-      end
-
-      def style_paths_map(font, names)
-        styles = style_paths(font, names)
-        group_paths(styles)
-      end
-
-      def style_paths(font, names)
-        names.flat_map do |style|
-          file_paths(font, style) || empty_paths(style)
-        end
-      end
-
-      def group_paths(styles)
-        styles.group_by { |s| s[:type] }
-          .transform_values { |group| style(group) }
-      end
-
-      def style(styles)
-        { "full_name" => styles.first[:full_name],
-          "paths" => styles.map { |x| x[:path] } }.compact
-      end
-
-      def file_paths(font, style)
-        find_font_with_name(font, style).tap do |x|
-          if x.nil?
-            raise Errors::MissingFontError.new(font, style)
-          end
-        end
-      end
-
-      def find_font_with_name(font, style)
-        Fontist::SystemFont.find_styles(font, style)
-      end
-
-      def empty_paths(style)
-        [{ "full_name" => nil, "type" => style, "path" => nil }]
-      end
-    end
-  end
-end