fontist 1.8.7 → 1.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69bc4225a7dac5b44f92364344568e4990ec3917631febbab1739a4980890308
-  data.tar.gz: b1bd65c7db74152b911375a6990cda7dd23f849291feeb00edd3fddda5b93f4d
+  metadata.gz: 7cd7962408633c39bb2cfff2ef8c3c0500842033f80ed7211474eefe98845327
+  data.tar.gz: 4630d28fbe5afad9865aeaebfa46e50215eb99cc8e2580466ae1fcb616117cfa
 SHA512:
-  metadata.gz: 298d8927f07494407568e35fea9a3ed6fc26a725df7dcd9f4a6f3e134be628bc38bc315b0d61bac63c15c92501396b04c8e59dcad59429420785fdeaf9d4ac22
-  data.tar.gz: 27f7bf0e155c8c3210030de3e5d1f140b4b0cee26214ca48c5cf34136eb09f8850f80178aa331b608c61583af003c8d7ca4ac071601e3fe8dbbebd25e6e15e9d
+  metadata.gz: 57ac2451e5911694725ddd4f7f29bb8693e0be8e4397101f1f90c6a83ba353ea51fc7e2c9c0875e1bc0f4f17a466b9191d2c4017a47e971c9bb620bef0ea4a4c
+  data.tar.gz: 6aee6a31dd412af421191cb8cb5ca7793d5071bfcb0101666ef7d591abffcb98a7e9a3990978e7268d4e55fb1f0fa339711bffe801f272e08c133cd3c6783a9b

data/fontist.gemspec

@@ -27,15 +27,11 @@ 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 "excavate", "~> 0.1"
 
   spec.add_development_dependency "extract_ttc", "~> 0.1"
   spec.add_development_dependency "pry"

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/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

data/lib/fontist/utils.rb

@@ -5,14 +5,6 @@ require "fontist/utils/dsl"
 require "fontist/utils/dsl/font"
 require "fontist/utils/dsl/collection_font"
 require "fontist/utils/downloader"
-require "fontist/utils/zip_extractor"
-require "fontist/utils/exe_extractor"
-require "fontist/utils/msi_extractor"
-require "fontist/utils/seven_zip_extractor"
-require "fontist/utils/rpm_extractor"
-require "fontist/utils/gzip_extractor"
-require "fontist/utils/cpio_extractor"
-require "fontist/utils/tar_extractor"
 
 module Fontist
   module Utils

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.8.7".freeze
+  VERSION = "1.8.8".freeze
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.8.7
+  version: 1.8.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-20 00:00:00.000000000 Z
+date: 2021-02-26 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: arr-pm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: down
   requirement: !ruby/object:Gem::Requirement
@@ -39,49 +25,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: libmspack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-- !ruby/object:Gem::Dependency
-  name: seven_zip_ruby
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: ruby-ole
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -95,21 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-- !ruby/object:Gem::Dependency
-  name: git
+  name: ttfunk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -123,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: ttfunk
+  name: excavate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: extract_ttc
   requirement: !ruby/object:Gem::Requirement
@@ -324,16 +268,6 @@ files:
 - lib/fontist/import.rb
 - lib/fontist/import/convert_formulas.rb
 - lib/fontist/import/create_formula.rb
-- lib/fontist/import/extractors.rb
-- lib/fontist/import/extractors/cab_extractor.rb
-- lib/fontist/import/extractors/cpio_extractor.rb
-- lib/fontist/import/extractors/extractor.rb
-- lib/fontist/import/extractors/gzip_extractor.rb
-- lib/fontist/import/extractors/ole_extractor.rb
-- lib/fontist/import/extractors/rpm_extractor.rb
-- lib/fontist/import/extractors/seven_zip_extractor.rb
-- lib/fontist/import/extractors/tar_extractor.rb
-- lib/fontist/import/extractors/zip_extractor.rb
 - lib/fontist/import/files/collection_file.rb
 - lib/fontist/import/files/file_requirement.rb
 - lib/fontist/import/files/font_detector.rb
@@ -372,22 +306,13 @@ files:
 - lib/fontist/system_index.rb
 - lib/fontist/utils.rb
 - lib/fontist/utils/cache.rb
-- lib/fontist/utils/cpio/cpio.rb
-- lib/fontist/utils/cpio_extractor.rb
 - lib/fontist/utils/downloader.rb
 - lib/fontist/utils/dsl.rb
 - lib/fontist/utils/dsl/collection_font.rb
 - lib/fontist/utils/dsl/font.rb
-- lib/fontist/utils/exe_extractor.rb
-- lib/fontist/utils/gzip_extractor.rb
 - lib/fontist/utils/locking.rb
-- lib/fontist/utils/msi_extractor.rb
-- lib/fontist/utils/rpm_extractor.rb
-- lib/fontist/utils/seven_zip_extractor.rb
 - lib/fontist/utils/system.rb
-- lib/fontist/utils/tar_extractor.rb
 - lib/fontist/utils/ui.rb
-- lib/fontist/utils/zip_extractor.rb
 - lib/fontist/version.rb
 homepage: https://github.com/fontist/fontist
 licenses: