metanorma 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d0a42d18ad2b95b3d714ad8564f52946bfc3f7aea5d92c0811145aaa73dbe02
-  data.tar.gz: 5f2eadd66a58d2d26a0ff281a67438030a41eb0a5bc0b6fe3c80f6731703b93f
+  metadata.gz: 1b847f719ea09aa03edc9b67fc73f955c682bbff4690c0d5cea06561f7fbc478
+  data.tar.gz: c545afe2938e475a9360d5ae5bd1031920de4c279edf1d1860b83ee287367faf
 SHA512:
-  metadata.gz: 6aee169581e757063339606669a64c7027e98fd6f817d9944f23b66dde5dba28050e1985cf8c98331be2a4438fe6f7bb7573a9ffa53bf526db2292817c64cc30
-  data.tar.gz: dd1bfa19872fea3ca3d61f462998f00d961de3dfc4f22f9893263f88a5dd18dbcb13518696c9514e200d8eac759bdcb461dcda637e0187b364208a0cca1124cd
+  metadata.gz: 98b3f3268ce2ac4f60d71ecff97abe398e4c49ad84ff2d8759c486a3b87788c556e23b10454b9c67b352b8a86418587c969290072ee42d131d0449af030b3466
+  data.tar.gz: 3f3cf0eb527bf6d2b7db8438d01206961e57bdb2e7249d43537dd635c4bbac3e293b50fd5dcf7f3c069c542c454aa3b2356021aafeecd5ae0fb6c8cf3b198f4f

data/.github/workflows/dependent_repos.env

@@ -1,2 +1,2 @@
 ORGANISATION=metanorma
-DEPENDENT_REPOS=metanorma-docker
+DEPENDENT_REPOS="metanorma-docker"

data/.github/workflows/macos.yml

@@ -1,12 +1,11 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: macos
 
 on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ '**' ]
 
 jobs:
   test-macos:

data/.github/workflows/ubuntu.yml

@@ -1,5 +1,5 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: ubuntu
 
 on:
@@ -24,7 +24,7 @@ jobs:
           architecture: 'x64'
       - name: Update gems
         run: |
-          gem install bundler 
+          gem install bundler
           bundle install --jobs 4 --retry 3
       - name: Use Node
         uses: actions/setup-node@v1
@@ -43,8 +43,8 @@ jobs:
           GH_ACCESS_TOKEN: ${{ secrets.PAT_TOKEN }}
         run: |
           curl -LO --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/trigger-gh-actions.sh
