fontist 1.15.1 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b05f079e527eb6128f6525bd4923886e5181d266a4cf88151a4131551694de15
-  data.tar.gz: 1b8ab3e7b58c1c96aa9565d0b244475e047d48823ae9deec6fb194ed95201de0
+  metadata.gz: 14a836d048cc0ce0d74885f256e3d7cb48466efcadd75008207e1568927ca8cc
+  data.tar.gz: 468355d3c50412aef7642ad44abf204edbf827a81d3ccfe327f274a90cddedcd
 SHA512:
-  metadata.gz: 5aa9bbfcf8b155bd876c5f9d28f37fcbe13d1cb6729ecf7056e298457834370973d0898e80af6515a96e904255fe1da027545a0f3c6d601dc41cc26cd211c060
-  data.tar.gz: 6bae05a6ee7445abb41ee724fb01f07ebf2d7a7222ffc09744bb8b5acd4e2119949b35860f7b21d6bbdc2f8e81545a8115ccd7f2846beab1397842c5ae6b3e76
+  metadata.gz: 62e88a6ac1766b61ffe5db70b36f9b0bb8316d80c048d8df8de57e39e3387de1fd60c3cff1094f0b235d7bfab0979d2b4e4ed01eba12125852f745327e8641b1
+  data.tar.gz: 97338d5eee1a8df78555281d9bc765499f30c86b98913bae5b21729745e5e983ed257e8ee51d543802e69dc734eee64f464dd8b319c534c3b06c768a65267817

data/.github/workflows/test-and-release.yml

@@ -82,7 +82,7 @@ jobs:
     needs: prepare
     if: needs.prepare.outputs.push-for-tag != 'true'
 
-    continue-on-error: ${{ matrix.ruby.experimental }}
+    continue-on-error: ${{ matrix.ruby.experimental || matrix.os == 'windows-latest' }} # workaround https://github.com/metanorma/metanorma/issues/288
     strategy:
       fail-fast: false
       max-parallel: 5

data/README.adoc

@@ -123,7 +123,7 @@ for the newest version of the font among formulas with size below a limit
 (300 MB). This behavior can be changed with options.
 
 NOTE: If styles of a font are spread among several formulas, then all
-available formulas would be installed.
+available styles from all formulas would be installed.
 
 Supported options:
 
@@ -936,6 +936,33 @@ its font location was only obtainable using the full "`Courier New`" font name.
 From v1.10 onwards the behavior has been made consistent -- only the proper
 "`Courier New`" name should be used.
 
+[[install-font-change]]
+==== To v1.16+
+
+Fontist versions beyond v1.16 treats the `font` argument of the `install`
+command differently.
+After the upgrade, please ensure all required fonts are specified when using
+`fontist install`, `fontist manifest-install` (and their corresponding Ruby
+interface `Font.install` and `Manifest::Install`), or use the `-F, --formula`
+option.
+
+Starting from v1.16, Fontist installs only requested fonts instead of a whole
+formula, unless specified explicitly.
+changed now.
+
+For example, an installation request for the "`Arial`" font prior to v1.16 will
+setup all fonts found in the "`ms_truetype`" formula: "`Arial`", "`Trebuchet
+MS`", "`Verdana`" and "`Times New Roman`".
+
+From v1.16 onwards, Fontist will install _only_ the requested "`Arial`" font.
+
+To install all fonts from a formula, the `-F, --formula` option can be used:
+
+[source,sh]
+----
+$ fontist install --formula ms_truetype
+----
+
 
 
 == Maintenance (for Fontist maintainers only!)

data/fontist.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "nokogiri", "~> 1.0"
   spec.add_runtime_dependency "mime-types", "~> 3.0"
   spec.add_runtime_dependency "sys-uname", "~> 1.2"
-  spec.add_runtime_dependency "thor", "~> 1.0.1"
+  spec.add_runtime_dependency "thor", "~> 1.2.1"
   spec.add_runtime_dependency "git", "~> 1.0"
   spec.add_runtime_dependency "ttfunk", "~> 1.6"
   spec.add_runtime_dependency "plist", "~> 3.0"
@@ -46,7 +46,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 13"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-benchmark", "~> 0.6"
-  spec.add_development_dependency "rubocop", "~> 1.5"
+  spec.add_development_dependency "rubocop", "~> 1.22.1"
   spec.add_development_dependency "rubocop-rails", "~> 2.9"
   spec.add_development_dependency "rubocop-performance", "~> 1.10"
 end

data/lib/fontist/font.rb

@@ -125,7 +125,10 @@ module Fontist
     end
 
     def font_installer(formula)
-      FontInstaller.new(formula, no_progress: @no_progress)
+      options = { no_progress: @no_progress }
+      return FontInstaller.new(formula, **options) if @by_formula
+
+      FontInstaller.new(formula, font_name: @name, **options)
     end
 
     def sufficient_formulas

data/lib/fontist/font_installer.rb

@@ -3,8 +3,9 @@ require "excavate"
 
 module Fontist
   class FontInstaller
-    def initialize(formula, no_progress: false)
+    def initialize(formula, font_name: nil, no_progress: false)
       @formula = formula
+      @font_name = font_name
       @no_progress = no_progress
     end
 
@@ -90,9 +91,15 @@ module Fontist
 
     def source_files
       @source_files ||= @formula.fonts.flat_map do |font|
-        font.styles.map do |style|
-          style.source_font || style.font
-        end
+        next [] if @font_name && !font.name.casecmp?(@font_name)
+
+        font_files(font)
+      end
+    end
+
+    def font_files(font)
+      font.styles.map do |style|
+        style.source_font || style.font
       end
     end
 

data/lib/fontist/formula_picker.rb

@@ -11,7 +11,7 @@ module Fontist
     end
 
     def call(formulas)
-      return [] if formulas.size.zero?
+      return [] if formulas.empty?
       return formulas if contain_different_styles?(formulas)
       return by_version(formulas) if version_is_passed?
       return newest(formulas) if newest_is_passed?
@@ -82,7 +82,8 @@ module Fontist
 
     def filter_by_size_limit(formulas)
       formulas.select do |formula|
-        formula.file_size.nil? || formula.file_size < size_limit_in_bytes
+        formula.file_size.nil? || resources_cached?(formula) ||
+          formula.file_size < size_limit_in_bytes
       end
     end
 
@@ -122,5 +123,11 @@ module Fontist
         formula.file_size || 0
       end
     end
+
+    def resources_cached?(formula)
+      Utils::Cache.new.already_fetched?(
+        formula.resources.flat_map(&:urls),
+      )
+    end
   end
 end

data/lib/fontist/repo.rb

@@ -1,6 +1,62 @@
 require "git"
 
 module Fontist
+  class Info
+    attr_reader :name, :metadata, :formulas
+
+    def initialize(name, path)
+      @name = name
+      @metadata = build_metadata(path)
+      @formulas = build_formulas(path)
+    end
+
+    def to_s
+      <<~MSG.chomp
+        Repository info for '#{@name}':
+        #{@metadata.map { |k, v| "  #{k}: #{v}" }.join("\n")}
+        Found #{formulas.count} formulas:
+        #{@formulas.map { |info| "- #{info.description} (#{info.name})" }.join("\n")}
+      MSG
+    end
+
+    private
+
+    def build_metadata(path)
+      repo = Git.open(path)
+
+      {
+        url: repo.config["remote.origin.url"],
+        revision: revision(repo),
+        created: created(repo),
+        updated: updated(repo),
+        dirty: dirty?(repo),
+      }
+    end
+
+    def build_formulas(path)
+      path.glob("*.yml").map do |formula_path|
+        formula = Formula.new_from_file(formula_path)
+        Struct.new(:name, :description).new(formula.key, formula.description)
+      end
+    end
+
+    def revision(repo)
+      repo.log.first.sha[0..6]
+    end
+
+    def created(repo)
+      repo.gcommit(repo.log.last.sha).date
+    end
+
+    def updated(repo)
+      repo.gcommit(repo.log.first.sha).date
+    end
+
+    def dirty?(repo)
+      !repo.status.changed.empty?
+    end
+  end
+
   class Repo
     class << self
       def setup(name, url)
@@ -47,11 +103,20 @@ module Fontist
           .map { |path| File.basename(path) }
       end
 
+      def info(name)
+        path = Pathname.new repo_path(name)
+        unless path.exist?
+          raise(Errors::RepoNotFoundError, "No such repo '#{name}'.")
+        end
+
+        Info.new(name, path)
+      end
+
       private
 
       def ensure_private_formulas_path_exists
         Fontist.private_formulas_path.tap do |path|
-          FileUtils.mkdir_p(path) unless Dir.exist?(path)
+          FileUtils.mkdir_p(path)
         end
       end
 

data/lib/fontist/repo_cli.rb

@@ -47,6 +47,16 @@ module Fontist
       CLI::STATUS_SUCCESS
     end
 
+    desc "info NAME", "Information about repos"
+    def info(name)
+      handle_class_options(options)
+      info = Repo.info(name)
+      Fontist.ui.say(info.to_s)
+      CLI::STATUS_SUCCESS
+    rescue Errors::RepoNotFoundError
+      handle_repo_not_found(name)
+    end
+
     private
 
     def handle_repo_not_found(name)

data/lib/fontist/utils/cache.rb

@@ -21,6 +21,11 @@ module Fontist
         downloaded_file(path)
       end
 
+      def already_fetched?(keys)
+        map = load_cache
+        keys.find { |k| cache_exist?(map[k]) }
+      end
+
       def delete(key)
         lock(lock_path) do
           map = load_cache

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.15.1".freeze
+  VERSION = "1.16.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.15.1
+  version: 1.16.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-07 00:00:00.000000000 Z
+date: 2023-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -240,14 +240,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.22.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.22.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement