fontist 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbead3aabe1b99a416f96322c97681a9a693526c719d3fcf55658645ca6eb6ae
-  data.tar.gz: c45621c68c5b456104f2f6bc07b8af5dcba2f60a180ddb700bb6ad4373fee775
+  metadata.gz: 1f45a43c4f700cd793576c4783b7098beea7d366c8aeb2654fcc5b6a38c986b0
+  data.tar.gz: 01ce25c4eae85e3fb20b7cdf0d106a04a2273e770a4261e937c344520a723651
 SHA512:
-  metadata.gz: e69aa36d462a3e554da1435f5194c12b9ad4103739d58ecc1bce0659d3fa730dcbedf1881c561535b2af2386038c42cff70535f62fc8c63ee4c1c86a7f429e67
-  data.tar.gz: f94bb6c098e06eca1efbd16fa79e2ea5ec525c05caddb1a043a7ba6e34a2d869c50125d1aa3af96f14b40bddbb95244ada63d5045126a7e621f9e2f9b634add3
+  metadata.gz: 6aae04a73aa89e5a7919430cecf56a8da1361bbe7b4a40a5676abe1ca02cc011e95681b7520a2d0ec3f47dd793af48c462f9deb1377b2547ba5d5edbc8c864e4
+  data.tar.gz: 541d57da927636744955a5917ad39d57fe793bb37b0c31d167252da9efea8815c3675d2e998ed7ef585921415733e2b393de19f16be433d2ca62cfdbf0d00f02

data/fontist.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "down", "~> 5.0"
   spec.add_runtime_dependency "libmspack", "~> 0.1.0"
   spec.add_runtime_dependency "rubyzip", "~> 2.3.0"
+  spec.add_runtime_dependency "thor", "~> 1.0.1"
 
   spec.add_development_dependency "pry"
   spec.add_development_dependency "bundler", "~> 2.0"

data/lib/fontist.rb

@@ -14,6 +14,10 @@ require "fontist/formula"
 require "fontist/system_font"
 
 module Fontist
+  def self.ui
+    Fontist::Utils::UI
+  end
+
   def self.lib_path
     Fontist.root_path.join("lib")
   end

data/lib/fontist/font.rb

@@ -62,17 +62,52 @@ module Fontist
       if formula
         raise(
           Fontist::Errors::MissingFontError,
-          "Fonts are missing, please run " \
+"#{name}"          "Fonts are missing, please run " \
           "Fontist::Font.install('#{name}', confirmation: 'yes') to " \
-          "download the font"
+          "download the font."
         )
       end
     end
 
     def download_font
       if formula
+        check_and_confirm_required_license(formula)
         font_installer(formula).fetch_font(name, confirmation: confirmation)
       end
     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 !confirmation.casecmp("yes").zero?
+          raise Fontist::Errors::LicensingError.new(
+            "Fontist will not download these fonts unless you accept the terms."
+          )
+        end
+      end
+    end
+
+    def show_license_and_ask_for_input(license)
+      Fontist.ui.say(license_agrement_message(license))
+      Fontist.ui.ask(
+        "\nDo you accept all presented font licenses, and want Fontist " \
+        "to download these fonts for you? => TYPE 'Yes' or 'No':"
+      )
+    end
+
+    def license_agrement_message(license)
+      <<~MSG
+        FONT LICENSE ACCEPTANCE REQUIRED FOR "#{name}":
+
+        Fontist can install this font if you accept its licensing conditions.
+
+        FONT LICENSE BEGIN ("#{name}")
+        -----------------------------------------------------------------------
+        #{license}
+        -----------------------------------------------------------------------
+        FONT LICENSE END ("#{name}")
+      MSG
+    end
   end
 end

data/lib/fontist/registry.rb

@@ -32,6 +32,7 @@ module Fontist
         license: formula.instance.license,
         homepage: formula.instance.homepage ,
         description: formula.instance.description,
+        license_required: formula.instance.license_required,
       }
     end
 

data/lib/fontist/utils.rb

@@ -1,3 +1,4 @@
+require "fontist/utils/ui"
 require "fontist/utils/dsl"
 require "fontist/utils/downloader"
 require "fontist/utils/zip_extractor"

data/lib/fontist/utils/downloader.rb

@@ -4,8 +4,8 @@ module Fontist
       def initialize(file, file_size: nil, sha: nil, progress_bar: nil)
         # TODO: If the first mirror fails, try the second one
         @file = file
-        @progress_bar = progress_bar
         @sha = [sha].flatten.compact
+        @progress_bar = set_progress_bar(progress_bar)
         @file_size = (file_size || default_file_size).to_i
       end
 
@@ -42,6 +42,10 @@ module Fontist
         options[:download_path] || Fontist.root_path.join("tmp")
       end
 
+      def set_progress_bar(progress_bar)
+        ENV.fetch("TEST_ENV", "") === "CI" ? false : progress_bar
+      end
+
       def download_file
         bar = ProgressBar.new(file_size / byte_to_megabyte)
 

data/lib/fontist/utils/ui.rb

@@ -0,0 +1,15 @@
+require "thor"
+
+module Fontist
+  module Utils
+    class UI < Thor
+      def self.say(message)
+        new.say(message)
+      end
+
+      def self.ask(message, options = {})
+        new.ask(message, options)
+      end
+    end
+  end
+end

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.2.1".freeze
+  VERSION = "1.3.0".freeze
 end

data/spec/fontist/font_spec.rb

@@ -46,13 +46,35 @@ RSpec.describe Fontist::Font do
 
   describe ".install" do
     context "with valid font name" do
-      it "installs the font and return the paths" do
-        name = "Calibri"
+      it "installs and returns paths for fonts with open license" do
+        stub_fontist_path_to_temp_path
+
+        font = { name: "Overpass Mono", filename: "overpass-mono-regular.otf" }
+        font_paths = Fontist::Font.install(font[:name], confirmation: "no")
+
+        expect(font_paths.join("|").downcase).to include(font[:filename])
+      end
 
+      it "install proprietary fonts with correct license agreement" do
         stub_fontist_path_to_temp_path
-        font_paths = Fontist::Font.install(name, confirmation: "yes")
+        stub_license_agreement_prompt_with("yes")
+
+        font = { name: "Calibri", filename: "calibri.ttf" }
+        font_paths = Fontist::Font.install(font[:name])
+
+        expect(font_paths.join("|").downcase).to include(font[:filename])
+      end
+
+      it "raises error for missing license agreement" do
+        stub_fontist_path_to_temp_path
+        stub_license_agreement_prompt_with("no")
 
-        expect(font_paths.join("|").downcase).to include("#{name.downcase}.ttf")
+        font = { name: "Calibri", filename: "calibri.ttf" }
+        allow(Fontist::SystemFont).to receive(:find).and_return(nil)
+
+        expect { Fontist::Font.install(font[:name]) }.to raise_error(
+          Fontist::Errors::LicensingError
+        )
       end
     end
 
@@ -84,4 +106,8 @@ RSpec.describe Fontist::Font do
     allow(Fontist::SystemFont).to receive(:find).
       and_return(["spec/fixtures/fonts/#{name}"])
   end
+
+  def stub_license_agreement_prompt_with(confirmation = "yes")
+    allow(Fontist.ui).to receive(:ask).and_return(confirmation)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Ribose Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-03 00:00:00.000000000 Z
+date: 2020-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -53,6 +53,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.0
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +173,7 @@ files:
 - lib/fontist/utils/downloader.rb
 - lib/fontist/utils/dsl.rb
 - lib/fontist/utils/exe_extractor.rb
+- lib/fontist/utils/ui.rb
 - lib/fontist/utils/zip_extractor.rb
 - lib/fontist/version.rb
 - spec/fixtures/fonts/DejaVuSerif.ttf
@@ -209,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: A libarary find or download fonts