metanorma-cli 1.3.7.2 → 1.3.9pre

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,9 +1,9 @@
 require "thor"
-require "metanorma/cli/setup"
 require "metanorma/cli/compiler"
 require "metanorma/cli/generator"
 require "metanorma/cli/git_template"
 require "metanorma/cli/commands/template_repo"
+require "metanorma"
 
 module Metanorma
   module Cli
@@ -31,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
@@ -88,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)
@@ -174,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.7.2"
+    VERSION = "1.3.9pre"
   end
 end

data/metanorma-cli.gemspec

@@ -14,18 +14,13 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://www.metanorma.com"
   spec.license       = "BSD-2-Clause"
 
-=begin
-  spec.files         = Dir['**/*'].reject { |f| f.match(%r{^(test|spec|features|templates|.git)/|.(gem|gif|png|jpg|jpeg|xml|html|doc|pdf|dtd|ent)$}) }
-  spec.files        += Dir.glob("templates/base/**", File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
-=end
-
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-
-  spec.extra_rdoc_files = %w[README.adoc LICENSE]
+  spec.extra_rdoc_files = %w[README.adoc LICENSE CODE_OF_CONDUCT.md]
+  spec.files         = Dir['{lib,bin,exe,docs}/**/*'] \
+                     + Dir['templates/base/**/*'] \
+                     + %w[Gemfile Rakefile i18n.yaml metanorma-cli.gemspec]
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+
   spec.require_paths = ["lib"]
   spec.required_ruby_version = '>= 2.4.0'
 
@@ -34,30 +29,32 @@ 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"
+  spec.add_development_dependency "simplecov", "~> 0.15"
+  # need for dev because locally compiled metanorma-iso does not have css
+  spec.add_development_dependency "sassc"
 
   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.5.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.5.0"
-  spec.add_runtime_dependency 'metanorma-generic', "~> 1.6.0"
-  spec.add_runtime_dependency 'metanorma-standoc', "~> 1.5.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.1.0"
-  #spec.add_runtime_dependency 'nokogiri', ">= 1"
+  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.7.2
+  version: 1.3.9pre
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-11 00:00:00.000000000 Z
+date: 2020-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -81,89 +81,117 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.3
 - !ruby/object:Gem::Dependency
-  name: equivalent-xml
+  name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: rspec-core
+  name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: webmock
+  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: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
+        version: '0.15'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
-  name: metanorma-iso
+  name: sassc
+  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: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: metanorma-ietf
+  name: metanorma-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
-  name: metanorma-gb
+  name: metanorma-ietf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: metanorma-iec
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: metanorma-csa
   requirement: !ruby/object:Gem::Requirement
@@ -212,42 +240,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: metanorma-un
   requirement: !ruby/object:Gem::Requirement
@@ -322,30 +350,30 @@ dependencies:
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     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
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -374,39 +402,26 @@ 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
 executables:
+- index.html
+- index.xml
 - metanorma
 - metanorma-manifest
+- metanorma.old
+- rfc2629-other.ent
+- rfc2629-xhtml.ent
+- rfc2629.dtd
+- rfc6350.adoc
+- rfc6350.xml
 extensions: []
 extra_rdoc_files:
 - README.adoc
 - LICENSE
+- CODE_OF_CONDUCT.md
 files:
-- ".github/workflows/dependent_repos.env"
-- ".github/workflows/macos.yml"
-- ".github/workflows/ubuntu.yml"
-- ".github/workflows/windows.yml"
-- ".gitignore"
-- ".hound.yml"
-- ".rspec"
-- ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
@@ -418,8 +433,16 @@ files:
 - docs/installation.adoc
 - docs/navigation.adoc
 - docs/usage.adoc
+- exe/index.html
+- exe/index.xml
 - exe/metanorma
 - exe/metanorma-manifest
+- exe/metanorma.old
+- exe/rfc2629-other.ent
+- exe/rfc2629-xhtml.ent
+- exe/rfc2629.dtd
+- exe/rfc6350.adoc
+- exe/rfc6350.xml
 - i18n.yaml
 - lib/metanorma-cli.rb
 - lib/metanorma/cli.rb
@@ -429,17 +452,10 @@ 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
 - metanorma-cli.gemspec
-- templates/base/.github/workflows/docker.yml
-- templates/base/.github/workflows/macos.yml
-- templates/base/.github/workflows/ubuntu.yml
-- templates/base/.github/workflows/windows.yml
-- templates/base/.gitignore
-- templates/base/.gitlab-ci.yml
 - templates/base/Gemfile
 - templates/base/Makefile
 - templates/base/Makefile.win
@@ -459,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: