mnconvert 1.59.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c6abad25d8d4e753ccd5945aefe771c126b6031e9dc3c3b3f0a9e525f281be7
-  data.tar.gz: f84409b1bdfe98de3102dbe4cc5283fef89770f786bbf13f9f8eba95813a9217
+  metadata.gz: 7a283a92498bf3b58ab9943115c3c989537a64f820ee60b9fe61af28417a095a
+  data.tar.gz: 406f771bee4bb2aca206ba9d8e45ce84461719ff09e39cc037b9890d07d25ec4
 SHA512:
-  metadata.gz: 726ccbe55e698cbfc7202a3037e68a67bff893fd286213a256bad2d98ecb56c752c5605887735ce8d6b9ebf4aee3581939f35058c90d332fce114daae4affd6f
-  data.tar.gz: 7d3bf9e3b84d5ae5301166099d90c3befbf948a59f65ea706712cab1e883801a77e596eb3aa12205fe733b91a8bfc887fc4fb17f690fe0d9663806ecb61324b2
+  metadata.gz: 28228d72d77dd8adb749de865da095bb3bba3ecb81e6c3b2a03872e149d3a17807b7a45bb8c1b3ce33b05c2cf27f7d7a5a613bf80efb3a033c1c470d8d9b6852
+  data.tar.gz: 727e72075bf44398b34f7d25b9ee5d5844e744a08badeef1ffa64801210266c67ec8e24b60b3a54c660004ee7e8fae09494f52b205bb9df94807c4df6794fd96

data/.github/workflows/rake.yml

@@ -1,3 +1,5 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: rake
 
 on:
@@ -7,45 +9,24 @@ on:
   pull_request:
 
 jobs:
-  prepare:
-    uses: metanorma/ci/.github/workflows/prepare-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.version }} ${{ matrix.os }}
+    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
-
-    needs: [prepare, prepare-ieee]
-    if: needs.prepare.outputs.push-for-tag != 'true'
-
-    concurrency:
-      group: '${{ github.workflow }}-${{ matrix.os }}-${{ matrix.ruby.version }}-${{ github.head_ref || github.ref_name }}'
-      cancel-in-progress: true
-
-    continue-on-error: ${{ matrix.ruby.experimental }}
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
-      max-parallel: 5
-      matrix: ${{ fromJson(needs.prepare.outputs.matrix) }}
-
+      matrix:
+        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        experimental: [ false ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
         with:
           submodules: true
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby.version }}
+          ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-          rubygems: ${{ matrix.ruby.rubygems }}
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: ieee-test-input
-          path: ieee
 
       - run: bundle exec rake

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

@@ -0,0 +1,33 @@
+name: release-manual
+
+on:
+  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-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
+
+      - run: |
+          git config --global user.name "metanorma-ci"
+          git config --global user.email "metanorma-ci@users.noreply.github.com"
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '2.6'
+          bundler-cache: true
+
+      - run: gem install gem-release
+
+      - if: github.event_name == 'workflow_dispatch' && github.event.inputs.next_version != 'skip'
+        run: gem bump --version ${{ github.event.inputs.next_version }} --tag --push
+

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

@@ -5,28 +5,14 @@ on:
     types: [ metanorma/mnconvert ]
 
 jobs:
-  prepare:
-    uses: metanorma/ci/.github/workflows/prepare-rake.yml@main
-
-  prepare-ieee:
-    uses: ./.github/workflows/prepare.yml
-    secrets:
-      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
-
   tag_repo:
-    runs-on: ubuntu-latest
-    if: startsWith(github.event.client_payload.ref, 'refs/tags/v')
-    needs: [ prepare, prepare-ieee ]
+    runs-on: ubuntu-18.04
+    if: false # startsWith(github.event.client_payload.ref, 'refs/tags/v')
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
         with:
           token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
 
-      - uses: actions/download-artifact@v3
-        with:
-          name: ieee-test-input
-          path: ieee
-
       - run: |
           git config --global user.name "metanorma-ci"
           git config --global user.email "metanorma-ci@users.noreply.github.com"
@@ -37,14 +23,16 @@ jobs:
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ needs.prepare.outputs.default-ruby-version }}
+          ruby-version: '2.6'
           bundler-cache: true
 
-      - run: |
-          gem install gem-release
-          gem bump --version ${mnconvert_VERSION} --no-commit
+      - run: gem install gem-release
 
-      - run: rm -f bin/mnconvert.jar
+      - run: gem bump --version ${mnconvert_VERSION} --no-commit
+
+      - run: |
+          rm -f bin/mnconvert.jar
+          rake bin/mnconvert.jar
 
       - run: bundle exec rake
 
@@ -54,13 +42,3 @@ jobs:
           git commit -m "Bump version to ${mnconvert_VERSION}"
           git tag v${mnconvert_VERSION}
           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
-          filename: .github/RELEASE_ISSUE_TEMPLATE.md

data/.github/workflows/release.yml

@@ -4,61 +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:
-  prepare:
-    uses: metanorma/ci/.github/workflows/prepare-rake.yml@main
-
-  prepare-ieee:
-    uses: ./.github/workflows/prepare.yml
-    secrets:
-      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
-
   release:
-    runs-on: ubuntu-latest
-    needs: [ prepare, prepare-ieee ]
+    runs-on: ubuntu-18.04
     steps:
-      - uses: actions/checkout@v3
-
-      - run: |
-          git config user.name "metanorma-ci"
-          git config user.email "metanorma-ci@users.noreply.github.com"
-
-      - uses: ruby/setup-ruby@v1
+      - uses: actions/checkout@v1
+      - name: Use Ruby
+        uses: actions/setup-ruby@v1
         with:
-          ruby-version: ${{ needs.prepare.outputs.default-ruby-version }}
-          bundler-cache: true
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: ieee-test-input
-          path: ieee
-
-      - run: gem install gem-release
-
-      - if: github.event_name == 'workflow_dispatch' && inputs.next_version != 'skip'
+          ruby-version: '2.6'
+          architecture: 'x64'
+      - name: Update gems
+        run: |
+          gem install bundler
+          bundle install --jobs 4 --retry 3
+      - name: Update mnconvert.jar
         run: |
-          gem bump --version ${{ inputs.next_version }} --no-commit
           rm -f bin/mnconvert.jar
-          bundle exec rake bin/mnconvert.jar
-
-      - run: bundle exec rake
-
-      - if: github.event_name == 'workflow_dispatch' && inputs.next_version != 'skip'
+          rake bin/mnconvert.jar
+      - name: Run specs
         run: |
-          git add -u bin/mnconvert.jar lib/mnconvert/version.rb
-          git commit -m "Bump version to ${{ inputs.next_version }}"
-          git tag v${mnconvert_VERSION}
-          git push origin HEAD:${GITHUB_REF} --tags
-
-      - uses: actions-mn/gem-release@main
-        with:
-          api-key: ${{ secrets.METANORMA_CI_RUBYGEMS_API_KEY }}
-          release-command: gem release
+          bundle exec rake
+      - name: Publish to rubygems.org
+        env:
+          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/.gitignore

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

data/lib/mnconvert/version.rb

@@ -1,4 +1,4 @@
 module MnConvert
-  VERSION = "1.59.0"
-  MNCONVERT_JAR_VERSION = VERSION
+  VERSION = "2.0.0"
+  MNCONVERT_JAR_VERSION = "1.13.0"
 end

data/lib/mnconvert.rb

@@ -58,7 +58,6 @@ module MnConvert
       output_format: "--output-format",
       output_file: "--output",
       xsl_file: "--xsl-file",
-      validation_against: "--validation-against",
     }.freeze
 
     def java_cmd
@@ -80,7 +79,7 @@ module MnConvert
     end
 
     def validate_mn(opts, output_format)
-      unless output_format.nil? || %w(iso niso ieee).include?(output_format.to_s)
+      unless output_format.nil? || %w(iso niso).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.7.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.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.59.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-02-28 00:00:00.000000000 Z
+date: 2021-11-24 00:00:00.000000000 Z
 dependencies: []
 description: |
   mnconvert converts Metanorma XML into NISO STS XML.
@@ -20,9 +20,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/RELEASE_ISSUE_TEMPLATE.md"
-- ".github/workflows/prepare.yml"
 - ".github/workflows/rake.yml"
+- ".github/workflows/release-manual.yml"
 - ".github/workflows/release-tag.yml"
 - ".github/workflows/release.yml"
 - ".gitignore"
@@ -51,14 +50,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: mnconvert converts Metanorma XML into NISO STS XML.

data/.github/RELEASE_ISSUE_TEMPLATE.md

@@ -1,5 +0,0 @@
----
-title: Release {{ env.mnconvert_TAG }} failed
----
-
-Investigate {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }}

data/.github/workflows/prepare.yml

@@ -1,50 +0,0 @@
-name: prepare
-
-on:
-  workflow_call:
-    secrets:
-      pat_token:
-        required: false
-
-jobs:
-  prepare:
-    uses: metanorma/ci/.github/workflows/prepare-rake.yml@main
-
-  prepare-ieee:
-    runs-on: ubuntu-latest
-    needs: prepare
-    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: ${{ needs.prepare.outputs.default-ruby-version }}
-          bundler-cache: true
-          working-directory: ieee/samples
-
-      - uses: actions-mn/site-gen@v1
-        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