metanorma-cli 1.4.5 → 1.4.6pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7810d93037ab1a658d5926f6d78cd3be241572ca835bcfc7ded7a0ded10c183
-  data.tar.gz: cf1b89b3a511f319aa79778d36383c2e21912ab2637872acf3accd6ee0832acd
+  metadata.gz: 3f816a508f6849109c1993d57abe21d440e0ba7a5a9889ac3b94af22cece3460
+  data.tar.gz: 9cd0d1d840404896b0fc84b7538fc92cf0c871cad618e29229af4323682b24a7
 SHA512:
-  metadata.gz: 317c8c53fa4d8613c03842db8a83ad3853278a7548abf55af12a6f6cd8624d66b00cd42adfcd778561fe8cb1eafbf2d5db211ddc0e13ba9d1c2053bf7aeecad2
-  data.tar.gz: 7257f36e2d7f106ccaffd8464d393d8eadd4870b6c120701fdb8cded2a227cf4aa10fba43d89851282565645e96d4b385e54308d02c602c010e02a2af8162595
+  metadata.gz: 7c52209957baded4b395c2294eaf2d1101dd25733d53847f8c9aaedb9cf99cf707a7d2327a0803732a90b61bf1d902126cd788543af78685cdf6487618ab5288
+  data.tar.gz: 725c5b172877a8819bea002e1ac4d7a5403d17e338c272a03ef306060562ac0dda09b89e1714fab9d49c6a613d7c5d155a63169d07d32e506f2cf53eb8ca66ff

data/lib/metanorma/cli/commands/config.rb

@@ -10,9 +10,9 @@ module Metanorma
 
         desc "get NAME", "Get config value"
         def get(name = nil)
-          config, config_path = load_config(options.global)
+          config, config_path = load_config(options[:global], create_default_config: false)
 
-          if name.nil?
+          if name.nil? && File.exists?(config_path)
             UI.say File.read(config_path, encoding: "utf-8")
           else
             UI.say(config.dig(*dig_path(name)) || "nil")
@@ -21,7 +21,7 @@ module Metanorma
 
         desc "set NAME VALUE", "Set config value"
         def set(name, value = nil)
-          config, config_path = load_config(options.global)
+          config, config_path = load_config(options[:global])
 
           value = try_convert_to_bool(value)
           ypath = dig_path(name)
@@ -32,7 +32,7 @@ module Metanorma
 
         desc "unset [name]", "Set config [value] for [name]"
         def unset(name)
-          config, config_path = load_config(options.global)
+          config, config_path = load_config(options[:global])
 
           ypath = dig_path(name)
           deep_unset(config, *ypath)
@@ -75,9 +75,14 @@ module Metanorma
           end
         end
 
-        def load_config(global_config)
+        def load_config(global_config, create_default_config: true)
           config_path = Metanorma::Cli.config_path(global_config)
-          save_default_config(config_path) unless File.exists?(config_path)
+
+          unless File.exists?(config_path) || create_default_config
+            config_path = Metanorma::Cli.config_path(true)
+          end
+
+          save_default_config(config_path)
 
           [::YAML::load_file(config_path).symbolize_all_keys || {}, config_path]
         end

data/lib/metanorma/cli/commands/site.rb

@@ -18,6 +18,8 @@ module Metanorma
                                                       "presented (WARNING: do know what you are agreeing with!)"
         option :no_install_fonts, type: :boolean, desc: "Skip the font installation process"
         option :continue_without_fonts, type: :boolean, desc: "Continue processing even when fonts are missing"
+        option :stylesheet, alias: "-s", desc: "Stylesheet file path for rendering HTML page"
+        option :template_dir, alias: "-t", desc: "Liquid template directory to render site design"
 
         def generate(source_path = Dir.pwd)
           Cli::SiteGenerator.generate(source_path, options, filter_compile_options(options))

data/lib/metanorma/cli/site_generator.rb

@@ -10,7 +10,11 @@ module Metanorma
         @site_path = options.fetch(:output_dir, "site").to_s
         @asset_folder = options.fetch(:asset_folder, "documents").to_s
         @collection_name = options.fetch(:collection_name, "documents.xml")
+
         @manifest_file = find_realpath(options.fetch(:config, default_config))
+        @template_dir = options.fetch(:template_dir, template_data("path"))
+        @stylesheet = options.fetch(:stylesheet, template_data("stylesheet"))
+
         @compile_options = compile_options
         ensure_site_asset_directory!
       end
@@ -31,8 +35,8 @@ module Metanorma
 
       private
 
-      attr_reader :source, :asset_folder, :asset_directory
-      attr_reader :site_path, :manifest_file, :collection_name
+      attr_reader :source, :asset_folder, :asset_directory, :site_path
+      attr_reader :manifest_file, :collection_name, :stylesheet, :template_dir
 
       def find_realpath(source_path)
         Pathname.new(source_path.to_s).realpath if source_path
@@ -80,10 +84,15 @@ module Metanorma
       def convert_to_html_page(collection, page_name)
         UI.info("Generating html site in #{site_path} ...")
 
-        Relaton::Cli::XMLConvertor.to_html(collection)
+        Relaton::Cli::XMLConvertor.to_html(collection, stylesheet, template_dir)
         File.rename(Pathname.new(collection).sub_ext(".html").to_s, page_name)
       end
 
+      def template_data(node)
+        template_node = manifest[:template]
+        template_node&.fetch(node.to_s, nil)
+      end
+
       def manifest
         @manifest ||= config_from_manifest || {
           files: [], collection_name: "", collection_organization: ""
@@ -109,6 +118,8 @@ module Metanorma
           collection_organization: extract_config_data(
             manifest["metanorma"]["collection"], "organization"
           ),
+
+          template: extract_config_data(manifest["metanorma"], "template"),
         }
       rescue NoMethodError
         raise Errors::InvalidManifestFileError.new("Invalid manifest file")

data/lib/metanorma/cli/thor_with_config.rb

@@ -7,15 +7,16 @@ module Metanorma
     class ThorWithConfig < Thor
       no_commands do
         def options
-          @options_cache
           original_options = super.to_hash.symbolize_all_keys
-          @options_cache = Metanorma::Cli::Commands::Config.load_configs(original_options)
+          Thor::CoreExt::HashWithIndifferentAccess.new(
+            Metanorma::Cli::Commands::Config.load_configs(original_options)
+          )
         end
 
         def filter_compile_options(options)
           options.select do |k, _|
-            %i[agree_to_terms no_install_fonts continue_without_fonts].include?(k)
-          end
+            %w[agree_to_terms no_install_fonts continue_without_fonts].include?(k)
+          end.symbolize_all_keys
         end
       end
     end

data/lib/metanorma/cli/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Cli
-    VERSION = "1.4.5"
+    VERSION = "1.4.6pre"
   end
 end

data/metanorma-cli.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.4.0'
 
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "byebug", "~> 10.0"
   spec.add_development_dependency "rspec-command", "~> 1.0.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cli
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.6pre
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-22 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -494,9 +494,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: