fontist 1.8.4 → 1.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e12ad24d94f6220992c66f06c21872135932b1b64f7ae17c7aa414c2f80f12ad
-  data.tar.gz: 29665a7556a8fbeda7449616c688a90e694b8060c7f2b8158abcc41e049579c4
+  metadata.gz: 0c34f4a52f1c0842347ebd17811c7550b4eb9e31048bab00077cea20dcd94985
+  data.tar.gz: 9a5bad3ff72333d3b73673189510f0b739ef1160233235212e6b0c21f5152d2c
 SHA512:
-  metadata.gz: 92b8942a88a3f02c57fd9840060c8ba333f0378611477bf1ff9435296792a4b79f97616da3520ea8d6fbe1088498c6d15d9c885c02e740fdc4bc26811988b176
-  data.tar.gz: 41aab015006c2109db2a52ea6ace23aeaaa571e5153559c53e327c448be4684189c7d72d5785811ecf505b124a48fa5016f5cfe62cd0946f92d0d6aab6d9b870
+  metadata.gz: d8d58465500cd8417d3c164cb791215d6adcfeee358ac60b14d93492d5c6ef1b465cb26236e44ced38566995d61e741ffe1566ad482c491d474ccea9c10fa447
+  data.tar.gz: f41298a94ffe8d6c2d6f33ff990f9e3c03b6271d580db2a86f48d94bc7dd4776a7c767f7d0d946097782ec00335c716053c90bd88aec4ba3dc274a6e863555bb

data/.github/workflows/rspec.yml

@@ -13,19 +13,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
+        ruby: [ '2.4', '2.5', '2.6', '2.7' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
-        include:
-          - ruby: '2.7'
-            os: 'ubuntu-latest'
-            experimental: true
-          - ruby: '2.7'
-            os: 'windows-latest'
-            experimental: true
-          - ruby: '2.7'
-            os: 'macos-latest'
-            experimental: true
+        # 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
@@ -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/fontist.gemspec

@@ -27,22 +27,18 @@ 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"
-  spec.add_runtime_dependency "seven_zip_ruby", "~> 1.0"
-  spec.add_runtime_dependency "ruby-ole", "~> 1.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.2"
+  spec.add_runtime_dependency "excavate", "~> 0.1"
 
   spec.add_development_dependency "extract_ttc", "~> 0.1"
   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 "rake", "~> 13"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rubocop", "0.75.0"
   spec.add_development_dependency "rubocop-rails"

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

@@ -29,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
@@ -52,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)
@@ -90,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)
@@ -155,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/font.rb

@@ -1,10 +1,12 @@
 require "fontist/font_installer"
+require "fontist/font_path"
 
 module Fontist
   class Font
     def initialize(options = {})
       @name = options[:name]
       @confirmation = options[:confirmation] || "no"
+      @hide_licenses = options[:hide_licenses]
       @force = options[:force] || false
 
       check_or_create_fontist_path!
@@ -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
@@ -64,7 +66,7 @@ module Fontist
 
     private
 
-    attr_reader :name, :confirmation
+    attr_reader :name
 
     def find_system_font
       paths = Fontist::SystemFont.find(name)
@@ -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
 
@@ -94,6 +101,10 @@ module Fontist
       @formula ||= Fontist::Formula.find(name)
     end
 
+    def formulas
+      @formulas ||= Fontist::Formula.find_many(name)
+    end
+
     def downloadable_font
       if formula
         raise Fontist::Errors::MissingFontError.new(name)
@@ -101,8 +112,10 @@ module Fontist
     end
 
     def download_font
-      if formula
-        check_and_confirm_required_license(formula)
+      return if formulas.empty?
+
+      formulas.flat_map do |formula|
+        confirmation = check_and_confirm_required_license(formula)
         paths = font_installer(formula).install(confirmation: confirmation)
 
         Fontist.ui.say("Fonts installed at:")
@@ -113,19 +126,24 @@ 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)
+      return @confirmation unless formula.license_required
 
-        unless confirmation&.casecmp?("yes")
-          raise Fontist::Errors::LicensingError.new(
-            "Fontist will not download these fonts unless you accept the terms."
-          )
-        end
-      end
+      show_license(formula.license) unless @hide_licenses
+      return @confirmation if @confirmation.casecmp?("yes")
+
+      confirmation = ask_for_agreement
+      return confirmation if confirmation&.casecmp?("yes")
+
+      raise Fontist::Errors::LicensingError.new(
+        "Fontist will not download these fonts unless you accept the terms."
+      )
     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':"
@@ -161,37 +179,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

data/lib/fontist/font_installer.rb

@@ -1,16 +1,8 @@
 require "fontist/utils"
+require "excavate"
 
 module Fontist
   class FontInstaller
-    include Utils::ZipExtractor
-    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
     end
@@ -20,7 +12,6 @@ module Fontist
         raise(Fontist::Errors::LicensingError)
       end
 
-      reinitialize
       install_font
     end
 
@@ -28,10 +19,6 @@ module Fontist
 
     attr_reader :formula
 
-    def reinitialize
-      @downloaded = false
-    end
-
     def install_font
       fonts_paths = run_in_temp_dir { extract }
       fonts_paths.empty? ? nil : fonts_paths
@@ -50,47 +37,39 @@ module Fontist
     end
 
     def extract
-      resource = @formula.resources.first
-
-      [@formula.extract].flatten.each do |operation|
-        resource = extract_by_operation(operation, resource)
-      end
-
-      fonts_paths = resource
+      archive = download_file(@formula.resources.first)
 
-      fonts_paths
+      install_fonts_from_archive(archive)
     end
 
-    def extract_by_operation(operation, resource)
-      method = "#{operation.format}_extract"
-      if operation.options
-        send(method, resource, **operation.options.to_h)
-      else
-        send(method, resource)
-      end
-    end
+    def install_fonts_from_archive(archive)
+      Fontist.ui.say(%(Installing font "#{@formula.key}".))
 
-    def fonts_path
-      Fontist.fonts_path
+      Array.new.tap do |fonts_paths|
+        Excavate::Archive.new(archive.path).files(recursive_packages: true) do |path|
+          fonts_paths << install_font_file(path) if font_file?(path)
+        end
+      end
     end
 
     def download_file(source)
       url = source.urls.first
       Fontist.ui.say(%(Downloading font "#{@formula.key}" from #{url}))
 
-      downloaded_file = Fontist::Utils::Downloader.download(
+      Fontist::Utils::Downloader.download(
         url,
         sha: source.sha256,
         file_size: source.file_size,
         progress_bar: true
       )
+    end
 
-      @downloaded = true
-      downloaded_file
+    def font_file?(path)
+      source_file?(path) && font_directory?(path)
     end
 
-    def font_file?(filename)
-      source_files.include?(filename)
+    def source_file?(path)
+      source_files.include?(File.basename(path))
     end
 
     def source_files
@@ -101,6 +80,27 @@ module Fontist
       end
     end
 
+    def font_directory?(path)
+      return true unless subdirectory_pattern
+
+      File.fnmatch?(subdirectory_pattern, File.dirname(path))
+    end
+
+    def subdirectory_pattern
+      @subdirectory_pattern ||= "*" + subdirectories.first.chomp("/") unless subdirectories.empty?
+    end
+
+    def subdirectories
+      @subdirectories ||= [@formula.extract].flatten.map(&:options).compact.map(&:fonts_sub_dir).compact
+    end
+
+    def install_font_file(source)
+      target = Fontist.fonts_path.join(target_filename(File.basename(source))).to_s
+      FileUtils.mv(source, target)
+
+      target
+    end
+
     def target_filename(source_filename)
       target_filenames[source_filename]
     end

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