mnconvert 1.23.0 → 1.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '042308ce938f54eb4e02040cdd7a5e0bd32542767a8b68dfaeb0fb23930f05fa'
-  data.tar.gz: c4f84ea178d6a9e0815a857bd6064ceb956203a1b662cc29bb3731c9771fce14
+  metadata.gz: 7ec6aae934e739a9ed9d4e890f3bbea484098c9a135eb4126432f82cc494e851
+  data.tar.gz: 1433474209b2ab4590d4c77526012b372ae16f3d973679bc076240100b6de89f
 SHA512:
-  metadata.gz: 5469b019ed45f0d66a2a674c72b427964683ca43c3db929dd3c5f30ffe1a00410efd8fc11670dfaab0e71f627744547cff394ac5d6d36d0e5a22553b0c31ec0d
-  data.tar.gz: 435a73541c666ae67ade39c93915c117d01760020d453b2813039aa6b68e00015cb9f6503a2c838831987b0b4baea1d4909b2fdb2f773877deeda89f662d2890
+  metadata.gz: a82619b8568304c0c3a6383806d34c402cf08204022b01b2a43ad4ef44c166a31159085f9784255a7a1d646d923ef7fd5df091b6a3fea32fd8f1e51d854841c6
+  data.tar.gz: 6a58f337e3a644952fd3d8f4c744349303f58bc7bb91a68bcc7f4b3a76fbe8b22ed63d1fe9edd576be8d63c062ddcad64f6f56d92d1cde7390844286687a6c97

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/metanorma-build-scripts/.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.23.0"
+  VERSION = "1.25.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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mnconvert
 version: !ruby/object:Gem::Version
-  version: 1.23.0
+  version: 1.25.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-30 00:00:00.000000000 Z
+date: 2022-09-25 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"
@@ -56,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !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.