fontist 1.11.3 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0461da7c09c672b443f4a0bad5443f3bf48294cb3e0aee5ea7082838825519ca
-  data.tar.gz: 0e5931e6617e4484074b7d740fbe9f593dc3a31d9b524859167d90cdfc060498
+  metadata.gz: 709582759b1009bae25d302ab0590ed5f6fe92fe55d68d1cb57c918942b4f005
+  data.tar.gz: 165f75a0625995d8fcc388d46a26168008383d98d2705cb1ea5ed519abe41e80
 SHA512:
-  metadata.gz: c0b30b8bfc0f01507d436dea54d5b122751c852a63d2309a5236a5a5f698c140892e54c2f665dbbce4bf0c6f6276c9a7cd1910f212aa7a27937ceca1b8ba510d
-  data.tar.gz: de92e684e1368ee2a5c10d1789962181316590b87ea5b806d8fd0a959329c54dd0d95723d99334038f75e2865d277b12dbc2c17aeed39b5b57436506273e7be4
+  metadata.gz: fd3d62de512ff44e1d9b47c192889fdcefa5db9abea1f0966ac3d761c4ef5567fa547b7d57b4eda52720040d3ca82a03eec2e3d72b24d1f9522dbde1e092c625
+  data.tar.gz: 3adf2dcebf7714cc81fc3a6955ac69fdf7affe3e90a845f011f52d284332c856112bef7f8e98cf6d96175c043df299ad0965148ef96308b38c6eace46547ef52

data/.github/workflows/rspec.yml

