metanorma-cli 1.12.3 → 1.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90f685d6b13137d25912d7129caa1a487daf72b3c901cb886f70dc81b1db0379
-  data.tar.gz: 45b57be8c9ac1906e772d064502326d17ecb9537f313da2556cd855bdeb6dd1a
+  metadata.gz: 83127d9943ff11c57968eba5da57a1506bab8cdbe1e035e055c382b5a70ba8d9
+  data.tar.gz: 76a08db2cd6f26d9f82a795fd2075eabe1f4ec7b1789bb56d6fccd49deaf188d
 SHA512:
-  metadata.gz: 159cd71befca37dacc12caafd5bc1e9da5f3d729630de5afd43a02f58c5a2089a9e1e6557dffaea4a915bd957ea9fa69c0ff9d7d82211896214b28c3970b1921
-  data.tar.gz: 15a912993f92551525183ab983a5de78d29407b45def67fb96046e6e5da3e43ff3b8cb988901cbb7fd4b1ba82c542148b444fce0b7e686caf56737952519fcce
+  metadata.gz: 3e43bd5b2d5a3cb5bea64d82109963de633ab0c3e139ae36283cf4cbc0756a54e7952157c37e20c2bf0ee1c6edb09245671b77a5b1054a5073d13794063557e0
+  data.tar.gz: ac22976c0ee80b29e48ba6559230c742f97d86bbc2243cd51a4657833dc54ffb6b60b5a9919c8bbfc6be7404e9d6c4593fe8e5028ceb8cd45213d64b6b6f6ed9

data/lib/metanorma/cli/collection.rb

@@ -37,6 +37,7 @@ module Metanorma
           output_folder: build_output_folder,
           coverpage: @options.fetch(:coverpage, nil),
           format: collection_output_formats(@options.fetch(:format, "")),
+          site_generate: @options["site_generate"],
         }
       end
 

data/lib/metanorma/cli/site_generator.rb

@@ -34,6 +34,17 @@ module Metanorma
           template_data("output_filename"),
         )
 
+        # Determine base path for template files
+        # If template_dir is not absolute, then it is relative to the manifest
+        # file.
+        # If manifest file is not provided, then it is relative to the current
+        # directory.
+        @base_path = if manifest_file.nil?
+                       Pathname.pwd
+                     else
+                       Pathname.new(manifest_file).parent
+                     end
+
         @compile_options = compile_options
       end
       # rubocop:enable Metrics/AbcSize
@@ -47,7 +58,8 @@ module Metanorma
 
         compile_files!(select_source_files)
 
-        site_directory = asset_directory.join("..")
+        site_directory = asset_directory.parent
+
         Dir.chdir(site_directory) do
           build_collection_file!(relaton_collection_index)
           convert_to_html_page!(relaton_collection_index, DEFAULT_SITE_INDEX)
@@ -61,7 +73,8 @@ module Metanorma
       attr_reader :source, :asset_folder, :asset_directory, :site_path,
                   :manifest_file, :relaton_collection_index, :stylesheet,
                   :template_dir,
-                  :output_filename_template
+                  :output_filename_template,
+                  :base_path
 
       def find_realpath(source_path)
         Pathname.new(source_path.to_s).realpath if source_path
@@ -128,14 +141,32 @@ module Metanorma
         raise Errors::FatalCompilationError, fatals unless fatals.empty?
       end
 
-      def convert_to_html_page!(relaton_index_filename, page_name)
+      # Given a path, return the full path if it is not nil.
+      # If the path is absolute, return the path as is.
+      # If the path is relative, return the path relative to the base path.
+      # @param some_path [String, nil] the path to be converted to full path
+      # @return [String, nil] the full path
+      def full_path_for(some_path)
+        if some_path.nil?
+          nil
+        elsif Pathname.new(some_path).absolute?
+          some_path
+        elsif !base_path.nil?
+          base_path.join(some_path)
+        end
+      end
+
+      def convert_to_html_page!(
+        relaton_index_filename, page_name
+      )
         UI.info("Generating html site in #{site_path} ...")
 
         Relaton::Cli::XMLConvertor.to_html(
           relaton_index_filename,
-          stylesheet,
-          template_dir,
+          full_path_for(stylesheet),
+          full_path_for(template_dir),
         )
+
         File.rename(
           Pathname.new(relaton_index_filename).sub_ext(".html").to_s,
           page_name,
@@ -230,6 +261,7 @@ module Metanorma
             job,
             compile: @compile_options,
             output_dir: @asset_directory.join(".."),
+            site_generate: true,
           )
         end
       end

data/lib/metanorma/cli/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Cli
-    VERSION = "1.12.3".freeze
+    VERSION = "1.12.4".freeze
   end
 end

data/metanorma-cli.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "metanorma-standoc", "~> 3.0.0"
   # spec.add_dependency 'metanorma-mpfa', "~> 0.9.0"
   spec.add_dependency "git", "~> 1.5"
-  spec.add_dependency "lutaml-model", "~> 0.6.7"
+  spec.add_dependency "lutaml-model"
   spec.add_dependency "metanorma", "~> 2.1.0"
   spec.add_dependency "metanorma-iho", "~> 1.1.0"
   spec.add_dependency "metanorma-itu", "~> 2.6.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cli
 version: !ruby/object:Gem::Version
-  version: 1.12.3
+  version: 1.12.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-18 00:00:00.000000000 Z
+date: 2025-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-ietf
@@ -154,16 +154,16 @@ dependencies:
   name: lutaml-model
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: metanorma
   requirement: !ruby/object:Gem::Requirement