fontist 1.11.5 → 1.13.0

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/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,19 @@
+module Fontist
+  class ImportCLI < Thor
+    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
+    option :formulas_path, type: :string, desc: "Path to formulas"
+    def macos
+      if options[:formulas_path]
+        Fontist.formulas_path = Pathname.new(options[:formulas_path])
+      end
+
+      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.rb

@@ -15,8 +15,20 @@ module Fontist
           raise(Errors::RepoNotFoundError, "No such repo '#{name}'.")
         end
 
-        Git.open(path).pull
+        git = Git.open(path)
+        git.pull("origin", git.current_branch)
+
         Index.rebuild
+      rescue Git::GitExecuteError => e
+        raise Errors::RepoCouldNotBeUpdatedError.new(<<~MSG.chomp)
+          Formulas repo '#{name}' could not be updated.
+          Please consider reinitializing it with:
+            fontist remove #{name}
+            fontist setup #{name} REPO_URL
+
+          Git error:
+          #{e.message}
+        MSG
       end
 
       def remove(name)

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/system_font.rb

@@ -21,7 +21,7 @@ module Fontist
       templates = YAML.load_file(config_path)["system"][os]["paths"]
       patterns = expand_paths(templates)
 
-      Dir.glob(patterns)
+      Dir.glob(patterns, File::FNM_CASEFOLD)
     end
 
     def self.reset_system_font_paths_cache

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")
@@ -30,7 +28,14 @@ module Fontist
                          depth: 1)
       end
 
-      git = Git.open(Fontist.formulas_repo_path)
+      git = if Dir.exist?(Fontist.formulas_repo_path.join(".git"))
+              Git.open(Fontist.formulas_repo_path)
+            else
+              Git.init(Fontist.formulas_repo_path.to_s).tap do |g|
+                g.add_remote("origin", Fontist.formulas_repo_url)
+              end
+            end
+
       return git.pull("origin", @branch) if git.current_branch == @branch
 
       git.config("remote.origin.fetch",
@@ -41,36 +46,11 @@ module Fontist
     end
 
     def update_private_repos
-      private_repos.each do |path|
-        update_repo(path)
-      end
-    end
-
-    def update_repo(path)
-      Git.open(path).pull
-    rescue Git::GitExecuteError => e
-      name = repo_name(path)
-      raise Errors::RepoCouldNotBeUpdatedError.new(<<~MSG.chomp)
-        Formulas repo '#{name}' could not be updated.
-        Please consider reinitializing it with:
-          fontist remove #{name}
-          fontist setup #{name} REPO_URL
-
-        Git error:
-        #{e.message}
-      MSG
-    end
-
-    def private_repos
-      Dir.glob(Fontist.private_formulas_path.join("*")).select do |path|
-        File.directory?(path)
+      Repo.list.each do |name|
+        Repo.update(name)
       end
     end
 
-    def repo_name(path)
-      File.basename(path)
-    end
-
     def rebuild_index
       Index.rebuild
     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

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.11.5".freeze
+  VERSION = "1.13.0".freeze
 end

data/lib/fontist.rb

@@ -44,7 +44,11 @@ module Fontist
   end
 
   def self.fontist_version_path
-    Fontist.fontist_path.join("versions", Update::VERSION)
+    Fontist.fontist_path.join("versions", formulas_version)
+  end
+
+  def self.formulas_version
+    "v3"
   end
 
   def self.formulas_repo_url
@@ -103,6 +107,10 @@ module Fontist
     Fontist.fontist_version_path
   end
 
+  def self.formula_size_limit_in_megabytes
+    300
+  end
+
   def self.preferred_family?
     !!@preferred_family
   end