fontist 1.8.9 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c34f4a52f1c0842347ebd17811c7550b4eb9e31048bab00077cea20dcd94985
-  data.tar.gz: 9a5bad3ff72333d3b73673189510f0b739ef1160233235212e6b0c21f5152d2c
+  metadata.gz: 46371ff826db31f7fc1c4e5fefca2d6f237f0a874a896dbca6c4c2dbcb937255
+  data.tar.gz: dc6a20cb42ce6649791e256a4d6cb8376c29d196c795e2e1869279caa1df8b5a
 SHA512:
-  metadata.gz: d8d58465500cd8417d3c164cb791215d6adcfeee358ac60b14d93492d5c6ef1b465cb26236e44ced38566995d61e741ffe1566ad482c491d474ccea9c10fa447
-  data.tar.gz: f41298a94ffe8d6c2d6f33ff990f9e3c03b6271d580db2a86f48d94bc7dd4776a7c767f7d0d946097782ec00335c716053c90bd88aec4ba3dc274a6e863555bb
+  metadata.gz: 7ac9af8e04948c40b1b1fc488f6eeffebd7e598050d59224557f271b1deb328c639a67d153bad08b1a82e3869dda13525647db87e1b04269c0cf5e0b8c0ae295
+  data.tar.gz: 680fbde53bf5482ae3e36a720b6e6482cac5a62c29efa1b9962b18c1d51d7e7cafd2ce154c2c484cdfd6211002b413f1df45b909341df1d6ac864585aa590450

data/.github/workflows/metanorma.yml

@@ -0,0 +1,35 @@
+name: metanorma
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+
+jobs:
+  test:
+    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.5', '2.6', '2.7', '3.0' ]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        experimental: [ true ]
+    steps:
+      - uses: actions/checkout@master
+        with:
+          repository: metanorma/metanorma
+
+      - uses: actions/checkout@master
+        with:
+          path: "fontist"
+
+      - run: 'echo ''gem "fontist", path: "./fontist"'' > Gemfile.devel'
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - run: bundle exec rake

data/.github/workflows/rspec.yml

@@ -2,7 +2,7 @@ name: rspec
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
 
 jobs:
