metanorma 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7c602f3a5c769d4a31270abc6185b3e04bfb5fcc801e8c17768775e6af5cf2b
-  data.tar.gz: b3d2420c9b8eb2c4893e60ec02a72527ec3d4bb730d2f415418fa97cc1c8652b
+  metadata.gz: a3e99f6dcb3fe79eb0f8be74ff79c3bf461e64974992d0e56b5192bc0638970c
+  data.tar.gz: 5559be01e614c1c54d2e2b2900642ef73528acdb03a8ae569bfa694de3f4cb7f
 SHA512:
-  metadata.gz: d4e550a93798417d17184aae9e1ae85ac42f21a7e9f6df2c983a308304bc119b643fc889d2ca8614bd064057dbae59d26504cc564690ebaf3db76e9e22872645
-  data.tar.gz: 1c57ce431c760ef57dd41757bb8beb3f6e9518ce2548623f90f497b29128c40cfeda09e690398afa11e2c325022dfc3bf93e3995bf9f41ac3f69a632cd161c9b
+  metadata.gz: e5cd41cd491dd4518e1598b867dc48c7ee6973b1d5785c1b59107c777ac5970688595fd6d5d7761fd47ae56addccd64e2860a5483fe86deeba51caf9273e2803
+  data.tar.gz: 132b2bcf455b7f02fda5325157b70a9bccee16957be76a2fbcd1e67225bef0e4f5135ff56bf559a354a6eaabf326a4d8da96d668ce6571218c235793cdec4a13

data/.travis.yml

@@ -1,18 +1,20 @@
-dist: trusty
-sudo: false
+# Auto-generated !!! Do not edit it manually
+# use ci-master https://github.com/metanorma/metanorma-build-scripts
 language: ruby
+cache: bundler
+os:
+- linux
+- osx
 rvm:
-  - 2.5
-  - 2.4
-  - 2.3
-  - ruby-head
-node_js:
-  - "iojs"
-  - "8"
+- 2.5
+- 2.4
+- ruby-head
 before_install: 
-  - gem install bundler -v 1.16.1
-  - npm install -g puppeteer
-  - npm install
+- nvm install 8
+- npm install -g puppeteer
+- npm install
+- gem install bundler -v 2.0.1
+- bundle update
 matrix:
   allow_failures:
     - rvm: ruby-head

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metanorma (0.3.11)
+    metanorma (0.3.12)
       asciidoctor
       htmlentities
 
@@ -21,68 +21,49 @@ GEM
     diff-lcs (1.3)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    ffi (1.9.25)
+    ffi (1.11.1)
     gb-agencies (0.0.5)
-    gbbib (0.4.4)
-      cnccs (~> 0.1.1)
-      gb-agencies (~> 0.0.1)
-      iso-bib-item (~> 0.4.2)
-    html2doc (0.8.9)
+    html2doc (0.8.11)
       asciimath (~> 1.0.7)
       htmlentities (~> 4.3.4)
       image_size
       mime-types
       nokogiri
-      ruby-xslt
       thread_safe
       uuidtools
     htmlentities (4.3.4)
     httpclient (2.8.3)
-    iecbib (0.2.2)
-      addressable
-      iso-bib-item (~> 0.4.2)
-    ietfbib (0.4.5)
-      iso-bib-item (~> 0.4.2)
     iev (0.2.2)
       nokogiri
-    image_size (2.0.0)
-    iso-bib-item (0.4.4)
-      isoics (~> 0.1.6)
-      nokogiri (~> 1.8.4)
-      ruby_deep_clone (~> 0.8.0)
-    isobib (0.4.4)
-      algoliasearch
-      iecbib (~> 0.2.1)
-      iso-bib-item (~> 0.4.2)
-    isodoc (0.9.13)
+    image_size (2.0.1)
+    isodoc (0.10.0)
       asciimath
-      html2doc (~> 0.8.6)
+      html2doc (~> 0.8.11)
       htmlentities (~> 4.3.4)
       liquid
       metanorma (~> 0.3.0)
-      nokogiri
+      nokogiri (>= 1)
       rake (~> 12.0)
       roman-numerals
-      ruby-xslt
-      sassc (~> 1.12.1)
+      sassc (~> 2)
       thread_safe
       uuidtools
     isoics (0.1.7)
     json (2.2.0)
     liquid (4.0.3)
-    metanorma-iso (1.1.5)
+    metanorma-iso (1.2.0)
       asciidoctor (~> 1.5.7)
-      iev (~> 0.2.0)
-      isodoc (~> 0.9.8)
-      metanorma-standoc (~> 1.1.0)
+      isodoc (~> 0.10.0)
+      metanorma-standoc (~> 1.2.0)
       ruby-jing
-    metanorma-standoc (1.1.6)
+    metanorma-standoc (1.2.0)
       asciidoctor (~> 1.5.7)
       concurrent-ruby
-      html2doc (~> 0.8.0)
+      html2doc (~> 0.8.11)
       iev (~> 0.2.1)
-      isodoc (~> 0.9.0)
-      relaton (~> 0.3.1)
+      isodoc (~> 0.10.0)
+      relaton (~> 0.4.0)
+      relaton-cli (~> 0.2.0)
       ruby-jing
       sterile (~> 1.0.14)
       unicode2latex (~> 0.0.1)
@@ -94,18 +75,46 @@ GEM
     nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     optout (0.0.2)
-    public_suffix (3.0.3)
+    public_suffix (3.1.0)
     rake (12.3.2)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
-      ffi (~> 1.0)
-    relaton (0.3.3)
+    relaton (0.4.0)
+      algoliasearch
+      relaton-gb (~> 0.5.0)
+      relaton-iec (~> 0.3.0)
+      relaton-ietf (~> 0.5.0)
+      relaton-iso (~> 0.5.0)
+      relaton-iso-bib (~> 0.2.0)
+      relaton-itu (~> 0.2.0)
+      relaton-nist (~> 0.2.0)
+    relaton-bib (0.2.1)
+      addressable
+      nokogiri (~> 1.8.4)
+    relaton-cli (0.2.0)
+      liquid
+      relaton (~> 0.4)
+      thor
+    relaton-gb (0.5.0)
+      cnccs (~> 0.1.1)
+      gb-agencies (~> 0.0.1)
+      relaton-iso-bib (~> 0.2.0)
+    relaton-iec (0.3.0)
+      addressable
+      relaton-iso-bib (~> 0.2.0)
+    relaton-ietf (0.5.0)
+      relaton-iso-bib (~> 0.2.0)
+    relaton-iso (0.5.0)
       algoliasearch
-      gbbib (~> 0.4.0)
-      iecbib (~> 0.2.0)
-      ietfbib (~> 0.4.2)
-      iso-bib-item (~> 0.4.2)
-      isobib (~> 0.4.0)
+      relaton-iec (~> 0.3.0)
+      relaton-iso-bib (~> 0.2.0)
+    relaton-iso-bib (0.2.2)
+      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-iso-bib (~> 0.2.0)
+    relaton-nist (0.2.0)
+      relaton-bib (~> 0.2.0)
     roman-numerals (0.3.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -115,32 +124,27 @@ GEM
       mixlib-shellout (~> 2.0)
       rspec (~> 3.2)
       rspec-its (~> 1.2)
-    rspec-core (3.8.0)
+    rspec-core (3.8.1)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-its (1.2.0)
+    rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+    rspec-support (3.8.2)
     ruby-jing (0.0.1)
       optout (>= 0.0.2)
-    ruby-xslt (0.9.10)
     ruby_deep_clone (0.8.0)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sassc (1.12.1)
-      ffi (~> 1.9.6)
-      sass (>= 3.3.0)
+    sassc (2.0.1)
+      ffi (~> 1.9)
+      rake
     sterile (1.0.14)
       nokogiri
+    thor (0.20.3)
     thread_safe (0.3.6)
     unicode2latex (0.0.2)
     uuidtools (2.1.5)
@@ -149,16 +153,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.0.1)
+  bundler (~> 2.0)
   byebug (~> 10.0)
   equivalent-xml (~> 0.6)
-  isodoc (= 0.9.13)
   metanorma!
-  metanorma-iso (~> 1.1.3)
-  metanorma-standoc (~> 1.1.4)
+  metanorma-iso (~> 1.2)
   rake (~> 12.0)
   rspec (~> 3.0)
-  rspec-command (~> 1.0.3)
+  rspec-command (~> 1.0)
 
 BUNDLED WITH
    2.0.1

data/appveyor.yml

@@ -1,10 +1,14 @@
+# Auto-generated !!! Do not edit it manually
+# use ci-master https://github.com/metanorma/metanorma-build-scripts
 version: '{build}'
 
+cache:
+  - vendor/bundle
+
 environment:
   matrix:
     - RUBY_VERSION: 25
     - RUBY_VERSION: 24
-    - RUBY_VERSION: 23
     - RUBY_VERSION: _trunk
 
 matrix:
@@ -17,6 +21,8 @@ install:
 
 build_script:
   - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
+  - set GIT_TERMINAL_PROMPT=0
+  - bundle config --local path vendor/bundle
   - bundle update
   - bundle install
 
@@ -27,4 +33,3 @@ before_test:
 
 test_script:
   - bundle exec rake
-

data/lib/metanorma.rb

@@ -1,5 +1,7 @@
 require "metanorma/version"
 require "asciidoctor"
+require "metanorma/util"
+require "metanorma/config"
 require "metanorma/input"
 require "metanorma/output"
 require "metanorma/registry"

data/lib/metanorma/compile.rb

@@ -47,23 +47,23 @@ module Metanorma
 
     def validate_type(options)
       unless options[:type]
-        puts "[metanorma] Error: Please specify a standard type: #{@registry.supported_backends}."
+        Util.log("[metanorma] Error: Please specify a standard type: #{@registry.supported_backends}.", :error)
         return nil
       end
       stdtype = options[:type].to_sym
       unless @registry.supported_backends.include? stdtype
-        puts "[metanorma] Warning: #{stdtype} is not a default standard type."
-        puts "[metanorma] Info: Attempting to load `metanorma-#{stdtype}` gem for standard type `#{stdtype}`."
+        Util.log("[metanorma] Warning: #{stdtype} is not a default standard type.", :warning)
+        Util.log("metanorma] Info: Attempting to load `metanorma-#{stdtype}` gem for standard type `#{stdtype}`.", :info)
       end
       begin
         require "metanorma-#{stdtype}"
-        puts "[metanorma] Info: gem `metanorma-#{stdtype}` loaded."
+        Util.log("[metanorma] Info: gem `metanorma-#{stdtype}` loaded.", :info)
       rescue LoadError
-        puts "[metanorma] Error: loading gem `metanorma-#{stdtype}` failed. Exiting."
+        Util.log("[metanorma] Error: loading gem `metanorma-#{stdtype}` failed. Exiting.", :error)
         return false
       end
       unless @registry.supported_backends.include? stdtype
-        puts "[metanorma] Error: The `metanorma-#{stdtype}` gem still doesn't support `#{stdtype}`. Exiting."
+        Util.log("[metanorma] Error: The `metanorma-#{stdtype}` gem still doesn't support `#{stdtype}`. Exiting.", :error)
         return false
       end
       true
@@ -71,7 +71,7 @@ module Metanorma
 
     def validate_format(options)
       unless options[:format] == :asciidoc
-        puts "[metanorma] Error: Only source file format currently supported is 'asciidoc'."
+        Util.log("[metanorma] Error: Only source file format currently supported is 'asciidoc'.", :error)
         return false
       end
       true
@@ -83,7 +83,7 @@ module Metanorma
       end
       extensions = options[:extension_keys].inject([]) do |memo, e|
         @processor.output_formats[e] and memo << e or
-          puts "[metanorma] Error: #{e} format is not supported for this standard."
+          Util.log("[metanorma] Error: #{e} format is not supported for this standard.", :error)
         memo
       end
       extensions
@@ -92,7 +92,7 @@ module Metanorma
     def process_input(filename, options)
       case extname = File.extname(filename)
       when ".adoc"
-        puts "[metanorma] Processing: Asciidoctor input."
+        Util.log("[metanorma] Processing: Asciidoctor input.", :info)
         file = File.read(filename, encoding: "utf-8")
         options[:asciimath] and
           file.sub!(/^(=[^\n]+\n)/, "\\1:mn-keep-asciimath:\n")
@@ -101,12 +101,12 @@ module Metanorma
           file.gsub!(/^include::/, "include::#{dir}/")
         [file, @processor.input_to_isodoc(file, filename)]
       when ".xml"
-        puts "[metanorma] Processing: Metanorma XML input."
+        Util.log("[metanorma] Processing: Metanorma XML input.", :info)
         # TODO NN: this is a hack -- we should provide/bridge the
         # document attributes in Metanorma XML
         ["", File.read(filename, encoding: "utf-8")]
       else
-        puts "[metanorma] Error: file extension #{extname} is not supported."
+        Util.log("[metanorma] Error: file extension #{extname} is not supported.", :error)
         nil
       end
     end

data/lib/metanorma/config.rb

@@ -0,0 +1,23 @@
+module Metanorma
+  module Config
+    def configure
+      if block_given?
+        yield configuration
+      end
+    end
+
+    def configuration
+      @configuration ||= Configuration.new
+    end
+  end
+
+  class Configuration
+    attr_accessor :logs
+
+    def initialize
+      @logs ||= [:warning, :error]
+    end
+  end
+
+  extend Config
+end

data/lib/metanorma/output/pdf.rb

@@ -9,9 +9,6 @@ module Metanorma
         pdfjs = File.join(File.dirname(__FILE__), '../../../bin/metanorma-pdf.js')
         ENV['NODE_PATH'] ||= `npm root --quiet -g`.strip
         system "node #{pdfjs} #{file_url} #{output_path}"
-        #Phantomjs.path
-        #pdfjs = File.join(File.dirname(__FILE__), "../../../bin/rasterize.js")
-        #Phantomjs.run(pdfjs, file_url, output_path, "A4")
       end
     end
   end

data/lib/metanorma/registry.rb

@@ -19,8 +19,10 @@ module Metanorma
     def register processor
       raise Error unless processor < ::Metanorma::Processor
       p = processor.new
-      puts "[metanorma] processor \"#{p.short}\" registered"
-      @processors[p.short] = p
+      Array(p.short).each do |s|
+        @processors[s] = p
+      end
+      Util.log("[metanorma] processor \"#{Array(p.short)[0]}\" registered", :info)
     end
 
     def find_processor(short)

data/lib/metanorma/util.rb

@@ -0,0 +1,11 @@
+module Metanorma
+  module Util
+    def self.log(message, type = :info)
+      log_types = Metanorma.configuration.logs.map(&:to_s) || []
+
+      if log_types.include?(type.to_s)
+        puts(message)
+      end
+    end
+  end
+end

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "0.3.11"
+  VERSION = "0.3.12"
 end

data/metanorma.gemspec

@@ -21,19 +21,16 @@ Gem::Specification.new do |spec|
   spec.bindir        = "bin"
   #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_runtime_dependency 'asciidoctor'
   spec.add_runtime_dependency 'htmlentities'
 
-  spec.add_development_dependency "bundler", "~> 2.0.1"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "byebug", "~> 10.0"
-  spec.add_development_dependency "rspec-command", "~> 1.0.3"
+  spec.add_development_dependency "rspec-command", "~> 1.0"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
-  spec.add_development_dependency "metanorma-iso", "~> 1.1.3"
-  spec.add_development_dependency "metanorma-standoc", "~> 1.1.4"
-  spec.add_development_dependency "isodoc", "0.9.13"
+  spec.add_development_dependency "metanorma-iso", "~> 1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-04 00:00:00.000000000 Z
+date: 2019-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -128,42 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
-- !ruby/object:Gem::Dependency
-  name: metanorma-standoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.4
-- !ruby/object:Gem::Dependency
-  name: isodoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.13
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.13
+        version: '1.2'
 description: Library to process any Metanorma standard.
 email:
 - open.source@ribose.com
@@ -195,6 +167,7 @@ files:
 - lib/metanorma/asciidoctor_extensions.rb
 - lib/metanorma/asciidoctor_extensions/glob_include_processor.rb
 - lib/metanorma/compile.rb
+- lib/metanorma/config.rb
 - lib/metanorma/document.rb
 - lib/metanorma/input.rb
 - lib/metanorma/input/asciidoc.rb
@@ -204,6 +177,7 @@ files:
 - lib/metanorma/output/pdf.rb
 - lib/metanorma/processor.rb
 - lib/metanorma/registry.rb
+- lib/metanorma/util.rb
 - lib/metanorma/version.rb
 - metanorma.gemspec
 homepage: https://github.com/metanorma/metanorma
@@ -218,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -226,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Metanorma is the standard of standards; the metanorma gem allows you to create