fontist 1.8.3 → 1.8.8

data/lib/fontist/indexes/index_formula.rb

@@ -0,0 +1,36 @@
+module Fontist
+  module Indexes
+    class IndexFormula
+      def initialize(path)
+        @path = path
+      end
+
+      def name
+        normalized.sub(/\.yml$/, "")
+      end
+
+      def to_s
+        normalized
+      end
+
+      def to_full
+        Formula.new_from_file(full_path)
+      end
+
+      def ==(other)
+        to_s == other.to_s
+      end
+
+      private
+
+      def normalized
+        escaped = Regexp.escape(Fontist.formulas_path.to_s + "/")
+        @path.sub(Regexp.new("^" + escaped), "")
+      end
+
+      def full_path
+        Fontist.formulas_path.join(normalized).to_s
+      end
+    end
+  end
+end

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,10 +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"
 
 module Fontist
   module Utils

data/lib/fontist/utils/cache.rb

@@ -28,7 +28,7 @@ module Fontist
       end
 
       def downloaded_file(path)
-        File.new(downloaded_path(path))
+        File.new(downloaded_path(path), "rb")
       end
 
       def cache_exist?(path)

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.3".freeze
+  VERSION = "1.8.8".freeze
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.8
 platform: ruby
 authors:
 - Ribose Inc.
-- Abu Nashir
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-07 00:00:00.000000000 Z
+date: 2021-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -26,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:
     - - "~>"
@@ -82,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:
     - - "~>"
@@ -110,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
@@ -199,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
@@ -277,10 +234,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-description: A libarary find or download fonts
+description: Install openly-licensed fonts on Windows, Linux and Mac!
 email:
-- operations@ribose.com
-- abunashir@gmail.com
+- open.source@ribose.com
 executables:
 - fontist
 extensions: []
@@ -304,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
@@ -311,12 +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/extractor.rb
-- lib/fontist/import/extractors/ole_extractor.rb
-- lib/fontist/import/extractors/seven_zip_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
@@ -343,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
@@ -356,13 +310,9 @@ files:
 - 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/locking.rb
-- lib/fontist/utils/msi_extractor.rb
-- lib/fontist/utils/seven_zip_extractor.rb
 - lib/fontist/utils/system.rb
 - lib/fontist/utils/ui.rb
-- lib/fontist/utils/zip_extractor.rb
 - lib/fontist/version.rb
 homepage: https://github.com/fontist/fontist
 licenses:
@@ -371,7 +321,7 @@ metadata:
   homepage_uri: https://github.com/fontist/fontist
   source_code_uri: https://github.com/fontist/fontist
   changelog_uri: https://github.com/fontist/fontist
-post_install_message: Please run `fontist update` to fetch formulas
+post_install_message: Please run `fontist update` to fetch formulas.
 rdoc_options: []
 require_paths:
 - lib
@@ -389,5 +339,5 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: A libarary find or download fonts
+summary: Install openly-licensed fonts on Windows, Linux and Mac!
 test_files: []

data/lib/fontist/import/extractors.rb

@@ -1,5 +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"

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

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

@@ -1,44 +0,0 @@
-module Fontist
-  module Import
-    module Extractors
-      class SevenZipExtractor < Extractor
-        def extract
-          dir = Dir.mktmpdir
-          extract_7z(@archive, dir)
-          dir
-        end
-
-        def try
-          File.open(@archive, "rb") do |file|
-            reader.open(file)
-          end
-
-          true
-        rescue StandardError => e
-          return false if e.message.start_with?("Invalid file format")
-
-          raise
-        end
-
-        def format
-          "seven_zip"
-        end
-
-        private
-
-        def extract_7z(archive, dir)
-          File.open(archive, "rb") do |file|
-            reader.extract_all(file, dir)
-          end
-        end
-
-        def reader
-          @reader ||= begin
-                        require "seven_zip_ruby"
-                        SevenZipRuby::Reader
-                      end
-        end
-      end
-    end
-  end
-end