metanorma-cli 1.4.13 → 1.4.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d970059361b835cee83ac9cf99d7876552536a656db299fddaab7f1b66586a4
-  data.tar.gz: f98918779ead848b3f60d683b931bb9b9b0074102aabb02aa89c9824695871d4
+  metadata.gz: c699cdb1e6754c4487fb2647823057bc3b4940bffe39db815933b15c33f34bce
+  data.tar.gz: 983031e88418c45cf3027e1d7b41015bea7e8ee08d2ad3311e8592a3009b4436
 SHA512:
-  metadata.gz: 662c3d0ef7dff9526feed6e91d54d79b4e1b16e12783a817ee6f42e3bd3fb1f210e9054592a59817e2b26b6919df3f2035949fc47985902e4ab588644f826658
-  data.tar.gz: 87379dc1184a7760aeac5ba59bbb8ed315973d14299262054d3588efbff6f5c3e803a362e96ae250f7f5f34008b430d79036dad23ce76a44cad87a50fba91758
+  metadata.gz: 0412c5e0bf42f9c96bb9fadf72497a929634a560906b371bdcc415403ce724baa7cf8c23d8c9dfaf2ac05b83b4b57e01ece237f949220fc4b75d6396e5e15fb8
+  data.tar.gz: f42876f7c9f5b759c0ae045c645d4e07ede3d571bdd9f1d3da91b2bbb7ba25d25f433798e98188e2c56c8a4c0611aeabce4890b1ba5ef63bc27eaa07f604b3ed

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.13".freeze
+    VERSION = "1.4.15".freeze
   end
 end

data/metanorma-cli.gemspec

@@ -55,7 +55,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "metanorma-iho", "~> 0.3.0"
   spec.add_runtime_dependency "metanorma-itu", "~> 1.3.0"
   # spec.add_runtime_dependency "metanorma-nist", "~> 1.3.0"
-  spec.add_runtime_dependency "metanorma-ogc", "~> 1.3.0"
+  spec.add_runtime_dependency "metanorma-ogc", "~> 1.4.0"
   spec.add_runtime_dependency "metanorma-un", "~> 0.6.0"
   spec.add_runtime_dependency "relaton-cli", ">= 0.8.2"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cli
 version: !ruby/object:Gem::Version
-  version: 1.4.13
+  version: 1.4.15
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-03 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -380,14 +380,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: metanorma-un
   requirement: !ruby/object:Gem::Requirement
@@ -513,8 +513,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.7
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Metanorma is the standard of standards; the metanorma gem allows you to create