metanorma-cli 1.1.8 → 1.2.0

data/a

@@ -1 +1 @@
-git add  Gemfile.lock lib/metanorma/cli/version.rb 
+git add lib/metanorma/cli/version.rb metanorma-cli.gemspec 

data/appveyor.yml

@@ -1,3 +1,5 @@
+# Auto-generated !!! Do not edit it manually
+# use ci-master https://github.com/metanorma/metanorma-build-scripts
 version: '{build}'
 
 cache:
@@ -7,7 +9,6 @@ environment:
   matrix:
     - RUBY_VERSION: 25
     - RUBY_VERSION: 24
-    - RUBY_VERSION: 23
     - RUBY_VERSION: _trunk
 
 matrix:
@@ -31,4 +32,4 @@ before_test:
   - bundle -v
 
 test_script:
-  - bundle exec rake
+  - bundle exec rake

data/b

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gb-standard xmlns="http://riboseinc.com/gbstandard">
+<bibdata type="standard">
+<title>
+
+</title>
+<title>
+
+</title>
+<docidentifier type="gb">T/AAA 123</docidentifier>
+<docidentifier type="gb-structured">
+<project-number>T/AAA 123</project-number>
+</docidentifier>
+<docnumber>123</docnumber>
+<contributor>
+<role type="author"/>
+<person>
+<name>
+<surname>Author</surname>
+</name>
+</person>
+</contributor>
+<contributor>
+<role type="author"/>
+<organization>
+<name>GB</name>
+</organization>
+</contributor>
+<contributor>
+<role type="publisher"/>
+<organization>
+<name>GB</name>
+</organization>
+</contributor>
+<contributor>
+<role type="authority"/>
+<organization>
+<name>GB</name>
+</organization>
+</contributor>
+<contributor>
+<role type="proposer"/>
+<organization>
+<name>GB</name>
+</organization>
+</contributor>
+<contributor>
+<role type="issuer"/>
+<organization>
+<name>GB</name>
+</organization>
+</contributor>
+
+<language>en</language>
+<script>Latn</script>
+<status>
+<stage>60</stage>
+<substage>60</substage>
+</status>
+<copyright>
+<from>2019</from>
+<owner>
+<organization>
+<name>GB</name>
+</organization>
+</owner>
+</copyright>
+<relation type="nonequivalent">
+<bibitem>
+<title> Televisual Frequencies</title>
+<docidentifier>ISO 1012</docidentifier>
+</bibitem>
+</relation>
+<ext>
+<doctype>recommendation</doctype>
+<gbtype>
+<gbscope>social-group</gbscope>
+<gbprefix>AAA</gbprefix>
+<gbmandate>recommendation</gbmandate>
+<gbtopic>basic</gbtopic>
+</gbtype>
+</ext>
+</bibdata>
+<sections/>
+</gb-standard

data/lib/metanorma/cli.rb

@@ -4,7 +4,6 @@ require "metanorma/cli/command"
 
 module Metanorma
   module Cli
-
     SUPPORTED_GEMS = [
       "metanorma-iso",
       "metanorma-ietf",
@@ -57,6 +56,7 @@ module Metanorma
 
     rescue Errno::ENOENT => error
       UI.say("Error: #{error}, \nNot sure what to run? try: metanorma help")
+      exit(Errno::ENOENT::Errno)
     end
 
     def self.root
@@ -87,7 +87,7 @@ module Metanorma
 
     def self.find_command(arguments)
       commands = Metanorma::Cli::Command.all_commands.keys
-      commands.select { |cmd| arguments.include?(cmd) == true }
+      commands.select { |cmd| arguments.include?(cmd.gsub("_", "-")) == true }
     end
   end
 end

data/lib/metanorma/cli/command.rb

@@ -9,7 +9,7 @@ module Metanorma
       desc "new NAME", "Create new Metanorma document"
       option :type, aliases: "-t", required: true, desc: "Document type"
       option :doctype, aliases: "-d", required: true, desc: "Metanorma doctype"
-      option :overwrite, aliases: "-r", desc: "Overwrite existing document"
+      option :overwrite, aliases: "-y", type: :boolean, desc: "Overwrite existing document"
       option :template, aliases: "-l", desc: "Git hosted remote or local FS template skeleton"
 
       def new(name)
@@ -20,7 +20,7 @@ module Metanorma
       option :type, aliases: "-t", desc: "Type of standard to generate"
       option :extensions, aliases: "-x", type: :string, desc: "Type of extension to generate per type"
       option :format, aliases: "-f", default: :asciidoc, desc: "Format of source file: eg. asciidoc"
-      option :require, aliases: "-r", type: :array, desc: "Require LIBRARY prior to execution"
+      option :require, aliases: "-r", desc: "Require LIBRARY prior to execution"
       option :wrapper, aliases: "-w", type: :boolean, desc: "Create wrapper folder for HTML output"
       option :asciimath, aliases: "-a", type: :boolean, desc: "Keep Asciimath in XML output instead of converting it to MathM"
       option :datauriimage, aliases: "-d", type: :boolean, desc: "Encode HTML output images as data URIs"
@@ -49,16 +49,46 @@ module Metanorma
 
       def version
         if options[:format] == :asciidoc
-          UI.say(find_version(options[:type]))
+          UI.say(find_backend(options[:type].to_sym).version)
         end
       end
 
+      desc "list-extensions", "List supported extensions"
+      def list_extensions(type = nil)
+        single_type_extensions(type) || all_type_extensions
+      rescue LoadError
+        UI.say("Couldn't load #{type}, please provide a valid type!")
+      end
+
       private
 
-      def find_version(type)
+      def single_type_extensions(type)
+        if type
+          format_keys = find_backend(type).output_formats.keys
+          UI.say("Supported extensions: #{join_keys(format_keys)}.")
+          return true
+        end
+      end
+
+      def all_type_extensions
+        Metanorma::Cli.load_flavors
+
+        message = "Supported extensions per type: \n"
+        Metanorma::Registry.instance.processors.each do |type_sym, processor|
+          format_keys = processor.output_formats.keys
+          message += "  #{type_sym}: #{join_keys(format_keys)}.\n"
+        end
+
+        UI.say(message)
+      end
+
+      def find_backend(type)
         require "metanorma-#{type}"
-        processor = Metanorma::Registry.instance.find_processor(type.to_sym)
-        processor.version
+        Metanorma::Registry.instance.find_processor(type.to_sym)
+      end
+
+      def join_keys(keys)
+        [keys[0..-2].join(", "), keys.last].join(" and ")
       end
 
       def create_new_document(name, options)

data/lib/metanorma/cli/compiler.rb

@@ -4,8 +4,7 @@ module Metanorma
       def initialize(file, options)
         @file = file
         @options = options
-        @extract = (options.delete(:extract) || "").split(",")
-        @extensions = (options.delete(:extensions) || "").split(",")
+        normalize_special_options
       end
 
       def compile
@@ -51,6 +50,12 @@ module Metanorma
           end
         end
       end
+
+      def normalize_special_options
+        @extract = (options.delete(:extract) || "").split(",")
+        @extensions = (options.delete(:extensions) || "").split(",") 
+        options[:require] = [options[:require]] if options[:require]
+      end
     end
   end
 end

data/lib/metanorma/cli/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Cli
-    VERSION = "1.1.8"
+    VERSION = "1.2.0"
   end
 end

data/metanorma-cli.gemspec

@@ -21,8 +21,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-
-  spec.required_ruby_version = '>= 2.3.0'
+  spec.required_ruby_version = '>= 2.4.0'
 
   spec.add_development_dependency "bundler", "~> 2.0.1"
   spec.add_development_dependency "rake", "~> 12.0"
@@ -33,20 +32,20 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec-core", "~> 3.4"
 
   spec.add_runtime_dependency "thor", "~> 0.20.3"
-  spec.add_runtime_dependency "metanorma-iso", "~> 1.1.0"
+  spec.add_runtime_dependency "metanorma-iso", "~> 1.2.0"
   spec.add_runtime_dependency 'metanorma-ietf', "~> 1.0.1"
-  spec.add_runtime_dependency 'metanorma-gb', "~> 1.1.0"
-  spec.add_runtime_dependency 'metanorma-csd', "~> 1.1.0"
-  spec.add_runtime_dependency 'metanorma-csand', "~> 1.1.0"
-  spec.add_runtime_dependency 'metanorma-rsd', "~> 1.1.0"
-  spec.add_runtime_dependency 'metanorma-m3d', "~> 1.1.0"
-  spec.add_runtime_dependency 'metanorma-acme', "~> 1.1.0"
-  spec.add_runtime_dependency 'metanorma-standoc', "~> 1.1.0"
-  spec.add_runtime_dependency 'metanorma-mpfd', "~> 0.1.0"
-  spec.add_runtime_dependency 'metanorma-unece', "~> 0.0.1"
-  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-gb', "~> 1.2.0"
+  spec.add_runtime_dependency 'metanorma-csd', "~> 1.2.0"
+  spec.add_runtime_dependency 'metanorma-csand', "~> 1.2.0"
+  #spec.add_runtime_dependency 'metanorma-rsd', "~> 1.1.0"
+  spec.add_runtime_dependency 'metanorma-m3d', "~> 1.2.0"
+  spec.add_runtime_dependency 'metanorma-acme', "~> 1.2.0"
+  spec.add_runtime_dependency 'metanorma-standoc', "~> 1.2.0"
+  #spec.add_runtime_dependency 'metanorma-mpfd', "~> 0.1.0"
+  spec.add_runtime_dependency 'metanorma-unece', "~> 0.1.0"
+  spec.add_runtime_dependency 'metanorma-ogc', "~> 0.1.0"
+  spec.add_runtime_dependency 'metanorma-nist', "~> 0.1.0"
+  spec.add_runtime_dependency 'isodoc', "~> 0.10.0"
   spec.add_runtime_dependency 'metanorma', "~> 0.3.9"
   spec.add_runtime_dependency 'nokogiri', ">= 1"
   spec.add_runtime_dependency "git", "~> 1.5"

data/templates/base/Makefile

@@ -1,14 +1,19 @@
 #!make
 SHELL := /bin/bash
+# Ensure the xml2rfc cache directory exists locally
+IGNORE := $(shell mkdir -p $(HOME)/.cache/xml2rfc)
 
 FORMAT_MARKER := mn-output-
 FORMATS := $(shell grep "$(FORMAT_MARKER)" *.adoc | cut -f 2 -d ' ' | tr ',' '\n' | sort | uniq | tr '\n' ' ')
 
 SRC  := $(filter-out README.adoc, $(wildcard *.adoc))
 XML  := $(patsubst %.adoc,%.xml,$(SRC))
+XMLRFC3  := $(patsubst %.adoc,%.v3.xml,$(SRC))
 HTML := $(patsubst %.adoc,%.html,$(SRC))
 DOC  := $(patsubst %.adoc,%.doc,$(SRC))
 PDF  := $(patsubst %.adoc,%.pdf,$(SRC))
+TXT  := $(patsubst %.adoc,%.txt,$(SRC))
+NITS := $(patsubst %.adoc,%.nits,$(wildcard draft-*.adoc))
 WSD  := $(wildcard models/*.wsd)
 XMI	 := $(patsubst models/%,xmi/%,$(patsubst %.wsd,%.xmi,$(WSD)))
 PNG	 := $(patsubst models/%,images/%,$(patsubst %.wsd,%.png,$(WSD)))
@@ -27,10 +32,21 @@ OUT_FILES  := $(foreach F,$(_OUT_FILES),$($F))
 
 all: images $(OUT_FILES)
 
-%.xml %.html %.doc %.pdf:	%.adoc | bundle
+%.v3.xml %.xml %.html %.doc %.pdf %.txt:	%.adoc | bundle
 	FILENAME=$^; \
 	${COMPILE_CMD}
 
+draft-%.nits:	draft-%.txt
+	VERSIONED_NAME=`grep :name: draft-$*.adoc | cut -f 2 -d ' '`; \
+	cp $^ $${VERSIONED_NAME}.txt && \
+	idnits --verbose $${VERSIONED_NAME}.txt > $@ && \
+	cp $@ $${VERSIONED_NAME}.nits && \
+	cat $${VERSIONED_NAME}.nits
+
+%.nits:
+
+nits: $(NITS)
+
 images: $(PNG)
 
 images/%.png: models/%.wsd
@@ -112,6 +128,6 @@ watch-serve: $(NODE_BIN_DIR)/run-p
 
 publish:
 	mkdir -p published  && \
-	cp -a $(basename $(SRC)).* published/ && \
+	cp -a $(wildcard $(addsuffix .*,$(basename $(SRC)))) published/ && \
 	cp $(firstword $(HTML)) published/index.html; \
 	if [ -d "images" ]; then cp -a images published; fi

data/templates/base/Makefile.win

@@ -1,23 +1,20 @@
 #!make
 
-include metanorma.env
-export $(shell sed 's/=.*//' metanorma.env)
-
-FORMATS := $(METANORMA_FORMATS)
-comma := ,
-empty :=
-space := $(empty) $(empty)
+FORMAT_MARKER := mn-output-
+FORMATS := $(shell grep "$(FORMAT_MARKER)" *.adoc | cut -f 2 -d ' ' | tr ',' '\n' | sort | uniq | tr '\n' ' ')
 
 SRC  := $(filter-out README.adoc, $(wildcard *.adoc))
 XML  := $(patsubst %.adoc,%.xml,$(SRC))
 HTML := $(patsubst %.adoc,%.html,$(SRC))
 DOC  := $(patsubst %.adoc,%.doc,$(SRC))
 PDF  := $(patsubst %.adoc,%.pdf,$(SRC))
-RXL  := $(patsubst %.adoc,%.rxl,$(SRC))
+WSD  := $(wildcard models/*.wsd)
+XMI	 := $(patsubst models/%,xmi/%,$(patsubst %.wsd,%.xmi,$(WSD)))
+PNG	 := $(patsubst models/%,images/%,$(patsubst %.wsd,%.png,$(WSD)))
 
 HOST_SHARE_DIR=$(USERPROFILE)\$(shell for %%I in (.) do echo %%~nxI)
-COMPILE_CMD_LOCAL := bundle exec metanorma -R $(RXL) $(SRC)
-COMPILE_CMD_DOCKER := C:/ProgramData/chocolatey/bin/docker run --rm -it -v $(CURDIR):/metanorma/ ribose/metanorma "metanorma -R $(RXL) $(SRC)"
+COMPILE_CMD_LOCAL := bundle exec metanorma $(SRC)
+COMPILE_CMD_DOCKER := docker run --rm -it -v $(CURDIR):/metanorma/ ribose/metanorma "metanorma $(SRC)"
 
 ifdef METANORMA_DOCKER
   COMPILE_CMD := echo "Compiling via docker..." & $(COMPILE_CMD_DOCKER)
@@ -33,6 +30,16 @@ all: $(OUT_FILES)
 %.xml %.html %.doc %.pdf:	%.adoc | bundle
 	${COMPILE_CMD}
 
+images: $(PNG)
+
+images/%.png: models/%.wsd
+	plantuml -tpng -o ../images/ $<
+
+xmi: $(XMI)
+
+xmi/%.xmi: models/%.wsd
+	plantuml -xmi:star -o ../xmi/ $<
+
 define FORMAT_TASKS
 OUT_FILES-$(FORMAT) := $($(shell echo $(FORMAT) | tr '[:lower:]' '[:upper:]'))
 
@@ -50,8 +57,6 @@ endef
 
 $(foreach FORMAT,$(FORMATS),$(eval $(FORMAT_TASKS)))
 
-# open: $(foreach FORMAT,$(FORMATS),open-$(FORMAT))
-
 open: open-html
 
 clean:
@@ -60,4 +65,52 @@ clean:
 bundle:
 	IF "" == "${METANORMA_DOCKER}" bundle
 
-.PHONY: bundle all open clean
+.PHONY: bundle all open clean
+
+#
+# Watch-related jobs
+#
+
+.PHONY: watch serve watch-serve
+
+NODE_BINS          := onchange live-serve run-p
+NODE_BIN_DIR       := node_modules/.bin
+NODE_PACKAGE_PATHS := $(foreach PACKAGE_NAME,$(NODE_BINS),$(NODE_BIN_DIR)/$(PACKAGE_NAME))
+
+$(NODE_PACKAGE_PATHS): package.json
+	npm i
+
+watch: $(NODE_BIN_DIR)/onchange
+	make all
+	$< $(ALL_SRC) -- make all
+
+define WATCH_TASKS
+watch-$(FORMAT): $(NODE_BIN_DIR)/onchange
+	make $(FORMAT)
+	$$< $$(SRC_$(FORMAT)) -- make $(FORMAT)
+
+.PHONY: watch-$(FORMAT)
+endef
+
+$(foreach FORMAT,$(FORMATS),$(eval $(WATCH_TASKS)))
+
+serve: $(NODE_BIN_DIR)/live-server revealjs-css reveal.js images
+	set PORT=$${PORT:-8123} & \
+	set port=$${PORT} & \
+	for /r %%html in $(HTML) do ( \
+		$< --entry-file=%%html --port=%port% --ignore="*.html,*.xml,Makefile,Gemfile.*,package.*.json" --wait=1000 & \
+		set /A port=%port%+1 \
+	)
+
+watch-serve: $(NODE_BIN_DIR)/run-p
+	$< watch serve
+
+#
+# Deploy jobs
+#
+
+publish:
+	mkdir -p published
+	xcopy $(basename $(SRC)).* published
+	copy $(firstword $(HTML)) published\index.html
+	IF EXIST "images" xcopy /E images published

data/test.rxl

@@ -1,14 +1,9 @@
-<bibdata type="article">
-  <title>
-    
-  </title>
-  <title>
-    
-  </title>
+<bibdata type="standard">
+  
+  
+  
+  
   <docidentifier type="iso">ISO 123</docidentifier>
-  <docidentifier type="iso-structured">
-    <project-number>ISO 123</project-number>
-  </docidentifier>
   <docnumber>123</docnumber>
   <contributor>
     <role type="author"/>
@@ -40,9 +35,15 @@
       </organization>
     </owner>
   </copyright>
-  <editorialgroup>
-    <technical-committee/>
-    <subcommittee/>
-    <workgroup/>
-  </editorialgroup>
+  <ext>
+    <doctype>article</doctype>
+    <editorialgroup>
+      <technical-committee/>
+      <subcommittee/>
+      <workgroup/>
+    </editorialgroup>
+    <structuredidentifier>
+      <project-number>ISO 123</project-number>
+    </structuredidentifier>
+  </ext>
 </bibdata>