mn2pdf 1.28 → 1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7eba679b7b8ad90c8c92373dd64f68ef61303fd9e20e55b588c87d1b1c542060
-  data.tar.gz: b72a86e5f9f7c212e1ad20e4c1e9cf89de862b09bdcdca903491fe5dd5a32f21
+  metadata.gz: 143b5e801666557e86807fa8e13ea84b046e0e1d89882ef26dc52cf35ea9391b
+  data.tar.gz: d249dba0fecdde0eac0ad7e2a1342a5f00b29125554ededd4be38f5c6168ba9b
 SHA512:
-  metadata.gz: aa16f239b56af426ecf15bb11df97f55281691d5c025eb057483136ff1ecae9ecb563229004582760350ee70de9db7656615a0ddf8775ad189f9817157f43b74
-  data.tar.gz: 04c5d61373e57a32f3ea28de138ed00134c18d980330042a0c53c23d767712bf87fb5db485b23dfa7ea07243dde5d8af4799744b1e0d2ecca68fd914d182d6be
+  metadata.gz: 0634edb8a030f927ddf220f528dc31d2747f5afcbda4ac340ed7d35824a05568247f27be5bd31fdddcdc65a5ab988266232f1364c669ddbcb27204ca5d06903a
+  data.tar.gz: bb0b1e822cde0ea63b05d339dd1000f6f05118c1d1503cc4cd4cf5f72e402183ed5ada4ae0896299d135c793b1040414154bae3ca50c980122b8ccb1dae67429

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/.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.28'
+  VERSION = '1.29'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mn2pdf
 version: !ruby/object:Gem::Version
-  version: '1.28'
+  version: '1.29'
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-21 00:00:00.000000000 Z
+date: 2021-03-27 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