-          source .github/workflows/dependent_repos.env
+          [[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
           for repo in $DEPENDENT_REPOS
           do
             sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY
-          done
+          done

data/.github/workflows/windows.yml

@@ -1,12 +1,11 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: windows
 
 on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ '**' ]
 
 jobs:
   test-windows:
@@ -26,9 +25,8 @@ jobs:
       - name: Update gems
         shell: pwsh
         run: |
-          gem install bundler 
+          gem install bundler
           bundle config --local path vendor/bundle
-          bundle update
           bundle install --jobs 4 --retry 3
       - name: Use Node
         uses: actions/setup-node@v1

data/README.adoc

@@ -1,8 +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://travis-ci.com/metanorma/metanorma.svg["Build Status", link="https://travis-ci.com/metanorma/metanorma"]
-image:https://ci.appveyor.com/api/projects/status/ya3ymheq7xq5wn74?svg=true["AppVeyor Build Status", link="https://ci.appveyor.com/project/metanorma/metanorma"]
+image:https://github.com/metanorma/metanorma/workflows/ubuntu/badge.svg["Ubuntu Build Status", link="https://github.com/metanorma/metanorma/actions?query=workflow%3Aubuntu"]
+image:https://github.com/metanorma/metanorma/workflows/macos/badge.svg["OSX Build Status", link="https://github.com/metanorma/metanorma/actions?query=workflow%3Amacos"]
+image:https://github.com/metanorma/metanorma/workflows/windows/badge.svg["Windows Build Status", link="https://github.com/metanorma/metanorma/actions?query=workflow%3Awindows"]
 image:https://codeclimate.com/github/metanorma/metanorma/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma"]
 image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma.svg["Pull Requests", link="https://github.com/metanorma/metanorma/pulls"]
 image:https://img.shields.io/github/commits-since/metanorma/metanorma/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma/releases"]

data/bin/metanorma-pdf.js

@@ -3,17 +3,24 @@
 
 const puppeteer = require('puppeteer');
 
+const args = () => {
+  let args = ['--no-sandbox', '--disable-setuid-sandbox', '--headless'];
+  if (!process.platform.startsWith('win')) {
+    args << '--single-process';
+  }
+  return {args};
+}
+
 const createPdf = async() => {
   let browser;
   let exitCode = 0;
   try {
-    let args = ['--no-sandbox', '--disable-setuid-sandbox', '--headless'];
-    if (!process.platform.startsWith('win')) {
-      args << '--single-process';
-    }
-    browser = await puppeteer.launch({args});
+    browser = await puppeteer.launch(args());
     const page = await browser.newPage();
-    await page.goto(process.argv[2], {waitUntil: 'networkidle0'});
+    await page.goto(process.argv[2], {
+      waitUntil: 'networkidle0',
+      timeout: 120000 //ms
+    });
     await page.pdf({
       path: process.argv[3],
       format: 'A4'

data/lib/metanorma/compile.rb

@@ -39,8 +39,9 @@ module Metanorma
     end
 
     def options_extract(filename, options)
-      o = Metanorma::Input::Asciidoc.new.extract_metanorma_options(File.read(filename, encoding: "utf-8"))
-      o = o.merge(xml_options_extract(File.read(filename, encoding: "utf-8")))
+      content = read_file(filename)
+      o = Metanorma::Input::Asciidoc.new.extract_metanorma_options(content)
+      o = o.merge(xml_options_extract(content))
       options[:type] ||= o[:type]&.to_sym
       dir = filename.sub(%r(/[^/]+$), "/")
       options[:relaton] ||= "#{dir}/#{o[:relaton]}" if o[:relaton]
@@ -103,7 +104,7 @@ module Metanorma
       case extname = File.extname(filename)
       when ".adoc"
         Util.log("[metanorma] Processing: Asciidoctor input.", :info)
-        file = File.read(filename, encoding: "utf-8")
+        file = read_file(filename)
         options[:asciimath] and
           file.sub!(/^(=[^\n]+\n)/, "\\1:mn-keep-asciimath:\n")
         dir = File.dirname(filename)
@@ -114,13 +115,17 @@ module Metanorma
         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")]
+        ["", read_file(filename)]
       else
         Util.log("[metanorma] Error: file extension #{extname} is not supported.", :error)
         nil
       end
     end
 
+    def read_file(filename)
+      File.read(filename, encoding: "utf-8").gsub("\r\n", "\n")
+    end
+
     def relaton_export(isodoc, options)
       return unless options[:relaton]
       xml = Nokogiri::XML(isodoc)

data/lib/metanorma/output/pdf.rb

@@ -1,5 +1,6 @@
 require "open3"
 require "pathname"
+require "shellwords"
 
 module Metanorma
   module Output
@@ -12,11 +13,20 @@ module Metanorma
         pdfjs = File.join(File.dirname(__FILE__), "../../../bin/metanorma-pdf.js")
 
         node_path = ENV["NODE_PATH"] || `npm root --quiet -g`.strip
-        node_cmd = ["node", pdfjs, file_url, output_path].join(" ")
+        node_cmd = ["node", pdfjs, file_url, output_path].map { |arg| shellescape(arg) }.join(" ")
 
         _, error_str, status = Open3.capture3({ "NODE_PATH" => node_path }, node_cmd)
         raise error_str unless status.success?
       end
+
+      def shellescape(str)
+        if Gem.win_platform?()
+          # https://bugs.ruby-lang.org/issues/16741
+          str.match(" ") ? "\"#{str}\"" : str
+        else
+          Shellwords.shellescape(str)
+        end
+      end
     end
   end
 end

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-05 00:00:00.000000000 Z
+date: 2020-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor