fontist 1.8.6 → 1.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d13c412a0a68cdcf1845948c2f3b96c45187dc27193bae4a581d2ee1f3324201
-  data.tar.gz: ed82b44bfc05274b749e4c4b2f2ace5e4ae115343c6ca9f99ac4fc552d71147f
+  metadata.gz: 69bc4225a7dac5b44f92364344568e4990ec3917631febbab1739a4980890308
+  data.tar.gz: b1bd65c7db74152b911375a6990cda7dd23f849291feeb00edd3fddda5b93f4d
 SHA512:
-  metadata.gz: d8a08b20f1b2409b34749ad4f4531e2c727b3e39fa9e3b015d564d6ec14365dd9aa43274aa337845b72e4072bfcad50fe26412a69b805e7c83139934b009a6d6
-  data.tar.gz: bb20f38a5c4c4e9714dc69b15f249636e10c76942359e10ac38dc08d98eac3cfc1c6efe879bc9e13596d38872bae75c4721ce6d3892e1ca2726bbe7f9cb50b41
+  metadata.gz: 298d8927f07494407568e35fea9a3ed6fc26a725df7dcd9f4a6f3e134be628bc38bc315b0d61bac63c15c92501396b04c8e59dcad59429420785fdeaf9d4ac22
+  data.tar.gz: 27f7bf0e155c8c3210030de3e5d1f140b4b0cee26214ca48c5cf34136eb09f8850f80178aa331b608c61583af003c8d7ca4ac071601e3fe8dbbebd25e6e15e9d

data/.github/workflows/rspec.yml

@@ -13,17 +13,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
+        ruby: [ '2.4', '2.5', '2.6', '2.7' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
         include:
-          - ruby: '2.7'
+          - ruby: '3.0'
             os: 'ubuntu-latest'
             experimental: true
-          - ruby: '2.7'
+          - ruby: '3.0'
             os: 'windows-latest'
             experimental: true
-          - ruby: '2.7'
+          - ruby: '3.0'
             os: 'macos-latest'
             experimental: true
 

data/fontist.gemspec

@@ -42,7 +42,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "gem-release"
   spec.add_development_dependency "nokogiri", "~> 1.0"
-  spec.add_development_dependency "rake", "~> 12.3.3"
+  spec.add_development_dependency "rake", "~> 13"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rubocop", "0.75.0"
   spec.add_development_dependency "rubocop-rails"

data/lib/fontist/font.rb

@@ -66,7 +66,7 @@ module Fontist
 
     private
 
-    attr_reader :name, :confirmation
+    attr_reader :name
 
     def find_system_font
       paths = Fontist::SystemFont.find(name)
@@ -101,6 +101,10 @@ module Fontist
       @formula ||= Fontist::Formula.find(name)
     end
 
+    def formulas
+      @formulas ||= Fontist::Formula.find_many(name)
+    end
+
     def downloadable_font
       if formula
         raise Fontist::Errors::MissingFontError.new(name)
@@ -108,8 +112,10 @@ module Fontist
     end
 
     def download_font
-      if formula
-        check_and_confirm_required_license(formula)
+      return if formulas.empty?
+
+      formulas.flat_map do |formula|
+        confirmation = check_and_confirm_required_license(formula)
         paths = font_installer(formula).install(confirmation: confirmation)
 
         Fontist.ui.say("Fonts installed at:")
@@ -120,19 +126,17 @@ module Fontist
     end
 
     def check_and_confirm_required_license(formula)
-      if formula.license_required
-        show_license(formula.license) unless @hide_licenses
+      return @confirmation unless formula.license_required
 
-        unless confirmation.casecmp?("yes")
-          @confirmation = ask_for_agreement
+      show_license(formula.license) unless @hide_licenses
+      return @confirmation if @confirmation.casecmp?("yes")
 
-          unless confirmation&.casecmp?("yes")
-            raise Fontist::Errors::LicensingError.new(
-              "Fontist will not download these fonts unless you accept the terms."
-            )
-          end
-        end
-      end
+      confirmation = ask_for_agreement
+      return confirmation if confirmation&.casecmp?("yes")
+
+      raise Fontist::Errors::LicensingError.new(
+        "Fontist will not download these fonts unless you accept the terms."
+      )
     end
 
     def show_license(license)

data/lib/fontist/formula.rb

@@ -24,6 +24,10 @@ module Fontist
       Indexes::FontIndex.from_yaml.load_formulas(font_name).first
     end
 
+    def self.find_many(font_name)
+      Indexes::FontIndex.from_yaml.load_formulas(font_name)
+    end
+
     def self.find_fonts(font_name)
       formulas = Indexes::FontIndex.from_yaml.load_formulas(font_name)
 

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/utils/rpm_extractor.rb

@@ -21,6 +21,13 @@ module Fontist
       def rpm_class
         @rpm_class ||= begin
                          require "arr-pm"
+
+                         # fix for Ruby 3.0
+                         unless RPM::File::Header::HEADER_MAGIC == [0x8eade801, 0x00000000].pack("NN")
+                           RPM::File::Header.send(:remove_const, "HEADER_MAGIC")
+                           RPM::File::Header.const_set("HEADER_MAGIC", [0x8eade801, 0x00000000].pack("NN"))
+                         end
+
                          RPM::File
                        end
       end

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.8.6".freeze
+  VERSION = "1.8.7".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.8.6
+  version: 1.8.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-05 00:00:00.000000000 Z
+date: 2021-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arr-pm
@@ -212,14 +212,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