fontist 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a35bdc7e99674109bec5810eb8e57d91516ff93f7cf4aefbb608e0298a010f76
-  data.tar.gz: fc886de884ebc5309acb9dc6168fd6c2d7f460f11e05d9be8a1ffca8177e3b6f
+  metadata.gz: 2dc209840287f224caec09be365402ca43e3605debfed69d01f3f89f12d27093
+  data.tar.gz: 2ba6e5c3359cfa30afe30ecf96b4f11311e33c12dcce5053b7e37ea9c1750ce9
 SHA512:
-  metadata.gz: 05f4a699ac69711925ebf9f036be06e5f5c302b9fe3cec23974bc7892ff18a73115d2373694784ee11ac8c0620b5df215a50cb9c2f173a6448a1ceb0b688753b
-  data.tar.gz: a41c8f091f5783cb0f2d0beabc0d92e9059f78415f36593f9de6b18eb1175d4059a38cb60710dd5064f0a8280aaa6ab9a13e68190903ed7ebe011e8b9068d39c
+  metadata.gz: b3e2a83f4c56ca2092954e9602827dcc6fe74ba4ba40d52f5e8ce6b0ca532cec67558fcf5a2e24775b13d263843ff2fab045f66838468a9d5fe0f087c3c08e23
+  data.tar.gz: 5d8968907e2955e7657044ad60c6c8c66ffc0f90d4e06f219b4bde01ad43f949b8dfc24a3477a6eebd269535d14dd26b7222c841c1f2b216f9e5a9111c9c931d

data/lib/fontist/cli.rb

@@ -13,13 +13,10 @@ module Fontist
     option :force, type: :boolean, aliases: :f,
                    desc: "Install even if it's already installed in system"
     def install(font)
-      fonts_paths = Fontist::Font.install(font, force: options[:force])
-      Fontist.ui.success("These fonts are found or installed:")
-      Fontist.ui.success(fonts_paths.join("\n"))
+      Fontist::Font.install(font, force: options[:force])
       STATUS_SUCCESS
     rescue Fontist::Errors::NonSupportedFontError
-      Fontist.ui.error("Could not find font '#{font}'.")
-      STATUS_ERROR
+      could_not_find_font(font)
     end
 
     desc "uninstall/remove FONT", "Uninstall font by font or formula"
@@ -32,8 +29,7 @@ module Fontist
       Fontist.ui.error(e.message)
       STATUS_ERROR
     rescue Fontist::Errors::NonSupportedFontError
-      Fontist.ui.error("Could not find font '#{font}'.")
-      STATUS_ERROR
+      could_not_find_font(font)
     end
     map remove: :uninstall
 
@@ -47,7 +43,7 @@ module Fontist
     rescue Fontist::Errors::MissingFontError => e
       error(e.message)
     rescue Fontist::Errors::NonSupportedFontError
-      error("Could not find font '#{font}'.")
+      could_not_find_font(font)
     end
 
     desc "list [FONT]", "List installation status of FONT or fonts in fontist"
@@ -56,7 +52,7 @@ module Fontist
       print_list(formulas)
       success
     rescue Fontist::Errors::NonSupportedFontError
-      error("Could not find font '#{font}'.")
+      could_not_find_font(font)
     end
 
     desc "update", "Update formulas"
@@ -111,6 +107,15 @@ module Fontist
       STATUS_SUCCESS
     end
 
+    def could_not_find_font(font)
+      error("Font '#{font}' not found locally nor available in the Fontist " \
+            "formula repository.\n" \
+            "Perhaps it is available at the latest Fontist formula " \
+            "repository.\n" \
+            "You can update the formula repository using the command " \
+            "`fontist update` and try again.")
+    end
+
     def error(message)
       Fontist.ui.error(message)
       STATUS_ERROR

data/lib/fontist/font.rb

@@ -81,7 +81,16 @@ module Fontist
     attr_reader :name, :confirmation
 
     def find_system_font
-      Fontist::SystemFont.find(name)
+      paths = Fontist::SystemFont.find(name)
+      unless paths
+        Fontist.ui.say(%(Font "#{name}" not found locally.))
+        return
+      end
+
+      Fontist.ui.say("Fonts found at:")
+      paths.each do |path|
+        Fontist.ui.say("- #{path}")
+      end
     end
 
     def check_or_create_fontist_path!
@@ -113,7 +122,13 @@ module Fontist
     def download_font
       if formula
         check_and_confirm_required_license(formula)
-        font_installer(formula).fetch_font(name, confirmation: confirmation)
+        paths = font_installer(formula).fetch_font(name,
+                                                   confirmation: confirmation)
+
+        Fontist.ui.say("Fonts installed at:")
+        paths.each do |path|
+          Fontist.ui.say("- #{path}")
+        end
       end
     end
 
@@ -232,6 +247,5 @@ module Fontist
     def installed(style)
       path(style) ? true : false
     end
-
   end
 end

data/lib/fontist/font_formula.rb

@@ -109,8 +109,11 @@ module Fontist
     end
 
     def download_file(source)
+      url = source[:urls].first
+      Fontist.ui.say(%(Downloading font "#{key}" from #{url}))
+
       downloaded_file = Fontist::Utils::Downloader.download(
-        source[:urls].first,
+        url,
         sha: source[:sha256],
         file_size: source[:file_size],
         progress_bar: is_progress_bar_enabled
@@ -121,7 +124,7 @@ module Fontist
     end
 
     def is_progress_bar_enabled
-      options.nil? ? false : options.fetch(:progress_bar, false)
+      options.nil? ? true : options.fetch(:progress_bar, true)
     end
   end
 end

data/lib/fontist/utils/cache.rb

@@ -1,14 +1,18 @@
 module Fontist
   module Utils
     class Cache
-      def fetch(key)
+      def fetch(key, bar: nil)
         map = load_cache
-        return downloaded_path(map[key]) if cache_exist?(map[key])
+        if cache_exist?(map[key])
+          print_bar(bar, map[key]) if bar
+
+          return downloaded_file(map[key])
+        end
 
         generated_file = yield
         path = save_cache(generated_file, key)
 
-        downloaded_path(path)
+        downloaded_file(path)
       end
 
       private
@@ -21,12 +25,24 @@ module Fontist
         cache_map_path.exist? ? YAML.load_file(cache_map_path) : {}
       end
 
-      def downloaded_path(path)
-        File.new(Fontist.downloads_path.join(path))
+      def downloaded_file(path)
+        File.new(downloaded_path(path))
       end
 
       def cache_exist?(path)
-        path && File.exist?(Fontist.downloads_path.join(path))
+        path && File.exist?(downloaded_path(path))
+      end
+
+      def downloaded_path(path)
+        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
       end
 
       def save_cache(generated_file, key)

data/lib/fontist/utils/downloader.rb

@@ -7,13 +7,15 @@ module Fontist
         # TODO: If the first mirror fails, try the second one
         @file = file
         @sha = [sha].flatten.compact
-        @progress_bar = set_progress_bar(progress_bar)
         @file_size = (file_size || default_file_size).to_i
+        @progress_bar = set_progress_bar(progress_bar)
         @cache = Cache.new
       end
 
       def download
-        file = @cache.fetch(@file) { download_file }
+        file = @cache.fetch(@file, bar: @progress_bar) do
+          download_file
+        end
 
         if !sha.empty? && !sha.include?(Digest::SHA256.file(file).to_s)
           raise(Fontist::Errors::TamperedFileError.new(
@@ -46,25 +48,27 @@ module Fontist
       end
 
       def set_progress_bar(progress_bar)
-        ENV.fetch("TEST_ENV", "") === "CI" ? false : progress_bar
+        if ENV.fetch("TEST_ENV", "") === "CI" || progress_bar
+          ProgressBar.new(@file_size)
+        else
+          NullProgressBar.new
+        end
       end
 
       def download_file
-        bar = ProgressBar.new(file_size / byte_to_megabyte)
-
         file = Down.download(
           @file,
           open_timeout: 10,
           read_timeout: 10,
           content_length_proc: ->(content_length) {
-            bar.total = content_length / byte_to_megabyte if content_length
+            @progress_bar.total = content_length if content_length
           },
           progress_proc: -> (progress) {
-            bar.increment(progress / byte_to_megabyte) if @progress_bar === true
+            @progress_bar.increment(progress)
           }
         )
 
-        puts if @progress_bar === true
+        @progress_bar.finish
 
         file
       rescue Down::NotFound
@@ -72,6 +76,20 @@ 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
@@ -83,9 +101,35 @@ module Fontist
       end
 
       def increment(progress)
-        complete = sprintf("%#.2f%%", ((@counter.to_f / @total.to_f) * 100))
-        print "\r\e[0KDownloads: #{@counter}MB/#{@total}MB (#{complete})"
         @counter = progress
+        Fontist.ui.print "\r\e[0KDownloads: #{counter_mb}MB/#{total_mb}MB " \
+                         "(#{completeness})"
+      end
+
+      def finish(message = nil)
+        if message
+          Fontist.ui.print " (#{message})\n"
+        else
+          Fontist.ui.print "\n"
+        end
+      end
+
+      private
+
+      def completeness
+        sprintf("%#.2f%%", (@counter.fdiv(@total) * 100)) # rubocop:disable Style/FormatStringToken, Metrics/LineLength
+      end
+
+      def counter_mb
+        @counter / byte_to_megabyte
+      end
+
+      def total_mb
+        @total / byte_to_megabyte
+      end
+
+      def byte_to_megabyte
+        @byte_to_megabyte ||= 1024 * 1024
       end
     end
   end

data/lib/fontist/utils/exe_extractor.rb

@@ -5,6 +5,8 @@ module Fontist
         download = @downloaded === true ? false : download
 
         exe_file = download_file(exe_file).path if download
+
+        Fontist.ui.say(%(Installing font "#{key}".))
         cab_file = decompressor.search(exe_file)
         cabbed_fonts = grep_fonts(cab_file.files, font_ext) || []
         fonts_paths = extract_cabbed_fonts_to_assets(cabbed_fonts)

data/lib/fontist/utils/ui.rb

@@ -18,6 +18,10 @@ module Fontist
       def self.ask(message, options = {})
         new.ask(message, options)
       end
+
+      def self.print(message)
+        super
+      end
     end
   end
 end

data/lib/fontist/utils/zip_extractor.rb

@@ -10,6 +10,7 @@ module Fontist
         zip_file = download_file(resource) if download
         zip_file ||= resource.urls.first
 
+        Fontist.ui.say(%(Installing font "#{key}".))
         fonts_paths = unzip_fonts(zip_file)
         block_given? ? yield(fonts_paths) : fonts_paths
       end

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.5.1".freeze
+  VERSION = "1.6.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Ribose Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-17 00:00:00.000000000 Z
+date: 2020-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down