metanorma-cli 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb0751037e69234f0d34223e742f107ebd69a095c803d639ff7b4574bef06be1
-  data.tar.gz: b776d0d285d1e06cb71071460b1bcd46f33252c6ee76ac7024eb37063ef5341c
+  metadata.gz: 83ab2e94f18cd751ef590a43c00d854b9815c250cfe891e469cf04c9e686602e
+  data.tar.gz: 82a3bedaa67c437cd24b594afad77ac4f89f4135d6bd98381d00ef60fc4885e8
 SHA512:
-  metadata.gz: e7c3fc02662624ff2b68bbc147a6aa4707d0f90db24ba317adcb44bae25e9c2c2b846dfebc10f8cebd4c040ac58057f9e67c7db6d333672e2064fed46b051d65
-  data.tar.gz: cc329f85a1c4220f4fc29ebc765992116c78c7802041cb546e9a61333a268540cb683cf1a482c85d12d3c3e03bb0f83b84510da8191a1ed52244d2af93d95f45
+  metadata.gz: 3a206d1f4cfd66a660abd4bdf1423ae4c5d5e568f2f8ede333a422b70f6026497029fefd0aff7f7bae9f5071da938b2a939a02c2c2ff0fb38c0ad6ee6dbb838d
+  data.tar.gz: 6c0044c6c1e6ae0875ba12d3b2fe67e7bef91161ada459a5169a05c48f569e21cedaa8c8a0b71d319f56f6dab4b1c222fa12bb8dee248534a72d98c7d567ead7

data/lib/metanorma/cli/collection.rb

@@ -6,6 +6,7 @@ module Metanorma
       def initialize(file, options)
         @file = file
         @options = Cli.with_indifferent_access(options)
+        @output_dir = @options.delete(:output_dir)
         @compile_options = @options.delete(:compile)
       end
 
@@ -33,12 +34,22 @@ module Metanorma
       def collection_options
         @collection_options ||= {
           compile: @compile_options,
+          output_folder: build_output_folder,
           coverpage: options.fetch(:coverpage, nil),
-          output_folder: options.fetch(:output_folder, source_folder),
           format: collection_output_formats(options.fetch(:format, "")),
         }
       end
 
+      def build_output_folder
+        output_folder = options.fetch(:output_folder, nil)
+
+        if output_folder && @output_dir
+          @output_dir.join(output_folder).to_s
+        else
+          output_folder || source_folder
+        end
+      end
+
       def collection_output_formats(formats)
         if formats.is_a?(String)
           formats = formats.split(",")

data/lib/metanorma/cli/site_generator.rb

@@ -178,7 +178,11 @@ module Metanorma
         job = @collection_queue.pop
 
         if job
-          Cli::Collection.render(job, compile: @compile_options)
+          Cli::Collection.render(
+            job,
+            compile: @compile_options,
+            output_dir: @asset_directory.join(".."),
+          )
         end
       end
     end

data/lib/metanorma/cli/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Cli
-    VERSION = "1.6.2".freeze
+    VERSION = "1.6.3".freeze
   end
 end

data/metanorma-cli.gemspec

@@ -56,13 +56,12 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "metanorma-iho", "~> 0.6.0"
   spec.add_runtime_dependency "metanorma-itu", "~> 2.1.0"
   # spec.add_runtime_dependency "metanorma-nist", "~> 2.1.0"
-  spec.add_runtime_dependency "metanorma-ieee", "~> 0.0.1"
+  spec.add_runtime_dependency "metanorma-ieee", "~> 0.1.0"
   spec.add_runtime_dependency "metanorma-ogc", "~> 2.2.0"
   spec.add_runtime_dependency "metanorma-un", "~> 0.9.0"
   spec.add_runtime_dependency "relaton-cli", ">= 0.8.2"
 
   spec.add_runtime_dependency "socksify"
   # spec.metadata["rubygems_mfa_required"] = "true"
-  # spec.metadata["rubygems_mfa_required"] = "true"
   # NOBODY UNCOMMENTS THIS WITHOUT EXPLAINING TO ME HOW TO USE MFA
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cli
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-26 00:00:00.000000000 Z
+date: 2022-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debug
@@ -380,14 +380,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: metanorma-ogc
   requirement: !ruby/object:Gem::Requirement