mn2pdf 1.34 → 1.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6710166bd3dd09708552b3ff121b7c6ac72c4177e06d0e70b15505d7be3ec6bb
-  data.tar.gz: 9b7dd555669aa93472086ded118286ea1b1c5414647bc456e2c04c25d348a53f
+  metadata.gz: 4a0c240f5a70e4ac365e0a73680af079529857cf58260bfa430dd84367b73e0c
+  data.tar.gz: a327cd5eca2ee959345b8c32701868d24082fb9e2718f52ec7191c9b43e17547
 SHA512:
-  metadata.gz: d23b6e8db7771fa842ef76496e2e60c26deca2e992cc28823cb653f29cbe621cc75db447521a6be6ae1fbe3b058d06bbe6754756e9af3763bdd8afe4b766bf42
-  data.tar.gz: 59ef4ef16510648f6ffc95e078a339def1b41c3e8c4fda72a8e22c4055bd7cf3161ed8971e97dc4d7d50f5332975fbbf95d2d91571b6d585b674cefbf6fef3b4
+  metadata.gz: a11c040d8123f84e6686d42021fbcc51d72d3a17d16a1af762f0d5d895b0d1f557f9bb39d1cf40d6fb883fcffa3197fcf0ff8af54779e5786fc683eca603b287
+  data.tar.gz: aed4221c3d24355f347d5a89fdba8c45a8ff8a8eb06e6ccad84c4c8180387f17e5e952cf6614505de6840f73946b260e313a3c62b5826e2e825ee7151325777b

data/.github/workflows/rake.yml

@@ -10,23 +10,6 @@ on:
 
 jobs:
   rake:
-    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-        experimental: [ false ]
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-
-      - run: bundle exec rake
+    uses: metanorma/metanorma-build-scripts/.github/workflows/generic-rake.yml@main
+    secrets:
+      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.github/workflows/release.yml

@@ -4,28 +4,38 @@ on:
   push:
     tags:
       - '*'
+  workflow_dispatch:
+    inputs:
+      next_version:
+        description: |
+          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
+        required: true
+        default: 'skip'
 
 jobs:
   release:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v1
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
+
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '2.6'
-          architecture: 'x64'
-      - name: Update gems
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
-      - name: Update mn2pdf.jar
-        run: |
-          rm -f bin/mn2pdf.jar
-          rake bin/mn2pdf.jar
-      - name: Run specs
-        run: |
-          bundle exec rake
+          bundler-cache: true
+
+      - run: rm -f bin/mn2pdf.jar && rake bin/mn2pdf.jar
+
+      - run: bundle exec rake
+
+      - run: gem install gem-release
+
+      - run: |
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+
+      - if: github.event_name == 'workflow_dispatch' && github.event.inputs.next_version != 'skip'
+        run: gem bump --version ${{ github.event.inputs.next_version }} --tag --push
+
       - name: Publish to rubygems.org
         env:
           RUBYGEMS_API_KEY: ${{secrets.METANORMA_CI_RUBYGEMS_API_KEY}}

data/lib/mn2pdf/version.rb

@@ -1,3 +1,3 @@
 module Mn2pdf
-  VERSION = "1.34".freeze
+  VERSION = "1.41".freeze
 end

data/lib/mn2pdf.rb

@@ -1,12 +1,17 @@
 require "open3"
 require "rbconfig"
+require "tempfile"
+require "yaml"
+
 require "mn2pdf/version"
 
 module Mn2pdf
   MN2PDF_JAR_PATH = File.join(File.dirname(__FILE__), "../bin/mn2pdf.jar")
+  DEFAULT_JAVA_OPTS = ["-Xss5m", "-Xmx2048m"].freeze
+  FONTS_MANIFEST = :font_manifest
 
   def self.jvm_options
-    options = []
+    options = DEFAULT_JAVA_OPTS.dup
 
     if RbConfig::CONFIG["host_os"].match?(/darwin|mac os/)
       options << "-Dapple.awt.UIElement=true"
@@ -17,8 +22,9 @@ module Mn2pdf
 
   def self.help
     cmd = ["java", *jvm_options, "-jar", MN2PDF_JAR_PATH].join(" ")
-    message, = Open3.capture3(cmd)
-    message
+    # help message goes to STDERR (from mn2pdf v1.36)
+    _, help_message, = Open3.capture3(cmd)
+    help_message
   end
 
   def self.version
@@ -27,22 +33,71 @@ module Mn2pdf
     message.strip
   end
 
-  def self.convert(url_path, output_path, xsl_stylesheet, options = "")
-    return if url_path.nil? || output_path.nil? || xsl_stylesheet.nil?
+  def self.convert(url_path, output_path, xsl_stylesheet, options = {})
+    cmd = build_cmd(url_path, output_path, xsl_stylesheet)
+
+    return unless cmd
 
-    cmd = ["java", "-Xss5m", "-Xmx2048m", *jvm_options,
-           "-jar", MN2PDF_JAR_PATH, "--xml-file", url_path,
-           "--xsl-file", xsl_stylesheet, "--pdf-file", output_path, options].join(" ")
+    case options
+    when String
+      cmd << options
 
+      mn2pdf(cmd)
+    when Hash
+      manifest = options.delete(FONTS_MANIFEST)
+
+      options.each do |k, v|
+        cmd << "#{k} #{quote(v)}"
+      end
+      if manifest
+        dump_fontist_manifest_locations(manifest) do |manifest_path|
+          cmd << "--font-manifest" << quote(manifest_path)
+          mn2pdf(cmd)
+        end
+      else
+        mn2pdf(cmd)
+      end
+    else
+      warn "Unsupported options type #{options.class}"
+    end
+  end
+
+  def self.build_cmd(url, output, xslt)
+    return if url.nil? || output.nil? || xslt.nil?
+
+    ["java", *jvm_options,
+     "-jar", MN2PDF_JAR_PATH,
+     "--xml-file", quote(url),
+     "--xsl-file", quote(xslt),
+     "--pdf-file", quote(output)]
+  end
+
+  def self.mn2pdf(cmd)
+    cmd = cmd.join(" ")
     puts cmd
-    stdout_str, error_str, status = Open3.capture3(cmd)
+    out, err, status = Open3.capture3(cmd)
 
-    raise prepare_error_msg(stdout_str, error_str) unless status.success?
+    raise prepare_error_msg(out, err) unless status.success?
   end
 
-  def self.prepare_error_msg(stdout_str, error_str)
+  def self.prepare_error_msg(stdout, stderr)
     # Strip default mn2pdf message
-    stdout_str = stdout_str.gsub("Preparing...", "").strip
-    ["[mn2pdf] Fatal:", stdout_str, error_str].join(" ").strip
+    stdout = stdout.gsub("Preparing...", "").strip
+    ["[mn2pdf] Fatal:", stdout, stderr].join(" ").strip
+  end
+
+  def self.quote(str)
+    return str if /^'.*'$/.match(str) || /^".*"$/.match(str)
+
+    %("#{str}")
+  end
+
+  def self.dump_fontist_manifest_locations(manifest)
+    Tempfile.create(["fontist_locations", ".yml"]) do |f|
+      f.write manifest.to_yaml
+      f.flush
+
+      yield f.path
+    end
   end
 end

data/mn2pdf.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.files         = `git ls-files`.split("\n")
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mn2pdf
 version: !ruby/object:Gem::Version
-  version: '1.34'
+  version: '1.41'
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-19 00:00:00.000000000 Z
+date: 2022-02-10 00:00:00.000000000 Z
 dependencies: []
 description: |
   mn2pdf converts Metanorma XML into PDF.
@@ -49,14 +49,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: mn2pdf converts Metanorma XML into PDF.