metanorma-cli 1.5.7 → 1.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fff90bbd2871ac0894c95bb3eb6b51edac50da064be9e9a9b3aca24e228551b
-  data.tar.gz: f544433d2ea4baa4fa797ff1becfc0af7ab2dcdfb9922ae9733e643b6c3e37c3
+  metadata.gz: 6282445acbd814d5fe7561a6c2f0aa79ebdc3e783c6fc18b79a3ea5b458484ac
+  data.tar.gz: 52f15df8bcb0817ab747f7224866a8099251fcf48a86c6a820558fbb567bdde5
 SHA512:
-  metadata.gz: 5d8b653c3835af4b0ccf246cfce504dab1302fd77fdb83841fe350e90cd6c451946bb744c80abf541880517696317b4bf02f24cc6797be7d33db4ada2f2486ec
-  data.tar.gz: cae6562fd87902efe8a9aca1ab063793bcfcf08d39bc9ab2e416e85e42795e8d6b65d250691b38c61df320bd6f1c8906a2fd9ff1ff6d809dd81f144084848115
+  metadata.gz: 05a4a3e14905e1768ae10abdb5bf153896b55ccc73911b2b22d3013dea6d04c8719121aa4f24b315932b7522450935aa634217fd6f995b1b21356f377cdebc8a
+  data.tar.gz: 5e04c708242ce2917d62887920aa966aafa285ff7829006bef98101a49bf3321820c7db73db3a662c216aea7765231cb009c3e323ccf67b594a2933ea98acad0

data/lib/metanorma/cli/generator.rb

@@ -18,12 +18,12 @@ module Metanorma
         if Cli.writable_templates_path?
           if name && document_path.exist?
             return unless overwrite?(document_path)
+
             document_path.rmtree
           end
 
           create_metanorma_document
         end
-
       rescue Errno::EACCES
         permission_missing_error
       end
@@ -53,17 +53,24 @@ module Metanorma
       def create_metanorma_document
         type_template = type_specific_template
 
-        unless type_template.empty?
-          templates = base_templates.merge(type_template)
-          templates.each { |source, dest| create_file(source, dest) }
-        else
+        if type_template.empty?
           UI.say(
-            "Unable to generate document:\n" \
-            "Templates for type #{type.to_s} cannot be found -- please provide a valid `type` or a template URL"
+            "Unable to generate document:\n#{create_metanorma_document_error}",
           )
+        else
+          templates = base_templates.merge(type_template)
+          templates.each { |source, dest| create_file(source, dest) }
         end
       end
 
+      def create_metanorma_document_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"
+      end
+
       def find_standard_template(type)
         Cli::GitTemplate.find_or_download_by(type)
       end
@@ -85,7 +92,7 @@ module Metanorma
 
       def custom_template
         if template
-          if template !~ URI::regexp
+          if !template&.match?(URI::DEFAULT_PARSER.make_regexp)
             return Pathname.new(template)
           end
 
@@ -124,13 +131,13 @@ module Metanorma
 
       def ask_to_confirm(document)
         UI.ask(
-          "You've an existing document with the #{document.to_s}\n" \
+          "You've an existing document with the #{document}\n" \
           "Still want to continue, and overwrite the existing one? (yes/no):",
         ).downcase
       end
 
       def file_creation_message(document, destination)
-        UI.say("Creating #{[document, destination].join("/").gsub("//", "/")}")
+        UI.say("Creating #{[document, destination].join('/').gsub('//', '/')}")
       end
 
       def permission_missing_error
@@ -139,7 +146,7 @@ module Metanorma
           "The current user does not have permission to write to this path:\n" \
           "#{Cli.templates_path}\n" \
           "Please ensure the path is writable by the current user, or\n" \
-          "run Metanorma using a different user with write permissions."
+          "run Metanorma using a different user with write permissions.",
         )
       end
     end

data/lib/metanorma/cli/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Cli
-    VERSION = "1.5.7".freeze
+    VERSION = "1.5.9".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cli
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-17 00:00:00.000000000 Z
+date: 2022-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debug