fontist 1.13.1 → 1.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f376e0b45e530b28be9d60c132b3840d4485103995fc435c0512b07bf6e20435
-  data.tar.gz: b8c8aa1f3de0b627bcaffe09b45398dd60a0ba2a3a2163599263461acb179292
+  metadata.gz: 2e0bff9ea15b251c5c03206705574e12cfc9fc4bc779d197d73d20a05977e745
+  data.tar.gz: 33a6538507cc014c1fd4a0b1b11fa908560ae8319e9de13d33120c02a86953b4
 SHA512:
-  metadata.gz: 157c06d56119a5e94a7a15b33b7b1e65695eb94af595f618bbbcf382f8d201d8db7f1a51ed2e3b20cf56d0339a7bd33dc2be82900de1851e29ee31225d2f8054
-  data.tar.gz: 3fabd78041974540dc3504c293e335cfd39d241c5cd80da8fd0eef2b6b0a0e6a49701baf4c13e4c151ff397c8aaa6d9d542b37a45b52610ca404bb0abcef004a
+  metadata.gz: bf17d3b2dd7a687f97db3bd24200d0bd07821bab47ac0c0ce8eeb1156ec1fc95b39660dfb75e6eb13e00080968de1168c83cca7d54caee0c09139d0a167651d6
+  data.tar.gz: 18b6c0294686dcf739b2d1654b8c3e8488d823cb2de1d62659f834c7f8ca443615170d29f3f3bb2b705b27b07cb8a79d80ca6a185d09979c8c0f2f37f8af547f

data/README.adoc

@@ -127,6 +127,7 @@ available formulas would be installed.
 Supported options:
 
 -f, [--force]:: Install even if it's already installed in system
+-F, [--formula]:: Install by formula instead of font
 -a, [--accept-all-licenses]:: Accept all license agreements
 -h, [--hide-licenses]:: Hide license texts
 -p, [--no-progress]:: Hide download progress

data/lib/fontist/cli/class_options.rb

@@ -0,0 +1,14 @@
+module Fontist
+  class CLI < Thor
+    module ClassOptions
+      def handle_class_options(options)
+        Fontist.preferred_family = options[:preferred_family]
+        Fontist.log_level = options[:quiet] ? :fatal : :info
+
+        if options[:formulas_path]
+          Fontist.formulas_path = Pathname.new(options[:formulas_path])
+        end
+      end
+    end
+  end
+end

data/lib/fontist/cli.rb

@@ -1,10 +1,13 @@
 require "thor"
+require "fontist/cli/class_options"
 require "fontist/repo_cli"
 require "fontist/import_cli"
 require "fontist/google_cli"
 
 module Fontist
   class CLI < Thor
+    include ClassOptions
+
     STATUS_SUCCESS = 0
     STATUS_UNKNOWN_ERROR = 1
     STATUS_NON_SUPPORTED_FONT_ERROR = 2
@@ -18,6 +21,7 @@ module Fontist
     STATUS_REPO_COULD_NOT_BE_UPDATED = 10
     STATUS_MANUAL_FONT_ERROR = 11
     STATUS_SIZE_LIMIT_ERROR = 12
+    STATUS_FORMULA_NOT_FOUND = 13
 
     ERROR_TO_STATUS = {
       Fontist::Errors::UnsupportedFontError => [STATUS_NON_SUPPORTED_FONT_ERROR],
@@ -39,6 +43,7 @@ module Fontist
       Fontist::Errors::FontIndexCorrupted => [STATUS_FONT_INDEX_CORRUPTED],
       Fontist::Errors::RepoNotFoundError => [STATUS_REPO_NOT_FOUND],
       Fontist::Errors::MainRepoNotFoundError => [STATUS_MAIN_REPO_NOT_FOUND],
+      Fontist::Errors::FormulaNotFoundError => [STATUS_FORMULA_NOT_FOUND],
     }.freeze
 
     def self.exit_on_failure?
@@ -49,9 +54,18 @@ module Fontist
                  type: :boolean,
                  desc: "Use Preferred Family when available"
 
+    class_option :quiet,
+                 aliases: :q,
+                 type: :boolean,
+                 desc: "Hide all messages"
+
+    class_option :formulas_path, type: :string, desc: "Path to formulas"
+
     desc "install FONT", "Install font"
     option :force, type: :boolean, aliases: :f,
                    desc: "Install even if it's already installed in system"
+    option :formula, type: :boolean, aliases: :F,
+                     desc: "Install by formula instead of font"
     option :accept_all_licenses, type: :boolean,
                                  aliases: ["--confirm-license", :a],
                                  desc: "Accept all license agreements"
@@ -134,8 +148,12 @@ module Fontist
     end
 
     desc "manifest-install MANIFEST", "Install fonts from MANIFEST (yaml)"
-    option :accept_all_licenses, type: :boolean, aliases: "--confirm-license", desc: "Accept all license agreements"
-    option :hide_licenses, type: :boolean, desc: "Hide license texts"
+    option :accept_all_licenses, type: :boolean,
+                                 aliases: ["--confirm-license", :a],
+                                 desc: "Accept all license agreements"
+    option :hide_licenses, type: :boolean,
+                           aliases: :h,
+                           desc: "Hide license texts"
     def manifest_install(manifest)
       handle_class_options(options)
       paths = Fontist::Manifest::Install.from_file(
@@ -196,10 +214,6 @@ module Fontist
 
     private
 
-    def handle_class_options(options)
-      Fontist.preferred_family = options[:preferred_family]
-    end
-
     def success
       STATUS_SUCCESS
     end

data/lib/fontist/errors.rb

@@ -12,6 +12,16 @@ module Fontist
     # it depends on this exception to automatically download formulas
     class FormulaIndexNotFoundError < GeneralError; end
 
+    class FormulaNotFoundError < GeneralError
+      def initialize(formula)
+        super(<<~MSG.chomp)
+          Formula '#{formula}' not found locally nor available in the Fontist formula repository.
+          Perhaps it is available at the latest Fontist formula repository.
+          You can update the formula repository using the command `fontist update` and try again.
+        MSG
+      end
+    end
+
     class MainRepoNotFoundError < FormulaIndexNotFoundError; end
 
     class InvalidResourceError < GeneralError; end

data/lib/fontist/font.rb

@@ -14,6 +14,7 @@ module Fontist
       @smallest = options[:smallest]
       @newest = options[:newest]
       @size_limit = options[:size_limit]
+      @by_formula = options[:formula]
 
       check_or_create_fontist_path!
     end
@@ -48,6 +49,8 @@ module Fontist
     end
 
     def install
+      return install_formula if @by_formula
+
       (find_system_font unless @force) || download_font || manual_font ||
         raise_non_supported_font
     end
@@ -103,6 +106,22 @@ module Fontist
       end
     end
 
+    def install_formula
+      download_formula || raise_formula_not_found
+    end
+
+    def download_formula
+      formula = Formula.find_by_key(@name)
+      return unless formula
+      return unless formula.downloadable?
+
+      request_formula_installation(formula)
+    end
+
+    def raise_formula_not_found
+      raise Errors::FormulaNotFoundError.new(@name)
+    end
+
     def font_installer(formula)
       FontInstaller.new(formula, no_progress: @no_progress)
     end
@@ -148,13 +167,17 @@ module Fontist
       return if sufficient_formulas.empty?
 
       sufficient_formulas.flat_map do |formula|
-        confirmation = check_and_confirm_required_license(formula)
-        paths = font_installer(formula).install(confirmation: confirmation)
+        request_formula_installation(formula)
+      end
+    end
 
-        Fontist.ui.say("Fonts installed at:")
-        paths.each do |path|
-          Fontist.ui.say("- #{path}")
-        end
+    def request_formula_installation(formula)
+      confirmation = check_and_confirm_required_license(formula)
+      paths = font_installer(formula).install(confirmation: confirmation)
+
+      Fontist.ui.say("Fonts installed at:")
+      paths.each do |path|
+        Fontist.ui.say("- #{path}")
       end
     end
 

data/lib/fontist/formula.rb

@@ -45,6 +45,13 @@ module Fontist
       end.flatten
     end
 
+    def self.find_by_key(key)
+      path = Fontist.formulas_path.join("#{key}.yml")
+      return unless File.exist?(path)
+
+      new_from_file(path)
+    end
+
     def self.new_from_file(path)
       data = YAML.load_file(path)
       new(data, path)
@@ -72,7 +79,7 @@ module Fontist
     end
 
     def key
-      @data["key"] || default_key
+      key_from_path
     end
 
     def description
@@ -137,7 +144,7 @@ module Fontist
 
     private
 
-    def default_key
+    def key_from_path
       escaped = Regexp.escape(Fontist.formulas_path.to_s + "/")
       @path.sub(Regexp.new("^" + escaped), "").sub(/\.yml$/, "")
     end

data/lib/fontist/google_cli.rb

@@ -1,6 +1,6 @@
 module Fontist
   class GoogleCLI < Thor
-    class_option :formulas_path, type: :string, desc: "Path to formulas"
+    include CLI::ClassOptions
 
     desc "check", "Check Google fonts for updates"
     def check
@@ -17,13 +17,5 @@ module Fontist
       Fontist::Import::GoogleImport.new.call
       CLI::STATUS_SUCCESS
     end
-
-    private
-
-    def handle_class_options(options)
-      if options[:formulas_path]
-        Fontist.formulas_path = Pathname.new(options[:formulas_path])
-      end
-    end
   end
 end

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

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

data/lib/fontist/import_cli.rb

@@ -1,16 +1,14 @@
 module Fontist
   class ImportCLI < Thor
+    include CLI::ClassOptions
+
     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
-
+      handle_class_options(options)
       require_relative "import/macos"
       Import::Macos.new(options).call
       CLI::STATUS_SUCCESS

data/lib/fontist/repo_cli.rb

@@ -1,9 +1,12 @@
 module Fontist
   class RepoCLI < Thor
+    include CLI::ClassOptions
+
     desc "setup NAME URL",
          "Setup a custom fontist repo named NAME for the repository at URL " \
          "and fetches its formulas"
     def setup(name, url)
+      handle_class_options(options)
       Repo.setup(name, url)
       Fontist.ui.success(
         "Fontist repo '#{name}' from '#{url}' has been successfully set up.",
@@ -13,6 +16,7 @@ module Fontist
 
     desc "update NAME", "Update formulas in a fontist repo named NAME"
     def update(name)
+      handle_class_options(options)
       Repo.update(name)
       Fontist.ui.success(
         "Fontist repo '#{name}' has been successfully updated.",
@@ -24,6 +28,7 @@ module Fontist
 
     desc "remove NAME", "Remove fontist repo named NAME"
     def remove(name)
+      handle_class_options(options)
       Repo.remove(name)
       Fontist.ui.success(
         "Fontist repo '#{name}' has been successfully removed.",
@@ -35,6 +40,7 @@ module Fontist
 
     desc "list", "List fontist repos"
     def list
+      handle_class_options(options)
       Repo.list.each do |name|
         Fontist.ui.say(name)
       end

data/lib/fontist/utils/ui.rb

@@ -3,16 +3,36 @@ require "thor"
 module Fontist
   module Utils
     class UI < Thor
+      ALL_LEVELS = %i[debug info warn error fatal unknown].freeze
+
+      def self.level=(level)
+        unless ALL_LEVELS.include?(level)
+          raise Errors::GeneralError,
+                "Unknown log level: #{level.inspect}. " \
+                "Supported levels are #{ALL_LEVELS.map(&:inspect).join(', ')}."
+        end
+
+        @level = level
+      end
+
+      def self.level
+        @level || default_level
+      end
+
+      def self.default_level
+        :fatal
+      end
+
       def self.success(message)
-        new.say(message, :green)
+        new.say(message, :green) if log_levels.include?(:info)
       end
 
       def self.error(message)
-        new.say(message, :red)
+        new.say(message, :red) if log_levels.include?(:warn)
       end
 
       def self.say(message)
-        new.say(message)
+        new.say(message) if log_levels.include?(:info)
       end
 
       def self.ask(message, options = {})
@@ -20,7 +40,16 @@ module Fontist
       end
 
       def self.print(message)
-        super
+        super if log_levels.include?(:info)
+      end
+
+      def self.debug(message)
+        new.say(message) if log_levels.include?(:debug)
+      end
+
+      def self.log_levels
+        @log_levels ||= {}
+        @log_levels[@level] ||= ALL_LEVELS.drop_while { |l| l != level }
       end
     end
   end

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.13.1".freeze
+  VERSION = "1.13.2".freeze
 end

data/lib/fontist.rb

@@ -119,11 +119,7 @@ module Fontist
     @preferred_family = bool
   end
 
-  def self.debug?
-    @debug || false
-  end
-
-  def self.debug=(bool)
-    @debug = bool
+  def self.log_level=(level)
+    Fontist.ui.level = level
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.13.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-26 00:00:00.000000000 Z
+date: 2022-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -299,6 +299,7 @@ files:
 - fontist.gemspec
 - lib/fontist.rb
 - lib/fontist/cli.rb
+- lib/fontist/cli/class_options.rb
 - lib/fontist/errors.rb
 - lib/fontist/font.rb
 - lib/fontist/font_installer.rb