fontist 1.11.7 → 1.13.2

data/lib/fontist/formula_picker.rb

@@ -0,0 +1,126 @@
+require "fontist/style_version"
+
+module Fontist
+  class FormulaPicker
+    def initialize(font_name, size_limit:, version:, smallest:, newest:)
+      @font_name = font_name
+      @size_limit = size_limit || Fontist.formula_size_limit_in_megabytes
+      @version = version
+      @smallest = smallest
+      @newest = newest
+    end
+
+    def call(formulas)
+      return [] if formulas.size.zero?
+      return formulas if contain_different_styles?(formulas)
+      return by_version(formulas) if version_is_passed?
+      return newest(formulas) if newest_is_passed?
+      return smallest(formulas) if smallest_is_passed?
+
+      default_way(formulas)
+    end
+
+    private
+
+    def version_is_passed?
+      !@version.nil?
+    end
+
+    def by_version(formulas)
+      formulas.each do |formula|
+        fonts = formula.fonts_by_name(@font_name)
+        fonts.each do |font|
+          font.styles.each do |style|
+            version = StyleVersion.new(style.version)
+            return [formula] if version == passed_version
+          end
+        end
+      end
+
+      []
+    end
+
+    def passed_version
+      @passed_version ||= StyleVersion.new(@version)
+    end
+
+    def newest_is_passed?
+      @newest
+    end
+
+    def newest(formulas)
+      newest_formulas = filter_by_max_version(formulas)
+      smallest(newest_formulas)
+    end
+
+    def smallest_is_passed?
+      @smallest
+    end
+
+    def smallest(formulas)
+      [choose_smallest_formula(formulas)]
+    end
+
+    def default_way(formulas)
+      size_limited_formulas = filter_by_size_limit(formulas)
+      raise_size_limit_error if size_limited_formulas.empty?
+      newest(size_limited_formulas)
+    end
+
+    def contain_different_styles?(formulas)
+      styles_by_formula = formulas.map do |formula|
+        fonts = formula.fonts_by_name(@font_name)
+        styles = fonts.flat_map do |font|
+          font.styles.map(&:type)
+        end
+
+        styles.uniq.sort
+      end
+
+      styles_by_formula.uniq.size > 1
+    end
+
+    def filter_by_size_limit(formulas)
+      formulas.select do |formula|
+        formula.file_size.nil? || formula.file_size < size_limit_in_bytes
+      end
+    end
+
+    def size_limit_in_bytes
+      @size_limit_in_bytes ||= @size_limit * 1024 * 1024
+    end
+
+    def raise_size_limit_error
+      raise Errors::SizeLimitError,
+            "There are only formulas above the size limit " \
+            "(#{@size_limit} MB)."
+    end
+
+    def filter_by_max_version(formulas)
+      formulas_with_version = detect_formula_version(formulas)
+      max_version = formulas_with_version.map(&:first).max
+      formulas_with_version.select do |version, _formula|
+        version == max_version
+      end.map(&:last)
+    end
+
+    def detect_formula_version(formulas)
+      formulas.map do |formula|
+        fonts = formula.fonts_by_name(@font_name)
+        versions = fonts.flat_map do |font|
+          font.styles.map do |style|
+            StyleVersion.new(style.version)
+          end
+        end
+
+        [versions.max, formula]
+      end
+    end
+
+    def choose_smallest_formula(formulas)
+      formulas.min_by do |formula|
+        formula.file_size || 0
+      end
+    end
+  end
+end

data/lib/fontist/google_cli.rb

@@ -1,6 +1,6 @@
 module Fontist
   class GoogleCLI < Thor
-    class_option :formulas_path, type: :string, desc: "Path to formulas"
+    include CLI::ClassOptions
 
     desc "check", "Check Google fonts for updates"
     def check
@@ -17,13 +17,5 @@ module Fontist
       Fontist::Import::GoogleImport.new.call
       CLI::STATUS_SUCCESS
     end
-
-    private
-
-    def handle_class_options(options)
-      if options[:formulas_path]
-        Fontist.formulas_path = Pathname.new(options[:formulas_path])
-      end
-    end
   end
 end

data/lib/fontist/import/create_formula.rb

@@ -1,7 +1,5 @@
 require "fontist/import"
 require_relative "recursive_extraction"
-require_relative "otf/font_file"
-require_relative "files/collection_file"
 require_relative "helpers/hash_helper"
 require_relative "formula_builder"
 
@@ -14,21 +12,29 @@ module Fontist
       end
 
       def call
-        save(formula)
+        save(builder)
       end
 
       private
 
-      def formula
+      def builder
         builder = FormulaBuilder.new
-        builder.url = @url
+        setup_strings(builder, archive)
+        setup_files(builder)
+        builder
+      end
+
+      def setup_strings(builder, archive)
         builder.archive = archive
-        builder.extractor = extractor
+        builder.url = @url
         builder.options = @options
+      end
+
+      def setup_files(builder)
+        builder.extractor = extractor
         builder.font_files = extractor.font_files
         builder.font_collection_files = extractor.font_collection_files
         builder.license_text = extractor.license_text
-        builder.formula
       end
 
       def extractor
@@ -48,10 +54,10 @@ module Fontist
         Fontist::Utils::Downloader.download(url, progress_bar: true).path
       end
 
-      def save(hash)
-        filename = Import.name_to_filename(hash[:name])
+      def save(builder)
+        filename = Import.name_to_filename(builder.name)
         path = @options[:formula_dir] ? File.join(@options[:formula_dir], filename) : filename
-        yaml = YAML.dump(Helpers::HashHelper.stringify_keys(hash))
+        yaml = YAML.dump(Helpers::HashHelper.stringify_keys(builder.formula))
         File.write(path, yaml)
         path
       end

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

@@ -9,11 +9,13 @@ module Fontist
         FONT_LABELS = ["OpenType font data",
                        "TrueType Font data"].freeze
 
-        COLLECTION_LABEL = "TrueType font collection data".freeze
+        COLLECTION_LABELS = ["OpenType font collection data",
+                             "TrueType font collection data"].freeze
 
         FONT_EXTENSIONS = {
           "OpenType font data" => "otf",
           "TrueType Font data" => "ttf",
+          "OpenType font collection data" => "ttc",
           "TrueType font collection data" => "ttc",
         }.freeze
 
@@ -22,7 +24,7 @@ module Fontist
 
           if brief.start_with?(*FONT_LABELS)
             :font
-          elsif brief.start_with?(COLLECTION_LABEL)
+          elsif brief.start_with?(*COLLECTION_LABELS)
             :collection
           else
             :other

data/lib/fontist/import/formula_builder.rb

@@ -4,36 +4,41 @@ require_relative "text_helper"
 module Fontist
   module Import
     class FormulaBuilder
-      FORMULA_ATTRIBUTES = %i[name description homepage resources
+      FORMULA_ATTRIBUTES = %i[description homepage resources
                               font_collections fonts extract copyright
                               license_url open_license digest command].freeze
 
-      attr_accessor :archive,
-                    :url,
-                    :extractor,
-                    :options,
-                    :font_files,
-                    :font_collection_files,
-                    :license_text
+      attr_writer :archive,
+                  :url,
+                  :extractor,
+                  :options,
+                  :font_files,
+                  :font_collection_files,
+                  :license_text,
+                  :homepage
 
       def initialize
         @options = {}
       end
 
       def formula
-        FORMULA_ATTRIBUTES.map { |name| [name, send(name)] }.to_h.compact
+        formula_attributes.map { |name| [name, send(name)] }.to_h.compact
       end
 
-      private
-
       def name
-        return options[:name] if options[:name]
+        return @options[:name] if @options[:name]
 
         unique_names = both_fonts.map(&:family_name).uniq
         TextHelper.longest_common_prefix(unique_names) ||
           both_fonts.first.family_name
       end
 
+      private
+
+      def formula_attributes
+        FORMULA_ATTRIBUTES
+      end
+
       def both_fonts
         @both_fonts ||= group_fonts
       end
@@ -50,7 +55,7 @@ module Fontist
       end
 
       def homepage
-        both_fonts.map(&:homepage).compact.first
+        @options[:homepage] || both_fonts.map(&:homepage).compact.first
       end
 
       def resources
@@ -68,7 +73,7 @@ module Fontist
       end
 
       def resource_options_without_sha
-        { urls: [@url] + mirrors }
+        { urls: [@url] + mirrors, file_size: file_size }
       end
 
       def resource_options_with_sha
@@ -81,7 +86,7 @@ module Fontist
 
         sha = prepare_sha256(sha)
 
-        { urls: urls, sha256: sha }
+        { urls: urls, sha256: sha, file_size: file_size }
       end
 
       def downloads
@@ -115,6 +120,10 @@ module Fontist
         output
       end
 
+      def file_size
+        File.size(@archive)
+      end
+
       def font_collections
         return if @font_collection_files.empty?
 

data/lib/fontist/import/google/skiplist.yml

@@ -9,3 +9,4 @@
 - Andika
 - Harmattan
 - Padauk
+- STIX Two Math

data/lib/fontist/import/helpers/system_helper.rb

@@ -4,7 +4,7 @@ module Fontist
       module SystemHelper
         class << self
           def run(command)
-            Fontist.ui.say("Run `#{command}`") if Fontist.debug?
+            Fontist.ui.debug("Run `#{command}`")
 
             result = `#{command}`
             unless $CHILD_STATUS.to_i.zero?

data/lib/fontist/import/macos.rb

@@ -0,0 +1,148 @@
+require "plist"
+require "nokogiri"
+require "fontist/import"
+require_relative "recursive_extraction"
+require_relative "helpers/hash_helper"
+require_relative "manual_formula_builder"
+
+module Fontist
+  module Import
+    class Macos
+      FONT_XML = "/System/Library/AssetsV2/com_apple_MobileAsset_Font6/com_apple_MobileAsset_Font6.xml".freeze # rubocop:disable Layout/LineLength
+      DESCRIPTION = "Fonts included with macOS %<name>s".freeze
+
+      INSTRUCTIONS = <<~INSTRUCTIONS.freeze
+        To download and enable any of these fonts:
+
+        1. Open Font Book, which is in your Applications folder.
+        2. Select All Fonts in the sidebar, or use the Search field to find the font that you want to download. Fonts that are not already downloaded appear dimmed in the list of fonts.
+        3. Select the dimmed font and choose Edit > Download, or Control-click it and choose Download from the pop-up menu.
+      INSTRUCTIONS
+
+      def initialize(options = {})
+        @options = options
+      end
+
+      def call
+        downloadable_fonts = fetch_fonts_list
+        links = fetch_links(downloadable_fonts)
+        archives = download(links)
+        store_in_dir(archives) do |dir|
+          create_formula(dir)
+        end
+      end
+
+      private
+
+      def fetch_fonts_list
+        html = Net::HTTP.get(URI.parse(@options[:fonts_link]))
+
+        document = Nokogiri::HTML.parse(html)
+        document.css("#sections div.grid2col:nth-of-type(3) div ul > li",
+                     "#sections div.grid2col:nth-of-type(4) div ul > li")
+          .map(&:text)
+      end
+
+      def fetch_links(downloadable_fonts)
+        data = Plist.parse_xml(FONT_XML)
+        assets = downloadable_assets(data, downloadable_fonts)
+        assets_links(assets)
+      end
+
+      def downloadable_assets(data, downloadable_fonts)
+        data["Assets"].select do |x|
+          x["FontInfo4"].any? do |i|
+            downloadable_fonts.find do |d|
+              d.start_with?(i["FontFamilyName"])
+            end
+          end
+        end
+      end
+
+      def assets_links(assets)
+        assets.map do |x|
+          x.values_at("__BaseURL", "__RelativePath").join
+        end
+      end
+
+      def download(links)
+        links.map do |url|
+          Fontist::Utils::Downloader.download(url, progress_bar: true).path
+        end
+      end
+
+      def store_in_dir(archives)
+        Dir.mktmpdir do |dir|
+          archives.each do |archive|
+            FileUtils.ln(archive, dir)
+          end
+
+          yield dir
+        end
+      end
+
+      def create_formula(archives_dir)
+        extractor = RecursiveExtraction.new(archives_dir)
+        path = save(formula(archives_dir, extractor))
+        Fontist.ui.success("Formula has been successfully created: #{path}")
+
+        path
+      end
+
+      def formula(archive, extractor)
+        builder = ManualFormulaBuilder.new
+        setup_strings(builder, archive)
+        setup_files(builder, extractor)
+        builder.formula
+      end
+
+      def setup_strings(builder, archive)
+        builder.url = archive
+        builder.archive = archive
+        builder.platforms = platforms
+        builder.instructions = instructions
+        builder.description = description
+        builder.options = builder_options
+      end
+
+      def platforms
+        major_version = Sys::Uname.release.split(".").first
+
+        ["macos-#{major_version}"]
+      end
+
+      def instructions
+        INSTRUCTIONS.strip
+      end
+
+      def description
+        format(DESCRIPTION, name: @options[:name])
+      end
+
+      def builder_options
+        @options.merge(homepage: @options[:fonts_link])
+      end
+
+      def setup_files(builder, extractor)
+        builder.extractor = extractor
+        builder.font_files = extractor.font_files
+        builder.font_collection_files = extractor.font_collection_files
+        builder.license_text = extractor.license_text
+      end
+
+      def save(hash)
+        filename = Import.name_to_filename(@options[:name])
+        path = File.join(formula_dir, filename)
+        yaml = YAML.dump(Helpers::HashHelper.stringify_keys(hash))
+        File.write(path, yaml)
+        path
+      end
+
+      def formula_dir
+        @formula_dir ||= Fontist.formulas_path.join("macos").tap do |path|
+          FileUtils.mkdir_p(path) unless File.exist?(path)
+        end
+      end
+    end
+  end
+end

data/lib/fontist/import/manual_formula_builder.rb

@@ -0,0 +1,24 @@
+require_relative "formula_builder"
+
+module Fontist
+  module Import
+    class ManualFormulaBuilder < FormulaBuilder
+      attr_accessor :description,
+                    :platforms,
+                    :instructions
+
+      private
+
+      def formula_attributes
+        @formula_attributes ||= super.dup.tap do |attrs|
+          attrs.delete(:resources)
+          attrs.delete(:open_license)
+          attrs.delete(:license_url)
+          attrs.delete(:copyright)
+
+          attrs.insert(attrs.index(:homepage) + 1, :platforms, :instructions)
+        end
+      end
+    end
+  end
+end

data/lib/fontist/import/recursive_extraction.rb

@@ -1,3 +1,5 @@
+require_relative "otf/font_file"
+require_relative "files/collection_file"
 require_relative "files/font_detector"
 
 module Fontist

data/lib/fontist/import_cli.rb

@@ -0,0 +1,17 @@
+module Fontist
+  class ImportCLI < Thor
+    include CLI::ClassOptions
+
+    desc "macos", "Create formula for on-demand macOS fonts"
+    option :name, desc: "Example: Big Sur", required: true
+    option :fonts_link,
+           desc: "A link to a list of available fonts in a current OS",
+           required: true
+    def macos
+      handle_class_options(options)
+      require_relative "import/macos"
+      Import::Macos.new(options).call
+      CLI::STATUS_SUCCESS
+    end
+  end
+end

data/lib/fontist/indexes/default_family_font_index.rb

@@ -9,7 +9,10 @@ module Fontist
 
       def add_formula(formula)
         formula.fonts.each do |font|
-          add_index_formula(font.name, formula.to_index_formula)
+          font.styles.each do |style|
+            font_name = style.default_family_name || font.name
+            add_index_formula(font_name, formula.to_index_formula)
+          end
         end
       end
 

data/lib/fontist/repo_cli.rb

@@ -1,9 +1,12 @@
 module Fontist
   class RepoCLI < Thor
+    include CLI::ClassOptions
+
     desc "setup NAME URL",
          "Setup a custom fontist repo named NAME for the repository at URL " \
          "and fetches its formulas"
     def setup(name, url)
+      handle_class_options(options)
       Repo.setup(name, url)
       Fontist.ui.success(
         "Fontist repo '#{name}' from '#{url}' has been successfully set up.",
@@ -13,6 +16,7 @@ module Fontist
 
     desc "update NAME", "Update formulas in a fontist repo named NAME"
     def update(name)
+      handle_class_options(options)
       Repo.update(name)
       Fontist.ui.success(
         "Fontist repo '#{name}' has been successfully updated.",
@@ -24,6 +28,7 @@ module Fontist
 
     desc "remove NAME", "Remove fontist repo named NAME"
     def remove(name)
+      handle_class_options(options)
       Repo.remove(name)
       Fontist.ui.success(
         "Fontist repo '#{name}' has been successfully removed.",
@@ -35,6 +40,7 @@ module Fontist
 
     desc "list", "List fontist repos"
     def list
+      handle_class_options(options)
       Repo.list.each do |name|
         Fontist.ui.say(name)
       end

data/lib/fontist/style_version.rb

@@ -0,0 +1,39 @@
+module Fontist
+  class StyleVersion
+    def initialize(text)
+      @text = text
+    end
+
+    def value
+      @value ||= numbers || default_value
+    end
+
+    def numbers
+      string_version&.split(".")&.map(&:strip)
+    end
+
+    def string_version
+      @text&.split(";")&.first
+    end
+
+    def default_value
+      ["0"]
+    end
+
+    def <=>(other)
+      value <=> other.value
+    end
+
+    def ==(other)
+      value == other.value
+    end
+
+    def eql?(other)
+      value.eql?(other.value)
+    end
+
+    def hash
+      value.hash
+    end
+  end
+end

data/lib/fontist/system.yml

@@ -14,6 +14,7 @@ system:
       - /System/Library/Fonts/**/**.{ttf,ttc}
       - /Users/{username}/Library/Fonts/**.{ttf,ttc}
       - /Applications/Microsoft**/Contents/Resources/**/**.{ttf,ttc}
+      - /System/Library/AssetsV2/com_apple_MobileAsset_Font6/**/**.{ttf,ttc}
 
   unix:
     paths:

data/lib/fontist/update.rb

@@ -1,9 +1,7 @@
 module Fontist
   class Update
-    VERSION = "v2".freeze
-
     def self.call
-      new(VERSION).call
+      new(Fontist.formulas_version).call
     end
 
     def initialize(branch = "main")

data/lib/fontist/utils/downloader.rb

@@ -24,7 +24,7 @@ module Fontist
           download_file
         end
 
-        raise_if_tampered(file)
+        check_tampered(file)
 
         file
       end
@@ -33,15 +33,12 @@ module Fontist
 
       attr_reader :file, :sha, :file_size
 
-      def raise_if_tampered(file)
+      def check_tampered(file)
         file_checksum = Digest::SHA256.file(file).to_s
         if !sha.empty? && !sha.include?(file_checksum)
-          raise(
-            Fontist::Errors::TamperedFileError.new(
-              "The downloaded file from #{@file} doesn't " \
-              "match with the expected sha256 checksum (#{file_checksum})!\n" \
-              "Beginning of content: #{File.read(file, 3000)}",
-            ),
+          Fontist.ui.error(
+            "SHA256 checksum mismatch for #{url}: #{file_checksum}, " \
+            "should be #{sha.join(', or ')}.",
           )
         end
       end

data/lib/fontist/utils/system.rb

@@ -1,3 +1,5 @@
+require "sys/uname"
+
 module Fontist
   module Utils
     module System
@@ -18,6 +20,14 @@ module Fontist
           end
         end
       end
+
+      def self.user_os_with_version
+        "#{user_os}-#{Sys::Uname.release}"
+      end
+
+      def self.match?(platform)
+        user_os_with_version.start_with?(platform)
+      end
     end
   end
 end