metanorma 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e035adbe0198188b313c2b91ea58ec320e056e5f9b0b34a56cebbe782531cc03
-  data.tar.gz: e328e75abb7ea5d0d10582f9459d8e843b5f9b205dafe59447475945671d171e
+  metadata.gz: 65769038eade4b4613c4a2e8d3afae9937aff96be1de9c2837edf3daaf0b4864
+  data.tar.gz: c0f88cd2052207059fd87a27fb53ef5ef67d5f34df5f7911e43438a40c853d8f
 SHA512:
-  metadata.gz: 65fe8520fc1e1e8e8d5855cf977809b9eb1998dd5050b9c0f9432c544d1534d68d9830bf7c68e9260f41474392c607e437dfe31e9a84b2fe7874339aeca42ec4
-  data.tar.gz: ca6f446651de13513fb8d710b816fcb8f9257883b3de2faac54e5d396232ac60f2bc95ed0cfdf84bfb85a3eec392298bd651429ee07f20c77367fb3733276ee6
+  metadata.gz: 481b22243ec66037111e6e278f5a20fcf838c83de0eb5e4cad5326fe190c8b4ea04d70e3ce2b6f68aca442f7fe36c5e6d49ebcaf537cca86dc2f14fb81498fff
+  data.tar.gz: b37a1957127ac6b27299d7fddacaf1ad3596834a239993bc83e9be052d8f93faa1e2b823c7251ca1bd39aa73a164851383a5839f8b700a9e5eca0e4ddd0a4710

data/.travis.yml

@@ -1,7 +1,10 @@
+dist: trusty
 sudo: false
 language: ruby
 rvm:
-  - 2.5.1
+  - 2.5
+  - 2.4
+  - ruby-head
 node_js:
   - "iojs"
   - "8"
@@ -9,4 +12,7 @@ before_install:
   - gem install bundler -v 1.16.1
   - npm install -g puppeteer
   - npm install
+matrix:
+  allow_failures:
+    - rvm: ruby-head
 

data/Gemfile.lock

@@ -2,142 +2,19 @@ PATH
   remote: .
   specs:
     metanorma (0.2.5)
-      asciidoctor-csand (>= 0.3.0)
-      asciidoctor-csd (>= 0.4.0)
-      asciidoctor-gb (>= 0.3.0)
-      asciidoctor-iso (>= 0.9.1)
-      asciidoctor-m3d (>= 0.3.1)
-      asciidoctor-rfc (>= 0.9.0)
-      asciidoctor-rsd (>= 0.3.0)
-      isodoc (>= 0.8.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    algoliasearch (1.23.2)
-      httpclient (~> 2.8, >= 2.8.3)
-      json (>= 1.5.1)
-    asciidoctor (1.5.7.1)
-    asciidoctor-csand (0.3.1)
-      asciidoctor (~> 1.5.7)
-      asciidoctor-iso (>= 0.9.0)
-      asciimath
-      htmlentities (~> 4.3.4)
-      image_size
-      isodoc (>= 0.8.0)
-      mime-types
-      nokogiri
-      ruby-jing
-      ruby-xslt
-      thread_safe
-      uuidtools
-    asciidoctor-csd (0.4.1)
-      asciidoctor-iso (>= 0.9.0)
-      isodoc (>= 0.8.0)
-    asciidoctor-gb (0.3.1)
-      asciidoctor-iso (>= 0.9.0)
-      gbbib
-      isodoc (>= 0.8.0)
-      twitter_cldr
-    asciidoctor-iso (0.9.3)
-      asciidoctor (~> 1.5.7)
-      iso-bib-item (~> 0.1.6)
-      isobib (~> 0.1.8)
-      isodoc (>= 0.8)
-      ruby-jing
-    asciidoctor-m3d (0.3.2)
-      asciidoctor (~> 1.5.7)
-      asciidoctor-iso (>= 0.9.0)
-      asciimath
-      htmlentities (~> 4.3.4)
-      image_size
-      isodoc (>= 0.8.0)
-      mime-types
-      nokogiri
-      ruby-jing
-      ruby-xslt
-      thread_safe
-      uuidtools
-    asciidoctor-rfc (0.9.0)
-      asciidoctor (~> 1.5.7)
-      htmlentities (~> 4.3.4)
-      nokogiri
-      ruby-jing
-      thread_safe
-    asciidoctor-rsd (0.3.1)
-      asciidoctor (~> 1.5.7)
-      asciidoctor-iso (>= 0.8.0)
-      asciimath
-      htmlentities (~> 4.3.4)
-      image_size
-      isodoc (>= 0.7.0)
-      mime-types
-      nokogiri
-      ruby-jing
-      ruby-xslt
-      thread_safe
-      uuidtools
-    asciimath (1.0.4)
     byebug (10.0.2)
-    camertron-eprun (1.1.1)
-    cldr-plurals-runtime-rb (1.0.1)
-    cnccs (0.1.1)
     diff-lcs (1.3)
-    duplicate (1.1.1)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    ffi (1.9.25)
-    gbbib (0.1.2)
-      cnccs
-      iso-bib-item
-    html2doc (0.8.0)
-      asciimath
-      htmlentities (~> 4.3.4)
-      image_size
-      mime-types
-      nokogiri
-      ruby-xslt
-      thread_safe
-      uuidtools
-    htmlentities (4.3.4)
-    httpclient (2.8.3)
-    image_size (2.0.0)
-    iso-bib-item (0.1.10)
-      duplicate
-      isoics (~> 0.1.6)
-      nokogiri
-    isobib (0.1.9)
-      algoliasearch
-      iso-bib-item (~> 0.1.10)
-    isodoc (0.8.1)
-      asciimath
-      html2doc (>= 0.7.1)
-      htmlentities (~> 4.3.4)
-      image_size
-      liquid
-      mime-types
-      nokogiri
-      roman-numerals
-      ruby-xslt
-      sass
-      thread_safe
-      uuidtools
-    isoics (0.1.6)
-    json (2.1.0)
-    liquid (4.0.0)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
     mini_portile2 (2.3.0)
     mixlib-shellout (2.3.2)
-    nokogiri (1.8.3)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
-    optout (0.0.2)
     rake (10.5.0)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    roman-numerals (0.3.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
@@ -158,22 +35,6 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    ruby-jing (0.0.1)
-      optout (>= 0.0.2)
-    ruby-xslt (0.9.10)
-    sass (3.5.6)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    thread_safe (0.3.6)
-    twitter_cldr (4.4.3)
-      camertron-eprun
-      cldr-plurals-runtime-rb (~> 1.0)
-      tzinfo
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    uuidtools (2.1.5)
 
 PLATFORMS
   ruby

data/README.adoc

@@ -1,5 +1,9 @@
 = Metanorma: the standard for standards
 
+image:https://img.shields.io/gem/v/metanorma.svg["Gem Version", link="https://rubygems.org/gems/metanorma"]
+image:https://img.shields.io/travis/riboseinc/metanorma/master.svg["Build Status", link="https://travis-ci.org/riboseinc/metanorma"]
+image:https://codeclimate.com/github/riboseinc/metanorma/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/riboseinc/metanorma"]
+
 Metanorma is dedicated to harmonizing standard documents
 produced by different standard-setting bodies in a manner that
 maintains correct semantics while allowing each standard publisher to
@@ -45,7 +49,7 @@ the https://github.com/riboseinc/asciidoctor-m3d/[asciidoctor-m3d implementation
 
 == Installation
 
-=== All-in-one install
+=== All-in-one install, MacOS
 
 macOS users can directly run the Metanorma setup script located here:
 https://github.com/riboseinc/metanorma-macos-setup
@@ -53,6 +57,35 @@ https://github.com/riboseinc/metanorma-macos-setup
 This is a one-stop installation script that setups Ruby, Node
 and all necessary parts for running Metanorma.
 
+=== Installation, https://www.ubuntu.com[Ubunto]
+
+[source,sh]
+----
+# Set up prerequisites
+apt-get update
+apt install -y git make ruby-bundler ruby-dev libxml2-dev libxslt-dev default-jre
+gem install bundler
+gem install nokogiri -v '1.8.4'
+gem install metanorma-cli
+----
+
+(You may need to run these as `sudo`)
+
+If you want to run Ubuntu on MacOS, you should do the following beforehand:
+
+[source,sh]
+----
+# Setup docker through dinghy on MacOS:
+brew tap codekitchen/dinghy
+brew install dinghy
+brew install docker docker-machine
+dinghy create --provider virtualbox
+
+# Run the Ubuntu container:
+dinghy up
+eval $(dinghy env)
+docker run -it ubuntu:18.10 bash
+----
 
 === Installing individual components
 
@@ -60,7 +93,7 @@ The Metanorma workflow can be utilized via the `metanorma` Ruby gem.
 
 [source,sh]
 ----
-gem install metanorma
+gem install metanorma-cli
 ----
 
 If you are going to generate PDFs from HTML (which applies to CSD), you will also need to install

data/lib/metanorma/output/pdf.rb

@@ -4,7 +4,7 @@ module Metanorma
 
       def convert(url_path, output_path)
         file_url = "file://#{Dir.pwd}/#{url_path}"
-        pdfjs = File.join(File.dirname(__FILE__), '../../../exe/metanorma-pdf.js')
+        pdfjs = File.join(File.dirname(__FILE__), '../../../bin/metanorma-pdf.js')
         system "export NODE_PATH=$(npm root --quiet -g);
                       node #{pdfjs} #{file_url} #{output_path}"
       end

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/metanorma.gemspec

@@ -10,16 +10,16 @@ Gem::Specification.new do |spec|
   spec.email         = ['open.source@ribose.com']
 
   spec.summary       = %q{Metanorma is the standard of standards; the metanorma gem allows you to create any standard document type supported by Metanorma.}
-  spec.description   = %q{Executable and library to process any Metanorma standard.}
+  spec.description   = %q{Library to process any Metanorma standard.}
   spec.homepage      = "https://github.com/riboseinc/metanorma"
-  spec.license       = "MIT"
+  spec.license       = "BSD-2-Clause"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
   spec.extra_rdoc_files = %w[README.adoc CHANGELOG.adoc LICENSE.txt]
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir        = "bin"
+  #spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = '>= 2.4.0'
@@ -31,12 +31,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec-command", "~> 1.0.3"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
 
-  spec.add_runtime_dependency 'asciidoctor-iso', ">= 0.9.1"
-  spec.add_runtime_dependency 'asciidoctor-rfc', ">= 0.9.0"
-  spec.add_runtime_dependency 'asciidoctor-gb', ">= 0.3.0"
-  spec.add_runtime_dependency 'asciidoctor-csd', ">= 0.4.0"
-  spec.add_runtime_dependency 'asciidoctor-csand', ">= 0.3.0"
-  spec.add_runtime_dependency 'asciidoctor-rsd', ">= 0.3.0"
-  spec.add_runtime_dependency 'asciidoctor-m3d', ">= 0.3.1"
-  spec.add_runtime_dependency 'isodoc', ">= 0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2018-07-02 00:00:00.000000000 Z
+date: 2018-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,124 +94,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: asciidoctor-iso
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-- !ruby/object:Gem::Dependency
-  name: asciidoctor-rfc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: asciidoctor-gb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: asciidoctor-csd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: asciidoctor-csand
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: asciidoctor-rsd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: asciidoctor-m3d
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-- !ruby/object:Gem::Dependency
-  name: isodoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-description: Executable and library to process any Metanorma standard.
+description: Library to process any Metanorma standard.
 email:
 - open.source@ribose.com
-executables:
-- metanorma
-- metanorma-pdf.js
+executables: []
 extensions: []
 extra_rdoc_files:
 - README.adoc
@@ -229,9 +115,8 @@ files:
 - README.adoc
 - Rakefile
 - bin/console
+- bin/metanorma-pdf.js
 - bin/setup
-- exe/metanorma
-- exe/metanorma-pdf.js
 - lib/metanorma.rb
 - lib/metanorma/document.rb
 - lib/metanorma/input.rb
@@ -246,7 +131,7 @@ files:
 - metanorma.gemspec
 homepage: https://github.com/riboseinc/metanorma
 licenses:
-- MIT
+- BSD-2-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/exe/metanorma

@@ -1,140 +0,0 @@
-#!/usr/bin/env ruby
-
-require "optparse"
-require "metanorma"
-
-registry = Metanorma::Registry.instance
-
-supported_gem_paths = [
-  "asciidoctor-rfc",
-  "asciidoctor-iso",
-  "asciidoctor-gb",
-  "asciidoctor-csd",
-  "asciidoctor-csand",
-  "asciidoctor-m3d",
-  "asciidoctor-rsd"
-]
-
-puts "[metanorma] detecting backends:"
-supported_gem_paths.each do |backend|
-  begin
-    puts backend
-    require backend
-  rescue LoadError
-    puts "[metanorma] backend #{backend} not present"
-  end
-end
-puts
-
-options = {
-  format: :asciidoc
-}
-opt_parser = OptionParser.new do |opts|
-  opts.banner += " <file>"
-  opts.on(
-    '-t',
-    '--type TYPE',
-    "Type of standard to generate: #{registry.supported_backends.join(", ")}"
-  ) { |v| options[:type] = v.to_sym }
-
-  opts.on(
-    '-x',
-    '--extensions EXT1,EXT2,...',
-    Array,
-    "Type of extension to generate per type: #{registry.output_formats}\n"
-  ) { |v| options[:extension_keys] = v.map(&:to_sym) }
-
-  opts.on(
-    '-f',
-    '--format FORMAT',
-    'Format of source file: asciidoc (current default, only format supported)'
-  ) { |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_tail("-h", "--help", "Show this message") do
-    puts opts
-    exit
-  end
-
-end
-
-opt_parser.parse!(ARGV)
-
-if options[:version]
-  case options[:format]
-  when :asciidoc
-    processor = registry.find_processor(options[:type].to_sym)
-    puts processor.version
-    exit
-  end
-end
-
-options[:filename] = ARGV.pop
-
-unless options[:type]
-  puts "[metanorma] Error: Please specify a standard type."
-  puts opt_parser.help
-  exit 0
-end
-
-unless registry.supported_backends.include? options[:type]
-  puts "[metanorma] Error: #{options[:type]} is not a supported standard type."
-  exit 0
-end
-
-unless options[:format] == :asciidoc
-  puts "[metanorma] Error: Only source file format currently supported is 'asciidoc'."
-  exit 0
-end
-
-unless options[:filename]
-  puts "[metanorma] Error: Need to specify a file to process."
-  exit 0
-end
-
-if options[:require]
-  options[:require].each do |r|
-    require r
-  end
-end
-
-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 = File.read(options[:filename], encoding: "utf-8")
-  isodoc = processor.input_to_isodoc(file)
-  isodoc_options = processor.extract_options(file)
-  extensions.each do |ext|
-    file_extension = processor.output_formats[ext]
-    outfilename = options[:filename].sub(/\.[^.]+$/, ".#{file_extension}")
-    processor.output(isodoc, outfilename, ext, isodoc_options)
-  end
-end
-