metanorma-cli 1.4.4 → 1.4.7pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e9deaa593010eb7f9d96c58869a852e1c11d00324ba1b1b4dca8e875c334aed
-  data.tar.gz: abca4cf485a7b9f74e9f38cd20ba0af01ddde93ae7ee8e04cfaa7b813f0fbd4a
+  metadata.gz: 84fa2274950b2c9c8da2117de43fa05558192899f2c4b127d5f6f382b96cd7ea
+  data.tar.gz: cd45f93af207ac93aefb16bdd488ecca61827feea75e16ede69ea35bdc5c24cb
 SHA512:
-  metadata.gz: e39d75f8a89d42e92ee90088d7353164883d9f2da55f6c7dfee031c4fa27f73b757a7ef41c5d1a1c83c927edfd2ce74b6e1d18f6a5530c4c1f66ff8c23242c0a
-  data.tar.gz: 2e5e5030d31a17c1b24a94bf8f58ba7a59b777b41c665734a3f347296f4b7429718c05016328723e8d012e5a7ed92ae50345e94d5f05bdc9d7126028d2e27e5e
+  metadata.gz: 286a3da9a613f393f40de552c2dcc5c9af6b9340ab1c326ceec5d1e35d51d19eff4c2d40f8f93edbad4453da692ea830c26c93f8b3e83a37a6c6af8783234225
+  data.tar.gz: b407066259e6adafc760e1af9926160facdd5bf0f3bb0718bf8e8119153f14d7a42e4784ee60fe1df7c9545146014c4f981f5439c1637236407b960d3346c892

data/lib/metanorma/cli/command.rb

@@ -10,6 +10,9 @@ require "metanorma"
 module Metanorma
   module Cli
     class Command < ThorWithConfig
+      class_option :no_progress, aliases: "-s", type: :boolean, default: true,
+                                 desc: "Don't show progress for long running tasks (like download)"
+
       desc "new NAME", "Create new Metanorma document"
       option :type, aliases: "-t", required: true, desc: "Document type"
       option :doctype, aliases: "-d", required: true, desc: "Metanorma doctype"

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/generator.rb

@@ -39,7 +39,7 @@ module Metanorma
       # ooption, and in that case it will use that template.
       #
       def self.run(name, type:, doctype:, **options)
-        new(name, options.merge(type: type, doctype: doctype)).run
+        new(name, **options.merge(type: type, doctype: doctype)).run
       end
 
       private

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 no_progress].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.4"
+    VERSION = "1.4.7pre"
   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"
@@ -35,6 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", "~> 0.15"
   # need for dev because locally compiled metanorma-iso does not have css
   spec.add_development_dependency "sassc"
+  spec.add_development_dependency "rubocop", "~> 1.5.2"
 
   spec.add_runtime_dependency "thor", "~> 1.0"
   spec.add_runtime_dependency "metanorma-iso", "~> 1.7.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cli
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.7pre
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-08 00:00:00.000000000 Z
+date: 2021-03-29 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
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -494,9 +508,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: