metanorma-cli 1.16.9 → 1.16.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5443f4d74852fd5823e019a641c82cf043886c8da5c3b44b9e78ee6c18da364e
-  data.tar.gz: dc46dd399fe43a039f72efabc80d98543169eb598ed956bb00861cdf104e426e
+  metadata.gz: 826947482a6b6504d9e8b6f0270fbf9c21c7ea4aaf28987fae188a75d9785130
+  data.tar.gz: 70cdc4d3ae532c8119586898cc9b2fe2de7ebe47544131ba72b46be26c9efe67
 SHA512:
-  metadata.gz: 3f5aacd84e0bb749f4c5d3638be3f002c09629945ba4b586cdcb48be339f948441992ffcdc4d4c52c7652f6bd2b11f25a7ff0ea05dd530ace9a3722c3955b42e
-  data.tar.gz: 4d4d235a53568aa7c4622eabfee6c4fb741e87db0ab22571fb20bbed04a0ad4d35595b22cc7d77092cbf84590319f577887afecbe451b432eaa529a3c67f0258
+  metadata.gz: 3566044e7574ecba68e89cde656d0fa1931b970a1898d1d9fe90ce9cf9fbafc1a5d0456f75bafb18392a399ef3c157d599d89f53e4a414c23ec882c3582ea2a3
+  data.tar.gz: 8535140d5d93309cf295523b85fe368ad81e8c967ee65d65194232a78f7593748e1018b2b6de4dd5d429238c77ac6b7ba0cdc85b7cc71eb980ffcb6387f98929

data/Gemfile

@@ -20,6 +20,8 @@ group :development do
   gem "rspec-core"
   gem "rubocop"
   gem "rubocop-performance"
+  gem "rubocop-rake"
+  gem "rubocop-rspec"
   # need for dev because locally compiled metanorma-iso does not have css
   gem "sassc-embedded"
   gem "simplecov"

data/lib/metanorma/cli/flavor.rb

@@ -1,6 +1,23 @@
 module Metanorma
   module Cli
     class Command < ThorWithConfig
+      DEPENDENCY_GEMS =
+        %w(html2doc isodoc metanorma-utils mn2pdf mn-requirements isodoc-i18n
+           metanorma-core metanorma-plugin-glossarist metanorma-plugin-lutaml
+           metanorma-taste relaton-cli pubid glossarist fontist
+           plurimath expressir xmi lutaml-model emf2svg unitsml
+           vectory ogc-gml oscal suma).freeze
+
+      EXPORT_CONFIG_FLAVOR_FILES = [
+        "metanorma/*/*.adoc",
+        "isodoc/*/html/*",
+        "isodoc/*/*.xsl",
+        "isodoc/*/*.yml",
+        "isodoc/*/*.yaml",
+        "relaton/render/*.yml",
+        "relaton/render/*.yaml",
+      ].freeze
+
       private
 
       def print_doctypes_table(type)
@@ -104,20 +121,22 @@ module Metanorma
         end
       end
 
-      DEPENDENCY_GEMS =
-        %w(html2doc isodoc metanorma-utils mn2pdf mn-requirements isodoc-i18n
-           metanorma-core 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 suma).freeze
-
       def dependencies_versions
         versions = Gem.loaded_specs
         DEPENDENCY_GEMS.sort.each do |k|
-          UI.say("#{k} #{versions[k].version}")
+          spec = versions[k] || installed_gem_spec(k) or next
+          UI.say("#{k} #{spec.version}")
         end
       end
 
+      # gems installed but not loaded by the version command itself
+      # (e.g. emf2svg) are still reported, from the installed specs
+      def installed_gem_spec(name)
+        Gem::Specification.find_by_name(name)
+      rescue Gem::LoadError
+        nil
+      end
+
       def join_keys(keys)
         [keys[0..-2].join(", "), keys.last].join(" and ")
       end
@@ -150,16 +169,6 @@ module Metanorma
         abort if errors.any?
       end
 
-      EXPORT_CONFIG_FLAVOR_FILES = [
-        "metanorma/*/*.adoc",
-        "isodoc/*/html/*",
-        "isodoc/*/*.xsl",
-        "isodoc/*/*.yml",
-        "isodoc/*/*.yaml",
-        "relaton/render/*.yml",
-        "relaton/render/*.yaml",
-      ].freeze
-
       def export_config_flavor(type)
         base, taste, dir = export_config_flavor_prep(type)
         base or return
@@ -192,20 +201,23 @@ module Metanorma
       end
 
       def export_config_flavor_prep(type)
-        unless type
-          UI.say("Please specify a standard type")
-          return [nil, nil, nil]
-        end
-        dict = flavor_dictionary
-        unless dict[type.to_sym]
-          UI.say("Couldn't load #{type}, please provide a valid type!")
-          return [nil, nil, nil]
-        end
+        dict = type && flavor_dictionary
+        (dict && dict[type.to_sym]) or
+          return export_config_flavor_invalid(type)
         FileUtils.mkdir_p("export-config-#{type}")
         base = dict[type.to_sym][:base_flavor]
         [base || type, base ? type : nil, "export-config-#{type}"]
       end
 
+      def export_config_flavor_invalid(type)
+        if type
+          UI.say("Couldn't load #{type}, please provide a valid type!")
+        else
+          UI.say("Please specify a standard type")
+        end
+        [nil, nil, nil]
+      end
+
       def export_config_flavor_gem(base)
         begin
           gem_spec = Gem::Specification.find_by_name("metanorma-#{base}")
@@ -221,7 +233,7 @@ module Metanorma
           UI.say("No matching configuration files found in metanorma-#{base}")
         else
           UI.say("Exported #{copied_files.size} configuration file(s) " \
-            "from metanorma-#{base} to #{dir}")
+                 "from metanorma-#{base} to #{dir}")
         end
       end
 
@@ -249,11 +261,9 @@ module Metanorma
       end
 
       def export_config_taste_copy_files(source_path, gem_data_path, dest_path)
-        copied_files = []
         pattern = source_path.join("**", "*")
-        Pathname.glob(pattern).each do |source_file|
-          copied_files << export_config_copy_file(source_file, gem_data_path,
-                                                  dest_path)
+        copied_files = Pathname.glob(pattern).map do |source_file|
+          export_config_copy_file(source_file, gem_data_path, dest_path)
         end
         copied_files.compact
       end
@@ -263,7 +273,7 @@ module Metanorma
           UI.say("No files found in metanorma-taste/taste/#{taste}")
         else
           UI.say("Exported #{copied_files.size} taste configuration file(s) " \
-            "from metanorma-taste to #{dest_path}")
+                 "from metanorma-taste to #{dest_path}")
         end
       end
     end

data/lib/metanorma/cli/git_template.rb

@@ -74,6 +74,9 @@ module Metanorma
       end
 
       def clone_git_template(repo)
+        # git gem >= 5 spawns with a chdir into the target directory, which
+        # must already exist; older versions created it implicitly
+        templates_path.mkpath
         clone = Git.clone(repo, name, path: templates_path)
         template_path unless clone.nil?
       end

data/lib/metanorma/cli/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Cli
-    VERSION = "1.16.9".freeze
+    VERSION = "1.16.10".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cli
 version: !ruby/object:Gem::Version
-  version: 1.16.9
+  version: 1.16.10
 platform: ruby
 authors:
 - Ribose Inc.