mnconvert 1.24.0 → 1.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d8bb17ede7c7b834734b7cc1210eb932d3e25589e1abd144669cdbae9397be7
-  data.tar.gz: 3a671e772d8a8eff4b30e7a395f96b290c55f6fdf05829174aebfa8583209ebc
+  metadata.gz: 8e3294bb3a1b1cb4e2f639f1e3c6b58b748855f0718072bbf6822141baec2448
+  data.tar.gz: 87adb5d68c151e7fdac5bf50c3662119af611e8e09051af44d8eac6dd411e647
 SHA512:
-  metadata.gz: e4762015a10800a71306edc24d1730a68aca0e8a216642290784885f5852fb72e05c0be97c0742d17f3e7670845613d195bfe266158c163a0760b8a5f958dbfb
-  data.tar.gz: 320092435ef67e94154fc5c2df3b5e17528ca962e9410dfddd28a7047f37810901914733a91910c2ee4f28412e2ffb6a87db1d15ee4713d12ed52d32e084d7b6
+  metadata.gz: c15543a52f7a2822c687e5638962948026db1a862da8e07cee0d564daa0203295f3f382696cd8d26b6cdd104dfda60ff2c7011a3f780f6dc000be6dc0c2d6fc5
+  data.tar.gz: bbcb76bcb3616d407e6238821e4460967683269c823f366d0bde261cb636089cd43ae7c739b72be6d5f1e8c60c08b137af2ebeeceea79f5fc87396a706933d44

data/.github/workflows/prepare.yml

@@ -0,0 +1,46 @@
+name: prepare
+
+on:
+  workflow_call:
+    secrets:
+      pat_token:
+        required: false
+
+jobs:
+  prepare-ieee:
+    runs-on: ubuntu-latest
+    concurrency:
+      group: '${{ github.workflow }}-${{ github.head_ref || github.ref_name }}'
+      cancel-in-progress: true
+    steps:
+      - run: mkdir ieee
+
+      - uses: actions/checkout@v3
+        with:
+          repository: metanorma/ieee-stl
+          token: ${{ secrets.pat_token || github.token }}
+          path: ieee/stl
+
+      - uses: actions/checkout@v3
+        with:
+          repository: metanorma/mn-samples-ieee
+          path: ieee/samples
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+          bundler-cache: true
+          working-directory: ieee/samples
+
+      - uses: actions-mn/cli/site-gen@main
+        with:
+          source-path: ieee/samples
+          use-bundler: true
+          agree-to-terms: true
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: ieee-test-input
+          path: |
+            ieee/stl/standards-1-7-DTD/standards-1-7-dtd/
+            ieee/samples/site/documents/p987.6/document.xml

data/.github/workflows/rake.yml

@@ -1,5 +1,3 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
 name: rake
 
 on:
@@ -9,7 +7,41 @@ on:
   pull_request:
 
 jobs:
-  rake:
-    uses: metanorma/ci/.github/workflows/generic-rake.yml@main
+  prepare-ieee:
+    uses: ./.github/workflows/prepare.yml
     secrets:
       pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
+
+  rake:
+    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
+    concurrency:
+      group: '${{ github.workflow }}-${{ matrix.os }}-${{ matrix.ruby }}-${{ github.head_ref || github.ref_name }}'
+      cancel-in-progress: true
+    needs: [ prepare-ieee ]
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: false
+      max-parallel: 5
+      matrix:
+        ruby: [ '3.1', '3.0', '2.7' ]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        experimental: [ false ]
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: ieee-test-input
+          path: ieee
+
+      - run: ls -R ieee
+
+      - run: bundle exec rake

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

@@ -5,9 +5,15 @@ on:
     types: [ metanorma/mnconvert ]
 
 jobs:
+  prepare-ieee:
+    uses: ./.github/workflows/prepare.yml
+    secrets:
+      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
+
   tag_repo:
     runs-on: ubuntu-18.04
     if: startsWith(github.event.client_payload.ref, 'refs/tags/v')
+    needs: [ prepare-ieee ]
     steps:
       - uses: actions/checkout@v2
         with:
@@ -23,7 +29,7 @@ jobs:
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.6'
+          ruby-version: '2.7'
           bundler-cache: true
 
       - run: gem install gem-release
@@ -34,6 +40,11 @@ jobs:
           rm -f bin/mnconvert.jar
           bundle exec rake bin/mnconvert.jar
 
+      - uses: actions/download-artifact@v3
+        with:
+          name: ieee-test-input
+          path: ieee
+
       - run: bundle exec rake
 
       - name: Push commit and tag

data/.github/workflows/release.yml

@@ -7,27 +7,34 @@ on:
   workflow_dispatch: # just for manual release if previous was failed
 
 jobs:
+  prepare-ieee:
+    uses: ./.github/workflows/prepare.yml
+    secrets:
+      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
+
   release:
     runs-on: ubuntu-18.04
+    needs: [ prepare-ieee ]
     steps:
-      - uses: actions/checkout@v1
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
+      - uses: actions/checkout@v3
+
+      - 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 mnconvert.jar
-        run: |
+          ruby-version: '2.7'
+          bundler-cache: true
+
+      - run: |
           rm -f bin/mnconvert.jar
-          rake bin/mnconvert.jar
-      - name: Run specs
-        run: |
-          bundle exec rake
-      - name: Publish to rubygems.org
+          bundle exec rake bin/mnconvert.jar
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: ieee-test-input
+          path: ieee
+
+      - run: bundle exec rake
+
+      - name: publish to rubygems.org
         env:
           RUBYGEMS_API_KEY: ${{secrets.METANORMA_CI_RUBYGEMS_API_KEY}}
         run: |

data/.gitignore

@@ -11,3 +11,5 @@
 # rspec failure tracking
 .rspec_status
 /.rubocop-http*
+
+/ieee

data/lib/mnconvert/version.rb

@@ -1,4 +1,4 @@
 module MnConvert
-  VERSION = "1.24.0"
+  VERSION = "1.26.0"
   MNCONVERT_JAR_VERSION = VERSION
 end

data/lib/mnconvert.rb

@@ -58,6 +58,7 @@ module MnConvert
       output_format: "--output-format",
       output_file: "--output",
       xsl_file: "--xsl-file",
+      validation_against: "--validation-against",
     }.freeze
 
     def java_cmd
@@ -79,7 +80,7 @@ module MnConvert
     end
 
     def validate_mn(opts, output_format)
-      unless output_format.nil? || %w(iso niso).include?(output_format.to_s)
+      unless output_format.nil? || %w(iso niso ieee).include?(output_format.to_s)
         raise StandardError.new("Invalid output format: #{output_format}")
       end
 

data/mnconvert.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.7.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: mnconvert
 version: !ruby/object:Gem::Version
-  version: 1.24.0
+  version: 1.26.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-23 00:00:00.000000000 Z
+date: 2022-10-29 00:00:00.000000000 Z
 dependencies: []
 description: |
   mnconvert converts Metanorma XML into NISO STS XML.
@@ -20,6 +20,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/prepare.yml"
 - ".github/workflows/rake.yml"
 - ".github/workflows/release-tag.yml"
 - ".github/workflows/release.yml"
@@ -49,14 +50,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.7.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.1.6
 signing_key: 
 specification_version: 4
 summary: mnconvert converts Metanorma XML into NISO STS XML.