metanorma-cli 1.5.8 → 1.5.9pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f21088e13696d1170c99a3533f1fff240743ccfd11e5988bfb5a2542ed5d9de7
-  data.tar.gz: 74254c94389b45e243685087d5bb661ae00a9871438dabd7798f1f5c750e3324
+  metadata.gz: 5580b948d0d190232adc2a1977a8ce0fcfa2a2c7ad26385de1ac33e717bb56dd
+  data.tar.gz: 62932c33266289b60da258d1ae203ad4726145396b991b36203d328fbe67fb5d
 SHA512:
-  metadata.gz: 36ebaac6f842b6ef166329fb06e4d7b4856f0576e8775a36d57a2084ea7bb883812726362982d7047cf22ede3a425f88fcbd6ea18648a73c61d965e1fb1577b5
-  data.tar.gz: d8c432f10e48f7b2291eed12242e5628845cbe6687134d1a0b33484088f8673d526ead112a599a4291e2e901479804aaa6f1df31d3be4ceed36c991736ca7b1c
+  metadata.gz: 10b5780f1b8aa3220ec4087f103b8d710d452a49e1eddb63dc50199150c39b08b1ef74e0c5347599f82fab87fa76010df3e50d98ba174276d2816bd2c453f7fd
+  data.tar.gz: 1b0d9eb8dba65202ad10f9077d26d0b5639c9df8de59a17e1cc5f1e9a083c70789b0881ca0b085feca147ccf99b1ac7e82870930138573f0682bd6479f9af61f

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.8".freeze
+    VERSION = "1.5.9pre".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cli
 version: !ruby/object:Gem::Version
-  version: 1.5.8
+  version: 1.5.9pre
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-22 00:00:00.000000000 Z
+date: 2022-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debug
@@ -510,9 +510,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.2.32
 signing_key: