metanorma-cli 1.16.4 → 1.16.5

data/lib/metanorma/cli/commands/site.rb

@@ -58,6 +58,13 @@ module Metanorma
                type: :boolean,
                desc: "Strict compilation: abort if there are any errors"
 
+        option :extensions,
+               aliases: "-x",
+               desc: "Comma-separated list of output formats to generate " \
+                     "(e.g. html,rxl); overrides the manifest `extensions:` " \
+                     "key and any per-collection `format:`. " \
+                     "Default: all formats the flavor supports"
+
         # If no argument is provided, work out the base
         # path to use for calculation of full paths for
         # files referenced in the site manifest.

data/lib/metanorma/cli/flavor.rb

@@ -153,8 +153,11 @@ module Metanorma
       EXPORT_CONFIG_FLAVOR_FILES = [
         "metanorma/*/*.adoc",
         "isodoc/*/html/*",
+        "isodoc/*/*.xsl",
         "isodoc/*/*.yml",
+        "isodoc/*/*.yaml",
         "relaton/render/*.yml",
+        "relaton/render/*.yaml",
       ].freeze
 
       def export_config_flavor(type)

data/lib/metanorma/cli/site_generator.rb

@@ -12,7 +12,7 @@ module Metanorma
       DEFAULT_SITE_INDEX = "index.html"
       DEFAULT_CONFIG_FILE = "metanorma.yml"
 
-      # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       def initialize(source_path, options = {}, compile_options = {})
         @collection_queue = []
         @source_path = find_realpath(source_path)
@@ -46,8 +46,16 @@ module Metanorma
                      end
 
         @compile_options = compile_options
+
+        # Resolve the output formats to generate: CLI `--extensions` (a
+        # comma-separated string in compile_options) takes precedence over the
+        # manifest `extensions:` list; empty means "all formats the flavor
+        # supports" (the historical default).  Remove it from @compile_options
+        # so it is injected explicitly and not double-handled downstream.
+        @extensions = resolve_extensions
+        @compile_options.delete(:extensions)
       end
-      # rubocop:enable Metrics/AbcSize
+      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
       def self.generate!(source, options = {}, compile_options = {})
         new(source, options, compile_options).generate!
@@ -189,9 +197,10 @@ module Metanorma
           format: :asciidoc,
           output_dir: ensure_site_asset_output_sub_directory!(file_path),
           site_generate: true,
+          baseassetpath: Pathname.new(file_path.to_s).dirname.to_s,
+          **extensions_option,
         )
 
-        options[:baseassetpath] = Pathname.new(file_path.to_s).dirname.to_s
         Metanorma::Cli::Compiler.compile(file_path.to_s, options)
       end
 
@@ -257,22 +266,39 @@ module Metanorma
       end
 
       def manifest_config(manifest_model)
+        mn = manifest_model&.metanorma
         {
-          files: manifest_model&.metanorma&.source&.files || [],
-          template: manifest_model&.metanorma&.template,
-          collection_name: manifest_model
-            .metanorma
-            .collection
-            .name,
-          collection_organization: manifest_model
-            .metanorma
-            .collection
-            .organization,
+          files: mn&.source&.files || [],
+          template: mn&.template,
+          extensions: mn&.extensions || [],
+          collection_name: mn.collection.name,
+          collection_organization: mn.collection.organization,
         }
       rescue NoMethodError
         raise Errors::InvalidManifestFileError.new("Invalid manifest file")
       end
 
+      # @return [Array<String>] the output formats to generate, resolved from
+      # the CLI `--extensions` flag (highest precedence) then the manifest
+      # `extensions:` list.  Empty array means "all formats" (no filtering).
+      def resolve_extensions
+        cli = @compile_options[:extensions]
+        cli = cli.split(",") if cli.is_a?(String)
+        cli = (cli || []).map(&:strip).reject(&:empty?)
+        return cli unless cli.empty?
+
+        manifest[:extensions] || []
+      end
+
+      # Restrict output formats when extensions were requested (CLI or
+      # manifest); Compiler turns this into `extension_keys`.  Empty means no
+      # filtering (all formats the flavor supports).
+      def extensions_option
+        return {} if @extensions.empty?
+
+        { extensions: @extensions.join(",") }
+      end
+
       def source_from_manifest
         @source_from_manifest ||= begin
           result = manifest[:files].map do |source_file|
@@ -349,12 +375,18 @@ module Metanorma
       #
       def compile_collections!
         @collection_queue.compact.each do |file|
-          Cli::Collection.render(
-            file.to_s,
+          render_options = {
             compile: @compile_options,
             output_dir: asset_directory,
             site_generate: true,
-          )
+          }
+
+          # Override each collection file's own `format:` when extensions were
+          # requested (CLI or manifest); passed-in options win over the
+          # file-extracted ones in Cli::Collection.
+          render_options[:format] = @extensions unless @extensions.empty?
+
+          Cli::Collection.render(file.to_s, render_options)
         end
       end
     end

data/lib/metanorma/cli/thor_with_config.rb

@@ -22,6 +22,7 @@ module Metanorma
             continue_without_fonts
             progress
             strict
+            extensions
           ]
           options.select { |k, _| copts.include?(k) }.symbolize_all_keys
         end

data/lib/metanorma/cli/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Cli
-    VERSION = "1.16.4".freeze
+    VERSION = "1.16.5".freeze
   end
 end

data/lib/metanorma/site_manifest.rb

@@ -23,6 +23,7 @@ module Metanorma
       attribute :source, SourceEntries
       attribute :collection, SiteMetadata
       attribute :template, SiteTemplate
+      attribute :extensions, :string, collection: true
     end
 
     class Base < Lutaml::Model::Serializable

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cli
 version: !ruby/object:Gem::Version
-  version: 1.16.4
+  version: 1.16.5
 platform: ruby
 authors:
 - Ribose Inc.
@@ -321,8 +321,16 @@ description: Executable to process any Metanorma standard.
 email:
 - open.source@ribose.com
 executables:
+- index.html
+- index.xml
 - metanorma
 - metanorma-manifest
+- metanorma.old
+- rfc2629-other.ent
+- rfc2629-xhtml.ent
+- rfc2629.dtd
+- rfc6350.adoc
+- rfc6350.xml
 extensions: []
 extra_rdoc_files:
 - CODE_OF_CONDUCT.md
@@ -340,9 +348,18 @@ files:
 - bin/setup
 - docs/installation.adoc
 - docs/navigation.adoc
+- docs/testing.adoc
 - docs/usage.adoc
+- exe/index.html
+- exe/index.xml
 - exe/metanorma
 - exe/metanorma-manifest
+- exe/metanorma.old
+- exe/rfc2629-other.ent
+- exe/rfc2629-xhtml.ent
+- exe/rfc2629.dtd
+- exe/rfc6350.adoc
+- exe/rfc6350.xml
 - i18n.yaml
 - lib/metanorma-cli.rb
 - lib/metanorma/cli.rb