metanorma-cli 1.4.7.2 → 1.4.8pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fb9df9ff0531390c198459ae93a5e9e84bffeccdbbc25c658e273226d534c40
-  data.tar.gz: 23f6d32b5379e25dbbe42f4ece44f92df84cbba21030554355a68d7e202dc31f
+  metadata.gz: 8a632364391b754ad5f857c03f05c09033ff8e4a12e9df7ed58b2ee1fb5be3df
+  data.tar.gz: c59747e473154462b14c76d66368463449c00339499a0a56b7d864c4941db09a
 SHA512:
-  metadata.gz: '092b6a410fa3505bd9594d3be2ff69d761905465f50741593819b1d1509363b3eb842df2b6beec7fee64d07592852494b5f4cbb26c8884ed15d46009fab8d3bc'
-  data.tar.gz: 9d97996a4ce0b5b6b186f4d76d6c549f9466447dd6a0621ef725c4b384a5b05ab3b51d68d9c551a5ab174abb679352ef0dbb1a7e5c07f88d3c887d1030734e1c
+  metadata.gz: 9b3e142318165929042fbfc0b1860f8db811832324490a20f7a37a0c0f1f7b08cb919e3149bcd0ed83448eccaf006a26aeeabc77bd2c0632ece107689f92a24b
+  data.tar.gz: d76798f134f962b5b331d500e4c845f712bb5396ce4ea69698592cf8abf62e45c04d00c08b4301fcca6f4244cf9760f8429c398e654e0953e645de94f091ae22

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.2".freeze
+    VERSION = "1.4.8pre".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.2
+  version: 1.4.8pre
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-27 00:00:00.000000000 Z
+date: 2021-05-10 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: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.4
 signing_key: