mn2pdf 1.38.1 → 1.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3920d0ce988ca4a0c1748d9c203e26c396f2fccf7ee8f4a04c6ff9afb5572639
-  data.tar.gz: c3cdba0ff6c45eef7b44bd5020b98cde84fa193740c4556b04a6d9a660e66ee6
+  metadata.gz: db62f71291a732bacb13e82a70ec9cb01f0d69a080789d5e902d84e4cf4af4ff
+  data.tar.gz: 8f37a061dce13a8dcd177d13d60ced92b748931e0ec07d50238b1664e804a810
 SHA512:
-  metadata.gz: 83a37bfd6a57cde548675913cb29ec0b12c9b0496d14435736c95e2d43d41f878bff1b605f95b570ea48a13e693f78e67452c191f2c4b8cdba7df4e9507805a8
-  data.tar.gz: 947dc02d3aed97e8d98ad9c24a41263f34ee12866a665785aac74bfa57ee2a200614fb7eac4a33b873fdac4536d4bc3a8b3acd4ae58a86fa87ee94013f8835b2
+  metadata.gz: bc4e9b4719bd80929a8afcbd4c807fbff780c7be89708e085a6f9ff94f637609b6a0c9b66075a89e3c337d80e77ba5fbaf9577cb7aef05940c56694b1a691747
+  data.tar.gz: 9ea36a7f942960412485261396183f0a6c0ac2a753e72a2d24cf4e2f759113fb08c63aaae2917fa6359c9c95c15f20eca8402e70b75ce894012369be42d336b2

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-tag.yml

@@ -9,41 +9,42 @@ jobs:
     runs-on: ubuntu-18.04
     if: startsWith(github.event.client_payload.ref, 'refs/tags/v')
     steps:
-      - uses: actions/checkout@v1
-      - name: Add writable remote
-        run: |
-          git config --global user.name "metanorma-ci"
-          git config --global user.email "metanorma-ci@users.noreply.github.com"
-          git remote add github "https://metanorma-ci:${{ secrets.METANORMA_CI_PAT_TOKEN }}@github.com/$GITHUB_REPOSITORY.git"
-          git pull github ${GITHUB_REF} --ff-only
+      - uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
+
       - name: Parse mn2pdf version
         env:
           MN2PDF_TAG: ${{ github.event.client_payload.ref }}
-        run: |
-          echo MN2PDF_VERSION=${MN2PDF_TAG#*/v} >> ${GITHUB_ENV}
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
+        run: echo MN2PDF_VERSION=${MN2PDF_TAG#*/v} >> ${GITHUB_ENV}
+
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '2.6'
-          architecture: 'x64'
-      - name: Update gems
-        run: |
-          gem install gem-release
-          gem install bundler
-          bundle install --jobs 4 --retry 3
-      - name: Update version
-        run: |
-          gem bump --version ${MN2PDF_VERSION} --no-commit
-      - 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: gem install gem-release
+
+      - run: gem bump --version ${MN2PDF_VERSION} --no-commit
+
+      - run: bundle exec rake bin/mn2pdf.jar
+
+      - run: bundle exec rake
+
       - name: Push commit and tag
         run: |
-          git add -u bin/mn2pdf.jar lib/mn2pdf/version.rb
+          git config --global user.name "metanorma-ci"
+          git config --global user.email "metanorma-ci@users.noreply.github.com"
+          git add -u lib/mn2pdf/version.rb
           git commit -m "Bump version to ${MN2PDF_VERSION}"
           git tag v${MN2PDF_VERSION}
-          git push github HEAD:${GITHUB_REF} --tags
+          git push origin HEAD:${GITHUB_REF} --tags
+
+      - if: failure()
+        uses: JasonEtco/create-an-issue@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
+        with:
+          assignees: CAMOBAP
+          update_existing: true
+          search_existing: all

data/.github/workflows/release.yml

@@ -23,7 +23,7 @@ jobs:
           ruby-version: '2.6'
           bundler-cache: true
 
-      - run: rm -f bin/mn2pdf.jar && rake bin/mn2pdf.jar
+      - run: bundle exec rake bin/mn2pdf.jar
 
       - run: bundle exec rake
 
@@ -48,3 +48,12 @@ jobs:
           chmod 0600 ~/.gem/credentials
           gem release
 
+      - if: failure()
+        uses: JasonEtco/create-an-issue@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
+        with:
+          assignees: CAMOBAP
+          update_existing: true
+          search_existing: all
+

data/.gitignore

@@ -10,3 +10,7 @@
 
 # rspec failure tracking
 .rspec_status
+
+.rubocop-http*
+
+/bin/mn2pdf.jar

data/Rakefile

@@ -1,17 +1,26 @@
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-require_relative 'lib/mn2pdf/version'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+require "open-uri"
+require_relative "lib/mn2pdf/version"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: ["bin/mn2pdf.jar", :spec]
 
-require 'open-uri'
+def jar_url(ver)
+  "https://github.com/metanorma/mn2pdf/releases/download/v#{ver}/mn2pdf-#{ver}.jar"
+end
 
-file 'bin/mn2pdf.jar' do |file|
-  ver = Mn2pdf::VERSION
-  url = "https://github.com/metanorma/mn2pdf/releases/download/v#{ver}/mn2pdf-#{ver}.jar"
-  File.open(file.name, 'wb') do |file|
-    file.write open(url).read
+file "bin/mn2pdf.jar" do |file|
+  if Mn2pdf::VERSION != Mn2pdf::MN2PDF_JAR_VERSION
+    begin
+      URI.parse(jar_url(Mn2pdf::VERSION)).open
+      abort(%(MN2PDF_JAR_VERSION in lib/mn2pdf/version.rb is outdated!
+              Assign VERSION to MN2PDF_JAR_VERSION))
+    rescue OpenURI::HTTPError, Errno::ENOENT
+      # expected
+    end
   end
-end
+  url = jar_url(Mn2pdf::MN2PDF_JAR_VERSION)
+  File.binwrite(file.name, URI.parse(url).read)
+end

data/lib/mn2pdf/version.rb

@@ -1,3 +1,4 @@
 module Mn2pdf
-  VERSION = "1.38.1".freeze
+  VERSION = "1.42".freeze
+  MN2PDF_JAR_VERSION = VERSION
 end

data/lib/mn2pdf.rb

@@ -3,8 +3,6 @@ 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
@@ -47,7 +45,8 @@ module Mn2pdf
       manifest = options.delete(FONTS_MANIFEST)
 
       options.each do |k, v|
-        cmd << "#{k} #{quote(v)}"
+        sep = k.to_s.end_with?("=") ? "" : " "
+        cmd << "#{k}#{sep}#{quote(v)}"
       end
       if manifest
         dump_fontist_manifest_locations(manifest) do |manifest_path|
@@ -87,6 +86,7 @@ module Mn2pdf
   end
 
   def self.quote(str)
+    return "" if str.nil? || str.empty?
     return str if /^'.*'$/.match(str) || /^".*"$/.match(str)
 
     %("#{str}")

data/mn2pdf.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = "bin"
   spec.require_paths = ["lib"]
   spec.files         = `git ls-files`.split("\n")
-  spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
+  spec.test_files    = `git ls-files -- {spec}/*`.split("\n") << "bin/mn2pdf.jar"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   # Specify which files should be added to the gem when it is released.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mn2pdf
 version: !ruby/object:Gem::Version
-  version: 1.38.1
+  version: '1.42'
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-25 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies: []
 description: |
   mn2pdf converts Metanorma XML into PDF.
@@ -41,7 +41,7 @@ homepage: https://github.com/metanorma/mn2pdf-ruby
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -56,8 +56,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: mn2pdf converts Metanorma XML into PDF.
-test_files: []
+test_files:
+- bin/mn2pdf.jar