fontist 1.8.7 → 1.8.12

data/lib/fontist/manifest/install.rb

@@ -3,17 +3,18 @@ require_relative "locations"
 module Fontist
   module Manifest
     class Install < Locations
-      def initialize(manifest, confirmation: "no", hide_licenses: false)
-        @manifest = manifest
+      def initialize(manifest, confirmation: "no", hide_licenses: false, no_progress: false)
+        super(manifest)
         @confirmation = confirmation
         @hide_licenses = hide_licenses
+        @no_progress = no_progress
       end
 
       private
 
       def file_paths(font, style)
         paths = find_font_with_name(font, style)
-        return paths unless paths["paths"].empty?
+        return paths unless paths.nil?
 
         install_font(font)
 
@@ -21,7 +22,13 @@ module Fontist
       end
 
       def install_font(font)
-        Fontist::Font.install(font, force: true, confirmation: @confirmation, hide_licenses: @hide_licenses)
+        Fontist::Font.install(
+          font,
+          force: true,
+          confirmation: @confirmation,
+          hide_licenses: @hide_licenses,
+          no_progress: @no_progress
+        )
       end
     end
   end

data/lib/fontist/manifest/locations.rb

@@ -42,26 +42,40 @@ module Fontist
       end
 
       def style_paths_map(font, names)
-        paths = style_paths(font, names)
-        names.zip(paths).to_h
+        styles = style_paths(font, names)
+        group_paths(styles)
       end
 
       def style_paths(font, names)
-        names.map do |style|
-          file_paths(font, style)
+        names.flat_map do |style|
+          file_paths(font, style) || empty_paths(style)
         end
       end
 
+      def group_paths(styles)
+        styles.group_by { |s| s[:type] }
+          .transform_values { |group| style(group) }
+      end
+
+      def style(styles)
+        { "full_name" => styles.first[:full_name],
+          "paths" => styles.map { |x| x[:path] } }.compact
+      end
+
       def file_paths(font, style)
         find_font_with_name(font, style).tap do |x|
-          if x["paths"].empty?
+          if x.nil?
             raise Errors::MissingFontError.new(font, style)
           end
         end
       end
 
       def find_font_with_name(font, style)
-        Fontist::SystemFont.find_with_name(font, style).map { |k, v| [k.to_s, v] }.to_h
+        Fontist::SystemFont.find_styles(font, style)
+      end
+
+      def empty_paths(style)
+        [{ "full_name" => nil, "type" => style, "path" => nil }]
       end
     end
   end

data/lib/fontist/system_font.rb

@@ -40,8 +40,8 @@ module Fontist
       new(font: font, sources: sources).find
     end
 
-    def self.find_with_name(font, style)
-      new(font: font, style: style).find_with_name
+    def self.find_styles(font, style)
+      new(font: font, style: style).find_styles
     end
 
     def find
@@ -51,22 +51,14 @@ module Fontist
       styles.map { |x| x[:path] }
     end
 
-    def find_with_name
-      styles = find_styles
-      return { full_name: nil, paths: [] } unless styles
-
-      { full_name: styles.first[:full_name],
-        paths: styles.map { |x| x[:path] } }
+    def find_styles
+      find_by_index || find_by_formulas
     end
 
     private
 
     attr_reader :font, :style, :user_sources
 
-    def find_styles
-      find_by_index || find_by_formulas
-    end
-
     def find_by_index
       SystemIndex.new(all_paths).find(font, style)
     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/cache.rb

@@ -3,10 +3,10 @@ module Fontist
     class Cache
       include Locking
 
-      def fetch(key, bar: nil)
+      def fetch(key)
         map = load_cache
         if cache_exist?(map[key])
-          print_bar(bar, map[key]) if bar
+          print(map[key])
 
           return downloaded_file(map[key])
         end
@@ -17,6 +17,25 @@ module Fontist
         downloaded_file(path)
       end
 
+      def delete(key)
+        lock(lock_path) do
+          map = load_cache
+          return unless map[key]
+
+          value = map.delete(key)
+          File.write(cache_map_path, YAML.dump(map))
+          value
+        end
+      end
+
+      def set(key, value)
+        lock(lock_path) do
+          map = load_cache
+          map[key] = value
+          File.write(cache_map_path, YAML.dump(map))
+        end
+      end
+
       private
 
       def cache_map_path
@@ -39,12 +58,12 @@ module Fontist
         Fontist.downloads_path.join(path)
       end
 
-      def print_bar(bar, path)
-        File.size(downloaded_path(path)).tap do |size|
-          bar.total = size
-          bar.increment(size)
-          bar.finish("cache")
-        end
+      def print(path)
+        Fontist.ui.say("Fetched from cache: #{size(path)} MiB.")
+      end
+
+      def size(path)
+        File.size(downloaded_path(path)) / (1024 * 1024)
       end
 
       def save_cache(generated_file, key)

data/lib/fontist/utils/downloader.rb

@@ -14,13 +14,13 @@ module Fontist
         # TODO: If the first mirror fails, try the second one
         @file = file
         @sha = [sha].flatten.compact
-        @file_size = (file_size || default_file_size).to_i
+        @file_size = file_size.to_i if file_size
         @progress_bar = set_progress_bar(progress_bar)
         @cache = Cache.new
       end
 
       def download
-        file = @cache.fetch(@file, bar: @progress_bar) do
+        file = @cache.fetch(@file) do
           download_file
         end
 
@@ -38,10 +38,6 @@ module Fontist
 
       attr_reader :file, :sha, :file_size
 
-      def default_file_size
-        5 * byte_to_megabyte
-      end
-
       def byte_to_megabyte
         @byte_to_megabyte ||= 1024 * 1024
       end
@@ -51,10 +47,10 @@ module Fontist
       end
 
       def set_progress_bar(progress_bar)
-        if ENV.fetch("TEST_ENV", "") === "CI" || progress_bar
+        if progress_bar
           ProgressBar.new(@file_size)
         else
-          NullProgressBar.new
+          NullProgressBar.new(@file_size)
         end
       end
 
@@ -79,24 +75,13 @@ module Fontist
       end
     end
 
-    class NullProgressBar
-      def total=(_)
-        # do nothing
-      end
-
-      def increment(_)
-        # do nothing
-      end
-
-      def finish(_ = nil)
-        # do nothing
-      end
-    end
-
     class ProgressBar
       def initialize(total)
-        @counter = 1
+        @counter = 0
         @total  = total
+        @printed_percent = -1
+        @printed_size = -1
+        @start = Time.now
       end
 
       def total=(total)
@@ -105,22 +90,57 @@ module Fontist
 
       def increment(progress)
         @counter = progress
-        Fontist.ui.print "\r\e[0KDownloads: #{counter_mb}MB/#{total_mb}MB " \
-                         "(#{completeness})"
+
+        print_incrementally
+      end
+
+      def finish
+        print
+
+        Fontist.ui.print(format(", %<mb_per_second>.2f MiB/s, done.\n", mb_per_second: mb_per_second))
       end
 
-      def finish(message = nil)
-        if message
-          Fontist.ui.print " (#{message})\n"
+      private
+
+      def print_incrementally
+        if total?
+          print_percent_incrementally
         else
-          Fontist.ui.print "\n"
+          print_size_incrementally
         end
       end
 
-      private
+      def print
+        if total?
+          print_percent
+        else
+          print_size
+        end
+      end
+
+      def total?
+        !!@total
+      end
 
-      def completeness
-        sprintf("%#.2f%%", (@counter.fdiv(@total) * 100)) # rubocop:disable Style/FormatStringToken, Metrics/LineLength
+      def print_percent_incrementally
+        return unless percent > @printed_percent
+
+        print_percent
+
+        @printed_percent = percent
+      end
+
+      def print_percent
+        # rubocop:disable Style/FormatStringToken
+        Fontist.ui.print(format("\r\e[0KDownloading: %<completeness>3d%% (%<counter_mb>d/%<total_mb>d MiB)",
+                                completeness: percent,
+                                counter_mb: counter_mb,
+                                total_mb: total_mb))
+        # rubocop:enable Style/FormatStringToken
+      end
+
+      def percent
+        (@counter.fdiv(@total) * 100).to_i
       end
 
       def counter_mb
@@ -134,6 +154,28 @@ module Fontist
       def byte_to_megabyte
         @byte_to_megabyte ||= 1024 * 1024
       end
+
+      def print_size_incrementally
+        return unless counter_mb > @printed_size
+
+        print_size
+
+        @printed_size = counter_mb
+      end
+
+      def print_size
+        Fontist.ui.print(format("\r\e[0KDownloading: %<downloaded>4d MiB", downloaded: counter_mb))
+      end
+
+      def mb_per_second
+        @counter / (Time.now - @start) / byte_to_megabyte
+      end
+    end
+
+    class NullProgressBar < ProgressBar
+      def print_incrementally
+        # do nothing
+      end
     end
   end
 end

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.8.7".freeze
+  VERSION = "1.8.12".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.12
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-20 00:00:00.000000000 Z
+date: 2021-03-22 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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.6'
 - !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: