metanorma-cli 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13e00898d6da770a5a0cca7456e933676657e7c9fb7ea216cea5c0a8f7bdf641
-  data.tar.gz: fd6bd6274f4f009eef477935dac2a6eb1ba0b85f568d9bb5beb3f033a5748889
+  metadata.gz: d6a9cbd149506055cfacef18d4d480b75c749ef06581c37a2f3867e5cb3c7efe
+  data.tar.gz: a5cb8f93eea8b289bcfb078a33f4469b7de71ae9177d547bb310e03915490675
 SHA512:
-  metadata.gz: 00a80e85a45101eaa350c520614a437b41bb29303edbf8d083c8e35aecbabafc2fe48760e774cc921d7765d026d5692fadd4d057eedfd56ff6d2c1dd92e02443
-  data.tar.gz: 90d7d87f9428d90dc415240d080e31e9ce7842e0e3bcc63ca9e0ac5c7627d5c9ab903de3b506de7ac9653c841cd3464b446e76a81663929b6fc1e8013396fcdf
+  metadata.gz: b1132b67a377d9102dde1f195de27ae799e72d4129a613fcf81a662b6a75841935267a2777cc784f9f7964a9d176c8cffed9133367573f5b8942af01296f30f7
+  data.tar.gz: a778b63c1890eada45ab18be45a612caa23bf83aa02803fa9a89d5cf389ed404302f81cff9b866ecb430fb924ad228fdc34025276c0000c6049b4b52ad91a41b

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    metanorma-cli (1.1.4)
+    metanorma-cli (1.1.6)
       isodoc (~> 0.9.0)
-      metanorma (~> 0.3.5)
+      metanorma (~> 0.3.9)
       metanorma-acme (~> 1.1.0)
       metanorma-csand (~> 1.1.0)
       metanorma-csd (~> 1.1.0)
@@ -33,7 +33,7 @@ GEM
     camertron-eprun (1.1.1)
     cldr-plurals-runtime-rb (1.0.1)
     cnccs (0.1.3)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.5)
     diff-lcs (1.3)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
@@ -59,7 +59,7 @@ GEM
       iso-bib-item (~> 0.4.2)
     ietfbib (0.4.5)
       iso-bib-item (~> 0.4.2)
-    iev (0.2.0)
+    iev (0.2.1)
       nokogiri
     image_size (2.0.0)
     iso-639 (0.2.8)
@@ -71,7 +71,7 @@ GEM
       algoliasearch
       iecbib (~> 0.2.1)
       iso-bib-item (~> 0.4.2)
-    isodoc (0.9.17)
+    isodoc (0.9.19)
       asciimath
       html2doc (~> 0.8.6)
       htmlentities (~> 4.3.4)
@@ -86,17 +86,17 @@ GEM
       uuidtools
     isoics (0.1.7)
     json (2.2.0)
-    liquid (4.0.1)
-    metanorma (0.3.9)
+    liquid (4.0.3)
+    metanorma (0.3.10)
       asciidoctor
       htmlentities
-    metanorma-acme (1.1.2)
+    metanorma-acme (1.1.3)
       asciidoctor (~> 1.5.7)
       htmlentities (~> 4.3.4)
       isodoc (~> 0.9.0)
       metanorma-standoc (~> 1.1.0)
       ruby-jing
-    metanorma-csand (1.1.2)
+    metanorma-csand (1.1.3)
       asciidoctor (~> 1.5.7)
       asciimath
       htmlentities (~> 4.3.4)
@@ -109,10 +109,10 @@ GEM
       ruby-xslt
       thread_safe
       uuidtools
-    metanorma-csd (1.1.2)
+    metanorma-csd (1.1.3)
       isodoc (~> 0.9.6)
       metanorma-standoc (~> 1.1.0)
-    metanorma-gb (1.1.2)
+    metanorma-gb (1.1.4)
       gb-agencies (~> 0.0.4)
       isodoc (~> 0.9.1)
       metanorma-iso (~> 1.1.0)
@@ -120,13 +120,13 @@ GEM
     metanorma-ietf (1.0.1)
       isodoc (~> 0.9.6)
       metanorma-standoc (~> 1.1.0)
-    metanorma-iso (1.1.2)
+    metanorma-iso (1.1.4)
       asciidoctor (~> 1.5.7)
       iev (~> 0.2.0)
       isodoc (~> 0.9.8)
       metanorma-standoc (~> 1.1.0)
       ruby-jing
-    metanorma-m3d (1.1.2)
+    metanorma-m3d (1.1.3)
       asciidoctor (~> 1.5.7)
       asciimath
       htmlentities (~> 4.3.4)
@@ -139,42 +139,44 @@ GEM
       ruby-xslt
       thread_safe
       uuidtools
-    metanorma-mpfd (0.1.8)
+    metanorma-mpfd (0.1.9)
       asciidoctor (~> 1.5.7)
       htmlentities (~> 4.3.4)
       isodoc (~> 0.9.0)
       metanorma-standoc (~> 1.1.0)
       nokogiri
       twitter_cldr
-    metanorma-nist (0.0.4)
+    metanorma-nist (0.0.5)
       asciidoctor (~> 1.5.7)
       htmlentities (~> 4.3.4)
       isodoc (~> 0.9.0)
       metanorma-standoc (~> 1.1.0)
       ruby-jing
-    metanorma-ogc (0.0.6)
+      twitter_cldr
+    metanorma-ogc (0.0.7)
       asciidoctor (~> 1.5.7)
       htmlentities (~> 4.3.4)
       iso-639
       isodoc (~> 0.9.0)
       metanorma-standoc (~> 1.1.0)
       ruby-jing
-    metanorma-rsd (1.1.2)
+    metanorma-rsd (1.1.3)
       asciidoctor (~> 1.5.7)
       htmlentities (~> 4.3.4)
       isodoc (~> 0.9.0)
       metanorma-standoc (~> 1.1.0)
       nokogiri
-    metanorma-standoc (1.1.3)
+    metanorma-standoc (1.1.5)
       asciidoctor (~> 1.5.7)
       concurrent-ruby
       html2doc (~> 0.8.0)
-      iev (~> 0.2.0)
+      iev (~> 0.2.1)
       isodoc (~> 0.9.0)
       relaton (~> 0.3.1)
       ruby-jing
       sterile (~> 1.0.14)
-    metanorma-unece (0.0.11)
+      unicode2latex (~> 0.0.1)
+    metanorma-unece (0.0.13)
       asciidoctor (~> 1.5.7)
       htmlentities (~> 4.3.4)
       iso-639
@@ -196,7 +198,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    relaton (0.3.1)
+    relaton (0.3.2)
       algoliasearch
       gbbib (~> 0.4.0)
       iecbib (~> 0.2.0)
@@ -245,6 +247,7 @@ GEM
       tzinfo
     tzinfo (2.0.0)
       concurrent-ruby (~> 1.0)
+    unicode2latex (0.0.2)
     uuidtools (2.1.5)
 
 PLATFORMS

data/README.adoc

@@ -1,9 +1,9 @@
 = Metanorma's command-line interface (CLI)
 
 image:https://img.shields.io/gem/v/metanorma-cli.svg["Gem Version", link="https://rubygems.org/gems/metanorma-cli"]
-image:https://img.shields.io/travis/riboseinc/metanorma-cli/master.svg["Build Status", link="https://travis-ci.org/riboseinc/metanorma-cli"]
-image:https://codeclimate.com/github/riboseinc/metanorma-cli/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/riboseinc/metanorma-cli"]
-image:https://ci.appveyor.com/api/projects/status/vqo2221uwcaov8kx?svg=true["Build Status", link="https://ci.appveyor.com/project/ribose/metanorma-cli"]
+image:https://img.shields.io/travis/metanorma/metanorma-cli/master.svg["Build Status", link="https://travis-ci.org/metanorma/metanorma-cli"]
+image:https://codeclimate.com/github/metanorma/metanorma-cli/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-cli"]
+image:https://ci.appveyor.com/api/projects/status/vqo2221uwcaov8kx?svg=true["Build Status", link="https://ci.appveyor.com/project/metanorma/metanorma-cli"]
 
 == Installation
 

data/appveyor.yml

@@ -12,33 +12,11 @@ matrix:
     - RUBY_VERSION: _trunk
 
 install:
-  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
-  - gem install bundler -v 1.17.3
-  - npm install -g puppeteer
-  - npm install
-  # install libxml2 & libxslt
-  - ps: Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
+  - ps: . { iwr -useb https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/appveyor.ps1 } | iex
   - refreshenv
-  - cinst --x86 xsltproc
-  - set XSLT_PROC=%ChocolateyInstall%\lib\xsltproc\dist
-  # RUBY_DLL_PATH looks broken in ruby23
-  - if "%RUBY_VERSION%" == "23" (
-      XCOPY /Y %XSLT_PROC%\bin\lib*.dll C:\Ruby%RUBY_VERSION%\bin\*
-    ) else (
-      XCOPY /Y %XSLT_PROC%\bin\libxml2*.dll %XSLT_PROC%\bin\libxml2.dll* &
-      XCOPY /Y %XSLT_PROC%\bin\libxslt*.dll %XSLT_PROC%\bin\libxslt.dll* &
-      XCOPY /Y %XSLT_PROC%\bin\libexslt*.dll %XSLT_PROC%\bin\libexslt.dll*
-    )
-  - echo @ECHO OFF > %ChocolateyInstall%\bin\xml2-config.bat
-  - echo @ECHO OFF > %ChocolateyInstall%\bin\xslt-config.bat
 
 build_script:
-  # RUBY_DLL_PATH looks broken in ruby23
-  - if NOT "%RUBY_VERSION%" == "23" setx /M RUBY_DLL_PATH "%ChocolateyInstall%\lib\xsltproc\dist\bin;%RUBY_DLL_PATH%"
-  - refreshenv
   - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
-  - set XSLT_PROC=%ChocolateyInstall%\lib\xsltproc\dist
-  - bundle config build.ruby-xslt --with-xml2-include=%XSLT_PROC%\include\libxml2 --with-xslt-include=%XSLT_PROC%\include --with-xml2-lib=%XSLT_PROC%\lib --with-xslt-lib=%XSLT_PROC%\lib
   - bundle update
   - bundle install
 

data/exe/metanorma

@@ -89,10 +89,15 @@ opt_parser = OptionParser.new do |opts|
   ) { |v| options[:relaton] = v }
 
   opts.on(
-    '-S',
-    '--sourcecode DIR',
-    'Export sourcecode fragments from this document to nominated directory'
-  ) { |v| options[:sourcecode] = v }
+    '-e',
+    '--extract DIR(,ASSET1,ASSET2...)',
+    Array,
+    'Export sourcecode fragments from this document to nominated directory. If ASSET1,ASSET2 are named, only those types of asset are extracted'
+  ) do |v|
+    options[:extract] = v[0]
+    options[:extract_type] = []
+    v.size > 1 and options[:extract_type] = v[1..-1].map(&:to_sym)
+  end
 
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
@@ -129,108 +134,4 @@ end
 
 filename = options[:filename]
 
-=begin
-options[:type] ||= registry&.find_processor(:iso)&.extract_metanorma_options(File.read(filename, encoding: "utf-8"))[:type]&.to_sym
-standard_type = options[:type]
-unless standard_type
-  puts "[metanorma] Error: Please specify a standard type."
-  puts opt_parser.help
-  exit 0
-end
-=end
-
-=begin
-unless registry.supported_backends.include? standard_type
-  puts "[metanorma] Warning: #{standard_type} is not a default standard type."
-  puts "[metanorma] Info: Attempting to load `metanorma-#{standard_type}` gem for standard type `#{standard_type}`."
-
-  begin
-    require "metanorma-#{standard_type}"
-    puts "[metanorma] Info: gem `metanorma-#{standard_type}` loaded."
-  rescue LoadError
-    puts "[metanorma] Error: loading gem `metanorma-#{standard_type}` failed. Exiting."
-    exit 0
-  end
-
-  unless registry.supported_backends.include? standard_type
-    puts "[metanorma] Error: The `metanorma-#{standard_type}` gem still doesn't support `#{standard_type}`. Exiting."
-    exit 0
-  end
-end
-=end
-
-=begin
-unless options[:format] == :asciidoc
-  puts "[metanorma] Error: Only source file format currently supported is 'asciidoc'."
-  exit 0
-end
-=end
-
-=begin
-options[:extension_keys] ||= registry&.find_processor(:iso)&.
-  extract_metanorma_options(File.read(filename, encoding: "utf-8"))[:extensions]&.split(/,[ ]*/)&.map(&:to_sym)
-options[:extension_keys] = nil if options[:extension_keys] == [:all]
-=end
-
-=begin
-case options[:format]
-when :asciidoc
-  processor = registry.find_processor(options[:type].to_sym)
-  options[:extension_keys] ||= processor.output_formats.inject([]) do |memo, (k, _)|
-    memo << k; memo
-  end
-  extensions = options[:extension_keys].inject([]) do |memo, e|
-    if processor.output_formats[e]
-      memo << e
-    else
-      warn "[metanorma] Error: #{e} format is not supported for this standard."
-    end
-    memo
-  end
-  exit 0 if extensions.empty?
-
-  file, isodoc = case extname = File.extname(filename)
-                 when ".adoc"
-                   puts "[metanorma] Processing: Asciidoctor input."
-                   file = File.read(filename, encoding: "utf-8")
-                   [file, processor.input_to_isodoc(file, filename)]
-                 when ".xml"
-                   puts "[metanorma] Processing: Metanorma XML input."
-
-                   # TODO NN: this is a hack -- we should provide/bridge the
-                   # document attributes in Metanorma XML
-
-                   ["", File.read(filename, encoding: "utf-8")]
-                 else
-                   warn "[metanorma] Error: file extension #{extname} is not supported."
-                   exit 1
-                 end
-
-  if options[:relaton]
-    xml = Nokogiri::XML(isodoc)
-    bibdata = xml.at("//bibdata") || xml.at("//xmlns:bibdata")
-    #docid = bibdata&.at("./xmlns:docidentifier")&.text || options[:filename]
-    #outname = docid.sub(/^\s+/, "").sub(/\s+$/, "").gsub(/\s+/, "-") + ".xml"
-    File.open(options[:relaton], "w:UTF-8") { |f| f.write bibdata.to_xml }
-  end
-
-  extensions.each do |ext|
-    isodoc_options = processor.extract_options(file)
-    isodoc_options[:datauriimage] = true if options[:datauriimage]
-    file_extension = processor.output_formats[ext]
-    outfilename = options[:filename].sub(/\.[^.]+$/, ".#{file_extension}")
-    processor.output(isodoc, outfilename, ext, isodoc_options)
-    if options[:wrapper] and /html$/.match file_extension
-      outfilename = outfilename.sub(/\.html$/, "")
-      FileUtils.mkdir_p outfilename
-      FileUtils.mv "#{outfilename}.html", outfilename
-      FileUtils.mv "#{outfilename}_images", outfilename
-    end
-  end
-else
-  warn "[metanorma] Error: output format (#{options[:format]}) not supported."
-  exit 1
-end
-=end
-
 Metanorma::Compile.new().compile(filename, options)

data/extract/sourcecode/sourcecode-0000.txt

@@ -0,0 +1,5 @@
+def ruby(x)
+  if x < 0 && x > 1
+    return
+  end
+end

data/lib/metanorma/cli/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Cli
-    VERSION = "1.1.5"
+    VERSION = "1.1.6"
   end
 end

data/metanorma-cli.gemspec

@@ -47,6 +47,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'metanorma-ogc', "~> 0.0.1"
   spec.add_runtime_dependency 'metanorma-nist', "~> 0.0.1"
   spec.add_runtime_dependency 'isodoc', "~> 0.9.0"
-  spec.add_runtime_dependency 'metanorma', "~> 0.3.5"
+  spec.add_runtime_dependency 'metanorma', "~> 0.3.9"
   spec.add_runtime_dependency 'nokogiri', ">= 1"
 end

data/test.rxl

@@ -1,48 +1,48 @@
-<bibdata type="article"> 
-  <title> 
-     
-  </title> 
-  <title> 
-     
-  </title> 
-  <docidentifier type="iso">ISO 123</docidentifier> 
-  <docidentifier type="iso-structured"> 
-    <project-number>ISO 123</project-number> 
-  </docidentifier> 
-  <docnumber>123</docnumber> 
-  <contributor> 
-    <role type="author"/> 
-    <organization> 
-      <name>International Organization for Standardization</name> 
-      <abbreviation>ISO</abbreviation> 
-    </organization> 
-  </contributor> 
-  <contributor> 
-    <role type="publisher"/> 
-    <organization> 
-      <name>International Organization for Standardization</name> 
-      <abbreviation>ISO</abbreviation> 
-    </organization> 
-  </contributor> 
-   
-  <language>en</language> 
-  <script>script.html</script> 
-  <status> 
-    <stage>60</stage> 
-    <substage>60</substage> 
-  </status> 
-  <copyright> 
-    <from>2019</from> 
-    <owner> 
-      <organization> 
-        <name>International Organization for Standardization</name> 
-        <abbreviation>ISO</abbreviation> 
-      </organization> 
-    </owner> 
-  </copyright> 
-  <editorialgroup> 
-    <technical-committee/> 
-    <subcommittee/> 
-    <workgroup/> 
-  </editorialgroup> 
+<bibdata type="article">
+  <title>
+    
+  </title>
+  <title>
+    
+  </title>
+  <docidentifier type="iso">ISO 123</docidentifier>
+  <docidentifier type="iso-structured">
+    <project-number>ISO 123</project-number>
+  </docidentifier>
+  <docnumber>123</docnumber>
+  <contributor>
+    <role type="author"/>
+    <organization>
+      <name>International Organization for Standardization</name>
+      <abbreviation>ISO</abbreviation>
+    </organization>
+  </contributor>
+  <contributor>
+    <role type="publisher"/>
+    <organization>
+      <name>International Organization for Standardization</name>
+      <abbreviation>ISO</abbreviation>
+    </organization>
+  </contributor>
+  
+  <language>en</language>
+  <script>script.html</script>
+  <status>
+    <stage>60</stage>
+    <substage>60</substage>
+  </status>
+  <copyright>
+    <from>2019</from>
+    <owner>
+      <organization>
+        <name>International Organization for Standardization</name>
+        <abbreviation>ISO</abbreviation>
+      </organization>
+    </owner>
+  </copyright>
+  <editorialgroup>
+    <technical-committee/>
+    <subcommittee/>
+    <workgroup/>
+  </editorialgroup>
 </bibdata>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cli
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-25 00:00:00.000000000 Z
+date: 2019-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -310,14 +310,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.9
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -360,6 +360,7 @@ files:
 - exe/metanorma
 - exe/metanorma-manifest
 - exe/metanorma.old
+- extract/sourcecode/sourcecode-0000.txt
 - i18n.yaml
 - lib/metanorma-cli.rb
 - lib/metanorma/cli.rb