fontist 1.8.4 → 1.8.9

data/lib/fontist/manifest/install.rb

@@ -3,9 +3,10 @@ require_relative "locations"
 module Fontist
   module Manifest
     class Install < Locations
-      def initialize(manifest, confirmation: "no")
+      def initialize(manifest, confirmation: "no", hide_licenses: false)
         @manifest = manifest
         @confirmation = confirmation
+        @hide_licenses = hide_licenses
       end
 
       private
@@ -20,7 +21,7 @@ module Fontist
       end
 
       def install_font(font)
-        Fontist::Font.install(font, force: true, confirmation: @confirmation)
+        Fontist::Font.install(font, force: true, confirmation: @confirmation, hide_licenses: @hide_licenses)
       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/utils/downloader.rb

@@ -3,6 +3,13 @@ require_relative "cache"
 module Fontist
   module Utils
     class Downloader
+      class << self
+        def download(*args)
+          new(*args).download
+        end
+        ruby2_keywords :download if respond_to?(:ruby2_keywords, true)
+      end
+
       def initialize(file, file_size: nil, sha: nil, progress_bar: nil)
         # TODO: If the first mirror fails, try the second one
         @file = file
@@ -27,10 +34,6 @@ module Fontist
         file
       end
 
-      def self.download(file, options = {})
-        new(file, options).download
-      end
-
       private
 
       attr_reader :file, :sha, :file_size

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.8.4".freeze
+  VERSION = "1.8.9".freeze
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.8.9
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-10 00:00:00.000000000 Z
+date: 2021-03-10 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,47 +53,33 @@ 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:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.6.2
 - !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
@@ -212,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -316,6 +260,7 @@ files:
 - lib/fontist/errors.rb
 - lib/fontist/font.rb
 - lib/fontist/font_installer.rb
+- lib/fontist/font_path.rb
 - lib/fontist/fontist_font.rb
 - lib/fontist/formula.rb
 - lib/fontist/formula_paths.rb
@@ -323,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
@@ -359,7 +294,10 @@ files:
 - lib/fontist/import/template_helper.rb
 - lib/fontist/import/text_helper.rb
 - lib/fontist/index.rb
-- lib/fontist/index_formula.rb
+- lib/fontist/indexes/base_index.rb
+- lib/fontist/indexes/filename_index.rb
+- lib/fontist/indexes/font_index.rb
+- lib/fontist/indexes/index_formula.rb
 - lib/fontist/manifest.rb
 - lib/fontist/manifest/install.rb
 - lib/fontist/manifest/locations.rb
@@ -368,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:
@@ -408,7 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Install openly-licensed fonts on Windows, Linux and Mac!
 test_files: []

data/lib/fontist/import/extractors.rb

@@ -1,9 +0,0 @@
-require_relative "extractors/extractor"
-require_relative "extractors/zip_extractor"
-require_relative "extractors/ole_extractor"
-require_relative "extractors/seven_zip_extractor"
-require_relative "extractors/cab_extractor"
-require_relative "extractors/rpm_extractor"
-require_relative "extractors/gzip_extractor"
-require_relative "extractors/cpio_extractor"
-require_relative "extractors/tar_extractor"

data/lib/fontist/import/extractors/cab_extractor.rb

@@ -1,37 +0,0 @@
-module Fontist
-  module Import
-    module Extractors
-      class CabExtractor < Extractor
-        def extract
-          dir = Dir.mktmpdir
-          extract_exe(@archive, dir)
-          dir
-        end
-
-        def format
-          File.extname(@archive) == ".exe" ? "exe" : "cab"
-        end
-
-        private
-
-        def extract_exe(archive, dir)
-          opened = decompressor.search(archive)
-          file = opened.files
-
-          while file
-            path = File.join(dir, file.filename)
-            decompressor.extract(file, path)
-            file = file.next
-          end
-        end
-
-        def decompressor
-          @decompressor ||= begin
-                              require "libmspack"
-                              LibMsPack::CabDecompressor.new
-                            end
-        end
-      end
-    end
-  end
-end

data/lib/fontist/import/extractors/cpio_extractor.rb

@@ -1,39 +0,0 @@
-module Fontist
-  module Import
-    module Extractors
-      class CpioExtractor < Extractor
-        def extract
-          dir = Dir.mktmpdir
-          extract_cpio(@archive, dir)
-          dir
-        end
-
-        def format
-          "cpio"
-        end
-
-        private
-
-        def extract_cpio(archive, dir)
-          archive_file = File.open(archive, "rb")
-
-          reader_class.new(archive_file).each do |entry, file|
-            path = File.join(dir, entry.name)
-            if entry.directory?
-              FileUtils.mkdir_p(path)
-            else
-              File.write(path, file.read)
-            end
-          end
-        end
-
-        def reader_class
-          @reader_class ||= begin
-                              require "fontist/utils/cpio/cpio"
-                              CPIO::ASCIIReader
-                            end
-        end
-      end
-    end
-  end
-end

data/lib/fontist/import/extractors/extractor.rb

@@ -1,19 +0,0 @@
-module Fontist
-  module Import
-    module Extractors
-      class Extractor
-        def initialize(archive)
-          @archive = archive
-        end
-
-        def extract
-          raise NotImplementedError.new("You must implement this method")
-        end
-
-        def format
-          raise NotImplementedError.new("You must implement this method")
-        end
-      end
-    end
-  end
-end

data/lib/fontist/import/extractors/gzip_extractor.rb

@@ -1,27 +0,0 @@
-module Fontist
-  module Import
-    module Extractors
-      class GzipExtractor < Extractor
-        def extract
-          dir = Dir.mktmpdir
-          extract_gzip(@archive, dir)
-          dir
-        end
-
-        def format
-          "gzip"
-        end
-
-        private
-
-        def extract_gzip(archive, dir)
-          Zlib::GzipReader.open(archive) do |gz|
-            basename = File.basename(archive, ".*")
-            path = File.join(dir, basename)
-            File.write(path, gz.read)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/fontist/import/extractors/ole_extractor.rb

@@ -1,41 +0,0 @@
-module Fontist
-  module Import
-    module Extractors
-      class OleExtractor < Extractor
-        def extract
-          dir = Dir.mktmpdir
-          extract_ole(@archive, dir)
-          dir
-        end
-
-        def format
-          "msi"
-        end
-
-        private
-
-        def extract_ole(archive, dir)
-          ole = storage.open(archive)
-          file = the_largest_file(ole)
-
-          content = ole.file.read(file)
-          path = File.join(dir, "data.cab")
-          File.open(path, "wb") { |f| f.write(content) }
-        end
-
-        def storage
-          @storage ||= begin
-                         require "ole/storage"
-                         Ole::Storage
-                       end
-        end
-
-        def the_largest_file(ole)
-          ole.dir.entries(".").max_by do |x|
-            ole.file.size(x)
-          end
-        end
-      end
-    end
-  end
-end