metanorma-cli 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 727c9f20d6b9320c6a5c160cd909d418f7930e7610a26ffd21a84060da52ab0d
-  data.tar.gz: f2c7ebaf6858dbc5431e92d08b345fbdf31e498f9b8c57b5af929aa7dafa22a4
+  metadata.gz: 370299374d6064f4be2b1bce3ffe74d816a3221a197e85189e2d076173f4d843
+  data.tar.gz: 2a1a633b009ec2e34c809405d7d07f747a598f7a6eaa5d9d7be772d7a53811c0
 SHA512:
-  metadata.gz: e8d353085709cbb6bc0cefa595d8e8de8ad583164da05bbe44c832b810e43f5844f28235bce566f4cfb6fd6542252c3ab6a436763db63719eac2f1a82dcc7419
-  data.tar.gz: 4edc7b2ec475ca042b199bccfcdf0eafa1b5a5e054c91e9f97c93ab8cf71b11774c9cf468c79e609371392bdea62c840365a5ca2d7aecd68593405c8b5691611
+  metadata.gz: 503038584c4e2e3e869c00225439da73b93427f95a8f3ec3fe93b22c58c703483a4a980be0ae4cd2d9c97aa954db335b5762bc28d82ab9534d8e214894e95f75
+  data.tar.gz: bf08778ca3688e38f8df865daf162a02b008530faf2dfb14294609c6d1f329631df721e22b6b220c636aed6084b400bcd6c668dab4616a9a092f5ee7abf9832b

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    metanorma-cli (1.3.0)
-      fontist (~> 0.2.0)
+    metanorma-cli (1.3.1)
+      fontist (~> 1.0.0)
       git (~> 1.5)
       isodoc (~> 1.1.0)
       metanorma (~> 1.1.0)
@@ -51,9 +51,10 @@ GEM
     ffi-compiler2 (2.0.0)
       ffi (>= 1.0.0)
       rake
-    fontist (0.2.0)
+    fontist (1.0.0)
       down (~> 5.0)
       libmspack (~> 0.1.0)
+      rubyzip (~> 2.3.0)
     gb-agencies (0.0.6)
     git (1.7.0)
       rchardet (~> 1.8)
@@ -267,7 +268,7 @@ GEM
       relaton-iso-bib (~> 1.2.0)
     relaton-omg (1.2.0)
       relaton-bib (~> 1.2.0)
-    relaton-un (1.2.0)
+    relaton-un (1.2.1)
       faraday
       http-cookie
       relaton-bib (~> 1.2.0)

data/lib/metanorma/cli.rb

@@ -22,19 +22,6 @@ module Metanorma
       "metanorma-itu",
     ]
 
-    # @TODO: Note
-    #
-    # This is temporary, we are going to extend this to
-    # each of the metanorma gem, so they can specifcy their
-    # own font requirements.
-    #
-    # Please add the whole set here.
-    #
-    REQUIRED_FONTS = [
-      "CALIBRI.TTF",
-      "CAMBRIA.TTC",
-    ].freeze
-
     PRIVATE_SUPPORTED_GEMS = ["metanorma-ribose", "metanorma-mpfa"]
 
     def self.load_flavors(flavor_names = SUPPORTED_GEMS + PRIVATE_SUPPORTED_GEMS)

data/lib/metanorma/cli/command.rb

@@ -78,11 +78,15 @@ module Metanorma
       )
 
       def setup
-        Metanorma::Cli::REQUIRED_FONTS.each do |font|
-          Metanorma::Cli::Setup.run(
-            font: font,
-            term_agreement: options[:agree_to_terms],
-          )
+        list_required_fonts.each do |font|
+          begin
+            Metanorma::Cli::Setup.run(
+              font: font,
+              term_agreement: options[:agree_to_terms],
+            )
+          rescue Fontist::Errors::NonSupportedFontError
+            UI.say("[info]: Font `#{font}` is not supported yet!")
+          end
         end
       end
 
@@ -143,6 +147,19 @@ module Metanorma
           overwrite: options[:overwrite],
         )
       end
+
+      def list_required_fonts
+        Metanorma::Cli.load_flavors
+
+        Metanorma::Registry.instance.processors.map do |_key, processor|
+          flavour = processor.class.to_s.gsub("::Processor", "")
+          flavour_module = Object.const_get(flavour)
+
+          if flavour_module.respond_to?(:fonts_used)
+            flavour_module.fonts_used.map { |_, value| value }.flatten
+          end
+        end.compact.flatten.uniq
+      end
     end
   end
 end

data/lib/metanorma/cli/setup.rb

@@ -40,9 +40,11 @@ module Metanorma
       end
 
       def download_font
-        Fontist::Finder.find(font_name)
-      rescue Fontist::Errors::MissingFontError
-        ask_user_and_download_font(font_name)
+        begin
+          Fontist::Font.find(font_name)
+        rescue Fontist::Errors::MissingFontError
+          ask_user_and_download_font(font_name)
+        end
       end
 
       def copy_to_fonts(fonts_path)
@@ -54,23 +56,30 @@ module Metanorma
 
       def ask_user_and_download_font(font_name)
         response = term_agreement ? "yes" : "no"
+        formula = Fontist::Formula.find(font_name)
 
         if !term_agreement
-          response = UI.ask(message.strip)
+          response = UI.ask(message(formula.license).strip)
         end
 
         if response.downcase === "yes"
-          Fontist::Installer.download(font_name, confirmation: response)
+          Fontist::Font.install(font_name, confirmation: response)
         end
       end
 
-      def message
+      def message(license)
         <<~MSG
         Metanorma has detected that you do not have the necessary fonts installed
         for PDF generation. The generated PDF will use generic fonts that may not
         resemble the desired styling. Metanorma can download these files for you
         if you accept the font licensing conditions for the font #{font_name}.
 
+        ----------
+
+        #{license}
+
+        ----------
+
         If you want Metanorma to download these fonts for you and indicate your
         acceptance of the font licenses, type "Yes" / "No":
         MSG

data/lib/metanorma/cli/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Cli
-    VERSION = "1.3.0"
+    VERSION = "1.3.1"
   end
 end

data/metanorma-cli.gemspec

@@ -53,5 +53,5 @@ Gem::Specification.new do |spec|
   #spec.add_runtime_dependency 'nokogiri', ">= 1"
   spec.add_runtime_dependency "git", "~> 1.5"
   spec.add_runtime_dependency "relaton-cli", ">= 0.8.2"
-  spec.add_runtime_dependency "fontist", "~> 0.2.0"
+  spec.add_runtime_dependency "fontist", "~> 1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cli
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-26 00:00:00.000000000 Z
+date: 2020-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -380,14 +380,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 1.0.0
 description: Executable to process any Metanorma standard.
 email:
 - open.source@ribose.com