fontist 1.8.5 → 1.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b392969d430a5af69c38a73069d5a98cf90a6ef1c246f8cca215a7cd4c1202c
-  data.tar.gz: 97ca59729bf50acefa0bfe5ab23b82050eed8fd6ba4782a6d814a77e44939b4b
+  metadata.gz: 5a61fbcb4c7c4242df9816a14e4b38ef2a0653f2979d60351ff46e2afd534287
+  data.tar.gz: 117b390025eb49b700213b9964aa7134c39d9945b1aed822e7b92e36295b750f
 SHA512:
-  metadata.gz: b5911d154187149d2d8ebc81e776b7c4b12e0a8eddf4f2540f3914b41fd29c582a29287b5ed1d3d7cccbe696aeb40908f5039bf350c281e315ac08fffe76e110
-  data.tar.gz: 49a7e53eff6d6b750248141a608cb3e92c03c19130f75f4ff8806c7e55ca0d478cec376ed9eaa273dedff3e05b31057892c0c47367a48f1a3eadd5599ecaf968
+  metadata.gz: c77e83a9a67f3782bbf4eb8c3d3de30ebb0db904c6429e6d83bc457e9651125acee7528b5503ab51fac3dfc6a4441e966cc8596aa70455dc1181f2c866f0cdae
+  data.tar.gz: 1b542a3e06a395198277e5ac34d7615fa25f95bd7da1a3fcbd6e819a572871b3d0ca4ad51678859eeae180c0b76b586d6c815b1807ac82b3f79e703eef5bffde

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/cli.rb

@@ -29,12 +29,16 @@ 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"
+    option :no_progress, type: :boolean, desc: "Hide download progress"
     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],
+        no_progress: options[:no_progress]
       )
       success
     rescue Fontist::Errors::GeneralError => e
@@ -89,11 +93,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)

data/lib/fontist/font.rb

@@ -6,6 +6,8 @@ module Fontist
     def initialize(options = {})
       @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!
@@ -19,8 +21,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)
@@ -65,7 +67,7 @@ module Fontist
 
     private
 
-    attr_reader :name, :confirmation
+    attr_reader :name
 
     def find_system_font
       paths = Fontist::SystemFont.find(name)
@@ -93,13 +95,17 @@ module Fontist
     end
 
     def font_installer(formula)
-      FontInstaller.new(formula)
+      FontInstaller.new(formula, no_progress: @no_progress)
     end
 
     def formula
       @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)
@@ -107,8 +113,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:")
@@ -119,19 +127,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':"

data/lib/fontist/font_installer.rb

@@ -1,18 +1,11 @@
 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)
+    def initialize(formula, no_progress: false)
       @formula = formula
+      @no_progress = no_progress
     end
 
     def install(confirmation:)
@@ -20,7 +13,6 @@ module Fontist
         raise(Fontist::Errors::LicensingError)
       end
 
-      reinitialize
       install_font
     end
 
@@ -28,10 +20,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 +38,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
+        progress_bar: !@no_progress
       )
+    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 +81,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/formula.rb

@@ -24,6 +24,10 @@ module Fontist
       Indexes::FontIndex.from_yaml.load_formulas(font_name).first
     end
 
+    def self.find_many(font_name)
+      Indexes::FontIndex.from_yaml.load_formulas(font_name)
+    end
+
     def self.find_fonts(font_name)
       formulas = Indexes::FontIndex.from_yaml.load_formulas(font_name)
 

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/import/recursive_extraction.rb

@@ -1,21 +1,18 @@
-require "find"
-require_relative "extractors"
 require_relative "files/font_detector"
 
 module Fontist
   module Import
     class RecursiveExtraction
-      FONTS_PATTERN = "**/*.{ttf,otf,ttc}".freeze
-      ARCHIVE_EXTENSIONS = %w[zip msi exe cab].freeze
       LICENSE_PATTERN = /(ofl\.txt|ufl\.txt|licenses?\.txt|copying)$/i.freeze
 
       def initialize(archive, subarchive: nil, subdir: nil)
         @archive = archive
-        @subarchive = subarchive
         @subdir = subdir
-        @operations = []
+        @operations = {}
         @font_files = []
         @collection_files = []
+
+        save_operation_subdir
       end
 
       def extension
@@ -39,11 +36,18 @@ module Fontist
 
       def operations
         ensure_extracted
-        @operations.size == 1 ? @operations.first : @operations
+        @operations
       end
 
       private
 
+      def save_operation_subdir
+        return unless @subdir
+
+        @operations[:options] ||= {}
+        @operations[:options][:fonts_sub_dir] = @subdir
+      end
+
       def fetch_extension(file)
         File.extname(filename(file)).sub(/^\./, "")
       end
@@ -57,68 +61,21 @@ module Fontist
       end
 
       def ensure_extracted
-        extracted_path
-      end
+        return if @extracted
 
-      def extracted_path
-        @extracted_path ||= extract_recursively(@archive)
+        extract_data(@archive)
+        @extracted = true
       end
 
-      def extract_recursively(archive)
-        path = operate_on_archive(archive)
-        match_files(path)
-        if matched?
-          save_operation_subdir
-          return path
-        end
-
-        next_archive = find_archive(path)
-        extract_recursively(next_archive)
-      end
-
-      def operate_on_archive(archive)
-        extractor = choose_extractor(archive)
-        Fontist.ui.say("Extracting #{archive} with #{extractor.class.name}")
-
-        save_operation(extractor)
-        extractor.extract
-      end
-
-      # rubocop:disable Metrics/MethodLength
-      def choose_extractor(archive)
-        case fetch_extension(archive).downcase
-        when "msi"
-          Extractors::OleExtractor.new(archive)
-        when "cab"
-          Extractors::CabExtractor.new(archive)
-        when "exe"
-          extractor = Extractors::SevenZipExtractor.new(archive)
-          extractor.try ? extractor : Extractors::CabExtractor.new(archive)
-        when "zip"
-          Extractors::ZipExtractor.new(archive)
-        when "rpm"
-          Extractors::RpmExtractor.new(archive)
-        when "gz"
-          Extractors::GzipExtractor.new(archive)
-        when "cpio"
-          Extractors::CpioExtractor.new(archive)
-        when "tar"
-          Extractors::TarExtractor.new(archive)
-        else
-          raise Errors::UnknownArchiveError, "Could not unarchive `#{filename(archive)}`."
+      def extract_data(archive)
+        Excavate::Archive.new(path(archive)).files(recursive_packages: true) do |path|
+          match_license(path)
+          match_font(path) if font_directory?(path)
         end
       end
-      # rubocop:enable Metrics/MethodLength
 
-      def save_operation(extractor)
-        @operations << { format: extractor.format }
-      end
-
-      def match_files(dir_path)
-        Find.find(dir_path) do |entry_path| # rubocop:disable Style/CollectionMethods
-          match_license(entry_path)
-          match_font(entry_path) if font_directory?(entry_path, dir_path)
-        end
+      def path(file)
+        file.respond_to?(:path) ? file.path : file
       end
 
       def match_license(path)
@@ -129,18 +86,6 @@ module Fontist
         file.match?(LICENSE_PATTERN)
       end
 
-      def font_directory?(path, base_path)
-        return true unless @subdir
-
-        # https://bugs.ruby-lang.org/issues/10011
-        base_path = Pathname.new(base_path)
-
-        relative_path = Pathname.new(path).relative_path_from(base_path).to_s
-        dirname = File.dirname(relative_path)
-        normalized_pattern = @subdir.chomp("/")
-        File.fnmatch?(normalized_pattern, dirname)
-      end
-
       def match_font(path)
         case Files::FontDetector.detect(path)
         when :font
@@ -150,53 +95,14 @@ module Fontist
         end
       end
 
-      def matched?
-        [@font_files, @collection_files].any? do |files|
-          files.size.positive?
-        end
-      end
-
-      def save_operation_subdir
-        return unless @subdir
-
-        @operations.last[:options] ||= {}
-        @operations.last[:options][:fonts_sub_dir] = @subdir
-      end
-
-      def find_archive(path)
-        children = Dir.entries(path) - [".", ".."] # ruby 2.4 compat
-        paths = children.map { |file| File.join(path, file) }
-        by_subarchive(paths) || by_size(paths)
-      end
-
-      def by_subarchive(paths)
-        return unless @subarchive
-
-        path_found = paths.detect do |path|
-          @subarchive == File.basename(path)
-        end
-
-        return unless path_found
-
-        save_operation_subarchive(path_found)
-
-        path_found
-      end
-
-      def save_operation_subarchive(path)
-        @operations.last[:options] ||= {}
-        @operations.last[:options][:subarchive] = File.basename(path)
-      end
+      def font_directory?(path)
+        return true unless subdirectory_pattern
 
-      def by_size(paths)
-        paths.max_by do |path|
-          [file_type(path), File.size(path)]
-        end
+        File.fnmatch?(subdirectory_pattern, File.dirname(path))
       end
 
-      def file_type(file_path)
-        extension = File.extname(file_path).delete(".")
-        ARCHIVE_EXTENSIONS.include?(extension) ? 1 : 0
+      def subdirectory_pattern
+        @subdirectory_pattern ||= "*" + @subdir.chomp("/") if @subdir
       end
     end
   end