metanorma-cli 1.4.3pre → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 411678c2078b06cfa0528e83d9b58f5ee3511b217a26b04d0b230897cfac69d5
-  data.tar.gz: 77605993b5a0fa317db1562c836541d51f52856648188a8fb01f4e490ea0aa7c
+  metadata.gz: e7810d93037ab1a658d5926f6d78cd3be241572ca835bcfc7ded7a0ded10c183
+  data.tar.gz: cf1b89b3a511f319aa79778d36383c2e21912ab2637872acf3accd6ee0832acd
 SHA512:
-  metadata.gz: f0d041079818b8ed93add453ee9a1720a7f38b556b89db1b767dd7e1c915b878d975b14c7882bcf87aaa856ef9581c426a380fc9352a9b107e3aec0367b9a071
-  data.tar.gz: c46af918088b7b91f4645efceb7df3a0f426b939e7a8a257770416f11a725f5f0665fdbf63bafd0947a249fd5e7a225e92b7cbc73612c4acd033d6dc6631b90f
+  metadata.gz: 317c8c53fa4d8613c03842db8a83ad3853278a7548abf55af12a6f6cd8624d66b00cd42adfcd778561fe8cb1eafbf2d5db211ddc0e13ba9d1c2053bf7aeecad2
+  data.tar.gz: 7257f36e2d7f106ccaffd8464d393d8eadd4870b6c120701fdb8cded2a227cf4aa10fba43d89851282565645e96d4b385e54308d02c602c010e02a2af8162595

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/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,
@@ -19,7 +19,7 @@ module Metanorma
         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"
 
-        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

@@ -70,9 +70,11 @@ 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)
@@ -127,7 +129,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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cli
 version: !ruby/object:Gem::Version
-  version: 1.4.3pre
+  version: 1.4.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-25 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -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: 1.3.1
+      version: '0'
 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