metanorma-cli 1.4.7.2pre → 1.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e56aa5a1486ebc0bfea27f499c02b67bf7b5980e251e7d9ef8813cc00eabed22
-  data.tar.gz: '0896216bd8ab0a83cd82f3bba6d02453f8909ca017476e766bceaf303842ca64'
+  metadata.gz: 15699c21d3fccc15056af39c1f19f8bdbef4127d9f9dab4422fd7025380426c6
+  data.tar.gz: be0edc3721c341a7a5c2a875b0696b3af361e4eac7636b449530a81ab49d908e
 SHA512:
-  metadata.gz: 91c9ee45cb2d75f82640a1a1c233b3e97979ba2d89ab912bf62ad03f176c2e8765ffcc9aff830f07ab857a2739e90812b6679d92fec8e1ed886b10b56516c3ae
-  data.tar.gz: 01ed140e7082612bb8a47b0e119b33cda1358143f4cd108c3d8b3cb642332dc4ad59a3acd229b71f335fc8361c13ff139a3583d341eeefe4d7b94fd28b448111
+  metadata.gz: 5a061475861db813905cf36d4e05b351f25d6d32c782f5533c9ef6c9109644d8c75ba3a9d0005ffeb1554e5f5ee01b2b50281f9ae703fc51cfe80cc0be6dc086
+  data.tar.gz: e59a94b7e12876608b9da0df9c23de3864a2515c12a18eda7ebac325aafcc0e0db244d24870f53b3a4edbf464a1cd1d6c169fbddd0621f52eb5d7a691bdb8ad9

data/lib/metanorma/cli.rb

@@ -1,53 +1,20 @@
 # frozen_string_literal: true
 
 require "metanorma"
+require "metanorma/flavor"
+
 require "metanorma/cli/version"
 require "metanorma/cli/errors"
 require "metanorma/cli/command"
 
 module Metanorma
   module Cli
-    SUPPORTED_GEMS = [
-      "metanorma-iso",
-      "metanorma-iec",
-      "metanorma-ietf",
-      #"metanorma-gb",
-      "metanorma-bipm",
-      "metanorma-cc",
-      "metanorma-csa",
-      "metanorma-iho",
-      "metanorma-m3aawg",
-      "metanorma-generic",
-      "metanorma-standoc",
-      "metanorma-un",
-      "metanorma-nist",
-      "metanorma-ogc",
-      "metanorma-itu",
-    ]
 
     CONFIG_DIRNAME = ".metanorma"
     CONFIG_FILENAME = "config.yml"
 
-    PRIVATE_SUPPORTED_GEMS = ["metanorma-ribose", "metanorma-mpfa"]
-
-    def self.load_flavors(flavor_names = SUPPORTED_GEMS + PRIVATE_SUPPORTED_GEMS)
-      flavor_names.each do |flavor|
-        begin
-          require flavor
-        rescue LoadError
-          unless PRIVATE_SUPPORTED_GEMS.include?(flavor)
-            $stderr.puts "[metanorma] Error: flavor gem #{flavor} not present"
-          end
-        end
-      end
-    end
-
-    def self.load_all_flavors
-      flavor_names = Gem::Specification.find_all do |g|
-        g.name =~ /\Ametanorma-.*\Z/
-      end.map(&:name)
-
-      load_flavors(flavor_names)
+    def self.load_flavors
+      Metanorma::Flavor.load_flavors
     end
 
     # Invoking commands

data/lib/metanorma/cli/command.rb

@@ -5,7 +5,6 @@ require "metanorma/cli/thor_with_config"
 require "metanorma/cli/commands/config"
 require "metanorma/cli/commands/template_repo"
 require "metanorma/cli/commands/site"
-require "metanorma"
 
 module Metanorma
   module Cli

data/lib/metanorma/cli/ui.rb

@@ -15,6 +15,12 @@ module Metanorma
         new.say(["[info]", message].join(": "))
       end
 
+      def self.debug(message, enabled: false)
+        if enabled
+          new.say(["[debug]", message].join(": "))
+        end
+      end
+
       def self.error(message)
         new.error(message)
       end

data/lib/metanorma/cli/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Cli
-    VERSION = "1.4.7.2pre".freeze
+    VERSION = "1.4.9".freeze
   end
 end

data/lib/metanorma/flavor.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+require "metanorma/cli/ui"
+
+module Metanorma
+  class Flavor
+    SUPPORTED_GEMS = [
+      "metanorma-iso",
+      "metanorma-iec",
+      "metanorma-ietf",
+      "metanorma-bipm",
+      "metanorma-cc",
+      "metanorma-csa",
+      "metanorma-iho",
+      "metanorma-m3aawg",
+      "metanorma-generic",
+      "metanorma-standoc",
+      "metanorma-un",
+      "metanorma-ogc",
+      "metanorma-itu",
+    ].freeze
+
+    PRIVATE_SUPPORTED_GEMS = [
+      "metanorma-ribose",
+      "metanorma-mpfa",
+      "metanorma-nist",
+    ].freeze
+
+    def self.activate
+      new.activate
+    end
+
+    def self.load_flavors
+      new.load_flavors
+    end
+
+    def activate
+      flavors.each do |flavor_name|
+        begin
+          gem(flavor_name)
+        rescue LoadError, MissingSpecError => _e
+          Metanorma::Cli::UI.debug("#{flavor_name} is not present!")
+        end
+      end
+    end
+
+    def load_flavors
+      flavors.each do |flavor_name|
+        begin
+          require(flavor_name)
+        rescue LoadError => _e
+          gem_loading_error(flavor_name)
+        end
+      end
+    end
+
+    private
+
+    def flavors
+      @flavors ||= [SUPPORTED_GEMS + PRIVATE_SUPPORTED_GEMS].flatten.uniq
+    end
+
+    def gem_loading_error(flavor_name)
+      unless PRIVATE_SUPPORTED_GEMS.include?(flavor_name)
+        Metanorma::Cli::UI.error(
+          "[metanorma] Error: flavor gem #{flavor_name} not present",
+        )
+      end
+    end
+  end
+end
+
+# Activate flavors
+Metanorma::Flavor.activate

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cli
 version: !ruby/object:Gem::Version
-  version: 1.4.7.2pre
+  version: 1.4.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-26 00:00:00.000000000 Z
+date: 2021-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -488,6 +488,7 @@ files:
 - lib/metanorma/cli/thor_with_config.rb
 - lib/metanorma/cli/ui.rb
 - lib/metanorma/cli/version.rb
+- lib/metanorma/flavor.rb
 - metanorma-cli.gemspec
 - templates/base/Gemfile
 - templates/base/Makefile
@@ -508,9 +509,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: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.4
 signing_key: