metanorma-cli 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88193e8fa2e31b1e2d7361f669af82c64a64e44729240a573c3abcc221c30112
-  data.tar.gz: 0c1a39a506344e02866e3b364daa02c6e06af304b9384d0b6b462389a6c5260a
+  metadata.gz: 2410a33ad2bacfb66c4f7e6ee2c3ffb1d6c13bfb1ed65b6772c884c55ce4a663
+  data.tar.gz: 2fa231a58594b34711ff9b674a613e51ec6727f0639dedfcd2ed871f92b3fed5
 SHA512:
-  metadata.gz: 866e19a6269a9bacd36767729e89ee8be8c208532176e7d61cda7065b8b08f47f44df4e480ecb9f95f1adecc15f2a8a92eb598838dd59a583ba922487b3f3ef2
-  data.tar.gz: d0b4ab37ca0166b489d22e90b51206c10db13a5f9e98ed53d4de9ce9be183f6bf470d4314f7144b0094926b2d589a3e0a3f76807dd67328e06cbf9e998aad090
+  metadata.gz: 7afdd97819fec7df7ba1d056066ca658c6b4a33af191f40d88fa067fd27dafe2a37ca5ecb672465ee5d3f2904a1a86404bcf4d54d9682a1c2c55951b7ebc2f36
+  data.tar.gz: 1ab470e100859fae5746aa7a7fda60dbbf4cb783b23647ba6f9d1c4ef036a630d6d86cb9ee42bdf49a6aab4db695f54936b489079fbb80729e92930eae9a57e6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metanorma-cli (1.2.1)
+    metanorma-cli (1.2.2)
       git (~> 1.5)
       isodoc (~> 0.10.0)
       metanorma (~> 0.3.9)
@@ -69,7 +69,7 @@ GEM
     isoics (0.1.7)
     json (2.2.0)
     liquid (4.0.3)
-    metanorma (0.3.13)
+    metanorma (0.3.14)
       asciidoctor
       htmlentities
     metanorma-acme (1.2.1)
@@ -242,7 +242,7 @@ GEM
       tzinfo
     tzinfo (2.0.0)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2019.1)
+    tzinfo-data (1.2019.2)
       tzinfo (>= 1.0.0)
     unicode2latex (0.0.2)
     uuidtools (2.1.5)

data/appveyor.yml

@@ -22,6 +22,7 @@ install:
 build_script:
   - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
   - set GIT_TERMINAL_PROMPT=0
+  - gem install bundler -v "~> 2"
   - bundle config --local path vendor/bundle
   - bundle update
   - bundle install

data/exe/metanorma

@@ -1,151 +1,20 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
-# Note
-#
-# Currently, we are developing a new version for this CLI, and
-# to test it out we adding this environment variable. When the
-# `METANORMA_DEV_MODE` set to `true` then it will revert to the
-# old version of the CLI.
-#
-unless ENV.fetch("METANORMA_DEV_MODE", false) == "true"
-  require "bundler/setup"
-  require "metanorma/cli"
+# resolve bin path, ignoring symlinks
+require "pathname"
+bin_file = Pathname.new(__FILE__).realpath
 
-  Metanorma::Cli.start(ARGV)
-  exit 0
-end
-
-require "optparse"
-require "metanorma"
-require "fileutils"
-require "nokogiri"
-require "metanorma-cli"
-
-registry = Metanorma::Registry.instance
-Metanorma::Cli.load_flavors
-
-options = {
-  format: :asciidoc
-}
-opt_parser = OptionParser.new do |opts|
-  opts.banner += " <file>"
-  opts.on(
-    '-t',
-    '--type TYPE',
-    String,
-    "Type of standard to generate",
-    "#{registry.supported_backends}"
-  ) { |v| options[:type] = v.to_sym }
-
-  output_formats = registry.output_formats.inject([]) do |acc, (processor, formats)|
-    str = "* #{processor.to_s}: "
-
-    formats.each_pair do |type, ext|
-      str << "['#{type.to_s}': #{ext.to_s}] "
-    end
-
-    acc << str
-  end
-
-  opts.on(
-    '-x',
-    "--extensions all | EXT,...",
-    Array,
-    "Document extensions available per type (type, ['filetype': ext])",
-    *output_formats
-  ) { |v| options[:extension_keys] = v.map(&:to_sym) }
-
-  input_formats = [:asciidoc]
-  opts.on(
-    '-f',
-    '--format FORMAT',
-    String,
-    'Format of source file',
-    "#{input_formats}",
-  ) { |v| options[:format] = v.to_sym }
-
-  opts.on(
-    '-r',
-    '--require LIBRARY',
-    'Require LIBRARY prior to execution'
-  ) { |v|
-    options[:require] ||= []
-    options[:require] << v
-  }
-
-  opts.on(
-    '-v',
-    '--version',
-    "Print version of code (accompanied with -t)",
-  ) { options[:version] = true }
-
-  opts.on(
-    '-w',
-    '--wrapper',
-    'Create wrapper folder for HTML output'
-  ) { options[:wrapper] = true }
-
-  opts.on(
-    '-a',
-    '--asciimath',
-    'Keep Asciimath in XML output instead of converting it to MathML'
-  ) { options[:asciimath] = true }
-
-  opts.on(
-    '-d',
-    '--data-uri-image',
-    'Encode HTML output images as data URIs'
-  ) { options[:datauriimage] = true }
-
-  opts.on(
-    '-R',
-    '--relaton FILENAME',
-    'Export Relaton XML for document to nominated filename'
-  ) { |v| options[:relaton] = v }
-
-  opts.on(
-    '-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
-    exit
-  end
-
-end
-
-opt_parser.parse!(ARGV)
-
-=begin
-if options[:require]
-  options[:require].each do |r|
-    require r
-  end
-end
-=end
-
-if options[:version]
-  case options[:format]
-  when :asciidoc
-    processor = registry.find_processor(options[:type].to_sym)
-    puts processor.version
-    exit
-  end
-end
+# add self to libpath
+$:.unshift File.expand_path("../../lib", bin_file)
 
-options[:filename] = ARGV.pop
+# Fixes https://github.com/rubygems/rubygems/issues/1420
+require "rubygems/specification"
 
-unless options[:filename]
-  puts "[metanorma] Error: Need to specify a file to process."
-  exit 0
+class Gem::Specification
+  def this; self; end
 end
 
-filename = options[:filename]
-Metanorma::Compile.new().compile(filename, options)
+# start up the CLI
+require "metanorma/cli"
+Metanorma::Cli.start(ARGV)

data/lib/metanorma/cli/git_template.rb

@@ -84,6 +84,7 @@ module Metanorma
           csd: "https://github.com/metanorma/mn-templates-csd",
           ogc: "https://github.com/metanorma/mn-templates-ogc",
           iso: "https://github.com/metanorma/mn-templates-iso",
+          ietf: "https://github.com/metanorma/mn-templates-ietf"
         }
       end
 

data/lib/metanorma/cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-30 00:00:00.000000000 Z
+date: 2019-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler