fontist 1.8.9 → 1.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c34f4a52f1c0842347ebd17811c7550b4eb9e31048bab00077cea20dcd94985
-  data.tar.gz: 9a5bad3ff72333d3b73673189510f0b739ef1160233235212e6b0c21f5152d2c
+  metadata.gz: 5a61fbcb4c7c4242df9816a14e4b38ef2a0653f2979d60351ff46e2afd534287
+  data.tar.gz: 117b390025eb49b700213b9964aa7134c39d9945b1aed822e7b92e36295b750f
 SHA512:
-  metadata.gz: d8d58465500cd8417d3c164cb791215d6adcfeee358ac60b14d93492d5c6ef1b465cb26236e44ced38566995d61e741ffe1566ad482c491d474ccea9c10fa447
-  data.tar.gz: f41298a94ffe8d6c2d6f33ff990f9e3c03b6271d580db2a86f48d94bc7dd4776a7c767f7d0d946097782ec00335c716053c90bd88aec4ba3dc274a6e863555bb
+  metadata.gz: c77e83a9a67f3782bbf4eb8c3d3de30ebb0db904c6429e6d83bc457e9651125acee7528b5503ab51fac3dfc6a4441e966cc8596aa70455dc1181f2c866f0cdae
+  data.tar.gz: 1b542a3e06a395198277e5ac34d7615fa25f95bd7da1a3fcbd6e819a572871b3d0ca4ad51678859eeae180c0b76b586d6c815b1807ac82b3f79e703eef5bffde

data/lib/fontist/cli.rb

@@ -31,12 +31,14 @@ module Fontist
                    desc: "Install even if it's already installed in system"
     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[:accept_all_licenses] ? "yes" : "no",
-        hide_licenses: options[:hide_licenses]
+        hide_licenses: options[:hide_licenses],
+        no_progress: options[:no_progress]
       )
       success
     rescue Fontist::Errors::GeneralError => e

data/lib/fontist/font.rb

@@ -7,6 +7,7 @@ module Fontist
       @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!
@@ -94,7 +95,7 @@ module Fontist
     end
 
     def font_installer(formula)
-      FontInstaller.new(formula)
+      FontInstaller.new(formula, no_progress: @no_progress)
     end
 
     def formula

data/lib/fontist/font_installer.rb

@@ -3,8 +3,9 @@ require "excavate"
 
 module Fontist
   class FontInstaller
-    def initialize(formula)
+    def initialize(formula, no_progress: false)
       @formula = formula
+      @no_progress = no_progress
     end
 
     def install(confirmation:)
@@ -60,7 +61,7 @@ module Fontist
         url,
         sha: source.sha256,
         file_size: source.file_size,
-        progress_bar: true
+        progress_bar: !@no_progress
       )
     end
 

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/manifest/install.rb

@@ -3,10 +3,11 @@ 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
@@ -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/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.9".freeze
+  VERSION = "1.8.10".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.8.9
+  version: 1.8.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-10 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down