Merge pull request #324 from metanorma/fix/site-rxl

directive to include RXL output in metanorma site compilation: https:…
metanorma · Mar 25, 2024 · 098d382 · 098d382
2 parents 5f3d9e7 + c8246e0
commit 098d382
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/lib/metanorma/cli/site_generator.rb b/lib/metanorma/cli/site_generator.rb
@@ -89,7 +89,8 @@ def compile(source)
         UI.info("Compiling #{source} ...")
 
         options = @compile_options.merge(
-          format: :asciidoc, output_dir: build_asset_output_directory(source)
+          format: :asciidoc, output_dir: build_asset_output_directory(source),
+          site_generate: true
         )
 
         options[:baseassetpath] = Pathname.new(source.to_s).dirname.to_s

diff --git a/spec/acceptance/generate_site_spec.rb b/spec/acceptance/generate_site_spec.rb
@@ -10,28 +10,32 @@
   describe "site generate" do
     it "generate a mini site" do
       output_dir = Dir.pwd
-      allow(Metanorma::Cli::SiteGenerator).to receive(:generate).and_call_original
+      allow(Metanorma::Cli::SiteGenerator).to receive(:generate)
+        .and_call_original
       allow(Metanorma::Cli::Compiler).to receive(:compile)
       command = %W(site generate #{source_dir} -o #{output_dir})
 
       output = capture_stdout { Metanorma::Cli.start(command) }
 
       expect(output).to include("Site has been generated at #{output_dir}")
       expect(Metanorma::Cli::SiteGenerator).to have_received(:generate).with(
-        source_dir.to_s, { output_dir: output_dir, no_progress: true }, no_progress: true
+        source_dir.to_s, { output_dir: output_dir,
+                           no_progress: true }, no_progress: true
       )
 
       expect(Metanorma::Cli::Compiler).to have_received(:compile)
         .at_least(:once)
         .with(
           kind_of(String),
-          hash_including(format: :asciidoc, output_dir: kind_of(Pathname))
+          hash_including(format: :asciidoc, output_dir: kind_of(Pathname),
+                         site_generate: true),
         )
     end
 
     it "generate a mini site with extra compile args" do
       output_dir = Dir.pwd
-      allow(Metanorma::Cli::SiteGenerator).to receive(:generate).and_call_original
+      allow(Metanorma::Cli::SiteGenerator).to receive(:generate)
+        .and_call_original
       allow(Metanorma::Cli::Compiler).to receive(:compile)
       command = %W(site generate #{source_dir} -o #{output_dir}
                    --continue-without-fonts -S)
@@ -132,6 +136,7 @@
   end
 
   def source_dir
-    @source_dir ||= File.expand_path(File.join(File.dirname(__dir__), "fixtures"))
+    @source_dir ||=
+      File.expand_path(File.join(File.dirname(__dir__), "fixtures"))
   end
 end
diff --git a/spec/metanorma/cli/site_generator_spec.rb b/spec/metanorma/cli/site_generator_spec.rb
@@ -20,6 +20,7 @@
           format: :asciidoc,
           output_dir: asset_directory,
           continue_without_fonts: false,
+          site_generate: true,
         )
 
         expect(Relaton::Cli::RelatonFile).to have_received(:concatenate).with(
@@ -46,6 +47,7 @@
           output_dir: asset_directory,
           continue_without_fonts: false,
           no_progress: false,
+          site_generate: true,
         )
 
         expect(Relaton::Cli::RelatonFile).to have_received(:concatenate).with(
@@ -97,6 +99,7 @@
             format: :asciidoc,
             output_dir: output_directory.join(asset_folder),
             continue_without_fonts: false,
+            site_generate: true,
           )
         end