metanorma-cli 1.2.11.2 → 1.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fc0f93f8be72d41f653a11f0aba1c3ef046bb18bb347f778234177bcc83d2f8
-  data.tar.gz: cdd10afa9f767bbc2fda987e07145a10fc4d1c5cf9e095b9079ddbb42c9f65e1
+  metadata.gz: d1509db5c1126e1ca24e22b22128df8e27f99eac3a3e72084d167d169cf2ce08
+  data.tar.gz: 34f03e9cf1dd0b3a30431ad892a3341a58d433ebb3760c7ec13976266ce16401
 SHA512:
-  metadata.gz: 0b7e981b6af6a005c046da6f45da2b4053d64f20fc708655486bde6bb8b64152ea6e10fccda07de0e73442a2f06e626b58ad78376e360d5969d217aae9a82e0f
-  data.tar.gz: d4019e7c415d9bdcaea8281911457571d29e449eaae25e0e0685477935c58e783b897ddf94bafec3a155e3e68b51e6fe29c34c770c0e3b9530e116edbf3f76bb
+  metadata.gz: 8c068a0d288f8648264126dec89bc49f797eb8fc13a5e8ad94386cc6e4ca145cf289517fba41b1742b6887298433ca9a7fe08ffee2e5f95afd5c1f8bf3124760
+  data.tar.gz: 63c5b9715078c9783773cb069aa7b110854a8be81f73f29ace39de2acce93df471e9144f7b13f8579054daa223c3bf0249eddd8643dfaf8f41100cad0cf9ed9e

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    metanorma-cli (1.2.11.2)
+    metanorma-cli (1.2.12)
+      fontist (~> 0.2.0)
       git (~> 1.5)
       isodoc (~> 1.0.0)
       metanorma (~> 1.0.0)
@@ -11,6 +12,7 @@ PATH
       metanorma-generic (~> 1.4.0)
       metanorma-iec (~> 1.0.0)
       metanorma-ietf (~> 2.0.0)
+      metanorma-iho (~> 0.0.1)
       metanorma-iso (~> 1.3.0)
       metanorma-itu (~> 1.0.0)
       metanorma-m3d (~> 1.3.0)
@@ -34,15 +36,24 @@ GEM
     camertron-eprun (1.1.1)
     cldr-plurals-runtime-rb (1.0.1)
     cnccs (0.1.5)
+    coderay (1.1.2)
     concurrent-ruby (1.1.6)
     diff-lcs (1.3)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
+    down (5.1.1)
+      addressable (~> 2.5)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
     faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
     ffi (1.12.2)
+    ffi-compiler2 (2.0.0)
+      ffi (>= 1.0.0)
+      rake
+    fontist (0.2.0)
+      down (~> 5.0)
+      libmspack (~> 0.1.0)
     gb-agencies (0.0.6)
     git (1.7.0)
       rchardet (~> 1.8)
@@ -62,7 +73,7 @@ GEM
     image_size (2.0.2)
     iso-639 (0.3.5)
     iso639 (1.3.2)
-    isodoc (1.0.25)
+    isodoc (1.0.26)
       asciimath
       html2doc (~> 1.0.0)
       htmlentities (~> 4.3.4)
@@ -76,15 +87,19 @@ GEM
       uuidtools
     isoics (0.1.8)
     latex-decode (0.3.1)
+    libmspack (0.1.0)
+      ffi
+      ffi-compiler2 (>= 2.0.0)
     liquid (4.0.3)
     mathml2asciimath (0.0.10)
       htmlentities (~> 4.3.4)
       nokogiri (>= 1.10.4)
-    metanorma (1.0.4)
+    metanorma (1.0.5)
       asciidoctor
       htmlentities
+      mn2pdf (~> 1.13)
       nokogiri
-    metanorma-csa (1.4.9)
+    metanorma-csa (1.4.10)
       htmlentities (~> 4.3.4)
       image_size
       isodoc (~> 1.0.0)
@@ -93,38 +108,43 @@ GEM
       ruby-jing
       thread_safe
       uuidtools
-    metanorma-csd (1.3.20)
+    metanorma-csd (1.3.21)
       isodoc (~> 1.0.0)
       metanorma-standoc (~> 1.3.0)
-    metanorma-gb (1.3.22)
+    metanorma-gb (1.3.23)
       gb-agencies (~> 0.0.4)
       htmlentities (~> 4.3.4)
       isodoc (~> 1.0.0)
       metanorma-iso (~> 1.3.0)
       twitter_cldr (~> 4.4.4)
-    metanorma-generic (1.4.7)
+    metanorma-generic (1.4.8)
       htmlentities (~> 4.3.4)
       isodoc (~> 1.0.0)
       metanorma-standoc (~> 1.3.0)
       ruby-jing
-    metanorma-iec (1.0.5)
+    metanorma-iec (1.0.6)
       isodoc (~> 1.0.0)
       metanorma-iso (~> 1.3.0)
       ruby-jing
-    metanorma-ietf (2.0.9)
+    metanorma-ietf (2.0.10)
       isodoc (~> 1.0.0)
       mathml2asciimath
       metanorma-standoc (~> 1.3.0)
-    metanorma-iso (1.3.23)
+    metanorma-iho (0.0.1)
+      htmlentities (~> 4.3.4)
+      isodoc (~> 1.0.0)
+      metanorma-generic (~> 1.4.0)
+      metanorma-standoc (~> 1.3.0)
+    metanorma-iso (1.3.24)
       isodoc (~> 1.0.0)
       metanorma-standoc (~> 1.3.0)
       ruby-jing
-    metanorma-itu (1.0.14)
+    metanorma-itu (1.0.15)
       htmlentities (~> 4.3.4)
       isodoc (~> 1.0.0)
       metanorma-standoc (~> 1.3.0)
       ruby-jing
-    metanorma-m3d (1.3.18)
+    metanorma-m3d (1.3.19)
       asciimath
       htmlentities (~> 4.3.4)
       image_size
@@ -134,20 +154,20 @@ GEM
       ruby-jing
       thread_safe
       uuidtools
-    metanorma-nist (1.0.6)
+    metanorma-nist (1.0.7)
       htmlentities (~> 4.3.4)
       isodoc (~> 1.0.0)
       metanorma-standoc (~> 1.3.0)
       ruby-jing
       twitter_cldr
       tzinfo-data
-    metanorma-ogc (1.0.5)
+    metanorma-ogc (1.0.6)
       htmlentities (~> 4.3.4)
       iso-639
       isodoc (~> 1.0.20)
       metanorma-standoc (~> 1.3.20)
       ruby-jing
-    metanorma-standoc (1.3.26)
+    metanorma-standoc (1.3.28)
       asciidoctor (~> 2.0.0)
       concurrent-ruby
       iev (~> 0.2.1)
@@ -159,7 +179,7 @@ GEM
       ruby-jing
       sterile (~> 1.0.14)
       unicode2latex (~> 0.0.1)
-    metanorma-un (0.3.7)
+    metanorma-un (0.3.8)
       htmlentities (~> 4.3.4)
       iso-639
       isodoc (~> 1.0.0)
@@ -167,20 +187,25 @@ GEM
       roman-numerals
       ruby-jing
       twitter_cldr
+    method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0425)
-    mimemagic (0.3.4)
+    mime-types-data (3.2020.0512)
+    mimemagic (0.3.5)
     mini_portile2 (2.4.0)
     mixlib-shellout (2.4.4)
+    mn2pdf (1.14)
     multipart-post (2.1.1)
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     optout (0.0.2)
-    public_suffix (4.0.4)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (4.0.5)
     rake (12.3.3)
     rchardet (1.8.0)
-    relaton (1.0.0)
+    relaton (1.0.1)
       relaton-calconnect (~> 1.0.0)
       relaton-gb (~> 1.0.0)
       relaton-iec (~> 1.0.0)
@@ -192,7 +217,7 @@ GEM
       relaton-omg (~> 1.0.0)
       relaton-un (~> 1.0.0)
       relaton-w3c (~> 1.0.0)
-    relaton-bib (1.0.0)
+    relaton-bib (1.0.2)
       addressable
       bibtex-ruby
       iso639
@@ -221,7 +246,7 @@ GEM
     relaton-iso-bib (1.0.0)
       isoics (~> 0.1.6)
       relaton-bib (~> 1.0.0)
-    relaton-itu (1.0.0)
+    relaton-itu (1.0.2)
       relaton-iso-bib (~> 1.0.0)
     relaton-nist (1.0.0)
       relaton-bib (~> 1.0.0)
@@ -247,9 +272,9 @@ GEM
       mixlib-shellout (~> 2.0)
       rspec (~> 3.2)
       rspec-its (~> 1.2)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-its (1.3.0)
@@ -258,7 +283,7 @@ GEM
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+    rspec-support (3.9.3)
     ruby-jing (0.0.1)
       optout (>= 0.0.2)
     rubyzip (2.3.0)
@@ -289,6 +314,7 @@ DEPENDENCIES
   byebug (~> 10.0)
   equivalent-xml (~> 0.6)
   metanorma-cli!
+  pry
   rake (~> 12.0)
   rspec (~> 3.0)
   rspec-command (~> 1.0.3)

data/lib/metanorma/cli.rb

@@ -12,6 +12,7 @@ module Metanorma
       "metanorma-gb",
       "metanorma-csd",
       "metanorma-csa",
+      "metanorma-iho",
       "metanorma-m3d",
       "metanorma-generic",
       "metanorma-standoc",
@@ -21,6 +22,19 @@ 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-rsd", "metanorma-mpfd"]
 
     def self.load_flavors(flavor_names = SUPPORTED_GEMS + PRIVATE_SUPPORTED_GEMS)
@@ -80,6 +94,14 @@ module Metanorma
       Pathname.new(Dir.home).join(".metanorma")
     end
 
+    def self.fonts_directory
+      Metanorma::Cli.home_directory.join("fonts")
+    end
+
+    def self.fonts
+      Dir.glob(Metanorma::Cli.fonts_directory.join("**"))
+    end
+
     def self.writable_templates_path?
       parent_directory = templates_path.join("..", "..")
 

data/lib/metanorma/cli/command.rb

@@ -1,4 +1,5 @@
 require "thor"
+require "metanorma/cli/setup"
 require "metanorma/cli/compiler"
 require "metanorma/cli/generator"
 require "metanorma/cli/git_template"
@@ -65,14 +66,32 @@ module Metanorma
       desc "template-repo", "Manage metanorma templates repository"
       subcommand :template_repo, Metanorma::Cli::Commands::TemplateRepo
 
+      desc "setup", "Initial necessary setup"
+      option(
+        :agree_to_terms,
+        type: :boolean,
+        required: false,
+        default: false,
+        desc: "Agree / Disagree with all third-party licensing terms presented (WARNING: do know what you are agreeing with!)",
+      )
+
+      def setup
+        Metanorma::Cli::REQUIRED_FONTS.each do |font|
+          Metanorma::Cli::Setup.run(
+            font: font,
+            term_agreement: options[:agree_to_terms],
+          )
+        end
+      end
+
       private
 
       def single_type_extensions(type)
-        if type
-          format_keys = find_backend(type).output_formats.keys
-          UI.say("Supported extensions: #{join_keys(format_keys)}.")
-          return true
-        end
+        return false unless type
+
+        format_keys = find_backend(type).output_formats.keys
+        UI.say("Supported extensions: #{join_keys(format_keys)}.")
+        true
       end
 
       def all_type_extensions

data/lib/metanorma/cli/setup.rb

@@ -0,0 +1,80 @@
+require "fontist"
+require "fileutils"
+
+module Metanorma
+  module Cli
+    class Setup
+      def initialize(options)
+        @options = options
+        @font_name = options.fetch(:font)
+        @term_agreement = options.fetch(:term_agreement, false)
+
+        create_metanorma_fonts_directory
+      end
+
+      def self.run(options = {})
+        new(options).run
+      end
+
+      def run
+        font = Metanorma::Cli.fonts.grep(/#{font_name}/i)
+
+        if font.empty?
+          font_paths = download_font
+          copy_to_fonts(font_paths)
+        end
+      end
+
+      private
+
+      attr_reader :font_name, :options, :term_agreement
+
+      def create_metanorma_fonts_directory
+        unless Metanorma::Cli.fonts_directory.exist?
+          FileUtils.mkdir_p(Metanorma::Cli.fonts_directory)
+        end
+      end
+
+      def metanorma_fonts_path
+        @metanorma_fonts_path ||= Metanorma::Cli.fonts_directory
+      end
+
+      def download_font
+        Fontist::Finder.find(font_name)
+      rescue Fontist::Errors::MissingFontError
+        ask_user_and_download_font(font_name)
+      end
+
+      def copy_to_fonts(fonts_path)
+        fonts_path.each do |font_path|
+          font_name = File.basename(font_path)
+          FileUtils.copy_file(font_path, metanorma_fonts_path.join(font_name))
+        end
+      end
+
+      def ask_user_and_download_font(font_name)
+        response = term_agreement ? "yes" : "no"
+
+        if !term_agreement
+          response = UI.ask(message.strip)
+        end
+
+        if response.downcase === "yes"
+          Fontist::Installer.download(font_name, confirmation: response)
+        end
+      end
+
+      def message
+        <<~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}.
+
+        If you want Metanorma to download these fonts for you and indicate your
+        acceptance of the font licenses, type "Yes" / "No":
+        MSG
+      end
+    end
+  end
+end

data/lib/metanorma/cli/ui.rb

@@ -3,8 +3,8 @@ require "thor"
 module Metanorma
   module Cli
     class UI < Thor
-      def self.ask(message)
-        new.ask(message)
+      def self.ask(message, options = {})
+        new.ask(message, options)
       end
 
       def self.say(message)

data/lib/metanorma/cli/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Cli
-    VERSION = "1.2.11.2"
+    VERSION = "1.2.12"
   end
 end

data/metanorma-cli.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = '>= 2.4.0'
 
+  spec.add_development_dependency "pry"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "byebug", "~> 10.0"
@@ -46,9 +47,11 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'metanorma-ogc', "~> 1.0.0"
   spec.add_runtime_dependency 'metanorma-nist', "~> 1.0.0"
   spec.add_runtime_dependency 'metanorma-itu', "~> 1.0.0"
+  spec.add_runtime_dependency 'metanorma-iho', "~> 0.0.1"
   spec.add_runtime_dependency 'isodoc', "~> 1.0.0"
   spec.add_runtime_dependency 'metanorma', "~> 1.0.0"
   #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"
 end

data/test.rxl

@@ -3,7 +3,10 @@
 
 
 
-
+<docidentifier type="iso">ISO 123</docidentifier>
+<docidentifier type="iso-with-lang">ISO 123(E)</docidentifier>
+<docidentifier type="iso-reference">ISO 123(E)</docidentifier>
+<docnumber>123</docnumber>
 <contributor>
 <role type="author"/>
 <organization>
@@ -20,7 +23,7 @@
 </contributor>
 
 <language>en</language>
-<script>Latn</script>
+<script>script.html</script>
 <status>
 <stage abbreviation="IS">60</stage>
 <substage>60</substage>
@@ -41,6 +44,9 @@
 <subcommittee/>
 <workgroup/>
 </editorialgroup>
+<structuredidentifier>
+<project-number>ISO 123</project-number>
+</structuredidentifier>
 <stagename>International standard</stagename>
 </ext>
 </bibdata>

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.11.2
+  version: 1.2.12
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-01 00:00:00.000000000 Z
+date: 2020-05-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -296,6 +310,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: metanorma-iho
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
@@ -352,6 +380,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.2
+- !ruby/object:Gem::Dependency
+  name: fontist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 description: Executable to process any Metanorma standard.
 email:
 - open.source@ribose.com
@@ -395,6 +437,7 @@ files:
 - lib/metanorma/cli/errors.rb
 - lib/metanorma/cli/generator.rb
 - lib/metanorma/cli/git_template.rb
+- lib/metanorma/cli/setup.rb
 - lib/metanorma/cli/template_repo.rb
 - lib/metanorma/cli/ui.rb
 - lib/metanorma/cli/version.rb