fontist 1.8.8 → 1.8.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cd7962408633c39bb2cfff2ef8c3c0500842033f80ed7211474eefe98845327
-  data.tar.gz: 4630d28fbe5afad9865aeaebfa46e50215eb99cc8e2580466ae1fcb616117cfa
+  metadata.gz: a094865cc9cb315ad328f795c59934f06663e8c43ff2931a0644da7aef7d8c7d
+  data.tar.gz: 170ee4d526e74992ee56593fb5fb715c400fe07c2ade9307faebcdcd8e32e47c
 SHA512:
-  metadata.gz: 57ac2451e5911694725ddd4f7f29bb8693e0be8e4397101f1f90c6a83ba353ea51fc7e2c9c0875e1bc0f4f17a466b9191d2c4017a47e971c9bb620bef0ea4a4c
-  data.tar.gz: 6aee6a31dd412af421191cb8cb5ca7793d5071bfcb0101666ef7d591abffcb98a7e9a3990978e7268d4e55fb1f0fa339711bffe801f272e08c133cd3c6783a9b
+  metadata.gz: 52ec33b7a2000ec5af4ae65165c0b0cdd22f1b0389b6c3ec89ed3a135ca3e55ac810a71cf9ce4621ae2398dcb77ed1dd2c8a45b077a2bfb8a1afc4a5d4d5efab
+  data.tar.gz: 30635f72fb0d39f2ecb0657b36ee89f6a48647e8f23ec896f8837323e76eb7964d3feeda3cf899f6d698e06681e815000e132c6c4a556695f340d59a351db214

data/.github/workflows/metanorma.yml

@@ -0,0 +1,35 @@
+name: metanorma
+
+on:
+  push:
+    branches: [ master ]
+  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.4', '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

@@ -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

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.0"
+  spec.add_runtime_dependency "ttfunk", "~> 1.6"
   spec.add_runtime_dependency "excavate", "~> 0.1"
 
   spec.add_development_dependency "extract_ttc", "~> 0.1"

data/lib/fontist/cli.rb

@@ -31,12 +31,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

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

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:)
@@ -60,7 +61,7 @@ module Fontist
         url,
         sha: source.sha256,
         file_size: source.file_size,
-        progress_bar: true
+        progress_bar: !@no_progress
       )
     end
 

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

@@ -7,5 +7,10 @@ module Fontist
       Fontist::Indexes::FontIndex.rebuild
       Fontist::Indexes::FilenameIndex.rebuild
     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

@@ -18,6 +18,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

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/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(@file) 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,10 +47,10 @@ 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
 
@@ -79,24 +75,13 @@ module Fontist
       end
     end
 
-    class NullProgressBar
-      def total=(_)
-        # do nothing
-      end
-
-      def increment(_)
-        # do nothing
-      end
-
-      def finish(_ = nil)
-        # do nothing
-      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 +90,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
+        print
+
+        Fontist.ui.print(format(", %<mb_per_second>.2f MiB/s, done.\n", mb_per_second: mb_per_second))
       end
 
-      def finish(message = nil)
-        if message
-          Fontist.ui.print " (#{message})\n"
+      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 completeness
-        sprintf("%#.2f%%", (@counter.fdiv(@total) * 100)) # rubocop:disable Style/FormatStringToken, Metrics/LineLength
+      def print_percent_incrementally
+        return unless percent > @printed_percent
+
+        print_percent
+
+        @printed_percent = percent
+      end
+
+      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 +154,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/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.8.8".freeze
+  VERSION = "1.8.13".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.8.8
+  version: 1.8.13
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-26 00:00:00.000000000 Z
+date: 2021-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: excavate
   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"
@@ -337,7 +338,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Install openly-licensed fonts on Windows, Linux and Mac!
 test_files: []