metanorma-cli 1.4.3 → 1.4.6pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46cfadec82b49d2434f4d854b949d1a43052734dbf455d9fd5b00cf9688fc7f3
-  data.tar.gz: 1634372911d8c51fab3898aa79584e182098296d91f09dd2dc394340c2ea7d22
+  metadata.gz: 3f816a508f6849109c1993d57abe21d440e0ba7a5a9889ac3b94af22cece3460
+  data.tar.gz: 9cd0d1d840404896b0fc84b7538fc92cf0c871cad618e29229af4323682b24a7
 SHA512:
-  metadata.gz: df1e3bb7f61c245b173f86094cf61e5d2ded8b5ebe34b95646a937915a0ee8215dcc97621c57ff0bd986b5342a3c184966de93171a7b97fd529dda967c9c05aa
-  data.tar.gz: 63f15ed135e6a7e0d9ebb556c3202189c51fdc54a5a8d6ff16a946d06fa8ebd073ceca69b6230bfc0ad79b37f23887a473b0c905c5bf8da9d6395345a7586f8a
+  metadata.gz: 7c52209957baded4b395c2294eaf2d1101dd25733d53847f8c9aaedb9cf99cf707a7d2327a0803732a90b61bf1d902126cd788543af78685cdf6487618ab5288
+  data.tar.gz: 725c5b172877a8819bea002e1ac4d7a5403d17e338c272a03ef306060562ac0dda09b89e1714fab9d49c6a613d7c5d155a63169d07d32e506f2cf53eb8ca66ff

data/lib/metanorma/cli/command.rb

@@ -39,10 +39,8 @@ module Metanorma
 
       def compile(file_name = nil)
         if file_name && !options[:version]
-          Metanorma::Cli.load_flavors
-          errs = Metanorma::Cli::Compiler.compile(file_name, options)
-          errs.each { |e| Util.log e, :error }
-          exit(1) if errs.any?
+          documents = select_wildcard_documents(file_name) || [file_name]
+          documents.each { |document| compile_document(document, options.dup) }
 
         elsif options[:version]
           invoke(:version, [], type: options[:type], format: options[:format])
@@ -198,6 +196,20 @@ module Metanorma
 
         UI.table(["Type", "Input", "Supported output format"], table_data)
       end
+
+      def select_wildcard_documents(filename)
+        if filename.include?("*")
+          Dir.glob(Pathname.new(filename))
+        end
+      end
+
+      def compile_document(filename, options)
+        Metanorma::Cli.load_flavors
+        errors = Metanorma::Cli::Compiler.compile(filename, options)
+        errors.each { |error| Util.log(error, :error) }
+
+        exit(1) if errors.any?
+      end
     end
   end
 end

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

@@ -6,7 +6,7 @@ module Metanorma
   module Cli
     module Commands
       class Site < ThorWithConfig
-        desc "generate SOURCE_PATH", "Generate site from collection"
+        desc "generate [SOURCE_PATH]", "Generate site from collection"
         option :config, aliases: "-c", desc: "Metanorma configuration file"
         option(
           :output_dir,
@@ -18,8 +18,10 @@ 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)
+        def generate(source_path = Dir.pwd)
           Cli::SiteGenerator.generate(source_path, options, filter_compile_options(options))
           UI.say("Site has been generated at #{options[:output_dir]}")
         rescue Cli::Errors::InvalidManifestFileError

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
@@ -70,18 +74,25 @@ module Metanorma
       def compile(source)
         UI.info("Compiling #{source} ...")
 
-        opts = @compile_options.merge(format: :asciidoc, output_dir: asset_directory)
+        options = @compile_options.merge(
+          format: :asciidoc, output_dir: build_asset_output_directory(source)
+        )
 
-        Metanorma::Cli::Compiler.compile(source.to_s, opts)
+        Metanorma::Cli::Compiler.compile(source.to_s, options)
       end
 
       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: ""
@@ -107,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")
@@ -127,7 +140,22 @@ module Metanorma
         asset_path = [site_path, asset_folder].join("/")
         @asset_directory = Pathname.new(Dir.pwd).join(asset_path)
 
-        FileUtils.mkdir_p(@asset_directory) unless @asset_directory.exist?
+        create_directory_if_not_present!(@asset_directory)
+      end
+
+      def create_directory_if_not_present!(directory)
+        FileUtils.mkdir_p(directory) unless directory.exist?
+      end
+
+      def build_asset_output_directory(source)
+        sub_directory = Pathname.new(source.gsub(@source.to_s, "")).dirname.to_s
+        sub_directory.gsub!("/sources", "")
+        sub_directory.slice!(0)
+
+        output_directory = asset_directory.join(sub_directory)
+        create_directory_if_not_present!(output_directory)
+
+        output_directory
       end
     end
   end

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.3"
+    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.3
+  version: 1.4.6pre
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-25 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,11 +494,11 @@ 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.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Metanorma is the standard of standards; the metanorma gem allows you to create