metanorma-cli 1.3.8.1 → 1.3.9pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91bf6eef03296f9d321401c0017c4b39583dea7b21de170c694f2de236106878
-  data.tar.gz: 45cc3c9ae1e529d30f818205ef055ef10aee56c5b2280d01e9e2318ca9ab19b9
+  metadata.gz: 234928c265c26c0e5ac5a4d6f3c88826c485dcb56ff19821090c3ce9b6065688
+  data.tar.gz: 97331b9bc31a49d8589225d72de414a95205a3177a45c876f9f7c9bce7b2030d
 SHA512:
-  metadata.gz: 9449c8bc2de3dbe5a51f5587c6c475bb0af445eb395e232b69957747123a322f0dadb19f44d8b69b372c9eb0938ac98100177b98647d4ea446183ef7ab516b5f
-  data.tar.gz: 773578d9c862b66ee11cb67e9c6071f85f92a00ff4e31fc0b8c33f0d379a5dbd37817dad45fe439913ad6f84e0958425e6bec444f257fa8cc4652964a0c4d24c
+  metadata.gz: 418c7ae0f85da30ad14d4bc4ff15a7b8f5311fbde0efbb032d1eeeee37b19e02282854ab1d3b0368bdce9d90b11b00c69aba636cf8f15e8a1ebb151e754d891c
+  data.tar.gz: 281ad8d69a492cc9ed86f36e76ec0aa3faedc8bf52bbe96f1cfa640e6d2d77804ae0b2cc702f0772776c11ce30a07cd530a1879e34979eacea552734f645a42e

data/Gemfile

@@ -4,6 +4,7 @@ Encoding.default_internal = Encoding::UTF_8
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}" }
 
+
 gemspec
 
 if File.exist? 'Gemfile.devel'

data/lib/metanorma/cli.rb

@@ -9,7 +9,7 @@ module Metanorma
       "metanorma-iso",
       "metanorma-iec",
       "metanorma-ietf",
-      "metanorma-gb",
+      #"metanorma-gb",
       "metanorma-cc",
       "metanorma-csa",
       "metanorma-iho",
@@ -81,14 +81,6 @@ 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,5 +1,4 @@
 require "thor"
-require "metanorma/cli/setup"
 require "metanorma/cli/compiler"
 require "metanorma/cli/generator"
 require "metanorma/cli/git_template"
@@ -32,6 +31,10 @@ module Metanorma
       option :version, aliases: "-v", desc: "Print version of code (accompanied with -t)"
       option "output-dir", aliases: "-o", desc: "Directory to save compiled files"
 
+      option :agree_to_terms, type: :boolean, desc: "Agree / Disagree with all third-party licensing terms presented (WARNING: do know what you are agreeing with!)"
+      option :no_install_fonts, type: :boolean, desc: "Skip the font installation process"
+      option :continue_without_fonts, type: :boolean, desc: "Continue processing even when fonts are missing"
+
       def compile(file_name = nil)
         if file_name && !options[:version]
           Metanorma::Cli.load_flavors
@@ -89,34 +92,6 @@ 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
-        list_required_fonts.each do |font|
-          begin
-            Metanorma::Cli::Setup.run(
-              font: font,
-              term_agreement: options[:agree_to_terms],
-            )
-          rescue Fontist::Errors::LicensingError
-            UI.error(
-              "[error]: License acceptance required to install a necessary font." \
-              "Accept required licenses with: `metanorma setup --agree-to-terms`."
-            )
-            return
-          rescue Fontist::Errors::NonSupportedFontError
-            UI.say("[info]: The font `#{font}` is not yet supported.")
-          end
-        end
-      end
-
       private
 
       def single_type_extensions(type)
@@ -175,19 +150,6 @@ module Metanorma
         )
       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
-
       def load_flavours(type)
         Metanorma::Cli.load_flavors
         unless Metanorma::Registry.instance.find_processor(type&.to_sym)

data/lib/metanorma/cli/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Cli
-    VERSION = "1.3.8.1"
+    VERSION = "1.3.9pre"
   end
 end

data/metanorma-cli.gemspec

@@ -29,7 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "byebug", "~> 10.0"
   spec.add_development_dependency "rspec-command", "~> 1.0.3"
-  spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "rspec-core", "~> 3.4"
   spec.add_development_dependency "vcr", "~> 5.0.0"
   spec.add_development_dependency "webmock"
@@ -39,24 +38,23 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "thor", "~> 1.0"
   spec.add_runtime_dependency "metanorma-iso", "~> 1.5.0"
-  spec.add_runtime_dependency 'metanorma-ietf', "~> 2.2.0"
-  spec.add_runtime_dependency 'metanorma-gb', "~> 1.5.0"
-  spec.add_runtime_dependency 'metanorma-iec', "~> 1.2.0"
-  spec.add_runtime_dependency 'metanorma-cc', "~> 1.6.0"
-  spec.add_runtime_dependency 'metanorma-csa', "~> 1.6.0"
+  spec.add_runtime_dependency "metanorma-ietf", "~> 2.2.0"
+  #spec.add_runtime_dependency "metanorma-gb", "~> 1.5.0"
+  spec.add_runtime_dependency "metanorma-iec", "~> 1.2.0"
+  spec.add_runtime_dependency "metanorma-cc", "~> 1.6.0"
+  spec.add_runtime_dependency "metanorma-csa", "~> 1.6.0"
   #spec.add_runtime_dependency 'metanorma-ribose', "~> 1.6.0"
-  spec.add_runtime_dependency 'metanorma-m3aawg', "~> 1.6.0"
-  spec.add_runtime_dependency 'metanorma-generic', "~> 1.7.0"
-  spec.add_runtime_dependency 'metanorma-standoc', "~> 1.6.0"
+  spec.add_runtime_dependency "metanorma-m3aawg", "~> 1.6.0"
+  spec.add_runtime_dependency "metanorma-generic", "~> 1.8.0"
+  spec.add_runtime_dependency "metanorma-standoc", "~> 1.6.0"
   #spec.add_runtime_dependency 'metanorma-mpfa', "~> 0.5.0"
-  spec.add_runtime_dependency 'metanorma-un', "~> 0.5.0"
-  spec.add_runtime_dependency 'metanorma-ogc', "~> 1.2.0"
-  spec.add_runtime_dependency 'metanorma-nist', "~> 1.2.0"
-  spec.add_runtime_dependency 'metanorma-itu', "~> 1.2.0"
-  spec.add_runtime_dependency 'metanorma-iho', "~> 0.2.0"
-  spec.add_runtime_dependency 'isodoc', ">= 1.2.0"
-  spec.add_runtime_dependency 'metanorma', "~> 1.2.0"
+  spec.add_runtime_dependency "metanorma-un", "~> 0.5.0"
+  spec.add_runtime_dependency "metanorma-ogc", "~> 1.2.0"
+  spec.add_runtime_dependency "metanorma-nist", "~> 1.2.0"
+  spec.add_runtime_dependency "metanorma-itu", "~> 1.2.0"
+  spec.add_runtime_dependency "metanorma-iho", "~> 0.2.0"
+  spec.add_runtime_dependency "isodoc", ">= 1.3.0"
+  spec.add_runtime_dependency "metanorma", "~> 1.2.0"
   spec.add_runtime_dependency "git", "~> 1.5"
   spec.add_runtime_dependency "relaton-cli", ">= 0.8.2"
-  spec.add_runtime_dependency "fontist", "~> 1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cli
 version: !ruby/object:Gem::Version
-  version: 1.3.8.1
+  version: 1.3.9pre
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-13 00:00:00.000000000 Z
+date: 2020-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.3
-- !ruby/object:Gem::Dependency
-  name: equivalent-xml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
@@ -206,20 +192,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: metanorma-gb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: metanorma-iec
   requirement: !ruby/object:Gem::Requirement
@@ -282,14 +254,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
   requirement: !ruby/object:Gem::Requirement
@@ -380,14 +352,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: metanorma
   requirement: !ruby/object:Gem::Requirement
@@ -430,20 +402,6 @@ 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: 1.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.0
 description: Executable to process any Metanorma standard.
 email:
 - open.source@ribose.com
@@ -494,7 +452,6 @@ 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
@@ -518,9 +475,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key:

data/lib/metanorma/cli/setup.rb

@@ -1,73 +0,0 @@
-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
-        begin
-          Fontist::Font.find(font_name)
-        rescue Fontist::Errors::MissingFontError
-          process_font_installation(font_name)
-        end
-      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 process_font_installation(font_name)
-        accepted_agreement = term_agreement == true ? "yes" : "no"
-
-        UI.say(missing_font_message) if !term_agreement
-        Fontist::Font.install(font_name, confirmation: accepted_agreement)
-      end
-
-      def missing_font_message
-        <<~MSG
-          Your system does not have the necessary fonts installed for
-          PDF generation. Without these fonts, the generated PDF will use
-          generic fonts that may not resemble the desired styling.\n
-        MSG
-      end
-    end
-  end
-end