fontist 1.11.3 → 1.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0461da7c09c672b443f4a0bad5443f3bf48294cb3e0aee5ea7082838825519ca
-  data.tar.gz: 0e5931e6617e4484074b7d740fbe9f593dc3a31d9b524859167d90cdfc060498
+  metadata.gz: 0ac17862d959106489db89581d1af08b243738f4b894723c10c78495ff739392
+  data.tar.gz: 69573ac254f8391feeba6a060320a709bb674575208b94454f8bf7358e988ae2
 SHA512:
-  metadata.gz: c0b30b8bfc0f01507d436dea54d5b122751c852a63d2309a5236a5a5f698c140892e54c2f665dbbce4bf0c6f6276c9a7cd1910f212aa7a27937ceca1b8ba510d
-  data.tar.gz: de92e684e1368ee2a5c10d1789962181316590b87ea5b806d8fd0a959329c54dd0d95723d99334038f75e2865d277b12dbc2c17aeed39b5b57436506273e7be4
+  metadata.gz: dd59c9ed3333c2ae10ffa8b337f4e42e607057fefccd09d1194db98890e23835e0914a137c86ada8fff15b97930f3159ae5270bfb0ebda98488e262742692f06
+  data.tar.gz: 8c0850e4376f77a90f7040f6c28c8a7a6b7e072e3e3e7fd0e283327482753c88aec075a7dc3f264c5c886f16392e6a4e2354af1f0ccfbfd4c262756d3885510c

data/.github/workflows/rspec.yml

@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby: [ '2.4', '2.5', '2.6', '2.7', '3.0' ]
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        os: [ ubuntu-18.04, ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
 
     steps:

data/README.adoc

@@ -685,8 +685,8 @@ one, please refer to its documentation.
 There is an ability to use private fonts via private Fontist repositories.
 
 A Fontist repository is a Git repo which contains YAML formula files. Formulas can be created
-manually (see https://github.com/fontist/formulas/tree/master/Formulas)[examples],
-or #auto-generate-a-formula[auto-generated from an archive].
+manually (see https://github.com/fontist/formulas/tree/master/Formulas[examples]),
+or xref:Authoring Fontist formulas[auto-generated from an archive].
 
 A repository can be either a HTTPS or SSH Git repo. In case of SSH, a
 corresponding SSH key should be setup with `ssh-agent` in order to access this

data/lib/fontist/font_installer.rb

@@ -54,16 +54,30 @@ module Fontist
     end
 
     def download_file(source)
-      request = source.urls.first
-      url = request.respond_to?(:url) ? request.url : request
-      Fontist.ui.say(%(Downloading font "#{@formula.key}" from #{url}))
+      errors = []
+      source.urls.each do |request|
+        url = request.respond_to?(:url) ? request.url : request
+        Fontist.ui.say(%(Downloading font "#{@formula.key}" from #{url}))
 
+        result = try_download_file(request, source)
+        return result unless result.is_a?(Errors::InvalidResourceError)
+
+        errors << result
+      end
+
+      raise Errors::InvalidResourceError, errors.join(" ")
+    end
+
+    def try_download_file(request, source)
       Fontist::Utils::Downloader.download(
         request,
         sha: source.sha256,
         file_size: source.file_size,
         progress_bar: !@no_progress
       )
+    rescue Errors::InvalidResourceError => e
+      Fontist.ui.say(e.message)
+      e
     end
 
     def font_file?(path)

data/lib/fontist/utils/downloader.rb

@@ -15,7 +15,7 @@ module Fontist
         @file = file
         @sha = [sha].flatten.compact
         @file_size = file_size.to_i if file_size
-        @progress_bar = set_progress_bar(progress_bar)
+        @progress_bar = progress_bar
         @cache = Cache.new
       end
 
@@ -54,35 +54,48 @@ module Fontist
         options[:download_path] || Fontist.root_path.join("tmp")
       end
 
-      def set_progress_bar(progress_bar)
-        if progress_bar
+      def download_file
+        tries = tries ? tries + 1 : 1
+        do_download_file
+      rescue Down::Error => e
+        retry if tries < 3
+
+        raise Fontist::Errors::InvalidResourceError,
+              "Invalid URL: #{@file}. Error: #{e.inspect}."
+      end
+
+      def do_download_file
+        progress_bar = create_progress_bar
+        file = do_download_file_with_progress_bar(progress_bar)
+        progress_bar.finish
+        file
+      end
+
+      def create_progress_bar
+        if @progress_bar
           ProgressBar.new(@file_size)
         else
           NullProgressBar.new(@file_size)
         end
       end
 
-      def download_file
-        file = Down.download(
+      # rubocop:disable Metrics/MethodLength
+      def do_download_file_with_progress_bar(progress_bar)
+        Down.download(
           url,
           open_timeout: 10,
           read_timeout: 10,
           max_redirects: 10,
           headers: headers,
           content_length_proc: ->(content_length) {
-            @progress_bar.total = content_length if content_length
+            progress_bar.total = content_length if content_length
           },
           progress_proc: -> (progress) {
-            @progress_bar.increment(progress)
+            progress_bar.increment(progress)
           }
         )
-
-        @progress_bar.finish
-
-        file
-      rescue Down::NotFound
-        raise(Fontist::Errors::InvalidResourceError.new("Invalid URL: #{@file}"))
       end
+      # rubocop:enable Metrics/MethodLength
 
       def url
         @file.respond_to?(:url) ? @file.url : @file

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.11.3".freeze
+  VERSION = "1.11.5".freeze
 end

metadata

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