metanorma-cli 1.15.1 → 1.15.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aca5cb520051acb1fea32351c712d6f52813a75364e44a2039ba918a65466dbb
-  data.tar.gz: d9bb8a627570055b1b559b0ee821b3d65f7abfd2c333816f808964811b65d180
+  metadata.gz: 629f9930c5707c6784dd64a5e518114320d813cbde1690d56469833632ed872d
+  data.tar.gz: 59251c03a7c437a62e3b8fa131e66f6232b440fc03f3da0e06807ce06c535510
 SHA512:
-  metadata.gz: fcb2fbc237f6c492a344c83c21a1cceaedaa2950706ee82ac2246c4a33d96419956e69e4e55ad08f1044f3a45a51c4ded5252f8036797cf0d4c34941b4c7e36b
-  data.tar.gz: 6b50bd84ab68e43ee8f6bf7df00810d1683e1b0577b8bcdd2d5b46086aea5b372f5ccd357547d8c8360f26e9570f217c5878f0cbb25caecf19ccf16ac180441f
+  metadata.gz: c186e300c565b57e198ab517f753f3f5a129909660bc38eb6efb4210d2927a24202668c43bbe5a949e6c201c8d4d5ba18f671ccc0cd2622eb806ee2b1bece3b1
+  data.tar.gz: fada74ff2f22b20989a0e514f97fb4a504dc768c29aec547369b04e96bf7d694f901319b3b5efe5a3d86c6e1049539f4c46f6a76e4f1044de82475ccd4a9b91a

data/lib/metanorma/cli/flavor.rb

@@ -106,8 +106,8 @@ module Metanorma
 
       DEPENDENCY_GEMS =
         %w(html2doc isodoc metanorma-utils mn2pdf mn-requirements isodoc-i18n
-           metanorma-plugin-glossarist
-           metanorma-plugin-lutaml relaton-cli pubid glossarist fontist
+           metanorma-plugin-glossarist metanorma-plugin-lutaml 
+           metanorma-taste relaton-cli pubid glossarist fontist
            plurimath lutaml expressir xmi lutaml-model emf2svg unitsml
            vectory ogc-gml oscal).freeze
 
@@ -149,7 +149,7 @@ module Metanorma
         Metanorma::Cli.load_flavors
         errors = Metanorma::Cli::Compiler.compile(filename, options)
         errors.each { |error| Util.log(error, :error) }
-        exit(1) if errors.any?
+        abort if errors.any?
       end
 
       EXPORT_CONFIG_FLAVOR_FILES = [

data/lib/metanorma/cli/generator.rb

@@ -39,7 +39,7 @@ module Metanorma
       # ooption, and in that case it will use that template.
       #
       def self.run(name, type:, doctype:, **options)
-        new(name, **options.merge(type: type, doctype: doctype)).run
+        new(name, **options, type: type, doctype: doctype).run
       end
 
       private
@@ -53,9 +53,13 @@ module Metanorma
       def create_metanorma_document
         type_template = type_specific_template
 
-        if type_template.empty?
+        if type_template.nil?
           UI.say(
-            "Unable to generate document:\n#{create_metanorma_document_error}",
+            "Unable to generate document:\n#{type_not_found_error}",
+          )
+        elsif type_template.empty?
+          UI.say(
+            "Unable to generate document:\n#{doctype_not_found_error}",
           )
         else
           templates = base_templates.merge(type_template)
@@ -63,12 +67,29 @@ module Metanorma
         end
       end
 
-      def create_metanorma_document_error
+      def type_not_found_error
+        "Templates for type #{type} cannot be found -- " \
+          "please provide a valid `type` or a template URL"
+      end
+
+      def doctype_not_found_error
         type == "ogc" && doctype == "charter" and return <<~ERR
           The template for OGC charter documents can be downloaded from https://github.com/opengeospatial/templates/tree/master/charter_templates
         ERR
-        "Templates for type #{type} cannot be found -- "\
-          "please provide a valid `type` or a template URL"
+        available = available_template_doctypes
+        msg = "Doctype '#{doctype}' not found in templates for type '#{type}'."
+        msg += " Available doctypes: #{available.join(', ')}." unless available.empty?
+        msg
+      end
+
+      def available_template_doctypes
+        return [] unless @type_template_path
+
+        Pathname.new(@type_template_path).children
+          .select(&:directory?)
+          .map { |d| d.basename.to_s }
+          .reject { |d| d == "common" || d.start_with?(".") }
+          .sort
       end
 
       def find_standard_template(type)
@@ -85,13 +106,13 @@ module Metanorma
       end
 
       def type_specific_template
-        template_path = custom_template || find_standard_template(type)
-        return {} if template_path.nil?
+        @type_template_path = custom_template || find_standard_template(type)
+        return nil if @type_template_path.nil?
 
-        result = build_template_hash(template_path, doctype)
+        result = build_template_hash(@type_template_path, doctype)
         return result if result.empty?
 
-        result.merge(build_template_common_hash(template_path))
+        result.merge(build_template_common_hash(@type_template_path))
       end
 
       def custom_template

data/lib/metanorma/cli/git_template.rb

@@ -86,6 +86,11 @@ module Metanorma
           iec: "https://github.com/metanorma/mn-templates-iec",
           itu: "https://github.com/metanorma/mn-templates-itu",
           ietf: "https://github.com/metanorma/mn-templates-ietf",
+          iho: "https://github.com/metanorma/mn-templates-iho",
+          cc: "https://github.com/metanorma/mn-templates-cc",
+          un: "https://github.com/metanorma/mn-templates-un",
+          nist: "https://github.com/metanorma/mn-templates-nist",
+          m3aawg: "https://github.com/metanorma/mn-templates-m3aawg",
         }
       end
 

data/lib/metanorma/cli/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Cli
-    VERSION = "1.15.1".freeze
+    VERSION = "1.15.5".freeze
   end
 end

data/metanorma-cli.gemspec

@@ -37,9 +37,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "metanorma-ribose", "~> 2.8.0"
   spec.add_dependency "metanorma-standoc", "~> 3.3.1"
   # spec.add_dependency 'metanorma-mpfa', "~> 0.9.0"
-  spec.add_dependency "git", "~> 2.0"
+  spec.add_dependency "git", ">= 3.0"
   spec.add_dependency "lutaml-model"
-  spec.add_dependency "metanorma", "~> 2.3.0"
+  spec.add_dependency "metanorma", "~> 2.3.3"
   spec.add_dependency "metanorma-iho", "~> 1.3.0"
   spec.add_dependency "metanorma-itu", "~> 2.8.0"
   # spec.add_dependency "metanorma-nist", "~> 2.7.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cli
 version: !ruby/object:Gem::Version
-  version: 1.15.1
+  version: 1.15.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-03-02 00:00:00.000000000 Z
+date: 2026-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-ietf
@@ -140,16 +140,16 @@ dependencies:
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: lutaml-model
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.3.3
 - !ruby/object:Gem::Dependency
   name: metanorma-iho
   requirement: !ruby/object:Gem::Requirement