mn2pdf 1.26 → 1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d4992fb7f1bf56ed05ef2fd4cd01104d915ec39aaadbcf992aea4ec71d80fa4
-  data.tar.gz: d02d96499f94ba9f0d33e104b174b85a68fb46915dcd22cc7c4188ca5be04000
+  metadata.gz: 55ea33d8683ee2cef108879b9011b34a85f71bd1a190f3cfb02f2303b94cf42a
+  data.tar.gz: be56956b7b502f51fe481db6acd4466dcfcdbf3902b5bdea4d1f903b2b4ce7e3
 SHA512:
-  metadata.gz: ab900102792ef9bd74fe6399916dfb772ef4fb9f7324e1e07164b1c6bb8db962b01fda5e18384f780e429596ab3c41cdbff25f11b1f5ed29b58ea7362bd9abfa
-  data.tar.gz: b04335a1d24b951244b0016a09e6f637ef5c0dd4b0a882745dbd4ebd2964a28fc85c582da69f1ade5ad7930018cea1203d6806fbee28c645b38737ac2bfcb1f8
+  metadata.gz: b92fea3d06801a57b7ea61a1acd27c0ab63b3b06227e7c131beeb23f3b69d2bbac8b569369f16ea58b9ce1f4395584a9294bf711033e270d5082e3b515b5ae3a
+  data.tar.gz: 12061e8ee977178c83314e6598847b7a8d3c0f9356834f235c454e4e9a5a332b38dc57394dee9eaf3ab42eb4e77e4d9e67f70de5bdd9c977baed411c242da45f

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.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.26'
+  VERSION = '1.31'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mn2pdf
 version: !ruby/object:Gem::Version
-  version: '1.26'
+  version: '1.31'
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-16 00:00:00.000000000 Z
+date: 2021-04-19 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
@@ -54,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: mn2pdf converts Metanorma XML into PDF.