fontist 1.8.1 → 1.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0d083618f330800ccb94e30d93fa8b5bf65d5e0a
-  data.tar.gz: 133e64a85156c8fa5dcfc284ef57b3047fdbec0e
+SHA256:
+  metadata.gz: d13c412a0a68cdcf1845948c2f3b96c45187dc27193bae4a581d2ee1f3324201
+  data.tar.gz: ed82b44bfc05274b749e4c4b2f2ace5e4ae115343c6ca9f99ac4fc552d71147f
 SHA512:
-  metadata.gz: f5a33afe8b4157afadbaa8530e39de7a0b51222904101c396668e6e5d030fc51f6895f9f60478d9a32dc46af1bda7f1cef1aff0f27e2bc10bc3ae0e7b661d71f
-  data.tar.gz: 3b1d0e38e2b42cf5e24f568cec75a34666ff7b3a98b36b673969365a4ec87b4add38b5fe3dac79a16871596d19b9454eac9fd6ada0097764a26af364f7fd5fee
+  metadata.gz: d8a08b20f1b2409b34749ad4f4531e2c727b3e39fa9e3b015d564d6ec14365dd9aa43274aa337845b72e4072bfcad50fe26412a69b805e7c83139934b009a6d6
+  data.tar.gz: bb20f38a5c4c4e9714dc69b15f249636e10c76942359e10ac38dc08d98eac3cfc1c6efe879bc9e13596d38872bae75c4721ce6d3892e1ca2726bbe7f9cb50b41

data/.github/workflows/rspec.yml

@@ -37,8 +37,8 @@ jobs:
       - uses: actions/cache@v1
         with:
           path: vendor/bundle
-          key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
-          restore-keys: bundle-${{ matrix.os }}-${{ matrix.ruby }}
+          key: bundle-v2-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
+          restore-keys: bundle-v2-${{ matrix.os }}-${{ matrix.ruby }}
 
       - if: matrix.os == 'macos-latest'
         run: brew install lcdf-typetools

data/README.md

