metanorma-cli 1.4.14 → 1.4.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e6336cbea42f724106ef2d81a1a742526f713e843718861a3388d3e20c3148e
-  data.tar.gz: 89577c835bb93e9f2adb29a441481686ea85421af5149675eabc8fb3e01e1561
+  metadata.gz: e9144b8f31e88505e6bacc75d9168bf1b5671b7b09a8aec4c9d3b90fc4f2fc5b
+  data.tar.gz: 979bd574b765d9c6f039427db42e7f429475f93329c3cc85cf5897dcc295c8ef
 SHA512:
-  metadata.gz: b33354642e93dd60bbec2a596d4197a53ff738106d73e9552f25dc8e7169c942891cd09d93c8d7124463764955da5b2520bd51fc361e12b849d621b241f7aae6
-  data.tar.gz: 6ed35b3dea41caaa1e6c519ffcc9626e817a230923ea10864c168cabbffa8000d09d613881e76a6ba33800558aae05bce46c09ff0175f4a4f645665badc3b37e
+  metadata.gz: 7c3caa0038cd3e65ad164da094035e007cf33c40b154d4b382436b5f5523e8199ae7e62db8150cebb59fcd73106ab8eb1d7df098c161d925c23d58b308d982fc
+  data.tar.gz: 1d5f659db3a7cd5909a4ca3237f27a75ea7931bddcd232d0a8fef7f042e65a677d1f51246fb2d839af9958fbd4747389a943325a2f86a1fb363a16624ac2f414

data/exe/metanorma-manifest

@@ -17,7 +17,8 @@ def uuid
 end
 
 def extract_documents(m)
-  return [] unless m and m["sections"]
+  return [] unless m && m["sections"]
+
   ret = []
   m["sections"].each do |s|
     ret << s if s["file"]
@@ -28,17 +29,19 @@ end
 
 def hyperlink(link, suffix)
   return unless link
+
   link.sub(/\.adoc(?=$|#)/, ".#{suffix}")
 end
 
 def iterate(sections, options)
   return "" unless sections
+
   ret = ""
   Array(sections).each do |m|
-    ret+= "<clause id='#{uuid}'>\n"
-    title = m["title"] && m["number"] ? "#{m['number']}. #{m['title']}" : ( m["number"] || m["title"] || "&mdash;" )
-    ret+= "<title>#{title}</title>\n"
-    ret+= "<p>#{m["type"]}</p>\n" if m["type"]
+    ret += "<clause id='#{uuid}'>\n"
+    title = m["title"] && m["number"] ? "#{m['number']}. #{m['title']}" : (m["number"] || m["title"] || "&mdash;")
+    ret += "<title>#{title}</title>\n"
+    ret += "<p>#{m['type']}</p>\n" if m["type"]
     if m["file"]
       ret += "<p>"
       file = hyperlink(m["file"], "html")
@@ -53,20 +56,18 @@ def iterate(sections, options)
       end
       ret += "</p>\n"
     end
-    ret+= "<p>#{m['description']}</p>\n" if m["description"]
+    ret += "<p>#{m['description']}</p>\n" if m["description"]
     if m["revdate"]
-      if m["status"]
-        ret+= "<p>STAGE: #{m["status"]} (#{m['revdate']})</p>\n"
-      else
-        ret+= "<p align='right'>#{m['revdate']}</p>\n"
-      end
-    else
-      if m["status"]
-        ret+= "<p>STAGE: #{m["status"]}</p>\n"
-      end
+      ret += if m["status"]
+               "<p>STAGE: #{m['status']} (#{m['revdate']})</p>\n"
+             else
+               "<p align='right'>#{m['revdate']}</p>\n"
+             end
+    elsif m["status"]
+      ret += "<p>STAGE: #{m['status']}</p>\n"
     end
     ret += iterate(m["sections"], options)
-    ret+= "</clause>\n"
+    ret += "</clause>\n"
   end
   ret
 end
@@ -74,24 +75,24 @@ end
 opt_parser = OptionParser.new do |opts|
   opts.banner += " <file>"
   opts.on(
-    '-t',
-    '--type TYPE',
-    "Type of standard to generate"
+    "-t",
+    "--type TYPE",
+    "Type of standard to generate",
   ) { |v| options[:type] = v.to_sym }
 
   opts.on(
-    '-r',
-    '--require LIBRARY',
-    'Require LIBRARY prior to execution'
-  ) { |v|
+    "-r",
+    "--require LIBRARY",
+    "Require LIBRARY prior to execution",
+  ) do |v|
     options[:require] ||= []
     options[:require] << v
-  }
+  end
 
   opts.on(
-    '-R dir',
-    '--relaton',
-    "Insert links to relaton XML, generated by relaton-server-csd, with root directory dir (/id/xxxx is supplied)"
+    "-R dir",
+    "--relaton",
+    "Insert links to relaton XML, generated by relaton-server-csd, with root directory dir (/id/xxxx is supplied)",
   ) { |v| options[:relaton] = v }
 
   opts.on_tail("-h", "--help", "Show this message") do
@@ -115,35 +116,35 @@ documents = extract_documents(manifest)
 # TODO real lookup of namespaces and root elements
 
 out = <<~END
-<#{options[:type]}-standard xmlns="http://riboseinc.com/isoxml">
-<bibdata type="standard">
-  <title>#{manifest["title"]}</title>
+  <#{options[:type]}-standard xmlns="http://riboseinc.com/isoxml">
+  <bibdata type="standard">
+    <title>#{manifest['title']}</title>
 END
 
 # TODO leave in anchor references?
 #
 documents.each do |d|
   out += <<~END
-  <relation type="partOf">
-    <bibdata type="standard">
-      <title>#{d['title']}</title>
-      <docidentifier>#{d['number']}</docidentifier>
-      <abstract>#{d['description']}</abstract>
-    </bibdata>
-  </relation>
+    <relation type="partOf">
+      <bibdata type="standard">
+        <title>#{d['title']}</title>
+        <docidentifier>#{d['number']}</docidentifier>
+        <abstract>#{d['description']}</abstract>
+      </bibdata>
+    </relation>
   END
 end
 
 out += <<~END
-</bibdata>
-<sections>
+  </bibdata>
+  <sections>
 END
 
-out+=iterate(manifest["sections"], options)
+out += iterate(manifest["sections"], options)
 
-out+= <<~END
-</sections>
-<#{options[:type]}-standard>
+out += <<~END
+  </sections>
+  <#{options[:type]}-standard>
 END
 outfilename = options[:filename].sub(/\.[^.]+$/, ".xml")
 File.open(outfilename, "w") { |f| f.write out }
@@ -153,5 +154,8 @@ ext = :html
 file_extension = "html" || processor.output_formats[ext]
 outfilename = options[:filename].sub(/\.[^.]+$/, ".#{file_extension}")
 isodoc_options = { suppressheadingnumbers: true }
-isodoc_options[:htmlstylesheet] = manifest["htmlstylesheet"] if manifest["htmlstylesheet"]
+if manifest["htmlstylesheet"]
+  isodoc_options[:htmlstylesheet] =
+    manifest["htmlstylesheet"]
+end
 processor.output(out, outfilename, ext, isodoc_options)

data/lib/metanorma/cli/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Cli
-    VERSION = "1.4.14".freeze
+    VERSION = "1.4.16".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cli
 version: !ruby/object:Gem::Version
-  version: 1.4.14
+  version: 1.4.16
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-16 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug