mn2pdf 1.25 → 1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a7608665ad367e57f59456d047d3bc66540c26fb7e3a4b999c8c12378b8a08b
-  data.tar.gz: 0b586808298389164e4a62e16d268f56791e8e4aebc7bc8477fc03ff8bb434aa
+  metadata.gz: c3597f17edc0cc3bc820cf7ef4aa940aeedd425f11fc707445ff3b5a2e5fc027
+  data.tar.gz: 67311e8ad232674120735a0b3cd7b2d3a2706c6c444e35cf912a45ff984444b1
 SHA512:
-  metadata.gz: ee2a8efd34497b8a9f9c3743829899fa620933d10727dd1f46b42de652248d6fef0f7b10cbfa2d6a5e768821bb1dc7149bfdf279f3237d959adf960288242856
-  data.tar.gz: 9c07ace9be5398662e0eea6af619afe4a40ad7a2b8a64aa190981c52a643f9fadf1ffd7e6f90e3a59a534115f74c5eaec0e4515102cffeb46056ca8c7a94fb84
+  metadata.gz: be190dac599fd284d57395b560ef0dab8c03b07a8a46c7b1542a696c3f7ebab170ed45924561ee8612120ea79f197a4def8d6195439134ab3e5fbf440cd78920
+  data.tar.gz: a9e29610b4fea012b0a3cbf72554516128cefdb106c3b4b467b36345420761408c726e499de89490b884c6b8cae853e2ad5bb4469c3a29d2163414a9c6f0d4b7

data/.github/workflows/rake.yml

@@ -4,7 +4,7 @@ name: rake
 
 on:
   push:
-    branches: [ master, main  ]
+    branches: [ master, main ]
     tags: [ v* ]
   pull_request:
 
