metanorma-cli 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 257a0c33f07f9b412bf11de5c0dfeea4025dc05ec54ec3c69aea9b1eb205df35
-  data.tar.gz: bb4c121dd0d9d142097138da52a054f1a65321d7953bc0eeba0e71c8f122ba2c
+  metadata.gz: 88193e8fa2e31b1e2d7361f669af82c64a64e44729240a573c3abcc221c30112
+  data.tar.gz: 0c1a39a506344e02866e3b364daa02c6e06af304b9384d0b6b462389a6c5260a
 SHA512:
-  metadata.gz: 74866f346a2651bb295d881b42a846f66508cd6db1c2b33b5c2705ee4be11f963f06f611ed3b2c17ddd6428091b25d0fdf2baf264d66cc7428bcaf9946cb4276
-  data.tar.gz: 2152501a0b8e242f98f29ce0d08f961146efc95945b51fee4523684fc3bacc915fceef21426ba764466aece1e58f5ab05906ef9d69de2c43aeb000f452e7756f
+  metadata.gz: 866e19a6269a9bacd36767729e89ee8be8c208532176e7d61cda7065b8b08f47f44df4e480ecb9f95f1adecc15f2a8a92eb598838dd59a583ba922487b3f3ef2
+  data.tar.gz: d0b4ab37ca0166b489d22e90b51206c10db13a5f9e98ed53d4de9ce9be183f6bf470d4314f7144b0094926b2d589a3e0a3f76807dd67328e06cbf9e998aad090

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metanorma-cli (1.2.0)
+    metanorma-cli (1.2.1)
       git (~> 1.5)
       isodoc (~> 0.10.0)
       metanorma (~> 0.3.9)
@@ -40,7 +40,7 @@ GEM
     ffi (1.11.1)
     gb-agencies (0.0.5)
     git (1.5.0)
-    html2doc (0.8.11)
+    html2doc (0.8.12)
       asciimath (~> 1.0.7)
       htmlentities (~> 4.3.4)
       image_size
@@ -54,7 +54,7 @@ GEM
       nokogiri
     image_size (2.0.1)
     iso-639 (0.2.8)
-    isodoc (0.10.0)
+    isodoc (0.10.1)
       asciimath
       html2doc (~> 0.8.11)
       htmlentities (~> 4.3.4)
@@ -69,16 +69,16 @@ GEM
     isoics (0.1.7)
     json (2.2.0)
     liquid (4.0.3)
-    metanorma (0.3.12)
+    metanorma (0.3.13)
       asciidoctor
       htmlentities
-    metanorma-acme (1.2.0)
+    metanorma-acme (1.2.1)
       asciidoctor (~> 1.5.7)
       htmlentities (~> 4.3.4)
       isodoc (~> 0.10.0)
       metanorma-standoc (~> 1.2.0)
       ruby-jing
-    metanorma-csand (1.2.0)
+    metanorma-csand (1.2.1)
       asciidoctor (~> 1.5.7)
       asciimath
       htmlentities (~> 4.3.4)
@@ -90,10 +90,10 @@ GEM
       ruby-jing
       thread_safe
       uuidtools
-    metanorma-csd (1.2.0)
+    metanorma-csd (1.2.1)
       isodoc (~> 0.10.0)
       metanorma-standoc (~> 1.2.0)
-    metanorma-gb (1.2.0)
+    metanorma-gb (1.2.1)
       gb-agencies (~> 0.0.4)
       htmlentities (~> 4.3.4)
       isodoc (~> 0.10.0)
@@ -102,12 +102,12 @@ GEM
     metanorma-ietf (1.0.3)
       isodoc (~> 0.10.0)
       metanorma-standoc (~> 1.2.0)
-    metanorma-iso (1.2.0)
+    metanorma-iso (1.2.1)
       asciidoctor (~> 1.5.7)
       isodoc (~> 0.10.0)
       metanorma-standoc (~> 1.2.0)
       ruby-jing
-    metanorma-m3d (1.2.0)
+    metanorma-m3d (1.2.1)
       asciidoctor (~> 1.5.7)
       asciimath
       htmlentities (~> 4.3.4)
@@ -119,7 +119,7 @@ GEM
       ruby-jing
       thread_safe
       uuidtools
-    metanorma-nist (0.1.0)
+    metanorma-nist (0.1.2)
       asciidoctor (~> 1.5.7)
       htmlentities (~> 4.3.4)
       isodoc (~> 0.10.0)
@@ -128,14 +128,14 @@ GEM
       ruby-jing
       twitter_cldr
       tzinfo-data