@@ -13,19 +13,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.4', '2.5', '2.6', '2.7' ]
+        ruby: [ '2.4', '2.5', '2.6', '2.7', '3.0' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
-        # include:
-          # - ruby: '3.0'
-            # os: 'ubuntu-latest'
-            # experimental: true
-          # - ruby: '3.0'
-            # os: 'windows-latest'
-            # experimental: true
-          # - ruby: '3.0'
-            # os: 'macos-latest'
-            # experimental: true
 
     steps:
       - uses: actions/checkout@master
@@ -33,20 +23,11 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-
-      - uses: actions/cache@v1
-        with:
-          path: vendor/bundle
-          key: bundle-v2-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
-          restore-keys: bundle-v2-${{ matrix.os }}-${{ matrix.ruby }}
+          bundler-cache: true
 
       - if: matrix.os == 'macos-latest'
         run: brew install lcdf-typetools
 
-      - run: bundle config set path 'vendor/bundle'
-
-      - run: bundle install --jobs 4 --retry 3
-
       - if: matrix.os == 'macos-latest'
         run: bundle exec rspec
         env:

data/.rubocop.yml

@@ -9,14 +9,14 @@ AllCops:
 Rails:
   Enabled: false
 
-Metrics/LineLength:
+Layout/LineLength:
   Exclude:
     - 'lib/fontist/formulas/**/*.rb'
 
-Layout/IndentFirstHashElement:
+Layout/FirstHashElementIndentation:
   Exclude:
     - 'lib/fontist/formulas/**/*.rb'
 
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   Exclude:
     - 'lib/fontist/formulas/**/*.rb'

data/README.md

@@ -1,8 +1,8 @@
 # Fontist
 
-![windows](https://github.com/fontist/fontist/workflows/windows/badge.svg)
-![macos](https://github.com/fontist/fontist/workflows/macos/badge.svg)
-![ubuntu](https://github.com/fontist/fontist/workflows/ubuntu/badge.svg)
+[![Build Status](https://github.com/fontist/fontist/actions/workflows/rspec.yml/badge.svg)](https://github.com/fontist/fontist/actions/workflows/rspec.yml)
+[![Gem Version](https://img.shields.io/gem/v/fontist.svg)](https://rubygems.org/gems/fontist)
+[![Pull Requests](https://img.shields.io/github/issues-pr-raw/fontist/fontist.svg)](https://github.com/fontist/fontist/pulls)
 
 A simple library to find and download fonts for Windows, Linux and Mac.
 
@@ -34,6 +34,18 @@ After installation please fetch formulas to your system:
 fontist update
 ```
 
+### Dependencies
+
+Depends on
+[ffi-libarchive-binary](https://github.com/fontist/ffi-libarchive-binary) which
+has the following requirements:
+
+* zlib
+* Expat
+* OpenSSL (for Linux only)
+
+These dependencies are generally present on all systems.
+
 ## Usage
 
 ### Font
@@ -387,6 +399,57 @@ bin/rspec
 All formulas are kept in the [formulas][fontist-formulas] repository. If you'd
 like to add a new one or change any existing, please refer to its documentation.
 
+### Privare repos
+
+There is an ability to use private fonts via private fontist repo. Fontist repo
+is a git repo which contains YAML formula files. Formulas can be created
+manually (see [examples](https://github.com/fontist/formulas/tree/master/Formulas)),
+or [auto-generated from an archive](#auto-generate-a-formula).
+
+A corresponding SSH key should be setup with ssh-agent in order to access this private repo.
+
+Private fontist repo can be set up with:
+
+```sh
+fontist repo setup NAME URL
+```
+
+E.g.
+
+```sh
+fontist repo setup acme https://example.com/acme/formulas.git
+```
+
+Later, to fetch changes the following command can be used:
+
+```sh
+fontist repo update acme
+```
+
+If there is a need to avoid using these formulas, the repo can be removed with:
+
+```sh
+fontist repo remove acme
+```
+
+### Private formulas
+
+Authorization of private archives in private formulas can be implemented with
+headers. Here is an example which works with Github releases:
+
+```yaml
+resources:
+  fonts.zip:
+    urls:
+    - url: https://example.com/repos/acme/formulas/releases/assets/38777461
+      headers:
+        Accept: application/octet-stream
+        Authorization: token ghp_1234567890abcdefghi
+```
+
+A token can be obtained on [this page](https://github.com/settings/tokens).
+It should have at least the `repo` scope.
+
 ### Auto-generate a formula
 
 A formula could be generated from a fonts archive. Just specify a URL to the
@@ -397,20 +460,21 @@ fontist create-formula https://www.latofonts.com/download/lato2ofl-zip/
 cp lato.yml ~/.fontist/formulas/Formulas/
 ```
 
+Though indexes are auto-generated now, maintainers should rebuild indexes
+in the main repo for backward compatibility with fontist prior to 1.9.x versions.
 A formula index should be rebuild, when a new formula is generated or an
 existing one changed:
 
 ```sh
-fontist rebuild-index
+fontist rebuild-index --main-repo
 ```
 
-Then, both the formula and the updated index should be commited and pushed to
+Then, both the formula and the updated indexes should be commited and pushed to
 the formula repository:
 
 ```sh
 cd ~/.fontist/formulas
-git add Formulas/lato.yml
-git add index.yml
+git add Formulas/lato.yml index.yml filename_index.yml
 git commit -m "Add Lato formula"
 ```
 
@@ -429,7 +493,7 @@ repository [formulas][fontist-formulas]:
 
 ```
 cd ~/.fontist/formulas
-git add Formulas/google
+git add Formulas/google index.yml filename_index.yml
 git commit -m "Google Fonts update"
 git push
 ```
@@ -442,8 +506,7 @@ can be updated with:
 ```sh
 fontist import-sil
 cd ~/.fontist/formulas
-git add Formulas/sil
-git add index.yml
+git add Formulas/sil index.yml filename_index.yml
 git commit -m "SIL fonts update"
 git push
 ```

data/fontist.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "down", "~> 5.0"
   spec.add_runtime_dependency "thor", "~> 1.0.1"
   spec.add_runtime_dependency "git", "~> 1.0"
-  spec.add_runtime_dependency "ttfunk", "~> 1.6.2"
+  spec.add_runtime_dependency "ttfunk", "~> 1.6"
   spec.add_runtime_dependency "excavate", "~> 0.1"
 
   spec.add_development_dependency "extract_ttc", "~> 0.1"
@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "nokogiri", "~> 1.0"
   spec.add_development_dependency "rake", "~> 13"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rubocop", "0.75.0"
+  spec.add_development_dependency "rubocop", "1.5.2"
   spec.add_development_dependency "rubocop-rails"
   spec.add_development_dependency "rubocop-performance"
   spec.add_development_dependency "ruby-protocol-buffers", "~> 1.0"

data/lib/fontist.rb

@@ -7,6 +7,7 @@ require "singleton"
 require "fontist/errors"
 require "fontist/version"
 
+require "fontist/repo"
 require "fontist/font"
 require "fontist/formula"
 require "fontist/system_font"
@@ -28,7 +29,11 @@ module Fontist
   end
 
   def self.fontist_path
-    Pathname.new(ENV["FONTIST_PATH"] || File.join(Dir.home, ".fontist"))
+    Pathname.new(ENV["FONTIST_PATH"] || default_fontist_path)
+  end
+
+  def self.default_fontist_path
+    Pathname.new(File.join(Dir.home, ".fontist"))
   end
 
   def self.fonts_path
@@ -47,6 +52,10 @@ module Fontist
     Fontist.formulas_repo_path.join("Formulas")
   end
 
+  def self.private_formulas_path
+    Fontist.formulas_path.join("private")
+  end
+
   def self.downloads_path
     Fontist.fontist_path.join("downloads")
   end
@@ -60,10 +69,23 @@ module Fontist
   end
 
   def self.formula_index_path
-    Fontist.formulas_repo_path.join("index.yml")
+    @formula_index_path || Fontist.formula_index_dir.join("formula_index.yml")
+  end
+
+  def self.formula_index_path=(path)
+    @formula_index_path = path
   end
 
   def self.formula_filename_index_path
-    Fontist.formulas_repo_path.join("filename_index.yml")
+    @formula_filename_index_path ||
+      Fontist.formula_index_dir.join("filename_index.yml")
+  end
+
+  def self.formula_filename_index_path=(path)
+    @formula_filename_index_path = path
+  end
+
+  def self.formula_index_dir
+    Fontist.fontist_path
   end
 end

data/lib/fontist/cli.rb

@@ -1,4 +1,5 @@
 require "thor"
+require "fontist/repo_cli"
 
 module Fontist
   class CLI < Thor
@@ -10,6 +11,8 @@ module Fontist
     STATUS_MANIFEST_COULD_NOT_BE_FOUND_ERROR = 5
     STATUS_MANIFEST_COULD_NOT_BE_READ_ERROR = 6
     STATUS_FONT_INDEX_CORRUPTED = 7
+    STATUS_REPO_NOT_FOUND = 8
+    STATUS_MAIN_REPO_NOT_FOUND = 9
 
     ERROR_TO_STATUS = {
       Fontist::Errors::UnsupportedFontError => [STATUS_NON_SUPPORTED_FONT_ERROR],
@@ -20,6 +23,8 @@ module Fontist
       Fontist::Errors::ManifestCouldNotBeReadError => [STATUS_MANIFEST_COULD_NOT_BE_READ_ERROR,
                                                        "Manifest could not be read."],
       Fontist::Errors::FontIndexCorrupted => [STATUS_FONT_INDEX_CORRUPTED],
+      Fontist::Errors::RepoNotFoundError => [STATUS_REPO_NOT_FOUND],
+      Fontist::Errors::MainRepoNotFoundError => [STATUS_MAIN_REPO_NOT_FOUND],
     }.freeze
 
     def self.exit_on_failure?
@@ -31,12 +36,14 @@ module Fontist
                    desc: "Install even if it's already installed in system"
     option :accept_all_licenses, type: :boolean, aliases: "--confirm-license", desc: "Accept all license agreements"
     option :hide_licenses, type: :boolean, desc: "Hide license texts"
+    option :no_progress, type: :boolean, desc: "Hide download progress"
     def install(font)
       Fontist::Font.install(
         font,
         force: options[:force],
         confirmation: options[:accept_all_licenses] ? "yes" : "no",
-        hide_licenses: options[:hide_licenses]
+        hide_licenses: options[:hide_licenses],
+        no_progress: options[:no_progress]
       )
       success
     rescue Fontist::Errors::GeneralError => e
@@ -121,11 +128,21 @@ module Fontist
 
     desc "rebuild-index", "Rebuild formula index (used by formulas maintainers)"
     long_desc <<-LONGDESC
-      This index is pre-built and served with formulas, so there is no need
-      update it unless something changes in the formulas repo.
+      Index should be rebuilt when any formula changes.
+
+      It is done automatically when formulas are updated, or private formulas
+      are set up.
     LONGDESC
+    option :main_repo, type: :boolean,
+                       desc: "Updates indexes in the main repo (for backward " \
+                             "compatibility with versions prior to 1.9)"
     def rebuild_index
-      Fontist::Index.rebuild
+      if options[:main_repo]
+        Fontist::Index.rebuild_for_main_repo
+      else
+        Fontist::Index.rebuild
+      end
+
       Fontist.ui.say("Formula index has been rebuilt.")
       STATUS_SUCCESS
     end
@@ -136,6 +153,9 @@ module Fontist
       Fontist::Import::SilImport.new.call
     end
 
+    desc "repo SUBCOMMAND ...ARGS", "Manage custom repositories"
+    subcommand "repo", Fontist::RepoCLI
+
     private
 
     def success

data/lib/fontist/errors.rb

@@ -3,17 +3,35 @@ module Fontist
     class GeneralError < StandardError; end
 
     class BinaryCallError < GeneralError; end
+
     class FontIndexCorrupted < GeneralError; end
+
     class FontNotFoundError < GeneralError; end
+
+    # for backward compatibility with metanorma,
+    # it depends on this exception to automatically download formulas
     class FormulaIndexNotFoundError < GeneralError; end
+
+    class MainRepoNotFoundError < FormulaIndexNotFoundError; end
+
     class InvalidResourceError < GeneralError; end
+
     class LicensingError < GeneralError; end
+
     class ManifestCouldNotBeFoundError < GeneralError; end
+
     class ManifestCouldNotBeReadError < GeneralError; end
+
     class MissingAttributeError < GeneralError; end
+
+    class RepoNotFoundError < GeneralError; end
+
     class TamperedFileError < GeneralError; end
+
     class TimeoutError < GeneralError; end
+
     class UnknownFontTypeError < GeneralError; end
+
     class UnknownArchiveError < GeneralError; end
 
     class FontError < GeneralError

data/lib/fontist/font.rb

@@ -7,6 +7,7 @@ module Fontist
       @name = options[:name]
       @confirmation = options[:confirmation] || "no"
       @hide_licenses = options[:hide_licenses]
+      @no_progress = options[:no_progress] || false
       @force = options[:force] || false
 
       check_or_create_fontist_path!
@@ -94,7 +95,7 @@ module Fontist
     end
 
     def font_installer(formula)
-      FontInstaller.new(formula)
+      FontInstaller.new(formula, no_progress: @no_progress)
     end
 
     def formula
@@ -202,9 +203,9 @@ module Fontist
     end
 
     def font_list
-      return unless formula
+      return if formulas.empty?
 
-      list_styles([formula])
+      list_styles(formulas)
     end
 
     def list_styles(formulas)

data/lib/fontist/font_installer.rb

@@ -3,8 +3,9 @@ require "excavate"
 
 module Fontist
   class FontInstaller
-    def initialize(formula)
+    def initialize(formula, no_progress: false)
       @formula = formula
+      @no_progress = no_progress
     end
 
     def install(confirmation:)
@@ -53,14 +54,15 @@ module Fontist
     end
 
     def download_file(source)
-      url = source.urls.first
+      request = source.urls.first
+      url = request.respond_to?(:url) ? request.url : request
       Fontist.ui.say(%(Downloading font "#{@formula.key}" from #{url}))
 
       Fontist::Utils::Downloader.download(
-        url,
+        request,
         sha: source.sha256,
         file_size: source.file_size,
-        progress_bar: true
+        progress_bar: !@no_progress
       )
     end
 

data/lib/fontist/formula.rb

@@ -5,6 +5,9 @@ require "git"
 module Fontist
   class Formula
     def self.update_formulas_repo
+      dir = File.dirname(Fontist.formulas_repo_path)
+      FileUtils.mkdir_p(dir) unless File.exist?(dir)
+
       if Dir.exist?(Fontist.formulas_repo_path)
         Git.open(Fontist.formulas_repo_path).pull
       else
@@ -12,6 +15,8 @@ module Fontist
                   Fontist.formulas_repo_path,
                   depth: 1)
       end
+
+      Index.rebuild
     end
 
     def self.all

data/lib/fontist/formula_paths.rb

@@ -14,6 +14,7 @@ module Fontist
         paths = search_font_paths(s["font"])
         paths.map do |path|
           { full_name: s["full_name"],
+            type: s["type"],
             path: path }
         end
       end

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

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

data/lib/fontist/index.rb

@@ -3,9 +3,42 @@ require_relative "indexes/filename_index"
 
 module Fontist
   class Index
+    def self.rebuild_for_main_repo
+      unless Dir.exist?(Fontist.private_formulas_path)
+        return do_rebuild_for_main_repo_with
+      end
+
+      Dir.mktmpdir do |dir|
+        tmp_private_path = File.join(dir, "private")
+        FileUtils.mv(Fontist.private_formulas_path, tmp_private_path)
+
+        do_rebuild_for_main_repo_with
+
+        FileUtils.mv(tmp_private_path, Fontist.private_formulas_path)
+      end
+    end
+
+    def self.do_rebuild_for_main_repo_with
+      Fontist.formula_index_path = Fontist.formulas_repo_path.join("index.yml")
+      Fontist.formula_filename_index_path =
+        Fontist.formulas_repo_path.join("filename_index.yml")
+
+      rebuild
+
+      Fontist.formula_index_path = nil
+      Fontist.formula_filename_index_path = nil
+    end
+
     def self.rebuild
       Fontist::Indexes::FontIndex.rebuild
       Fontist::Indexes::FilenameIndex.rebuild
+
+      reset_cache
+    end
+
+    def self.reset_cache
+      Fontist::Indexes::FontIndex.reset_cache
+      Fontist::Indexes::FilenameIndex.reset_cache
     end
   end
 end

data/lib/fontist/indexes/base_index.rb

@@ -5,10 +5,14 @@ module Fontist
     class BaseIndex
       def self.from_yaml
         @from_yaml ||= begin
-          unless File.exist?(path)
-            raise Errors::FormulaIndexNotFoundError.new("Please fetch `#{path}` index with `fontist update`.")
+          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
@@ -18,6 +22,10 @@ module Fontist
         raise NotImplementedError, "Please define path of an index"
       end
 
+      def self.reset_cache
+        @from_yaml = nil
+      end
+
       def self.rebuild
         index = new
         index.build
@@ -59,6 +67,8 @@ module Fontist
       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
 

data/lib/fontist/manifest/install.rb

@@ -3,17 +3,18 @@ require_relative "locations"
 module Fontist
   module Manifest
     class Install < Locations
-      def initialize(manifest, confirmation: "no", hide_licenses: false)
-        @manifest = manifest
+      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["paths"].empty?
+        return paths unless paths.nil?
 
         install_font(font)
 
@@ -21,7 +22,13 @@ module Fontist
       end
 
       def install_font(font)
-        Fontist::Font.install(font, force: true, confirmation: @confirmation, hide_licenses: @hide_licenses)
+        Fontist::Font.install(
+          font,
+          force: true,
+          confirmation: @confirmation,
+          hide_licenses: @hide_licenses,
+          no_progress: @no_progress
+        )
       end
     end
   end

data/lib/fontist/manifest/locations.rb

@@ -42,26 +42,40 @@ module Fontist
       end
 
       def style_paths_map(font, names)
-        paths = style_paths(font, names)
-        names.zip(paths).to_h
+        styles = style_paths(font, names)
+        group_paths(styles)
       end
 
       def style_paths(font, names)
-        names.map do |style|
-          file_paths(font, style)
+        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["paths"].empty?
+          if x.nil?
             raise Errors::MissingFontError.new(font, style)
           end
         end
       end
 
       def find_font_with_name(font, style)
-        Fontist::SystemFont.find_with_name(font, style).map { |k, v| [k.to_s, v] }.to_h
+        Fontist::SystemFont.find_styles(font, style)
+      end
+
+      def empty_paths(style)
+        [{ "full_name" => nil, "type" => style, "path" => nil }]
       end
     end
   end

data/lib/fontist/repo.rb

@@ -0,0 +1,54 @@
+require "git"
+
+module Fontist
+  class Repo
+    class << self
+      def setup(name, url)
+        ensure_private_formulas_path_exists
+        fetch_repo(name, url)
+        Index.rebuild
+      end
+
+      def update(name)
+        path = repo_path(name)
+        unless Dir.exist?(path)
+          raise(Errors::RepoNotFoundError, "No such repo '#{name}'.")
+        end
+
+        Git.open(path).pull
+        Index.rebuild
+      end
+
+      def remove(name)
+        path = repo_path(name)
+        unless Dir.exist?(path)
+          raise(Errors::RepoNotFoundError, "No such repo '#{name}'.")
+        end
+
+        FileUtils.rm_r(path)
+        Index.rebuild
+      end
+
+      private
+
+      def ensure_private_formulas_path_exists
+        Fontist.private_formulas_path.tap do |path|
+          FileUtils.mkdir_p(path) unless Dir.exist?(path)
+        end
+      end
+
+      def fetch_repo(name, url)
+        path = repo_path(name)
+        if Dir.exist?(path)
+          Git.open(path).pull
+        else
+          Git.clone(url, path, depth: 1)
+        end
+      end
+
+      def repo_path(name)
+        Fontist.private_formulas_path.join(name)
+      end
+    end
+  end
+end

data/lib/fontist/repo_cli.rb

@@ -0,0 +1,42 @@
+module Fontist
+  class RepoCLI < Thor
+    desc "setup NAME URL",
+         "Setup a custom fontist repo named NAME for the repository at URL"
+    def setup(name, url)
+      Repo.setup(name, url)
+      Fontist.ui.success(
+        "Fontist repo '#{name}' from '#{url}' has been successfully set up.",
+      )
+      CLI::STATUS_SUCCESS
+    end
+
+    desc "update NAME", "Update formulas in a fontist repo named NAME"
+    def update(name)
+      Repo.update(name)
+      Fontist.ui.success(
+        "Fontist repo '#{name}' has been successfully updated.",
+      )
+      CLI::STATUS_SUCCESS
+    rescue Errors::RepoNotFoundError
+      handle_repo_not_found(name)
+    end
+
+    desc "remove NAME", "Remove fontist repo named NAME"
+    def remove(name)
+      Repo.remove(name)
+      Fontist.ui.success(
+        "Fontist repo '#{name}' has been successfully removed.",
+      )
+      CLI::STATUS_SUCCESS
+    rescue Errors::RepoNotFoundError
+      handle_repo_not_found(name)
+    end
+
+    private
+
+    def handle_repo_not_found(name)
+      Fontist.ui.error("Fontist repo '#{name}' is not found.")
+      CLI::STATUS_REPO_NOT_FOUND
+    end
+  end
+end

data/lib/fontist/system_font.rb

@@ -40,8 +40,8 @@ module Fontist
       new(font: font, sources: sources).find
     end
 
-    def self.find_with_name(font, style)
-      new(font: font, style: style).find_with_name
+    def self.find_styles(font, style)
+      new(font: font, style: style).find_styles
     end
 
     def find
@@ -51,22 +51,14 @@ module Fontist
       styles.map { |x| x[:path] }
     end
 
-    def find_with_name
-      styles = find_styles
-      return { full_name: nil, paths: [] } unless styles
-
-      { full_name: styles.first[:full_name],
-        paths: styles.map { |x| x[:path] } }
+    def find_styles
+      find_by_index || find_by_formulas
     end
 
     private
 
     attr_reader :font, :style, :user_sources
 
-    def find_styles
-      find_by_index || find_by_formulas
-    end
-
     def find_by_index
       SystemIndex.new(all_paths).find(font, style)
     end

data/lib/fontist/system_index.rb

@@ -83,7 +83,7 @@ module Fontist
         next by_path[path] if by_path[path]
 
         detect_fonts(path)
-      end
+      end.compact
     end
 
     def detect_fonts(path)
@@ -100,6 +100,9 @@ module Fontist
     def detect_file_font(path)
       file = TTFunk::File.open(path)
       parse_font(file, path)
+    rescue StandardError
+      warn $!.message
+      warn "Warning: File at #{path} not recognized as a font file."
     end
 
     def detect_collection_fonts(path)

data/lib/fontist/utils/cache.rb

@@ -3,10 +3,10 @@ module Fontist
     class Cache
       include Locking
 
-      def fetch(key, bar: nil)
+      def fetch(key)
         map = load_cache
         if cache_exist?(map[key])
-          print_bar(bar, map[key]) if bar
+          print(map[key])
 
           return downloaded_file(map[key])
         end
@@ -17,6 +17,25 @@ module Fontist
         downloaded_file(path)
       end
 
+      def delete(key)
+        lock(lock_path) do
+          map = load_cache
+          return unless map[key]
+
+          value = map.delete(key)
+          File.write(cache_map_path, YAML.dump(map))
+          value
+        end
+      end
+
+      def set(key, value)
+        lock(lock_path) do
+          map = load_cache
+          map[key] = value
+          File.write(cache_map_path, YAML.dump(map))
+        end
+      end
+
       private
 
       def cache_map_path
@@ -39,12 +58,12 @@ module Fontist
         Fontist.downloads_path.join(path)
       end
 
-      def print_bar(bar, path)
-        File.size(downloaded_path(path)).tap do |size|
-          bar.total = size
-          bar.increment(size)
-          bar.finish("cache")
-        end
+      def print(path)
+        Fontist.ui.say("Fetched from cache: #{size(path)} MiB.")
+      end
+
+      def size(path)
+        File.size(downloaded_path(path)) / (1024 * 1024)
       end
 
       def save_cache(generated_file, key)

data/lib/fontist/utils/downloader.rb

@@ -14,13 +14,13 @@ module Fontist
         # TODO: If the first mirror fails, try the second one
         @file = file
         @sha = [sha].flatten.compact
-        @file_size = (file_size || default_file_size).to_i
+        @file_size = file_size.to_i if file_size
         @progress_bar = set_progress_bar(progress_bar)
         @cache = Cache.new
       end
 
       def download
-        file = @cache.fetch(@file, bar: @progress_bar) do
+        file = @cache.fetch(url) do
           download_file
         end
 
@@ -38,10 +38,6 @@ module Fontist
 
       attr_reader :file, :sha, :file_size
 
-      def default_file_size
-        5 * byte_to_megabyte
-      end
-
       def byte_to_megabyte
         @byte_to_megabyte ||= 1024 * 1024
       end
@@ -51,18 +47,19 @@ module Fontist
       end
 
       def set_progress_bar(progress_bar)
-        if ENV.fetch("TEST_ENV", "") === "CI" || progress_bar
+        if progress_bar
           ProgressBar.new(@file_size)
         else
-          NullProgressBar.new
+          NullProgressBar.new(@file_size)
         end
       end
 
       def download_file
         file = Down.download(
-          @file,
+          url,
           open_timeout: 10,
           read_timeout: 10,
+          headers: headers,
           content_length_proc: ->(content_length) {
             @progress_bar.total = content_length if content_length
           },
@@ -77,26 +74,26 @@ module Fontist
       rescue Down::NotFound
         raise(Fontist::Errors::InvalidResourceError.new("Invalid URL: #{@file}"))
       end
-    end
-
-    class NullProgressBar
-      def total=(_)
-        # do nothing
-      end
 
-      def increment(_)
-        # do nothing
+      def url
+        @file.respond_to?(:url) ? @file.url : @file
       end
 
-      def finish(_ = nil)
-        # do nothing
+      def headers
+        @file.respond_to?(:headers) &&
+          @file.headers &&
+          @file.headers.to_h.map { |k, v| [k.to_s, v] }.to_h || # rubocop:disable Style/HashTransformKeys, Metrics/LineLength
+          {}
       end
     end
 
     class ProgressBar
       def initialize(total)
-        @counter = 1
+        @counter = 0
         @total  = total
+        @printed_percent = -1
+        @printed_size = -1
+        @start = Time.now
       end
 
       def total=(total)
@@ -105,22 +102,57 @@ module Fontist
 
       def increment(progress)
         @counter = progress
-        Fontist.ui.print "\r\e[0KDownloads: #{counter_mb}MB/#{total_mb}MB " \
-                         "(#{completeness})"
+
+        print_incrementally
       end
 
-      def finish(message = nil)
-        if message
-          Fontist.ui.print " (#{message})\n"
+      def finish
+        print
+
+        Fontist.ui.print(format(", %<mb_per_second>.2f MiB/s, done.\n", mb_per_second: mb_per_second))
+      end
+
+      private
+
+      def print_incrementally
+        if total?
+          print_percent_incrementally
         else
-          Fontist.ui.print "\n"
+          print_size_incrementally
         end
       end
 
-      private
+      def print
+        if total?
+          print_percent
+        else
+          print_size
+        end
+      end
+
+      def total?
+        !!@total
+      end
+
+      def print_percent_incrementally
+        return unless percent > @printed_percent
+
+        print_percent
+
+        @printed_percent = percent
+      end
 
-      def completeness
-        sprintf("%#.2f%%", (@counter.fdiv(@total) * 100)) # rubocop:disable Style/FormatStringToken, Metrics/LineLength
+      def print_percent
+        # rubocop:disable Style/FormatStringToken
+        Fontist.ui.print(format("\r\e[0KDownloading: %<completeness>3d%% (%<counter_mb>d/%<total_mb>d MiB)",
+                                completeness: percent,
+                                counter_mb: counter_mb,
+                                total_mb: total_mb))
+        # rubocop:enable Style/FormatStringToken
+      end
+
+      def percent
+        (@counter.fdiv(@total) * 100).to_i
       end
 
       def counter_mb
@@ -134,6 +166,28 @@ module Fontist
       def byte_to_megabyte
         @byte_to_megabyte ||= 1024 * 1024
       end
+
+      def print_size_incrementally
+        return unless counter_mb > @printed_size
+
+        print_size
+
+        @printed_size = counter_mb
+      end
+
+      def print_size
+        Fontist.ui.print(format("\r\e[0KDownloading: %<downloaded>4d MiB", downloaded: counter_mb))
+      end
+
+      def mb_per_second
+        @counter / (Time.now - @start) / byte_to_megabyte
+      end
+    end
+
+    class NullProgressBar < ProgressBar
+      def print_incrementally
+        # do nothing
+      end
     end
   end
 end

data/lib/fontist/utils/locking.rb

@@ -11,6 +11,7 @@ module Fontist
         yield
       ensure
         f.flock(File::LOCK_UN)
+        f.close
       end
     end
   end

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.8.9".freeze
+  VERSION = "1.9.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.8.9
+  version: 1.9.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-10 00:00:00.000000000 Z
+date: 2021-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: excavate
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.75.0
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.75.0
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
@@ -243,6 +243,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/check_google.yml"
+- ".github/workflows/metanorma.yml"
 - ".github/workflows/release.yml"
 - ".github/workflows/rspec.yml"
 - ".gitignore"
@@ -301,6 +302,8 @@ files:
 - lib/fontist/manifest.rb
 - lib/fontist/manifest/install.rb
 - lib/fontist/manifest/locations.rb
+- lib/fontist/repo.rb
+- lib/fontist/repo_cli.rb
 - lib/fontist/system.yml
 - lib/fontist/system_font.rb
 - lib/fontist/system_index.rb
@@ -336,7 +339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Install openly-licensed fonts on Windows, Linux and Mac!