metanorma-cli 1.5.4 → 1.5.5pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4ff0658a52885286b37c9ee1db0b72ae971f7b8b98a9c058e811d26c172b37c
-  data.tar.gz: 234127060684061599372566ee8b1aa16e1802c0dc4f7e714243a05cc63c6103
+  metadata.gz: 216941505e4823840c1a68100c614e8176ae6bab6191678c9ecc8672a1689cc9
+  data.tar.gz: e8d4d9687da7271aee62442fe6d8b2a439e09d14d7f0dc632f3cceab9ea2ea98
 SHA512:
-  metadata.gz: fd8dc8b79a8d6173f6aa126115f8cff2fe0283975b0d54d9954efad96a13961d797210b166abceba7b65f03f244c7216f53306f01b0ca9a005539e21f20d5928
-  data.tar.gz: 5e83a65c32c7482c4a66bc097bf9c9c186ad3de1dc4296e2accd73de55f20741a1781624831e998f50f495d9c5294936bc4263d1ecff44042e3c2d0ef405ef17
+  metadata.gz: 93e7b276b5e6ba39e2d52b3a1c0a93b8c02e8f40b711f9f540487d313e57c4b48165800d6a380837577662eca58ee8b13755230b35821cdf24aa9e81f1c9fce0
+  data.tar.gz: 208cd9e50cd8733aef8676bd2df1fa6b225edad8b3575f1cdf4e7b39fcef9dd33ec0c2ab875a8ec3635c16756e24f1394968b3a94bc40c17fc6ea1fc6c56fc93

data/lib/metanorma/cli/collection.rb

@@ -0,0 +1,57 @@
+require "yaml"
+
+module Metanorma
+  module Cli
+    class Collection
+      def initialize(file, options)
+        @file = file
+        @options = Cli.with_indifferent_access(options)
+        @compile_options = @options.delete(:compile)
+      end
+
+      def self.render(filename, options = {})
+        new(filename, options).render
+      end
+
+      def render
+        extract_options_from_file
+        collection_file.render(collection_options.compact)
+      end
+
+      private
+
+      attr_reader :file, :options
+
+      def collection_file
+        @collection_file ||= Metanorma::Collection.parse(file)
+      end
+
+      def collection_options
+        {
+          compile: @compile_options,
+          coverpage: options.fetch(:coverpage, nil),
+          output_folder: options.fetch(:output_folder, nil),
+          format: collection_output_formats(options.fetch(:format, "")),
+        }
+      end
+
+      def collection_output_formats(formats)
+        if formats.is_a?(String)
+          formats = formats.split(",")
+        end
+
+        (formats || []).map { |extension| extension.strip.to_sym }
+      end
+
+      def extract_options_from_file
+        if options.empty?
+          yaml_file = YAML.safe_load(File.read(@file.to_s))
+
+          @options = Cli.with_indifferent_access(
+            yaml_file.slice("coverpage", "format", "output_folder"),
+          )
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/cli/command.rb

@@ -1,5 +1,6 @@
 require "metanorma/cli/compiler"
 require "metanorma/cli/generator"
+require "metanorma/cli/collection"
 require "metanorma/cli/git_template"
 require "metanorma/cli/thor_with_config"
 require "metanorma/cli/commands/config"
@@ -67,12 +68,11 @@ module Metanorma
 
       def collection(filename = nil)
         if filename
-          opts = options
-          opts[:format] &&= opts[:format].split(",").map &:to_sym
-          opts[:compile] = filter_compile_options(opts)
-          coll = Metanorma::Collection.parse filename
-          coll.render opts
-        else UI.say("Need to specify a file to process")
+          coll_options = options.dup
+          coll_options[:compile] = filter_compile_options(coll_options)
+          Metanorma::Cli::Collection.render(filename, coll_options)
+        else
+          UI.say("Need to specify a file to process")
         end
       rescue ArgumentError => e
         UI.say e.message

data/lib/metanorma/cli/site_generator.rb

@@ -6,6 +6,7 @@ module Metanorma
   module Cli
     class SiteGenerator
       def initialize(source, options = {}, compile_options = {})
+        @collection_queue = []
         @source = find_realpath(source)
         @site_path = options.fetch(:output_dir, "site").to_s
         @asset_folder = options.fetch(:asset_folder, "documents").to_s
@@ -31,6 +32,8 @@ module Metanorma
           build_collection_file(collection_name)
           convert_to_html_page(collection_name, "index.html")
         end
+
+        dequeue_jobs
       end
 
       private
@@ -72,6 +75,10 @@ module Metanorma
       end
 
       def compile(source)
+        if collection_file?(source)
+          return
+        end
+
         UI.info("Compiling #{source} ...")
 
         options = @compile_options.merge(
@@ -158,6 +165,22 @@ module Metanorma
 
         output_directory
       end
+
+      def collection_file?(source)
+        ext = File.extname(source)&.downcase
+
+        if [".yml", ".yaml"].include?(ext)
+          @collection_queue << source
+        end
+      end
+
+      def dequeue_jobs
+        job = @collection_queue.pop
+
+        if job
+          Cli::Collection.render(job, compile: @compile_options)
+        end
+      end
     end
   end
 end

data/lib/metanorma/cli/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Cli
-    VERSION = "1.5.4".freeze
+    VERSION = "1.5.5pre".freeze
   end
 end

data/lib/metanorma/cli.rb

@@ -82,6 +82,10 @@ module Metanorma
       Pathname.new(Cli.root).join("..")
     end
 
+    def self.with_indifferent_access(options)
+      Thor::CoreExt::HashWithIndifferentAccess.new(options)
+    end
+
     def self.find_command(arguments)
       commands = Metanorma::Cli::Command.all_commands.keys
       commands.select { |cmd| arguments.include?(cmd.gsub("_", "-")) == true }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cli
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5pre
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-14 00:00:00.000000000 Z
+date: 2021-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debug
@@ -474,6 +474,7 @@ files:
 - i18n.yaml
 - lib/metanorma-cli.rb
 - lib/metanorma/cli.rb
+- lib/metanorma/cli/collection.rb
 - lib/metanorma/cli/command.rb
 - lib/metanorma/cli/commands/config.rb
 - lib/metanorma/cli/commands/site.rb
@@ -509,9 +510,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.2.32
 signing_key: