fontist 1.8.5 → 1.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b392969d430a5af69c38a73069d5a98cf90a6ef1c246f8cca215a7cd4c1202c
-  data.tar.gz: 97ca59729bf50acefa0bfe5ab23b82050eed8fd6ba4782a6d814a77e44939b4b
+  metadata.gz: d13c412a0a68cdcf1845948c2f3b96c45187dc27193bae4a581d2ee1f3324201
+  data.tar.gz: ed82b44bfc05274b749e4c4b2f2ace5e4ae115343c6ca9f99ac4fc552d71147f
 SHA512:
-  metadata.gz: b5911d154187149d2d8ebc81e776b7c4b12e0a8eddf4f2540f3914b41fd29c582a29287b5ed1d3d7cccbe696aeb40908f5039bf350c281e315ac08fffe76e110
-  data.tar.gz: 49a7e53eff6d6b750248141a608cb3e92c03c19130f75f4ff8806c7e55ca0d478cec376ed9eaa273dedff3e05b31057892c0c47367a48f1a3eadd5599ecaf968
+  metadata.gz: d8a08b20f1b2409b34749ad4f4531e2c727b3e39fa9e3b015d564d6ec14365dd9aa43274aa337845b72e4072bfcad50fe26412a69b805e7c83139934b009a6d6
+  data.tar.gz: bb20f38a5c4c4e9714dc69b15f249636e10c76942359e10ac38dc08d98eac3cfc1c6efe879bc9e13596d38872bae75c4721ce6d3892e1ca2726bbe7f9cb50b41

data/.github/workflows/rspec.yml

@@ -37,8 +37,8 @@ jobs:
       - uses: actions/cache@v1
         with:
           path: vendor/bundle
-          key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
-          restore-keys: bundle-${{ matrix.os }}-${{ matrix.ruby }}
+          key: bundle-v2-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
+          restore-keys: bundle-v2-${{ matrix.os }}-${{ matrix.ruby }}
 
       - if: matrix.os == 'macos-latest'
         run: brew install lcdf-typetools

data/lib/fontist/cli.rb

@@ -29,12 +29,14 @@ module Fontist
     desc "install FONT", "Install font"
     option :force, type: :boolean, aliases: :f,
                    desc: "Install even if it's already installed in system"
-    option :confirm_license, type: :boolean, desc: "Confirm license agreement"
+    option :accept_all_licenses, type: :boolean, aliases: "--confirm-license", desc: "Accept all license agreements"
+    option :hide_licenses, type: :boolean, desc: "Hide license texts"
     def install(font)
       Fontist::Font.install(
         font,
         force: options[:force],
-        confirmation: options[:confirm_license] ? "yes" : "no"
+        confirmation: options[:accept_all_licenses] ? "yes" : "no",
+        hide_licenses: options[:hide_licenses]
       )
       success
     rescue Fontist::Errors::GeneralError => e
@@ -89,11 +91,13 @@ module Fontist
     end
 
     desc "manifest-install MANIFEST", "Install fonts from MANIFEST (yaml)"
-    option :confirm_license, type: :boolean, desc: "Confirm license agreement"
+    option :accept_all_licenses, type: :boolean, aliases: "--confirm-license", desc: "Accept all license agreements"
+    option :hide_licenses, type: :boolean, desc: "Hide license texts"
     def manifest_install(manifest)
       paths = Fontist::Manifest::Install.from_file(
         manifest,
-        confirmation: options[:confirm_license] ? "yes" : "no"
+        confirmation: options[:accept_all_licenses] ? "yes" : "no",
+        hide_licenses: options[:hide_licenses]
       )
 
       print_yaml(paths)

data/lib/fontist/font.rb

@@ -6,6 +6,7 @@ module Fontist
     def initialize(options = {})
       @name = options[:name]
       @confirmation = options[:confirmation] || "no"
+      @hide_licenses = options[:hide_licenses]
       @force = options[:force] || false
 
       check_or_create_fontist_path!
@@ -19,8 +20,8 @@ module Fontist
       new(name: name).find
     end
 
-    def self.install(name, confirmation: "no", force: false)
-      new(name: name, confirmation: confirmation, force: force).install
+    def self.install(name, options = {})
+      new(options.merge(name: name)).install
     end
 
     def self.uninstall(name)
@@ -119,19 +120,26 @@ module Fontist
     end
 
     def check_and_confirm_required_license(formula)
-      if formula.license_required && !confirmation.casecmp("yes").zero?
-        @confirmation = show_license_and_ask_for_input(formula.license)
+      if formula.license_required
+        show_license(formula.license) unless @hide_licenses
 
-        unless confirmation&.casecmp?("yes")
-          raise Fontist::Errors::LicensingError.new(
-            "Fontist will not download these fonts unless you accept the terms."
-          )
+        unless confirmation.casecmp?("yes")
+          @confirmation = ask_for_agreement
+
+          unless confirmation&.casecmp?("yes")
+            raise Fontist::Errors::LicensingError.new(
+              "Fontist will not download these fonts unless you accept the terms."
+            )
+          end
         end
       end
     end
 
-    def show_license_and_ask_for_input(license)
+    def show_license(license)
       Fontist.ui.say(license_agrement_message(license))
+    end
+
+    def ask_for_agreement
       Fontist.ui.ask(
         "\nDo you accept all presented font licenses, and want Fontist " \
         "to download these fonts for you? => TYPE 'Yes' or 'No':"

data/lib/fontist/manifest/install.rb

@@ -3,9 +3,10 @@ require_relative "locations"
 module Fontist
   module Manifest
     class Install < Locations
-      def initialize(manifest, confirmation: "no")
+      def initialize(manifest, confirmation: "no", hide_licenses: false)
         @manifest = manifest
         @confirmation = confirmation
+        @hide_licenses = hide_licenses
       end
 
       private
@@ -20,7 +21,7 @@ module Fontist
       end
 
       def install_font(font)
-        Fontist::Font.install(font, force: true, confirmation: @confirmation)
+        Fontist::Font.install(font, force: true, confirmation: @confirmation, hide_licenses: @hide_licenses)
       end
     end
   end

data/lib/fontist/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.8.5
+  version: 1.8.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-03 00:00:00.000000000 Z
+date: 2021-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arr-pm