fontist 1.21.4 → 2.0.1

data/lib/fontist/cli.rb

@@ -1,11 +1,12 @@
 require "thor"
-require "fontist/cli/class_options"
-require "fontist/cli/thor_ext"
-require "fontist/repo_cli"
-require "fontist/cache_cli"
-require "fontist/import_cli"
-require "fontist/fontconfig_cli"
-require "fontist/config_cli"
+require_relative "../fontist"
+require_relative "cli/class_options"
+require_relative "cli/thor_ext"
+require_relative "repo_cli"
+require_relative "cache_cli"
+require_relative "import_cli"
+require_relative "fontconfig_cli"
+require_relative "config_cli"
 
 module Fontist
   class CLI < Thor
@@ -143,8 +144,8 @@ module Fontist
          "Get locations of fonts from MANIFEST (yaml)"
     def manifest_locations(manifest)
       handle_class_options(options)
-      paths = Fontist::Manifest::Locations.from_file(manifest)
-      print_yaml(paths)
+      paths = Fontist::Manifest.from_file(manifest, locations: true)
+      print_yaml(paths.to_hash)
       success
     rescue Fontist::Errors::GeneralError => e
       handle_error(e)
@@ -159,13 +160,12 @@ module Fontist
                            desc: "Hide license texts"
     def manifest_install(manifest)
       handle_class_options(options)
-      paths = Fontist::Manifest::Install.from_file(
-        manifest,
+      instance = Fontist::Manifest.from_file(manifest)
+      paths = instance.install(
         confirmation: options[:accept_all_licenses] ? "yes" : "no",
-        hide_licenses: options[:hide_licenses]
+        hide_licenses: options[:hide_licenses],
       )
-
-      print_yaml(paths)
+      print_yaml(paths.to_hash)
       success
     rescue Fontist::Errors::GeneralError => e
       handle_error(e)

data/lib/fontist/config.rb

@@ -1,9 +1,65 @@
+require "lutaml/model"
+
 module Fontist
-  class Config
-    include Singleton
+  class Config < Lutaml::Model::Serializable
+    attribute :fonts_path, :string
+    attribute :google_fonts_key, :string
+    attribute :open_timeout, :integer
+    attribute :read_timeout, :integer
+    attribute :continue_on_checksum_mismatch, :boolean
+    attribute :use_system_index, :boolean
+    attribute :preferred_family, :boolean
+    attribute :update_fontconfig, :boolean
+    attribute :no_progress, :boolean
+
+    key_value do
+      map "fonts_path", to: :fonts_path
+      map "google_fonts_key", to: :google_fonts_key
+      map "open_timeout", to: :open_timeout
+      map "read_timeout", to: :read_timeout
+      map "continue_on_checksum_mismatch", to: :continue_on_checksum_mismatch
+      map "use_system_index", to: :use_system_index
+      map "preferred_family", to: :preferred_family
+      map "update_fontconfig", to: :update_fontconfig
+      map "no_progress", to: :no_progress
+    end
 
-    def initialize
-      @custom_values = load_config_file
+    class << self
+      def instance
+        @instance ||= new.tap(&:load)
+      end
+
+      def values
+        instance.values
+      end
+
+      def custom_values
+        instance.custom_values
+      end
+
+      def set(key, value)
+        instance.set(key, value)
+      end
+
+      def delete(key)
+        instance.delete(key)
+      end
+
+      def default_value(key)
+        instance.default_value(key)
+      end
+
+      def from_file(path)
+        return new unless File.exist?(path)
+
+        content = File.read(path)
+        from_yaml(content)
+      end
+    end
+
+    def initialize(**attrs)
+      @custom_values = {}
+      super
     end
 
     def values
@@ -22,18 +78,14 @@ module Fontist
       end
 
       v = normalize_value(value)
-      if respond_to?("#{attr}=")
-        public_send("#{attr}=", v)
-      else
-        @custom_values[attr] = v
-      end
+      @custom_values[attr] = v
+      send("#{attr}=", v) if respond_to?("#{attr}=")
 
       persist
     end
 
     def delete(key)
       @custom_values.delete(key.to_sym)
-
       persist
     end
 
@@ -49,9 +101,13 @@ module Fontist
     end
 
     def persist
-      values = @custom_values.transform_keys(&:to_s)
+      config_model = self.class.new
+      @custom_values.each do |key, value|
+        config_model.send("#{key}=", value) if config_model.respond_to?("#{key}=")
+      end
+
       FileUtils.mkdir_p(File.dirname(Fontist.config_path))
-      File.write(Fontist.config_path, YAML.dump(values))
+      config_model.to_file(Fontist.config_path)
     end
 
     def load
@@ -59,7 +115,12 @@ module Fontist
     end
 
     def fonts_path=(value)
-      @custom_values[:fonts_path] = File.expand_path(value)
+      @custom_values[:fonts_path] = File.expand_path(value.to_s)
+      @fonts_path = @custom_values[:fonts_path]
+    end
+
+    def to_file(path)
+      File.write(path, to_yaml)
     end
 
     private
@@ -67,7 +128,7 @@ module Fontist
     def load_config_file
       return {} unless File.exist?(Fontist.config_path)
 
-      YAML.load_file(Fontist.config_path).transform_keys(&:to_sym)
+      self.class.from_file(Fontist.config_path)&.to_hash&.transform_keys(&:to_sym) || {}
     end
 
     def normalize_value(value)

data/lib/fontist/errors.rb

@@ -28,6 +28,8 @@ module Fontist
     # it depends on this exception to automatically download formulas
     class FormulaIndexNotFoundError < GeneralError; end
 
+    class FormulaInvalidError < GeneralError; end
+
     class FormulaNotFoundError < GeneralError
       def initialize(formula)
         super(<<~MSG.chomp)

data/lib/fontist/extract.rb

@@ -0,0 +1,25 @@
+require "lutaml/model"
+
+module Fontist
+  class ExtractOptions < Lutaml::Model::Serializable
+    attribute :file, :string
+    attribute :fonts_sub_dir, :string
+
+    key_value do
+      map "file", to: :file
+      map "fonts_sub_dir", to: :fonts_sub_dir
+    end
+  end
+
+  class Extract < Lutaml::Model::Serializable
+    attribute :format, :string
+    attribute :file, :string
+    attribute :options, ExtractOptions, collection: true
+
+    key_value do
+      map "format", to: :format
+      map "file", to: :file
+      map "options", to: :options
+    end
+  end
+end

data/lib/fontist/font.rb

@@ -228,7 +228,7 @@ module Fontist
     end
 
     def check_and_confirm_required_license(formula)
-      return @confirmation unless formula.license_required
+      return @confirmation unless formula.license_required?
 
       show_license(formula) unless @hide_licenses
       return @confirmation if @confirmation.casecmp?("yes")
@@ -237,7 +237,7 @@ module Fontist
       return confirmation if confirmation&.casecmp?("yes")
 
       raise Fontist::Errors::LicensingError.new(
-        "Fontist will not download these fonts unless you accept the terms."
+        "Fontist will not download these fonts unless you accept the terms.",
       )
     end
 
@@ -248,7 +248,7 @@ module Fontist
     def ask_for_agreement
       Fontist.ui.ask(
         "\nDo you accept all presented font licenses, and want Fontist " \
-        "to download these fonts for you? => TYPE 'Yes' or 'No':"
+        "to download these fonts for you? => TYPE 'Yes' or 'No':",
       )
     end
 
@@ -301,9 +301,7 @@ module Fontist
       fonts = Fontist::SystemIndex.fontist_index.find(name, nil)
       return unless fonts
 
-      fonts.map do |font|
-        font[:path]
-      end
+      fonts.map(&:path)
     end
 
     def installed_paths
@@ -336,7 +334,7 @@ module Fontist
 
     def list_styles(formulas)
       map_to_hash(formulas) do |formula|
-        map_to_hash(requested_fonts(formula.fonts)) do |font|
+        map_to_hash(requested_fonts(formula.all_fonts)) do |font|
           map_to_hash(font.styles) do |style|
             installed(style)
           end
@@ -351,7 +349,7 @@ module Fontist
     def requested_fonts(fonts)
       return fonts unless @name
 
-      fonts.select do |font|
+      fonts&.select do |font|
         font.name.casecmp?(name)
       end
     end

data/lib/fontist/font_collection.rb

@@ -0,0 +1,16 @@
+require "lutaml/model"
+require_relative "font_model"
+
+module Fontist
+  class FontCollection < Lutaml::Model::Serializable
+    attribute :filename, :string
+    attribute :source_filename, :string
+    attribute :fonts, FontModel, collection: true
+
+    key_value do
+      map "filename", to: :filename
+      map "source_filename", to: :source_filename
+      map "fonts", to: :fonts
+    end
+  end
+end

data/lib/fontist/font_installer.rb

@@ -40,7 +40,7 @@ module Fontist
     end
 
     def license_is_accepted?(confirmation)
-      return true unless @formula.license_required
+      return true unless @formula.license_required?
 
       "yes".casecmp?(confirmation)
     end
@@ -95,7 +95,7 @@ module Fontist
     end
 
     def fonts
-      @formula.fonts.select do |font|
+      @formula.all_fonts.select do |font|
         @font_name.nil? || font.name.casecmp?(@font_name)
       end
     end
@@ -111,7 +111,7 @@ module Fontist
     end
 
     def subdirectories
-      @subdirectories ||= [@formula.extract].flatten.map(&:options).compact.map(&:fonts_sub_dir).compact
+      @subdirectories ||= [@formula.extract].flatten.compact.map(&:options).compact.map(&:fonts_sub_dir).compact
     end
 
     def install_font_file(source)
@@ -126,7 +126,7 @@ module Fontist
     end
 
     def target_filenames
-      @target_filenames ||= @formula.fonts.flat_map do |font|
+      @target_filenames ||= @formula.all_fonts.flat_map do |font|
         font.styles.map do |style|
           source = style.source_font || style.font
           target = style.font

data/lib/fontist/font_model.rb

@@ -0,0 +1,15 @@
+require "lutaml/model"
+require_relative "font_style"
+
+module Fontist
+  class FontModel < Lutaml::Model::Serializable
+    attribute :name, :string
+    attribute :styles, FontStyle, collection: true
+
+    key_value do
+      map "name", to: :name
+      map "styles", to: :styles
+    end
+
+  end
+end

data/lib/fontist/font_path.rb

@@ -16,7 +16,7 @@ module Fontist
 
     def formulas
       @formulas ||= if fontist_font?
-                      Indexes::FilenameIndex.from_yaml.load_index_formulas(File.basename(@path)).map(&:name)
+                      Indexes::FilenameIndex.from_file.load_index_formulas(File.basename(@path)).flat_map(&:name)
                     else
                       []
                     end

data/lib/fontist/font_style.rb

@@ -0,0 +1,37 @@
+require "lutaml/model"
+
+module Fontist
+  class FontStyle < Lutaml::Model::Serializable
+    attribute :family_name, :string
+    attribute :type, :string
+    attribute :full_name, :string
+    attribute :post_script_name, :string
+    attribute :version, :string
+    attribute :description, :string
+    attribute :copyright, :string
+    attribute :font, :string
+    attribute :source_font, :string
+    attribute :preferred_family_name, :string
+    attribute :preferred_type, :string
+    attribute :default_family_name, :string
+    attribute :default_type, :string
+    attribute :override, :string
+
+    key_value do
+      map "family_name", to: :family_name
+      map "type", to: :type
+      map "preferred_family_name", to: :preferred_family_name
+      map "preferred_type", to: :preferred_type
+      map "full_name", to: :full_name
+      map "post_script_name", to: :post_script_name
+      map "version", to: :version
+      map "description", to: :description
+      map "copyright", to: :copyright
+      map "font", to: :font
+      map "source_font", to: :source_font
+      map "default_family_name", to: :default_family_name
+      map "default_type", to: :default_type
+      map "override", to: :override
+    end
+  end
+end