@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby: [ '2.4', '2.5', '2.6', '2.7', '3.0' ]
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        os: [ ubuntu-18.04, ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
 
     steps:
@@ -33,7 +33,15 @@ jobs:
         env:
           TEST_ENV: CI
 
-      - if: matrix.os != 'macos-latest'
+      - if: matrix.os == 'windows-latest' && matrix.ruby == '2.4'
+        run: curl -O https://curl.se/ca/cacert.pem
+
+      - if: matrix.os == 'windows-latest' && matrix.ruby == '2.4'
+        run: bundle exec rspec --tag ~dev
+        env:
+          SSL_CERT_FILE: cacert.pem
+
+      - if: matrix.os != 'macos-latest' || matrix.os == 'windows-latest' && matrix.ruby == '2.4'
         run: bundle exec rspec --tag ~dev
         env:
           TEST_ENV: CI

data/.rubocop.yml

@@ -1,22 +1,5 @@
 inherit_from:
   - 'https://raw.githubusercontent.com/fontist/oss-guides/master/ci/rubocop.yml'
 
-AllCops:
-  Exclude:
-    - 'lib/fontist/import/google/fonts_public.pb.rb'
-    - 'lib/fontist/formula_template.rb'
-
 Rails:
   Enabled: false
-
-Layout/LineLength:
-  Exclude:
-    - 'lib/fontist/formulas/**/*.rb'
-
-Layout/FirstHashElementIndentation:
-  Exclude:
-    - 'lib/fontist/formulas/**/*.rb'
-
-Layout/HeredocIndentation:
-  Exclude:
-    - 'lib/fontist/formulas/**/*.rb'

data/README.adoc

@@ -618,7 +618,7 @@ repository https://github.com/fontist/formulas[formulas]:
 
 [source,sh]
 ----
-cd ~/.fontist/versions/v2/formulas
+cd ~/.fontist/versions/{last_version}/formulas
 git add Formulas/google
 git commit -m "Google Fonts update"
 git push
@@ -640,12 +640,44 @@ They can be updated with:
 [source,sh]
 ----
 fontist import-sil
-cd ~/.fontist/formulas
-git add Formulas/sil index.yml filename_index.yml
+cd ~/.fontist/versions/{last_version}/formulas
+git add Formulas/sil
 git commit -m "SIL fonts update"
 git push
 ----
 
+=== Dynamically importing formulas from macOS
+
+macOS provides https://support.apple.com/en-om/HT211240#download[fonts] which
+can be manually downloaded with the Font Book app. When such font is requested,
+fontist prints information on how to install it.
+
+In order to know which fonts are available in a current version of macOS,
+for each version there is a formula containing all supported fonts.
+
+A new formula can be generated with:
+
+[source,sh]
+----
+fontist import macos --name "Big Sur" --fonts-link "https://support.apple.com/en-om/HT211240#download"
+cd ~/.fontist/versions/{last_version}/formulas
+git add Formulas/macos
+git commit -m "Add Big Sur macOS formula"
+git push
+----
+
+Here `--fonts-link` is a link to a page containing a list of available fonts
+in the Font Book app.
+
+If the import is run on a different version of macOS, then a proper version
+should be set in the `platforms` attribute of the generated formula:
+
+[source,yaml]
+----
+platforms:
+- macos-20
+----
+
 
 == Development
 
@@ -685,8 +717,8 @@ one, please refer to its documentation.
 There is an ability to use private fonts via private Fontist repositories.
 
 A Fontist repository is a Git repo which contains YAML formula files. Formulas can be created
-manually (see https://github.com/fontist/formulas/tree/master/Formulas)[examples],
-or #auto-generate-a-formula[auto-generated from an archive].
+manually (see https://github.com/fontist/formulas/tree/master/Formulas[examples]),
+or xref:Authoring Fontist formulas[auto-generated from an archive].
 
 A repository can be either a HTTPS or SSH Git repo. In case of SSH, a
 corresponding SSH key should be setup with `ssh-agent` in order to access this

data/fontist.gemspec

@@ -29,15 +29,17 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "down", "~> 5.0"
   spec.add_runtime_dependency "extract_ttc", "~> 0.1"
+  spec.add_runtime_dependency "nokogiri", "~> 1.0"
+  spec.add_runtime_dependency "sys-uname", "~> 1.2"
   spec.add_runtime_dependency "thor", "~> 1.0.1"
   spec.add_runtime_dependency "git", "~> 1.0"
   spec.add_runtime_dependency "ttfunk", "~> 1.6"
+  spec.add_runtime_dependency "plist", "~> 3.0"
   spec.add_runtime_dependency "excavate", "~> 0.1"
 
   spec.add_development_dependency "pry"
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "gem-release"
-  spec.add_development_dependency "nokogiri", "~> 1.0"
   spec.add_development_dependency "rake", "~> 13"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-benchmark", "~> 0.6"

data/lib/fontist/cli.rb

@@ -1,5 +1,6 @@
 require "thor"
 require "fontist/repo_cli"
+require "fontist/import_cli"
 require "fontist/google_cli"
 
 module Fontist
@@ -15,10 +16,12 @@ module Fontist
     STATUS_REPO_NOT_FOUND = 8
     STATUS_MAIN_REPO_NOT_FOUND = 9
     STATUS_REPO_COULD_NOT_BE_UPDATED = 10
+    STATUS_MANUAL_FONT_ERROR = 11
 
     ERROR_TO_STATUS = {
       Fontist::Errors::UnsupportedFontError => [STATUS_NON_SUPPORTED_FONT_ERROR],
       Fontist::Errors::MissingFontError => [STATUS_MISSING_FONT_ERROR],
+      Fontist::Errors::ManualFontError => [STATUS_MANUAL_FONT_ERROR],
       Fontist::Errors::LicensingError => [STATUS_LICENSING_ERROR],
       Fontist::Errors::ManifestCouldNotBeFoundError => [STATUS_MANIFEST_COULD_NOT_BE_FOUND_ERROR,
                                                         "Manifest could not be found."],
@@ -167,6 +170,9 @@ module Fontist
     desc "repo SUBCOMMAND ...ARGS", "Manage custom repositories"
     subcommand "repo", Fontist::RepoCLI
 
+    desc "import SUBCOMMAND ...ARGS", "Manage imports"
+    subcommand "import", Fontist::ImportCLI
+
     desc "google SUBCOMMAND ...ARGS", "Manage Google formulas"
     subcommand "google", Fontist::GoogleCLI
 
@@ -205,10 +211,15 @@ module Fontist
           Fontist.ui.say(" #{font.name}")
 
           styles.each do |style, installed|
+            opts = []
+            opts << "manual" if formula.manual?
+            opts << (installed ? "installed" : "uninstalled")
+            msg = "  #{style.type} (#{opts.join(', ')})"
+
             if installed
-              Fontist.ui.success("  #{style.type} (installed)")
+              Fontist.ui.success(msg)
             else
-              Fontist.ui.error("  #{style.type} (uninstalled)")
+              Fontist.ui.error(msg)
             end
           end
         end

data/lib/fontist/errors.rb

@@ -72,6 +72,14 @@ module Fontist
       end
     end
 
+    class ManualFontError < FontError
+      def initialize(font, formula)
+        msg = "'#{font}' font is missing.\n\n#{formula.instructions}"
+
+        super(msg, font)
+      end
+    end
+
     class UnsupportedFontError < FontError
       def initialize(font)
         msg = <<~MSG.chomp

data/lib/fontist/font.rb

@@ -38,21 +38,25 @@ module Fontist
     end
 
     def find
-      find_system_font || downloadable_font || raise_non_supported_font
+      find_system_font || downloadable_font || manual_font ||
+        raise_non_supported_font
     end
 
     def install
-      (find_system_font unless @force) || download_font || raise_non_supported_font
+      (find_system_font unless @force) || download_font || manual_font ||
+        raise_non_supported_font
     end
 
     def uninstall
-      uninstall_font || downloadable_font || raise_non_supported_font
+      uninstall_font || downloadable_font || manual_font ||
+        raise_non_supported_font
     end
 
     def status
       return installed_paths unless @name
 
-      find_system_font || downloadable_font || raise_non_supported_font
+      find_system_font || downloadable_font || manual_font ||
+        raise_non_supported_font
     end
 
     def list
@@ -62,7 +66,7 @@ module Fontist
     end
 
     def all
-      Fontist::Formula.all.map(&:fonts).flatten
+      all_formulas.map(&:fonts).flatten
     end
 
     private
@@ -98,24 +102,37 @@ module Fontist
       FontInstaller.new(formula, no_progress: @no_progress)
     end
 
-    def formula
-      @formula ||= Fontist::Formula.find(name)
+    def downloadable_formulas
+      @downloadable_formulas ||= formulas.select(&:downloadable?)
+    end
+
+    def manual_formulas
+      @manual_formulas ||= formulas.reject(&:downloadable?)
     end
 
     def formulas
       @formulas ||= Fontist::Formula.find_many(name)
+        .select { |f| supported_formula?(f) }
     end
 
-    def downloadable_font
-      if formula
-        raise Fontist::Errors::MissingFontError.new(name)
+    def supported_formula?(formula)
+      return true if formula.platforms.nil?
+
+      formula.platforms.any? do |platform|
+        Utils::System.match?(platform)
       end
     end
 
+    def downloadable_font
+      return if downloadable_formulas.empty?
+
+      raise Fontist::Errors::MissingFontError.new(name)
+    end
+
     def download_font
-      return if formulas.empty?
+      return if downloadable_formulas.empty?
 
-      formulas.flat_map do |formula|
+      downloadable_formulas.flat_map do |formula|
         confirmation = check_and_confirm_required_license(formula)
         paths = font_installer(formula).install(confirmation: confirmation)
 
@@ -165,6 +182,12 @@ module Fontist
       MSG
     end
 
+    def manual_font
+      return if manual_formulas.empty?
+
+      raise Fontist::Errors::ManualFontError.new(name, manual_formulas.first)
+    end
+
     def uninstall_font
       paths = find_fontist_paths
       return unless paths
@@ -190,7 +213,7 @@ module Fontist
     end
 
     def all_formulas
-      Fontist::Formula.all
+      Fontist::Formula.all.select { |f| supported_formula?(f) }
     end
 
     def path(style)
@@ -215,7 +238,7 @@ module Fontist
 
     def list_styles(formulas)
       map_to_hash(formulas) do |formula|
-        map_to_hash(formula.fonts) do |font|
+        map_to_hash(requested_fonts(formula.fonts)) do |font|
           map_to_hash(font.styles) do |style|
             installed(style)
           end
@@ -227,6 +250,14 @@ module Fontist
       elements.map { |e| [e, yield(e)] }.to_h
     end
 
+    def requested_fonts(fonts)
+      return fonts unless @name
+
+      fonts.select do |font|
+        font.name.casecmp?(name)
+      end
+    end
+
     def installed(style)
       path(style) ? true : false
     end

data/lib/fontist/font_installer.rb

@@ -54,16 +54,30 @@ module Fontist
     end
 
     def download_file(source)
-      request = source.urls.first
-      url = request.respond_to?(:url) ? request.url : request
-      Fontist.ui.say(%(Downloading font "#{@formula.key}" from #{url}))
+      errors = []
+      source.urls.each do |request|
+        url = request.respond_to?(:url) ? request.url : request
+        Fontist.ui.say(%(Downloading font "#{@formula.key}" from #{url}))
 
+        result = try_download_file(request, source)
+        return result unless result.is_a?(Errors::InvalidResourceError)
+
+        errors << result
+      end
+
+      raise Errors::InvalidResourceError, errors.join(" ")
+    end
+
+    def try_download_file(request, source)
       Fontist::Utils::Downloader.download(
         request,
         sha: source.sha256,
         file_size: source.file_size,
         progress_bar: !@no_progress
       )
+    rescue Errors::InvalidResourceError => e
+      Fontist.ui.say(e.message)
+      e
     end
 
     def font_file?(path)

data/lib/fontist/formula.rb

@@ -59,6 +59,14 @@ module Fontist
       Indexes::IndexFormula.new(path)
     end
 
+    def manual?
+      !downloadable?
+    end
+
+    def downloadable?
+      @data.key?("resources")
+    end
+
     def path
       @path
     end
@@ -91,12 +99,20 @@ module Fontist
       @data["requires_license_agreement"] ? true : false
     end
 
+    def platforms
+      @data["platforms"]
+    end
+
     def extract
       Helpers.parse_to_object(@data["extract"])
     end
 
     def resources
-      Helpers.parse_to_object(@data["resources"].values)
+      Helpers.parse_to_object(@data["resources"]&.values)
+    end
+
+    def instructions
+      @data["instructions"]
     end
 
     def fonts

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

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

@@ -15,7 +15,7 @@ module Fontist
         @file = file
         @sha = [sha].flatten.compact
         @file_size = file_size.to_i if file_size
-        @progress_bar = set_progress_bar(progress_bar)
+        @progress_bar = progress_bar
         @cache = Cache.new
       end
 
@@ -54,35 +54,48 @@ module Fontist
         options[:download_path] || Fontist.root_path.join("tmp")
       end
 
-      def set_progress_bar(progress_bar)
-        if progress_bar
+      def download_file
+        tries = tries ? tries + 1 : 1
+        do_download_file
+      rescue Down::Error => e
+        retry if tries < 3
+
+        raise Fontist::Errors::InvalidResourceError,
+              "Invalid URL: #{@file}. Error: #{e.inspect}."
+      end
+
+      def do_download_file
+        progress_bar = create_progress_bar
+        file = do_download_file_with_progress_bar(progress_bar)
+        progress_bar.finish
+        file
+      end
+
+      def create_progress_bar
+        if @progress_bar
           ProgressBar.new(@file_size)
         else
           NullProgressBar.new(@file_size)
         end
       end
 
-      def download_file
-        file = Down.download(
+      # rubocop:disable Metrics/MethodLength
+      def do_download_file_with_progress_bar(progress_bar)
+        Down.download(
           url,
           open_timeout: 10,
           read_timeout: 10,
           max_redirects: 10,
           headers: headers,
           content_length_proc: ->(content_length) {
-            @progress_bar.total = content_length if content_length
+            progress_bar.total = content_length if content_length
           },
           progress_proc: -> (progress) {
-            @progress_bar.increment(progress)
+            progress_bar.increment(progress)
           }
         )
-
-        @progress_bar.finish
-
-        file
-      rescue Down::NotFound
-        raise(Fontist::Errors::InvalidResourceError.new("Invalid URL: #{@file}"))
       end
+      # rubocop:enable Metrics/MethodLength
 
       def url
         @file.respond_to?(:url) ? @file.url : @file

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.3".freeze
+  VERSION = "1.12.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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.11.3
+  version: 1.12.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-17 00:00:00.000000000 Z
+date: 2021-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -38,6 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: sys-uname
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: plist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: excavate
   requirement: !ruby/object:Gem::Requirement
@@ -136,20 +178,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -293,6 +321,8 @@ files:
 - lib/fontist/import/google_import.rb
 - lib/fontist/import/helpers/hash_helper.rb
 - lib/fontist/import/helpers/system_helper.rb
+- lib/fontist/import/macos.rb
+- lib/fontist/import/manual_formula_builder.rb
 - lib/fontist/import/otf/font_file.rb
 - lib/fontist/import/otf_parser.rb
 - lib/fontist/import/otf_style.rb
@@ -303,6 +333,7 @@ files:
 - lib/fontist/import/sil_import.rb
 - lib/fontist/import/template_helper.rb
 - 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