-    metanorma-ogc (0.1.0)
+    metanorma-ogc (0.1.1)
       asciidoctor (~> 1.5.7)
       htmlentities (~> 4.3.4)
       iso-639
       isodoc (~> 0.10.0)
       metanorma-standoc (~> 1.2.0)
       ruby-jing
-    metanorma-standoc (1.2.0)
+    metanorma-standoc (1.2.1)
       asciidoctor (~> 1.5.7)
       concurrent-ruby
       html2doc (~> 0.8.11)
@@ -146,7 +146,7 @@ GEM
       ruby-jing
       sterile (~> 1.0.14)
       unicode2latex (~> 0.0.1)
-    metanorma-unece (0.1.0)
+    metanorma-unece (0.1.1)
       asciidoctor (~> 1.5.7)
       htmlentities (~> 4.3.4)
       iso-639
@@ -163,9 +163,9 @@ GEM
     nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     optout (0.0.2)
-    public_suffix (3.1.0)
+    public_suffix (3.1.1)
     rake (12.3.2)
-    relaton (0.4.0)
+    relaton (0.4.1)
       algoliasearch
       relaton-gb (~> 0.5.0)
       relaton-iec (~> 0.3.0)
@@ -174,35 +174,36 @@ GEM
       relaton-iso-bib (~> 0.2.0)
       relaton-itu (~> 0.2.0)
       relaton-nist (~> 0.2.0)
-    relaton-bib (0.2.1)
+    relaton-bib (0.2.3)
       addressable
       nokogiri (~> 1.8.4)
-    relaton-cli (0.2.0)
+    relaton-cli (0.2.1)
       liquid
       relaton (~> 0.4)
       thor
-    relaton-gb (0.5.0)
+    relaton-gb (0.5.1)
       cnccs (~> 0.1.1)
       gb-agencies (~> 0.0.1)
       relaton-iso-bib (~> 0.2.0)
-    relaton-iec (0.3.0)
+    relaton-iec (0.3.1)
       addressable
       relaton-iso-bib (~> 0.2.0)
-    relaton-ietf (0.5.0)
+    relaton-ietf (0.5.3)
       relaton-iso-bib (~> 0.2.0)
-    relaton-iso (0.5.0)
+    relaton-iso (0.5.1)
       algoliasearch
       relaton-iec (~> 0.3.0)
       relaton-iso-bib (~> 0.2.0)
-    relaton-iso-bib (0.2.2)
+    relaton-iso-bib (0.2.3)
       isoics (~> 0.1.6)
       nokogiri (~> 1.8.4)
       relaton-bib (~> 0.2.0)
       ruby_deep_clone (~> 0.8.0)
-    relaton-itu (0.2.0)
+    relaton-itu (0.2.1)
       relaton-iso-bib (~> 0.2.0)
-    relaton-nist (0.2.0)
+    relaton-nist (0.2.2)
       relaton-bib (~> 0.2.0)
+      rubyzip
     roman-numerals (0.3.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -212,7 +213,7 @@ GEM
       mixlib-shellout (~> 2.0)
       rspec (~> 3.2)
       rspec-its (~> 1.2)
-    rspec-core (3.8.1)
+    rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
     rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -227,6 +228,7 @@ GEM
     ruby-jing (0.0.1)
       optout (>= 0.0.2)
     ruby_deep_clone (0.8.0)
+    rubyzip (1.2.3)
     sassc (2.0.1)
       ffi (~> 1.9)
       rake

data/README.adoc

@@ -195,6 +195,17 @@ using for that specific processor.
 metanorma version --type iso
 ----
 
+=== Add new template repository (`metanorma template-repo add`)
+
+The `template-repo add` interface allows you to add your custom template
+repository to metanorma, so next time when you need to generate a new document
+then you can directly use that name to use your custom template from that
+repository.
+
+[source, sh]
+----
+metanorma template-repo add my-iso https://github.com/you/my-iso-template
+----
 
 == Credits
 

data/a

@@ -1 +1 @@
-git add lib/metanorma/cli/version.rb metanorma-cli.gemspec 
+git add lib/metanorma/cli/version.rb spec/metanorma_spec.rb 

data/lib/metanorma/cli/command.rb

@@ -2,6 +2,7 @@ require "thor"
 require "metanorma/cli/compiler"
 require "metanorma/cli/generator"
 require "metanorma/cli/git_template"
+require "metanorma/cli/commands/template_repo"
 
 module Metanorma
   module Cli
@@ -60,6 +61,9 @@ module Metanorma
         UI.say("Couldn't load #{type}, please provide a valid type!")
       end
 
+      desc "template-repo", "Manage metanorma templates repository"
+      subcommand :template_repo, Metanorma::Cli::Commands::TemplateRepo
+
       private
 
       def single_type_extensions(type)

data/lib/metanorma/cli/commands/template_repo.rb

@@ -0,0 +1,20 @@
+require "metanorma/cli/template_repo"
+
+module Metanorma
+  module Cli
+    module Commands
+      class TemplateRepo < Thor
+        desc "add NAME SOURCE", "Add new metanorma templates repository"
+        option :overwrite, aliases: "-y", type: :boolean, desc: "Overwrite existing template"
+
+        def add(name, source)
+          Metanorma::Cli::TemplateRepo.add(name, source, options)
+          UI.say("Template repo: #{name} has been added successfully")
+
+        rescue Errors::DuplicateTemplateError
+          UI.error("Duplicate metanorma template")
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/cli/errors.rb

@@ -0,0 +1,8 @@
+module Metanorma
+  module Cli
+    module Errors
+      class DuplicateTemplateError < StandardError
+      end
+    end
+  end
+end

data/lib/metanorma/cli/template_repo.rb

@@ -0,0 +1,62 @@
+require "yaml"
+
+module Metanorma
+  module Cli
+    class TemplateRepo
+      def initialize(options = {})
+        @name = options.fetch(:name)
+        @source = options.fetch(:source)
+        @type = options.fetch(:type, "custom")
+        @overwrite = options.fetch(:overwrite, false)
+      end
+
+      def add
+        create_template_config
+        add_new_template(name, source, type)
+        write_to_template_config(templates)
+
+        templates[:templates]
+      end
+
+      def self.add(name, source, options = {})
+        new(options.merge(name: name, source: source)).add
+      end
+
+      private
+
+      attr_reader :name, :source, :type, :overwrite
+
+      def templates
+        @templates ||= YAML.load(template_config_file.read)
+      end
+
+      def template_config_file
+        @template_config_file ||= Cli.home_directory.join("config.yml")
+      end
+
+      def create_template_config
+        unless template_config_file.exist?
+          unless template_config_file.dirname.exist?
+            FileUtils.mkdir_p(template_config_file.dirname)
+          end
+
+          write_to_template_config({templates: []})
+        end
+      end
+
+      def write_to_template_config(templates)
+        File.write(template_config_file, templates.to_yaml)
+      end
+
+      def add_new_template(name, source, type)
+        names = templates[:templates].map { |template| template[:name].to_s }
+
+        if names.include?(name.to_s) && overwrite == false
+          raise Errors::DuplicateTemplateError.new("Duplicate metanorma template")
+        end
+
+        templates[:templates].push({ name: name, source: source, type: type })
+      end
+    end
+  end
+end

data/lib/metanorma/cli/ui.rb

@@ -11,6 +11,10 @@ module Metanorma
         new.say(message)
       end
 
+      def self.error(message)
+        new.error(message)
+      end
+
       def self.run(command)
         require "open3"
         Open3.capture3(command)

data/lib/metanorma/cli/version.rb

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

data/lib/metanorma/cli.rb

@@ -1,5 +1,6 @@
 require "metanorma"
 require "metanorma/cli/version"
+require "metanorma/cli/errors"
 require "metanorma/cli/command"
 
 module Metanorma
@@ -68,7 +69,11 @@ module Metanorma
     end
 
     def self.templates_path
-      Pathname.new(Dir.home).join(".metanorma", "templates")
+      home_directory.join("templates")
+    end
+
+    def self.home_directory
+      Pathname.new(Dir.home).join(".metanorma")
     end
 
     def self.writable_templates_path?

data/tmp/my-custom-csd/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/tmp/my-document/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/tmp/my-local-document/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-16 00:00:00.000000000 Z
+date: 2019-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -367,9 +367,12 @@ files:
 - lib/metanorma-cli.rb
 - lib/metanorma/cli.rb
 - lib/metanorma/cli/command.rb
+- lib/metanorma/cli/commands/template_repo.rb
 - lib/metanorma/cli/compiler.rb
+- lib/metanorma/cli/errors.rb
 - lib/metanorma/cli/generator.rb
 - lib/metanorma/cli/git_template.rb
+- lib/metanorma/cli/template_repo.rb
 - lib/metanorma/cli/ui.rb
 - lib/metanorma/cli/version.rb
 - metanorma-cli.gemspec
@@ -418,7 +421,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Metanorma is the standard of standards; the metanorma gem allows you to create