@@ -16,48 +16,27 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
+        ruby: [ '2.7', '2.6', '2.5', '2.4' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
         include:
-          - ruby: '2.7'
+          - ruby: '3.0'
             os: 'ubuntu-latest'
             experimental: true
-          - ruby: '2.7'
+          - ruby: '3.0'
             os: 'windows-latest'
             experimental: true
-          - ruby: '2.7'
+          - ruby: '3.0'
             os: 'macos-latest'
             experimental: true
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
 
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-
-      - uses: actions/cache@v1
-        with:
-          path: vendor/bundle
-          key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
-          restore-keys: bundle-${{ matrix.os }}-${{ matrix.ruby }}
-
-      - run: bundle config set path 'vendor/bundle'
-
-      - run: bundle install --jobs 4 --retry 3
+          bundler-cache: true
 
       - run: bundle exec rake
-
-  notify:
-    name: Trigger notify workflow
-    needs: rake
-    runs-on: ubuntu-latest
-    steps:
-      - name: Trigger notify workflow
-        uses: Sibz/github-status-action@v1
-        with:
-          authToken: ${{ secrets.GITHUB_TOKEN }}
-          context: 'tests-passed-successfully'
-          description: 'Tests passed successfully'
-          state: 'success'
-          sha: ${{ github.event.pull_request.head.sha || github.sha }}

data/.github/workflows/release-tag.yml

@@ -20,7 +20,6 @@ jobs:
         env:
           MN2PDF_TAG: ${{ github.event.client_payload.ref }}
         run: |
-          echo "::set-env name=MN2PDF_VERSION::${MN2PDF_TAG#*/v}"
           echo MN2PDF_VERSION=${MN2PDF_TAG#*/v} >> ${GITHUB_ENV}
       - name: Use Ruby
         uses: actions/setup-ruby@v1

data/.github/workflows/release.yml

@@ -31,12 +31,10 @@ jobs:
           RUBYGEMS_API_KEY: ${{secrets.METANORMA_CI_RUBYGEMS_API_KEY}}
         run: |
           gem install gem-release
-          touch ~/.gem/credentials
           cat > ~/.gem/credentials << EOF
           ---
           :rubygems_api_key: ${RUBYGEMS_API_KEY}
           EOF
           chmod 0600 ~/.gem/credentials
-          git status
           gem release
 

data/.rubocop.yml

@@ -0,0 +1,6 @@
+# This project follows the Ribose OSS style guide.
+# https://github.com/riboseinc/oss-guides
+# All project-specific additions and overrides should be specified in this file.
+
+inherit_from:
+  - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml

data/lib/mn2pdf.rb

@@ -1,36 +1,48 @@
-require 'open3'
-require 'mn2pdf/version'
+require "open3"
+require "rbconfig"
+require "mn2pdf/version"
 
 module Mn2pdf
-  MN2PDF_JAR_PATH = File.join(File.dirname(__FILE__), '../bin/mn2pdf.jar')
+  MN2PDF_JAR_PATH = File.join(File.dirname(__FILE__), "../bin/mn2pdf.jar")
+
+  def self.jvm_options
+    options = []
+
+    if RbConfig::CONFIG["host_os"].match?(/darwin|mac os/)
+      options << "-Dapple.awt.UIElement=true"
+    end
+
+    options
+  end
 
   def self.help
-    cmd = ['java', '-jar', MN2PDF_JAR_PATH].join(' ')
-    message, error_str, status = Open3.capture3(cmd)
+    cmd = ["java", *jvm_options, "-jar", MN2PDF_JAR_PATH].join(" ")
+    message, = Open3.capture3(cmd)
     message
   end
 
   def self.version
-    cmd = ['java', '-jar', MN2PDF_JAR_PATH, '-v'].join(' ')
-    message, error_str, status = Open3.capture3(cmd)
+    cmd = ["java", *jvm_options, "-jar", MN2PDF_JAR_PATH, "-v"].join(" ")
+    message, = Open3.capture3(cmd)
     message.strip
   end
 
   def self.convert(url_path, output_path, xsl_stylesheet, options = "")
     return if url_path.nil? || output_path.nil? || xsl_stylesheet.nil?
 
-    puts MN2PDF_JAR_PATH
-    cmd = ['java', '-Xss5m', '-Xmx1024m', '-jar', MN2PDF_JAR_PATH, '--xml-file',
-           url_path, '--xsl-file', xsl_stylesheet, '--pdf-file',
-           output_path, options].join(' ')
+    cmd = ["java", "-Xss5m", "-Xmx1024m", *jvm_options,
+           "-jar", MN2PDF_JAR_PATH, "--xml-file", url_path,
+           "--xsl-file", xsl_stylesheet, "--pdf-file", output_path, options].join(" ")
 
     puts cmd
     stdout_str, error_str, status = Open3.capture3(cmd)
 
-    unless status.success?
-      # Strip default mn2pdf message
-      stdout_str = stdout_str.gsub('Preparing...', '').strip
-      raise [stdout_str, error_str].join(' ').strip
-    end
+    raise prepare_error_msg(stdout_str, error_str) unless status.success?
+  end
+
+  def self.prepare_error_msg(stdout_str, error_str)
+    # Strip default mn2pdf message
+    stdout_str = stdout_str.gsub("Preparing...", "").strip
+    [stdout_str, error_str].join(" ").strip
   end
 end

data/lib/mn2pdf/version.rb

@@ -1,3 +1,3 @@
 module Mn2pdf
-  VERSION = '1.25'
+  VERSION = '1.30'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mn2pdf
 version: !ruby/object:Gem::Version
-  version: '1.25'
+  version: '1.30'
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-14 00:00:00.000000000 Z
+date: 2021-04-13 00:00:00.000000000 Z
 dependencies: []
 description: |
   mn2pdf converts Metanorma XML into PDF.
@@ -25,6 +25,7 @@ files:
 - ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - README.adoc
@@ -39,7 +40,7 @@ homepage: https://github.com/metanorma/mn2pdf-ruby
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -55,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key:
+signing_key: 
 specification_version: 4
 summary: mn2pdf converts Metanorma XML into PDF.
 test_files: []