@@ -434,6 +434,20 @@ git commit -m "Google Fonts update"
 git push
 ```
 
+### Import of SIL fonts
+
+Fontist contains formulas of [SIL fonts](https://software.sil.org/fonts/). They
+can be updated with:
+
+```sh
+fontist import-sil
+cd ~/.fontist/formulas
+git add Formulas/sil
+git add index.yml
+git commit -m "SIL fonts update"
+git push
+```
+
 ### Releasing
 
 Releasing is done automatically with GitHub Action. Just bump and tag with `gem-release`.

data/fontist.gemspec

@@ -5,15 +5,15 @@ require "fontist/version"
 Gem::Specification.new do |spec|
   spec.name          = "fontist"
   spec.version       = Fontist::VERSION
-  spec.authors       = ["Ribose Inc.", "Abu Nashir"]
-  spec.email         = ["operations@ribose.com", "abunashir@gmail.com"]
+  spec.authors       = ["Ribose Inc."]
+  spec.email         = ["open.source@ribose.com"]
 
-  spec.summary       = %q{A libarary find or download fonts}
-  spec.description   = %q{A libarary find or download fonts}
+  spec.summary       = %q{Install openly-licensed fonts on Windows, Linux and Mac!}
+  spec.description   = %q{Install openly-licensed fonts on Windows, Linux and Mac!}
   spec.homepage      = "https://github.com/fontist/fontist"
   spec.license       = "BSD-2-Clause"
 
-  spec.post_install_message = "Please run `fontist update` to fetch formulas"
+  spec.post_install_message = "Please run `fontist update` to fetch formulas."
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/fontist/fontist"
@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = ["fontist"]
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
 
+  spec.add_runtime_dependency "arr-pm", "~> 0.0.1"
   spec.add_runtime_dependency "down", "~> 5.0"
   spec.add_runtime_dependency "libmspack", "~> 0.1.0"
   spec.add_runtime_dependency "rubyzip", "~> 2.3.0"
@@ -40,6 +41,7 @@ Gem::Specification.new do |spec|
   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", "~> 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rubocop", "0.75.0"

data/lib/fontist.rb

@@ -62,4 +62,8 @@ module Fontist
   def self.formula_index_path
     Fontist.formulas_repo_path.join("index.yml")
   end
+
+  def self.formula_filename_index_path
+    Fontist.formulas_repo_path.join("filename_index.yml")
+  end
 end

data/lib/fontist/cli.rb

@@ -9,15 +9,17 @@ module Fontist
     STATUS_LICENSING_ERROR = 4
     STATUS_MANIFEST_COULD_NOT_BE_FOUND_ERROR = 5
     STATUS_MANIFEST_COULD_NOT_BE_READ_ERROR = 6
+    STATUS_FONT_INDEX_CORRUPTED = 7
 
     ERROR_TO_STATUS = {
-      Fontist::Errors::NonSupportedFontError => [STATUS_NON_SUPPORTED_FONT_ERROR],
+      Fontist::Errors::UnsupportedFontError => [STATUS_NON_SUPPORTED_FONT_ERROR],
       Fontist::Errors::MissingFontError => [STATUS_MISSING_FONT_ERROR],
       Fontist::Errors::LicensingError => [STATUS_LICENSING_ERROR],
       Fontist::Errors::ManifestCouldNotBeFoundError => [STATUS_MANIFEST_COULD_NOT_BE_FOUND_ERROR,
                                                         "Manifest could not be found."],
       Fontist::Errors::ManifestCouldNotBeReadError => [STATUS_MANIFEST_COULD_NOT_BE_READ_ERROR,
                                                        "Manifest could not be read."],
+      Fontist::Errors::FontIndexCorrupted => [STATUS_FONT_INDEX_CORRUPTED],
     }.freeze
 
     def self.exit_on_failure?
@@ -27,12 +29,14 @@ module Fontist
     desc "install FONT", "Install font"
     option :force, type: :boolean, aliases: :f,
                    desc: "Install even if it's already installed in system"
-    option :confirm_license, type: :boolean, desc: "Confirm license agreement"
+    option :accept_all_licenses, type: :boolean, aliases: "--confirm-license", desc: "Accept all license agreements"
+    option :hide_licenses, type: :boolean, desc: "Hide license texts"
     def install(font)
       Fontist::Font.install(
         font,
         force: options[:force],
-        confirmation: options[:confirm_license] ? "yes" : "no"
+        confirmation: options[:accept_all_licenses] ? "yes" : "no",
+        hide_licenses: options[:hide_licenses]
       )
       success
     rescue Fontist::Errors::GeneralError => e
@@ -50,12 +54,11 @@ module Fontist
     end
     map remove: :uninstall
 
-    desc "status [FONT]", "Show status of FONT or all fonts in fontist"
+    desc "status [FONT]", "Show paths of FONT or all fonts"
     def status(font = nil)
-      formulas = Fontist::Font.status(font)
-      return error("No font is installed.", STATUS_MISSING_FONT_ERROR) if formulas.empty?
+      paths = Fontist::Font.status(font)
+      return error("No font is installed.", STATUS_MISSING_FONT_ERROR) if paths.empty?
 
-      print_formulas(formulas)
       success
     rescue Fontist::Errors::GeneralError => e
       handle_error(e)
@@ -88,11 +91,13 @@ module Fontist
     end
 
     desc "manifest-install MANIFEST", "Install fonts from MANIFEST (yaml)"
-    option :confirm_license, type: :boolean, desc: "Confirm license agreement"
+    option :accept_all_licenses, type: :boolean, aliases: "--confirm-license", desc: "Accept all license agreements"
+    option :hide_licenses, type: :boolean, desc: "Hide license texts"
     def manifest_install(manifest)
       paths = Fontist::Manifest::Install.from_file(
         manifest,
-        confirmation: options[:confirm_license] ? "yes" : "no"
+        confirmation: options[:accept_all_licenses] ? "yes" : "no",
+        hide_licenses: options[:hide_licenses]
       )
 
       print_yaml(paths)
@@ -105,7 +110,8 @@ module Fontist
     option :name, desc: "Example: Times New Roman"
     option :mirror, repeatable: true
     option :subarchive, desc: "Subarchive to choose when there are several ones"
-    option :subdir, desc: "Subdirectory to take fonts from"
+    option :subdir, desc: "Subdirectory to take fonts from, starting with the " \
+      "root dir, e.g.: stixfonts-2.10/fonts/static_otf. May include `fnmatch` patterns."
     def create_formula(url)
       require "fontist/import/create_formula"
       name = Fontist::Import::CreateFormula.new(url, options).call
@@ -124,6 +130,12 @@ module Fontist
       STATUS_SUCCESS
     end
 
+    desc "import-sil", "Import formulas from SIL"
+    def import_sil
+      require "fontist/import/sil_import"
+      Fontist::Import::SilImport.new.call
+    end
+
     private
 
     def success
@@ -146,20 +158,6 @@ module Fontist
       Fontist.ui.say(YAML.dump(object))
     end
 
-    def print_formulas(formulas)
-      formulas.each do |formula, fonts|
-        Fontist.ui.success(formula.key)
-
-        fonts.each do |font, styles|
-          Fontist.ui.success(" #{font.name}")
-
-          styles.each do |style, path|
-            Fontist.ui.success("  #{style.type} (#{path})")
-          end
-        end
-      end
-    end
-
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def print_list(formulas)
       formulas.each do |formula, fonts|

data/lib/fontist/errors.rb

@@ -1,7 +1,9 @@
 module Fontist
   module Errors
     class GeneralError < StandardError; end
+
     class BinaryCallError < GeneralError; end
+    class FontIndexCorrupted < GeneralError; end
     class FontNotFoundError < GeneralError; end
     class FormulaIndexNotFoundError < GeneralError; end
     class InvalidResourceError < GeneralError; end
@@ -9,10 +11,57 @@ module Fontist
     class ManifestCouldNotBeFoundError < GeneralError; end
     class ManifestCouldNotBeReadError < GeneralError; end
     class MissingAttributeError < GeneralError; end
-    class MissingFontError < GeneralError; end
-    class NonSupportedFontError < GeneralError; end
     class TamperedFileError < GeneralError; end
     class TimeoutError < GeneralError; end
     class UnknownFontTypeError < GeneralError; end
+    class UnknownArchiveError < GeneralError; end
+
+    class FontError < GeneralError
+      attr_reader :font, :style
+
+      def initialize(msg, font = nil, style = nil)
+        @font = font
+        @style = style
+
+        super(msg)
+      end
+
+      def name
+        messages = []
+        messages << "Font name: '#{@font}'"
+        messages << "Style: '#{@style}'" if @style
+        messages.join("; ")
+      end
+    end
+
+    class MissingFontError < FontError
+      def initialize(font, style = nil)
+        name = prepare_name(font, style)
+        msg = "#{name} font is missing, please run `fontist install '#{font}'` to download the font."
+
+        super(msg, font, style)
+      end
+
+      private
+
+      def prepare_name(font, style)
+        names = []
+        names << "'#{font}'"
+        names << "'#{style}'" if style
+        names.join(" ")
+      end
+    end
+
+    class UnsupportedFontError < FontError
+      def initialize(font)
+        msg = <<~MSG.chomp
+          Font '#{font}' 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
+
+        super(msg, font)
+      end
+    end
   end
 end

data/lib/fontist/font.rb

@@ -1,11 +1,13 @@
 require "fontist/font_installer"
+require "fontist/font_path"
 
 module Fontist
   class Font
     def initialize(options = {})
-      @name = options.fetch(:name, nil)
-      @confirmation = options.fetch(:confirmation, "no")
-      @force = options.fetch(:force, false)
+      @name = options[:name]
+      @confirmation = options[:confirmation] || "no"
+      @hide_licenses = options[:hide_licenses]
+      @force = options[:force] || false
 
       check_or_create_fontist_path!
     end
@@ -18,8 +20,8 @@ module Fontist
       new(name: name).find
     end
 
-    def self.install(name, confirmation: "no", force: false)
-      new(name: name, confirmation: confirmation, force: force).install
+    def self.install(name, options = {})
+      new(options.merge(name: name)).install
     end
 
     def self.uninstall(name)
@@ -47,9 +49,9 @@ module Fontist
     end
 
     def status
-      return installed_statuses unless @name
+      return installed_paths unless @name
 
-      font_status || downloadable_font || raise_non_supported_font
+      find_system_font || downloadable_font || raise_non_supported_font
     end
 
     def list
@@ -73,9 +75,14 @@ module Fontist
         return
       end
 
+      print_paths(paths)
+    end
+
+    def print_paths(paths)
       Fontist.ui.say("Fonts found at:")
       paths.each do |path|
-        Fontist.ui.say("- #{path}")
+        font_path = FontPath.new(path)
+        Fontist.ui.say(font_path.to_s)
       end
     end
 
@@ -96,12 +103,7 @@ module Fontist
 
     def downloadable_font
       if formula
-        raise(
-          Fontist::Errors::MissingFontError,
-          "#{name} fonts are missing, please run " \
-          "`fontist install '#{name}'` to " \
-          "download the font."
-        )
+        raise Fontist::Errors::MissingFontError.new(name)
       end
     end
 
@@ -118,19 +120,26 @@ module Fontist
     end
 
     def check_and_confirm_required_license(formula)
-      if formula.license_required && !confirmation.casecmp("yes").zero?
-        @confirmation = show_license_and_ask_for_input(formula.license)
+      if formula.license_required
+        show_license(formula.license) unless @hide_licenses
 
-        if !confirmation.casecmp("yes").zero?
-          raise Fontist::Errors::LicensingError.new(
-            "Fontist will not download these fonts unless you accept the terms."
-          )
+        unless confirmation.casecmp?("yes")
+          @confirmation = ask_for_agreement
+
+          unless confirmation&.casecmp?("yes")
+            raise Fontist::Errors::LicensingError.new(
+              "Fontist will not download these fonts unless you accept the terms."
+            )
+          end
         end
       end
     end
 
-    def show_license_and_ask_for_input(license)
+    def show_license(license)
       Fontist.ui.say(license_agrement_message(license))
+    end
+
+    def ask_for_agreement
       Fontist.ui.ask(
         "\nDo you accept all presented font licenses, and want Fontist " \
         "to download these fonts for you? => TYPE 'Yes' or 'No':"
@@ -166,37 +175,14 @@ module Fontist
       Fontist::FontistFont.find(name)
     end
 
-    def installed_statuses
-      installed_styles(all_formulas)
+    def installed_paths
+      print_paths(SystemFont.font_paths)
     end
 
     def all_formulas
       Fontist::Formula.all
     end
 
-    def font_status
-      return unless formula
-
-      statuses = installed_styles([formula])
-      statuses.empty? ? nil : statuses
-    end
-
-    def installed_styles(formulas)
-      filter_blank(formulas) do |formula|
-        filter_blank(formula.fonts) do |font|
-          filter_blank(font.styles) do |style|
-            path(style)
-          end
-        end
-      end
-    end
-
-    def filter_blank(elements)
-      elements.map { |e| [e, yield(e)] }
-        .to_h
-        .reject { |_k, v| v.nil? || v.empty? }
-    end
-
     def path(style)
       font_paths.detect do |path|
         File.basename(path) == style.font
@@ -236,14 +222,7 @@ module Fontist
     end
 
     def raise_non_supported_font
-      raise Fontist::Errors::NonSupportedFontError.new(
-        "Font '#{@name}' not found locally nor available in the Fontist " \
-        "formula repository.\n" \
-        "Perhaps it is available at the latest Fontist formula " \
-        "repository.\n" \
-        "You can update the formula repository using the command " \
-        "`fontist update` and try again."
-      )
+      raise Fontist::Errors::UnsupportedFontError.new(@name)
     end
   end
 end

data/lib/fontist/font_installer.rb

@@ -6,6 +6,10 @@ module Fontist
     include Utils::ExeExtractor
     include Utils::MsiExtractor
     include Utils::SevenZipExtractor
+    include Utils::RpmExtractor
+    include Utils::GzipExtractor
+    include Utils::CpioExtractor
+    include Utils::TarExtractor
 
     def initialize(formula)
       @formula = formula

data/lib/fontist/font_path.rb

@@ -0,0 +1,29 @@
+require "fontist/indexes/filename_index"
+
+module Fontist
+  class FontPath
+    def initialize(path)
+      @path = path
+    end
+
+    def to_s
+      [].tap do |s|
+        s << "-"
+        s << @path
+        s << "(from #{formulas.join(' or ')} formula)" if formulas.any?
+      end.join(" ")
+    end
+
+    def formulas
+      @formulas ||= if fontist_font?
+                      Indexes::FilenameIndex.from_yaml.load_index_formulas(File.basename(@path)).map(&:name)
+                    else
+                      []
+                    end
+    end
+
+    def fontist_font?
+      @path.start_with?(Fontist.fonts_path.to_s)
+    end
+  end
+end