expressir 1.2.10-arm64-darwin → 1.3.0-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74d150eb10f581d1c0d8c3a1c92d82d1f4d79cdbc0ebd6142ef43b23b791aadd
-  data.tar.gz: 0ec5650b19a8a7af56eb6422c664f3fcc30075bede4c036f82a31cf2058e9ed5
+  metadata.gz: 1402e85f9059b98f174d0b514c481b8fecee13b8552f9d9cfa64badfe970313a
+  data.tar.gz: 38edd7d8ca9818a8647c57d2fd6f11730b6f3bb338499b6dbaa2747152f3b343
 SHA512:
-  metadata.gz: b20b92f3d249c2cc915c21cad5639b8b4a0374a6618428d0969b2aac182bdea31b577368394098543abcc8364b8dd7e48f208322c6fa285b0bea08494a458e52
-  data.tar.gz: cbb3d633a2e5bf4a3028fd9c60cbd9219ef7db5ab49ae487b8bce4f41641d1e5deb5ccfae530a581bece835c2c1634e875286b2596dd7d02e2b2002d87a4c0ca
+  metadata.gz: 93396c2e359baaf690e5e2ab36638fd95754bf9ee958b0729ec9c33b3d188933247d9bdc827cc6d155127631a23ba5349119afd529fb6a72c0639913372a15ac
+  data.tar.gz: ea53a316f2c54309dd3b4347ac24ff292e1017957267773ab56b4e39aeb367984351f84ea4a0574221c88a9e78dd33c2893fd2dc82fcd14e659f928e9e9687b7

data/.github/workflows/rake.yml

@@ -2,8 +2,14 @@ name: rake
 
 on:
   push:
-    branches: [ master, main ]
+    branches: [ main ]
+    paths-ignore:
+      - 'docs/**'
+      - '**.adoc'
+      - '**.md'
+      - .github/workflows/release.yml
   pull_request:
+  workflow_dispatch:
 
 concurrency:
   group: '${{ github.workflow }}-${{ github.job }}-${{ github.head_ref || github.ref_name }}'
@@ -62,14 +68,20 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler: ${{ env.BUNDLER_VER }}
-          bundler-cache: true
+          # Rice gem has issues with bundler cache
+          # more info https://github.com/lutaml/expressir/runs/2097658383?check_suite_focus=true#step:7:2126
+          # but it is not the only issue
+          bundler-cache: false
+
+      - name: Bundle
+        run: bundle install --jobs 4 --retry 3
 
       - name: Process cache
         uses: actions/cache@v3
         id: cache
         with:
           path: lib/expressir/express/express_parser.*
-          key: v4-${{ runner.os }}-${{ matrix.ruby }}-${{ hashFiles('ext/express-parser/extconf.rb', 'ext/express-parser/antlrgen/**', 'ext/express-parser/express_parser.cpp', '.git/modules/ext/express-parser/antlr4-upstream/HEAD') }}
+          key: v4-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('ext/express-parser/extconf.rb', 'ext/express-parser/antlrgen/**', 'ext/express-parser/express_parser.cpp', '.git/modules/ext/express-parser/antlr4-upstream/HEAD') }}
 
       - name: Build native extension
         if: steps.cache.outputs.cache-hit != 'true'
@@ -92,10 +104,9 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@master
         with:
-          ruby-version: '3.0'
-          # bundler-cache: true important to not use cache because it leads to "cannot find -lrice"
-          # more info https://github.com/lutaml/expressir/runs/2097658383?check_suite_focus=true#step:7:2126
+          ruby-version: '3.1'
           bundler: ${{ env.BUNDLER_VER }}
+          bundler-cache: false
 
       - name: Bundle
         run: bundle install --jobs 4 --retry 3
@@ -114,7 +125,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        host: [ linux, windows, darwin ]
+        platform: [ linux-gnu, windows, darwin ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -124,9 +135,8 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@master
         with:
-          ruby-version: '3.0'
-          # bundler-cache: true important to not use cache because it leads to "cannot find -lrice"
-          # more info https://github.com/lutaml/expressir/runs/2097658383?check_suite_focus=true#step:7:2126
+          ruby-version: '3.1'
+          bundler-cache: false
           bundler: ${{ env.BUNDLER_VER }}
 
       - name: Bundle
@@ -141,12 +151,12 @@ jobs:
           sudo swapon --all --verbose
 
       - name: Build gem with native extension
-        run: bundle exec rake gem:${{ matrix.host }}
+        run: bundle exec rake gem:${{ matrix.platform }}
 
       - name: Package gem with native extension
         uses: actions/upload-artifact@v3
         with:
-          name: pkg-${{ matrix.host }}
+          name: pkg-${{ matrix.platform }}
           path: pkg/*.gem
 
   verify-ruby:
@@ -163,7 +173,7 @@ jobs:
         uses: ruby/setup-ruby@master
         with:
           ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
+          bundler-cache: false
           bundler: ${{ env.BUNDLER_VER }}
 
       - name: Checkout
@@ -202,7 +212,7 @@ jobs:
         uses: ruby/setup-ruby@master
         with:
           ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
+          bundler-cache: false
           bundler: ${{ env.BUNDLER_VER }}
 
       - name: Checkout
@@ -227,8 +237,8 @@ jobs:
           ruby bin/rspec
           cat .rspec_status || echo ".rspec_status was not found"
 
-  verify-linux:
-    name: verify Linux binary gem on ruby-${{ matrix.ruby }}
+  verify-linux-gnu:
+    name: verify Linux (gnu) binary gem on ruby-${{ matrix.ruby }}
     needs: pack
     runs-on: ubuntu-latest
     strategy:
@@ -240,7 +250,7 @@ jobs:
         uses: ruby/setup-ruby@master
         with:
           ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
+          bundler-cache: false
           bundler: ${{ env.BUNDLER_VER }}
 
       - name: Checkout
@@ -252,11 +262,11 @@ jobs:
       - name: Download packaged gem
         uses: actions/download-artifact@v3
         with:
-         name: pkg-linux
+         name: pkg-linux-gnu
          path: pkg
 
       - name: Install binary gem
-        run: gem install -l pkg/expressir-*-$(ruby -e "puts RUBY_PLATFORM").gem
+        run: gem install -l pkg/expressir-*-$(ruby -e "puts RUBY_PLATFORM")-gnu.gem
 
       - name: Verify
         run: |
@@ -271,8 +281,6 @@ jobs:
     runs-on: windows-latest
     strategy:
       fail-fast: false
-# Ruby 3.1 fails
-# https://github.com/lutaml/expressir/issues/103
       matrix:
         ruby: [ '3.2', '3.1', '3.0', '2.7' ]
     steps:
@@ -280,7 +288,7 @@ jobs:
         uses: ruby/setup-ruby@master
         with:
           ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
+          bundler-cache: false
           bundler: ${{ env.BUNDLER_VER }}
 
       - name: Checkout

data/.github/workflows/release.yml

@@ -30,8 +30,8 @@ jobs:
 
       - if: ${{ github.event_name == 'workflow_dispatch' }} # unfortunatelly cannot keep this condition on job level
         run: |
-          git config user.name github-actions
-          git config user.email github-actions@github.com
+          git config --global user.name github-actions
+          git config --global user.email github-actions@github.com
           gem install gem-release
           gem bump --version ${{ github.event.inputs.next_version }} --tag --push
 
@@ -41,7 +41,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        host: [ linux, windows, darwin ]
+        platform: [ linux-gnu, windows, darwin ]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -56,15 +56,23 @@ jobs:
 
       - run: bundle install --jobs 4 --retry 3
 
-      # build gem WITHOUT pre-built native extension
-      - run: gem build expressir.gemspec
+      - name: Build gem and save version
+        if: matrix.platform == 'linux-gnu'
+        run: |
+          gem build expressir.gemspec | grep -o 'Version: .*' | awk '{print $2}' > version
 
-      - if: matrix.host == 'linux'
+      - if: matrix.platform == 'linux-gnu'
         uses: actions/upload-artifact@v3
         with:
           name: pkg-ruby
           path: expressir-*.gem
 
+      - if: matrix.platform == 'linux-gnu'
+        uses: actions/upload-artifact@v3
+        with:
+          name: version
+          path: version
+
       - name: Enable swap
         run: |
           sudo fallocate -l 15g /compile.swap
@@ -74,11 +82,11 @@ jobs:
           sudo swapon --all --verbose
 
       # build gem WITH pre-built native extension
-      - run: bundle exec rake gem:${{ matrix.host }}
+      - run: bundle exec rake gem:${{ matrix.platform }}
 
       - uses: actions/upload-artifact@v3
         with:
-          name: pkg-${{ matrix.host }}
+          name: pkg-${{ matrix.platform }}
           path: pkg/*.gem
 
   publish:
@@ -92,7 +100,7 @@ jobs:
 
       - uses: actions/download-artifact@v3
         with:
-          name: pkg-linux
+          name: pkg-linux-gnu
           path: pkg
 
       - uses: actions/download-artifact@v3
@@ -109,12 +117,11 @@ jobs:
         with:
           ruby-version: '3.1'
 
-      - run: ls -l pkg/
-
       - name: Publish to rubygems.org
         env:
           RUBYGEMS_API_KEY: ${{ secrets.LUTAML_CI_RUBYGEMS_API_KEY }}
         run: |
+          ls -l pkg/
           mkdir -p ~/.gem
           cat > ~/.gem/credentials << EOF
           ---
@@ -123,3 +130,52 @@ jobs:
           chmod 0600 ~/.gem/credentials
           gem signin
           for gem in pkg/*.gem; do gem push $gem -V; done
+          sleep(5)
+
+  verify:
+    name: Verify published gem on ${{ matrix.os }}
+    needs: publish
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+    steps:
+      - name: Install Ruby
+        uses: ruby/setup-ruby@master
+        with:
+          ruby-version: 3.1
+          bundler-cache: true
+          bundler: ${{ env.BUNDLER_VER }}
+
+      - name: Download version
+        uses: actions/download-artifact@v3
+        with:
+         name: version
+
+      - name: Install gem
+        run: gem install expressir -v $(cat version)
+
+      - name: Verify
+        run: expressir version
+
+  verify-alpine:
+    name: Verify published gem on alpine
+    needs: publish
+    runs-on: ubuntu-latest
+    container:
+      image: alpine:3.17
+    steps:
+      - name: Install packages
+        run: apk --no-cache add bash build-base git ruby-dev gcc g++ automake
+
+      - name: Download version
+        uses: actions/download-artifact@v3
+        with:
+         name: version
+
+      - name: Install gem
+        run: gem install expressir -v $(cat version)
+
+      - name: Verify
+        run: expressir version

data/expressir.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.name          = "expressir"
   spec.version       = Expressir::VERSION
   spec.authors       = ["Ribose Inc."]
-  spec.email         = ["open.source@ribose.com'"]
+  spec.email         = ["open.source@ribose.com"]
 
   spec.summary       = "ISO EXPRESS parser and tools in Ruby."
   spec.description   = "Expressir (“EXPRESS in Ruby”) is a Ruby parser for EXPRESS and a set of Ruby tools for accessing ISO EXPRESS data models."
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
 
   spec.extensions = File.join(*%w(ext express-parser extconf.rb))
 
-  spec.add_runtime_dependency "rice", "~> 4.0.3"
+  spec.add_runtime_dependency "rice", "~> 4.1"
   spec.add_runtime_dependency "thor", "~> 1.0"
   spec.add_development_dependency "antlr4-native", "~> 2.1.0"
   spec.add_development_dependency "asciidoctor", "~> 2.0.13"

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "1.2.10".freeze
+  VERSION = "1.3.0".freeze
 end

data/rakelib/antlr4-native.rake

@@ -48,7 +48,7 @@ def create_pp_class_definition(parser_source_lines)
 
     class ParserProxyExt : public Object {
       public:
-        ParserProxyExt(Object self, string file) {
+        ParserProxyExt(string file) {
           ifstream stream;
           stream.open(file);
           input = new ANTLRInputStream(stream);
@@ -115,7 +115,7 @@ def create_class_api(parser_source_lines)
       .define_method("token_index", &TokenProxy::getTokenIndex);
 
     rb_cParserExt = define_class_under<ParserProxyExt>(rb_mExpressParser, "ParserExt")
-      .define_constructor(Constructor<ParserProxyExt, Object, string>())
+      .define_constructor(Constructor<ParserProxyExt, string>())
       .define_method("syntax", &ParserProxyExt::syntax, Return().keepAlive())
       .define_method("tokens", &ParserProxyExt::getTokens)
       .define_method("visit", &ParserProxyExt::visit, Return().keepAlive());

data/rakelib/cross-ruby.rake

@@ -2,7 +2,7 @@ require "rbconfig"
 require "shellwords"
 
 WINDOWS_PLATFORM_REGEX = /mingw|mswin/.freeze
-LINUX_PLATFORM_REGEX = /linux/.freeze
+LINUX_GNU_PLATFORM_REGEX = /linux-gnu/.freeze
 DARWIN_PLATFORM_REGEX = /darwin/.freeze
 GLIBC_MIN_VERSION = "2.17".freeze
 
@@ -15,8 +15,8 @@ CrossRuby = Struct.new(:version, :host) do
     !!(platform =~ WINDOWS_PLATFORM_REGEX)
   end
 
-  def linux?
-    !!(platform =~ LINUX_PLATFORM_REGEX)
+  def linux_gnu?
+    !!(platform =~ LINUX_GNU_PLATFORM_REGEX)
   end
 
   def darwin?
@@ -59,10 +59,10 @@ CrossRuby = Struct.new(:version, :host) do
         else
           "x64-mingw32"
         end
-      when /\Ax86_64.*linux/
-        "x86_64-linux"
-      when /\A(arm64|aarch64).*linux/
-        "aarch64-linux"
+      when "x86_64-linux-gnu"
+        "x86_64-linux-gnu"
+      when "aarch64-linux-gnu"
+        "aarch64-linux-gnu"
       when /\Ax86_64-darwin/
         "x86_64-darwin"
       when /\Aarm64-darwin/
@@ -72,12 +72,24 @@ CrossRuby = Struct.new(:version, :host) do
       end
   end
 
+  def tag
+    @tag ||=
+      case platform
+      when "x86_64-linux-gnu"
+        "x86_64-linux"
+      when "aarch64-linux-gnu"
+        "aarch64-linux"
+      else
+        platform
+      end
+  end
+
   def tool(name)
     (@binutils_prefix ||=
        case platform
        when /x64-mingw(32|-ucrt)/
          "x86_64-w64-mingw32-"
-       when /(x86_64|aarch64)-linux/
+       when /(x86_64|aarch64)-linux-gnu/
          # We do believe that we are on Linux and can use native tools
          ""
        when /x86_64.*darwin/
@@ -93,9 +105,9 @@ CrossRuby = Struct.new(:version, :host) do
     case platform
     when /64-mingw(32|-ucrt)/
       "pei-x86-64"
-    when "x86_64-linux"
+    when "x86_64-linux-gnu"
       "elf64-x86-64"
-    when "aarch64-linux"
+    when "aarch64-linux-gnu"
       "elf64-little"
     when "x86_64-darwin"
       "Mach-O 64-bit x86-64"
@@ -142,7 +154,7 @@ CrossRuby = Struct.new(:version, :host) do
     case platform
     when WINDOWS_PLATFORM_REGEX
       verify_entry_windows(dump, dll)
-    when LINUX_PLATFORM_REGEX
+    when LINUX_GNU_PLATFORM_REGEX
       verify_entry_linux(dll)
     when DARWIN_PLATFORM_REGEX
       verify_entry_darwin(dll)
@@ -188,7 +200,7 @@ CrossRuby = Struct.new(:version, :host) do
   end
 
   def allowed_dlls_linux
-    suffix = (platform == "x86_64-linux" ? "x86-64" : "aarch64")
+    suffix = (platform == "x86_64-linux-gnu" ? "x86-64" : "aarch64")
     [
       "ld-linux-#{suffix}.so",
       "libc.so",
@@ -210,7 +222,7 @@ CrossRuby = Struct.new(:version, :host) do
     case platform
     when WINDOWS_PLATFORM_REGEX
       allowed_dlls_windows
-    when LINUX_PLATFORM_REGEX
+    when LINUX_GNU_PLATFORM_REGEX
       allowed_dlls_linux
     when DARWIN_PLATFORM_REGEX
       allowed_dlls_darwin
@@ -236,7 +248,7 @@ CrossRuby = Struct.new(:version, :host) do
     case platform
     when DARWIN_PLATFORM_REGEX
       actual_dlls_darwin(dll)
-    when LINUX_PLATFORM_REGEX
+    when LINUX_GNU_PLATFORM_REGEX
       actual_dlls_linux(dump)
     when WINDOWS_PLATFORM_REGEX
       actual_dlls_windows(dump)
@@ -291,7 +303,7 @@ def verify_dll(dll, cross_ruby)
   cross_ruby.verify_imports(dump, dll)
   #  Not sure if it is required, probably not
   #  I am keeping related code as a reference for future advances
-  #  cross_ruby.verify_glibc_version(dump, dll) if cross_ruby.linux?
+  #  cross_ruby.verify_glibc_version(dump, dll) if cross_ruby.linux_gnu?
 
   puts "#{dll}: passed shared library sanity checks"
 end
@@ -315,7 +327,7 @@ UBUNTU_PREREQ = "sudo apt-get update -y && sudo apt-get install -y automake auto
 
 def pre_req(plat)
   case plat
-  when /\linux/
+  when /linux/
     "if [[ $(awk -F= '/^NAME/{print $2}' /etc/os-release) == '\"Ubuntu\"' ]]; then #{UBUNTU_PREREQ}; else #{REDHAT_PREREQ}; fi"
   else
     UBUNTU_PREREQ.to_s
@@ -323,14 +335,17 @@ def pre_req(plat)
 end
 
 namespace "gem" do
-  CROSS_RUBIES.find_all { |cr| cr.windows? || cr.linux? || cr.darwin? }.map(&:platform).uniq.each do |plat|
+  CROSS_RUBIES.find_all { |cr| cr.windows? || cr.linux_gnu? || cr.darwin? }
+    .map { |cr| { platform: cr.platform, tag: cr.tag } }
+    .uniq { |hash| hash[:platform] }.each do |hash|
+    plat = hash[:platform]
+    tag = hash[:tag]
+
     desc "build native gem for #{plat} platform"
     task plat do
-      RakeCompilerDock.sh <<~RCD, platform: plat
-        #{pre_req(plat)} &&
-        gem install bundler --no-document &&
-        bundle &&
-        bundle exec rake gem:#{plat}:builder MAKE="nice make -j`nproc`"
+      RakeCompilerDock.sh <<~RCD, platform: tag
+        #{pre_req(plat)} && gem install bundler --no-document &&
+        bundle && bundle exec rake gem:#{plat}:builder MAKE="nice make -j`nproc`"
       RCD
     end
 
@@ -346,7 +361,7 @@ namespace "gem" do
   multitask "windows" => CROSS_RUBIES.find_all(&:windows?).map(&:platform).uniq
 
   desc "build native gems for linux"
-  multitask "linux" => CROSS_RUBIES.find_all(&:linux?).map(&:platform).uniq
+  multitask "linux-gnu" => CROSS_RUBIES.find_all(&:linux_gnu?).map(&:platform).uniq
 
   desc "build native gems for darwin"
   multitask "darwin" => CROSS_RUBIES.find_all(&:darwin?).map(&:platform).uniq
@@ -361,6 +376,7 @@ Rake::ExtensionTask.new("express_parser", GEMSPEC) do |ext|
   ext.cross_compile  = true
   ext.cross_platform = CROSS_RUBIES.map(&:platform).uniq
   ext.cross_config_options << "--enable-cross-build"
+
   ext.cross_compiling do |spec|
     spec.files.reject! { |path| File.fnmatch?("ext/*", path) }
     spec.dependencies.reject! { |dep| dep.name == "rice" }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 1.2.10
+  version: 1.3.0
 platform: arm64-darwin
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-11 00:00:00.000000000 Z
+date: 2023-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -209,7 +209,7 @@ dependencies:
 description: Expressir (“EXPRESS in Ruby”) is a Ruby parser for EXPRESS and a set
   of Ruby tools for accessing ISO EXPRESS data models.
 email:
-- open.source@ribose.com'
+- open.source@ribose.com
 executables:
 - expressir
 extensions: []