metanorma-cli 1.2.13.1 → 1.3.3

data/lib/metanorma/cli/compiler.rb

@@ -25,10 +25,12 @@ module Metanorma
         end
       end
 
+      # @return [Array<String>]
       def compile
         compile_file
       end
 
+      # @return [Array<String>]
       def self.compile(file, options)
         new(file, options).compile
       end
@@ -37,8 +39,11 @@ module Metanorma
 
       attr_reader :file, :options, :extract, :extensions
 
+      # @return [Array<String>]
       def compile_file
-        Compile.new.compile(file, serialize_options)
+        c = Compile.new
+        c.compile(file, serialize_options)
+        c.errors
       end
 
       def serialize_options

data/lib/metanorma/cli/setup.rb

@@ -40,9 +40,11 @@ module Metanorma
       end
 
       def download_font
-        Fontist::Finder.find(font_name)
-      rescue Fontist::Errors::MissingFontError
-        ask_user_and_download_font(font_name)
+        begin
+          Fontist::Font.find(font_name)
+        rescue Fontist::Errors::MissingFontError
+          ask_user_and_download_font(font_name)
+        end
       end
 
       def copy_to_fonts(fonts_path)
@@ -54,25 +56,37 @@ module Metanorma
 
       def ask_user_and_download_font(font_name)
         response = term_agreement ? "yes" : "no"
+        formula = Fontist::Formula.find(font_name)
 
         if !term_agreement
-          response = UI.ask(message.strip)
+          response = UI.ask(message(formula.license).strip)
         end
 
         if response.downcase === "yes"
-          Fontist::Installer.download(font_name, confirmation: response)
+          Fontist::Font.install(font_name, confirmation: response)
         end
       end
 
-      def message
+      def message(license)
         <<~MSG
-        Metanorma has detected that you do not have the necessary fonts installed
-        for PDF generation. The generated PDF will use generic fonts that may not
-        resemble the desired styling. Metanorma can download these files for you
-        if you accept the font licensing conditions for the font #{font_name}.
+          FONT LICENSE ACCEPTANCE REQUIRED:
+
+          Metanorma has detected that you do not have the necessary fonts installed
+          for PDF generation. Without those fonts, the generated PDF will use
+          generic fonts that may not resemble the desired styling.
+
+          Metanorma can download these files for you if you accept the font
+          licensing conditions for the font "#{font_name}".
+
+          FONT LICENSE BEGIN ("#{font_name}")
+          -----------------------------------------------------------------------
+          #{license}
+          -----------------------------------------------------------------------
+          FONT LICENSE END ("#{font_name}")
 
-        If you want Metanorma to download these fonts for you and indicate your
-        acceptance of the font licenses, type "Yes" / "No":
+          Do you accept all presented font licenses, and want Metanorma to
+          download these fonts for you?
+          => TYPE "Yes" or "No":
         MSG
       end
     end

data/lib/metanorma/cli/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Cli
-    VERSION = "1.2.13.1"
+    VERSION = "1.3.3"
   end
 end

data/metanorma-cli.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.4.0'
 
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "byebug", "~> 10.0"
@@ -31,27 +32,27 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "rspec-core", "~> 3.4"
 
-  spec.add_runtime_dependency "thor", "~> 0.20.3"
-  spec.add_runtime_dependency "metanorma-iso", "~> 1.3.0"
-  spec.add_runtime_dependency 'metanorma-ietf', "~> 2.0.0"
-  spec.add_runtime_dependency 'metanorma-gb', "~> 1.3.0"
-  spec.add_runtime_dependency 'metanorma-iec', "~> 1.0.0"
-  spec.add_runtime_dependency 'metanorma-csd', "~> 1.3.0"
-  spec.add_runtime_dependency 'metanorma-csa', "~> 1.4.0"
-  #spec.add_runtime_dependency 'metanorma-rsd', "~> 1.4.0"
-  spec.add_runtime_dependency 'metanorma-m3d', "~> 1.3.0"
-  spec.add_runtime_dependency 'metanorma-generic', "~> 1.4.0"
+  spec.add_runtime_dependency "thor", "~> 1.0"
+  spec.add_runtime_dependency "metanorma-iso", "~> 1.4.0"
+  spec.add_runtime_dependency 'metanorma-ietf', "~> 2.1.0"
+  spec.add_runtime_dependency 'metanorma-gb', "~> 1.4.0"
+  spec.add_runtime_dependency 'metanorma-iec', "~> 1.1.0"
+  spec.add_runtime_dependency 'metanorma-cc', "~> 1.4.0"
+  spec.add_runtime_dependency 'metanorma-csa', "~> 1.5.0"
+  #spec.add_runtime_dependency 'metanorma-ribose', "~> 1.5.0"
+  spec.add_runtime_dependency 'metanorma-m3aawg', "~> 1.4.0"
+  spec.add_runtime_dependency 'metanorma-generic', "~> 1.5.0"
   spec.add_runtime_dependency 'metanorma-standoc', "~> 1.4.0"
-  #spec.add_runtime_dependency 'metanorma-mpfd', "~> 0.1.0"
-  spec.add_runtime_dependency 'metanorma-un', "~> 0.3.1"
-  spec.add_runtime_dependency 'metanorma-ogc', "~> 1.0.0"
-  spec.add_runtime_dependency 'metanorma-nist', "~> 1.0.0"
-  spec.add_runtime_dependency 'metanorma-itu', "~> 1.0.0"
-  spec.add_runtime_dependency 'metanorma-iho', "~> 0.0.1"
-  spec.add_runtime_dependency 'isodoc', "~> 1.0.0"
-  spec.add_runtime_dependency 'metanorma', "~> 1.0.0"
+  #spec.add_runtime_dependency 'metanorma-mpfa', "~> 0.4.0"
+  spec.add_runtime_dependency 'metanorma-un', "~> 0.4.0"
+  spec.add_runtime_dependency 'metanorma-ogc', "~> 1.1.0"
+  spec.add_runtime_dependency 'metanorma-nist', "~> 1.1.0"
+  spec.add_runtime_dependency 'metanorma-itu', "~> 1.1.0"
+  spec.add_runtime_dependency 'metanorma-iho', "~> 0.1.0"
+  spec.add_runtime_dependency 'isodoc', "~> 1.1.0"
+  spec.add_runtime_dependency 'metanorma', "~> 1.1.0"
   #spec.add_runtime_dependency 'nokogiri', ">= 1"
   spec.add_runtime_dependency "git", "~> 1.5"
   spec.add_runtime_dependency "relaton-cli", ">= 0.8.2"
-  spec.add_runtime_dependency "fontist", "~> 0.2.0"
+  spec.add_runtime_dependency "fontist", "~> 1.0"
 end

data/relaton/cache/version

@@ -0,0 +1 @@
+0.5.0

data/rice.rxl

@@ -0,0 +1,51 @@
+<bibdata type="standard">
+  <title language="en" format="text/plain">Rice model</title>
+  <title language="intro-en" format="text/plain">Cereals and pulses</title>
+  <title language="main-en" format="text/plain">Specifications and test methods</title>
+  <title language="part-en" format="text/plain">Rice</title>
+  <title language="intro-fr" format="text/plain">Céréales et légumineuses</title>
+  <title language="main-fr" format="text/plain">Spécification et méthodes d'essai</title>
+  <title language="part-fr" format="text/plain">Riz</title>
+  <docidentifier type="m3d">17301:2016</docidentifier>
+  <docnumber>17301</docnumber>
+  <contributor>
+    <role type="author"/>
+    <organization>
+      <name>Messaging Malware and Mobile Anti-Abuse Working Group</name>
+      <abbreviation>M3AAWG</abbreviation>
+    </organization>
+  </contributor>
+  <contributor>
+    <role type="publisher"/>
+    <organization>
+      <name>Messaging Malware and Mobile Anti-Abuse Working Group</name>
+      <abbreviation>M3AAWG</abbreviation>
+    </organization>
+  </contributor>
+  <edition>2</edition>
+  <version>
+    <revision-date>2016-05-01</revision-date>
+    
+  </version>
+  <language>en</language>
+  <script>Latn</script>
+  <status>
+    <stage>30</stage>
+    <substage>92</substage>
+  </status>
+  <copyright>
+    <from>2016</from>
+    <owner>
+      <organization>
+        <name>Messaging Malware and Mobile Anti-Abuse Working Group</name>
+        <abbreviation>M3AAWG</abbreviation>
+      </organization>
+    </owner>
+  </copyright>
+  <ext>
+    <doctype>report</doctype>
+    <editorialgroup>
+      <committee>Food products</committee>
+    </editorialgroup>
+  </ext>
+</bibdata>

data/sourcecode/0

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

data/test.rxl

@@ -0,0 +1,52 @@
+<bibdata type="standard">
+
+
+
+
+<docidentifier type="iso">ISO 123</docidentifier>
+<docidentifier type="iso-with-lang">ISO 123(E)</docidentifier>
+<docidentifier type="iso-reference">ISO 123(E)</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 abbreviation="IS">60</stage>
+<substage>60</substage>
+</status>
+<copyright>
+<from>2020</from>
+<owner>
+<organization>
+<name>International Organization for Standardization</name>
+<abbreviation>ISO</abbreviation>
+</organization>
+</owner>
+</copyright>
+<ext>
+<doctype>article</doctype>
+<editorialgroup>
+<technical-committee/>
+<subcommittee/>
+<workgroup/>
+</editorialgroup>
+<structuredidentifier>
+<project-number>ISO 123</project-number>
+</structuredidentifier>
+<stagename>International standard</stagename>
+</ext>
+</bibdata>

data/tmp/my-custom-csd/Gemfile

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+
+gem "metanorma-cli"
+gem "relaton-cli"

data/tmp/my-custom-csd/Makefile

@@ -0,0 +1,144 @@
+#!make
+SHELL := /bin/bash
+# Ensure the xml2rfc cache directory exists locally
+IGNORE := $(shell mkdir -p $(HOME)/.cache/xml2rfc)
+
+SRC := $(shell yq r metanorma.yml metanorma.source.files | cut -c 3-999)
+ifeq ($(SRC),ll)
+SRC := $(filter-out README.adoc, $(wildcard *.adoc))
+endif
+
+FORMAT_MARKER := mn-output-
+FORMATS := $(shell grep "$(FORMAT_MARKER)" $(SRC) | cut -f 2 -d ' ' | tr ',' '\n' | sort | uniq | tr '\n' ' ')
+
+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)))
+
+COMPILE_CMD_LOCAL := bundle exec metanorma $$FILENAME
+COMPILE_CMD_DOCKER := docker run -v "$$(pwd)":/metanorma/ ribose/metanorma "metanorma $$FILENAME"
+
+ifdef METANORMA_DOCKER
+  COMPILE_CMD := echo "Compiling via docker..."; $(COMPILE_CMD_DOCKER)
+else
+  COMPILE_CMD := echo "Compiling locally..."; $(COMPILE_CMD_LOCAL)
+endif
+
+_OUT_FILES := $(foreach FORMAT,$(FORMATS),$(shell echo $(FORMAT) | tr '[:lower:]' '[:upper:]'))
+OUT_FILES  := $(foreach F,$(_OUT_FILES),$($F))
+
+all: images $(OUT_FILES)
+
+%.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
+	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:]'))
+
+open-$(FORMAT):
+	open $$(OUT_FILES-$(FORMAT))
+
+clean-$(FORMAT):
+	rm -f $$(OUT_FILES-$(FORMAT))
+
+$(FORMAT): clean-$(FORMAT) $$(OUT_FILES-$(FORMAT))
+
+.PHONY: clean-$(FORMAT)
+
+endef
+
+$(foreach FORMAT,$(FORMATS),$(eval $(FORMAT_TASKS)))
+
+open: open-html
+
+clean:
+	rm -f $(OUT_FILES) && rm -rf published
+
+bundle:
+	if [ "x" == "${METANORMA_DOCKER}x" ]; then bundle; fi
+
+.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
+	export PORT=$${PORT:-8123} ; \
+	port=$${PORT} ; \
+	for html in $(HTML); do \
+		$< --entry-file=$$html --port=$${port} --ignore="*.html,*.xml,Makefile,Gemfile.*,package.*.json" --wait=1000 & \
+		port=$$(( port++ )) ;\
+	done
+
+watch-serve: $(NODE_BIN_DIR)/run-p
+	$< watch serve
+
+#
+# Deploy jobs
+#
+
+publish:
+	$(MAKE) published
+
+published:
+	mkdir -p $@ && \
+	export GLOBIGNORE=$(SRC); \
+	cp -a $(addsuffix .*,$(basename $(SRC))) $@/; \
+	unset GLOBIGNORE; \
+	cp $(firstword $(HTML)) $@/index.html
+
+.PHONY: publish
+

data/tmp/my-custom-csd/Makefile.win

@@ -0,0 +1,116 @@
+#!make
+
+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))
+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 $(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)
+else
+  COMPILE_CMD := echo "Compiling locally..." & $(COMPILE_CMD_LOCAL)
+endif
+
+_OUT_FILES := $(foreach FORMAT,$(FORMATS),$(shell echo $(FORMAT) | tr '[:lower:]' '[:upper:]'))
+OUT_FILES  := $(foreach F,$(_OUT_FILES),$($F))
+
+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:]'))
+
+open-$(FORMAT):
+	$$(OUT_FILES-$(FORMAT))
+
+clean-$(FORMAT):
+	rm $$(OUT_FILES-$(FORMAT))
+
+$(FORMAT): clean-$(FORMAT) $$(OUT_FILES-$(FORMAT))
+
+.PHONY: clean-$(FORMAT)
+
+endef
+
+$(foreach FORMAT,$(FORMATS),$(eval $(FORMAT_TASKS)))
+
+open: open-html
+
+clean:
+	rm -rf $(OUT_FILES)
+
+bundle:
+	IF "" == "${METANORMA_DOCKER}" bundle
+
+.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