expressir 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52184ecaf1717a9bbf98cadf3272b5ee049168537ba20ba92d583938839caa6e
-  data.tar.gz: 91afae8ad0efc945fa19918ed04c5e0e4ee7b6101405a7e35faa9c6644cd8433
+  metadata.gz: 7d96c2cd6d31a1202a26d62331a0d6766c1e3b566250ff2e6f97db0f105d5f7e
+  data.tar.gz: 3fa00f8b74260b373398a36e4358a38fa8c05f3f2574fa27e38c3fd438d1f987
 SHA512:
-  metadata.gz: d5736ecb7b76cded1ac2d823ad29bd05dd7a8b4ea9dc62365655ee9fc3837aead01fb0190ea173723ce26d162f82cb563398e2d2e296304a44ff6968231a0015
-  data.tar.gz: b2c4bb82aa4f867ceba0e1781bc6902ac456c98616aebb00efb60b9b7063cb718afadbb723fb5d90dd3c4e4b1a69fe79100816f041397665d42874df1ad117e9
+  metadata.gz: c5db3569cd696964cc2319216fcad7e5ed9541052b5cfa412d8a9ee235170567e7e1c992926ce2c184a18180b068ee0abc3f37c1eb3b36668d67bb2e36ea5bfa
+  data.tar.gz: 8d1bb252bcf1abc3d1b38805117667e18a47a391e8c8e0b6f112b9b82c362a25e4d77ad3aefbe4750bdb1c7599b4cccb8afaeafc25045d51ed3cab9aa7c6d725

data/.cross_rubies

@@ -1,20 +1,28 @@
 3.2.0:x86_64-w64-mingw32
 3.2.0:x86_64-linux-gnu
+3.2.0:x86_64-linux-musl
 3.2.0:aarch64-linux-gnu
+3.2.0:aarch64-linux-musl
 3.2.0:x86_64-darwin
 3.2.0:arm64-darwin
 3.1.0:x86_64-w64-mingw32
 3.1.0:x86_64-linux-gnu
+3.1.0:x86_64-linux-musl
 3.1.0:aarch64-linux-gnu
+3.1.0:aarch64-linux-musl
 3.1.0:x86_64-darwin
 3.1.0:arm64-darwin
 3.0.0:x86_64-w64-mingw32
 3.0.0:x86_64-linux-gnu
+3.0.0:x86_64-linux-musl
 3.0.0:aarch64-linux-gnu
+3.0.0:aarch64-linux-musl
 3.0.0:x86_64-darwin
 3.0.0:arm64-darwin
 2.7.0:x86_64-w64-mingw32
 2.7.0:x86_64-linux-gnu
+2.7.0:x86_64-linux-musl
 2.7.0:aarch64-linux-gnu
+2.7.0:aarch64-linux-musl
 2.7.0:x86_64-darwin
 2.7.0:arm64-darwin

data/.github/workflows/rake.yml

@@ -17,6 +17,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
+  RUBYGEM_VER: 3.4.22
   BUNDLER_VER: 2.4.22
 # Forcing bundler version to ensure that it is consistent everywhere and
 # does not cause bundler gem reinstalls
@@ -93,6 +94,49 @@ jobs:
           bundle exec rake
           cat .rspec_status
 
+  rake-alpine:
+    name: test on ruby-${{ matrix.ruby }} alpine container
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '3.2', '3.1', '3.0', '2.7' ]
+    container: ruby:${{ matrix.ruby }}-alpine
+    steps:
+      - name: Install packages
+        run: |
+          apk --no-cache --upgrade add build-base git bash tar
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Upgrade RubyGems
+        if: matrix.ruby == '3.0' || matrix.ruby == '2.7'
+        run: gem update --system ${{ env.RUBYGEM_VER }} --no-document
+
+      - name: Bundle
+        run: |
+          git config --global --add safe.directory $PWD
+          bundle install --jobs 4 --retry 3
+
+      - name: Process cache
+        uses: actions/cache@v4
+        id: cache
+        with:
+          path: lib/expressir/express/express_parser.*
+          key: v4-alpine-${{ 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'
+        run: bundle exec rake compile
+
+      - name: Run tests
+        run: |
+          bundle exec rake
+          cat .rspec_status
+
   # test release workflow
   pack-ruby:
     runs-on: ubuntu-latest
@@ -126,7 +170,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ linux-gnu, windows, darwin ]
+        platform: [ linux-gnu, linux-musl, windows, darwin ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -196,7 +240,50 @@ jobs:
 
       - name: Verify
         run: |
-          cd $(ruby -e "puts RbConfig::TOPDIR + '\/lib\/ruby\/gems\/' + RbConfig::CONFIG['ruby_version'] + '\/gems\/expressir*'")
+          cd $(ruby -e "puts Gem::Specification.find_by_name('expressir').gem_dir")
+          ruby bin/rspec
+          cat .rspec_status || echo ".rspec_status was not found"
+
+  verify-ruby-linux-musl:
+    name: verify ruby gem on ruby-${{ matrix.ruby }} on alpine container
+    needs: pack-ruby
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '3.2', '3.1', '3.0', '2.7' ]
+    container: ruby:${{ matrix.ruby }}-alpine
+    steps:
+      - name: Install packages
+        run: |
+          apk --no-cache --upgrade add build-base git bash tar
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Upgrade RubyGems
+        if: matrix.ruby == '3.0' || matrix.ruby == '2.7'
+        run: gem update --system ${{ env.RUBYGEM_VER }} --no-document
+
+      - name: Bundle
+        run: |
+          git config --global --add safe.directory $PWD
+          bundle install --jobs 4 --retry 3
+
+      - name: Download packaged gem
+        uses: actions/download-artifact@v4
+        with:
+         name: pkg-ruby
+         path: pkg
+
+      - name: Install gem
+        run: gem install -l pkg/expressir-*.gem
+
+      - name: Verify
+        run: |
+          cd $(ruby -e "puts Gem::Specification.find_by_name('expressir').gem_dir")
           ruby bin/rspec
           cat .rspec_status || echo ".rspec_status was not found"
 
@@ -234,7 +321,7 @@ jobs:
 
       - name: Verify
         run: |
-          cd $(ruby -e "puts RbConfig::TOPDIR + '\/lib\/ruby\/gems\/' + RbConfig::CONFIG['ruby_version'] + '\/gems\/expressir*'")
+          cd $(ruby -e "puts Gem::Specification.find_by_name('expressir').gem_dir")
           ruby bin/rspec
           cat .rspec_status || echo ".rspec_status was not found"
 
@@ -254,6 +341,10 @@ jobs:
           bundler-cache: false
           bundler: ${{ env.BUNDLER_VER }}
 
+      - name: Upgrade RubyGems
+        if: matrix.ruby == '3.0' || matrix.ruby == '2.7'
+        run: gem update --system ${{ env.RUBYGEM_VER }} --no-document
+
       - name: Checkout
         uses: actions/checkout@v4
 
@@ -271,7 +362,7 @@ jobs:
 
       - name: Verify
         run: |
-          cd $(ruby -e "puts RbConfig::TOPDIR + '\/lib\/ruby\/gems\/' + RbConfig::CONFIG['ruby_version'] + '\/gems\/expressir*'")
+          cd $(ruby -e "puts Gem::Specification.find_by_name('expressir').gem_dir")
           ruby bin/rspec
           cat .rspec_status || echo ".rspec_status was not found"
 
@@ -309,6 +400,49 @@ jobs:
 
       - name: Verify
         run: |
-          cd $(ruby -e "puts RbConfig::TOPDIR + '\/lib\/ruby\/gems\/' + RbConfig::CONFIG['ruby_version'] + '\/gems\/expressir*'")
+          cd $(ruby -e "puts Gem::Specification.find_by_name('expressir').gem_dir")
+          ruby bin/rspec
+          cat .rspec_status || echo ".rspec_status was not found"
+
+  verify-linux-musl:
+    name: verify Linux (musl) binary gem on ruby-${{ matrix.ruby }}
+    needs: pack
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '3.2', '3.1', '3.0', '2.7' ]
+    container: ruby:${{ matrix.ruby }}-alpine
+    steps:
+      - name: Install packages
+        run: |
+          apk --no-cache --upgrade add build-base git bash tar
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Upgrade RubyGems
+        if: matrix.ruby == '3.0' || matrix.ruby == '2.7'
+        run: gem update --system ${{ env.RUBYGEM_VER }} --no-document
+
+      - name: Bundle
+        run: |
+          git config --global --add safe.directory $PWD
+          bundle install --jobs 4 --retry 3
+
+      - name: Download packaged gem
+        uses: actions/download-artifact@v4
+        with:
+         name: pkg-linux-musl
+         path: pkg
+
+      - name: Install binary gem
+        run: gem install -l pkg/expressir-*-$(ruby -e "puts RUBY_PLATFORM").gem
+
+      - name: Verify
+        run: |
+          cd $(ruby -e "puts Gem::Specification.find_by_name('expressir').gem_dir")
           ruby bin/rspec
           cat .rspec_status || echo ".rspec_status was not found"

data/.github/workflows/release.yml

@@ -133,7 +133,7 @@ jobs:
           chmod 0600 ~/.gem/credentials
           gem signin
           for gem in pkg/*.gem; do gem push $gem -V; done
-          sleep 5
+          sleep 15
 
   verify:
     name: Verify published gem on ${{ matrix.os }}

data/expressir.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry", "~> 0.12.2"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rake-compiler", "~> 1.2"
-  spec.add_development_dependency "rake-compiler-dock", "~> 1.3"
+  spec.add_development_dependency "rake-compiler-dock", "~> 1.5"
   spec.add_development_dependency "rspec", "~> 3.11"
   spec.add_development_dependency "rubocop", "1.58"
   spec.add_development_dependency "rubocop-performance", "~> 1.19"

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "1.3.1".freeze
+  VERSION = "1.3.2".freeze
 end

data/rakelib/cross-ruby.rake

@@ -3,6 +3,7 @@ require "shellwords"
 
 WINDOWS_PLATFORM_REGEX = /mingw|mswin/.freeze
 LINUX_GNU_PLATFORM_REGEX = /linux-gnu/.freeze
+LINUX_MUSL_PLATFORM_REGEX = /linux-musl/.freeze
 DARWIN_PLATFORM_REGEX = /darwin/.freeze
 GLIBC_MIN_VERSION = "2.17".freeze
 
@@ -11,16 +12,20 @@ CrossRuby = Struct.new(:version, :host) do
     "tmp/#{platform}/stage/lib/expressir/express/#{minor_ver}/express_parser.#{dll_ext}"
   end
 
-  def windows?
-    !!(platform =~ WINDOWS_PLATFORM_REGEX)
+  def darwin?
+    !!(platform =~ DARWIN_PLATFORM_REGEX)
   end
 
   def linux_gnu?
     !!(platform =~ LINUX_GNU_PLATFORM_REGEX)
   end
 
-  def darwin?
-    !!(platform =~ DARWIN_PLATFORM_REGEX)
+  def linux_musl?
+    !!(platform =~ LINUX_MUSL_PLATFORM_REGEX)
+  end
+
+  def windows?
+    !!(platform =~ WINDOWS_PLATFORM_REGEX)
   end
 
   def ver
@@ -63,6 +68,10 @@ CrossRuby = Struct.new(:version, :host) do
         "x86_64-linux-gnu"
       when "aarch64-linux-gnu"
         "aarch64-linux-gnu"
+      when "x86_64-linux-musl"
+        "x86_64-linux-musl"
+      when "aarch64-linux-musl"
+        "aarch64-linux-musl"
       when /\Ax86_64-darwin/
         "x86_64-darwin"
       when /\Aarm64-darwin/
@@ -89,7 +98,7 @@ CrossRuby = Struct.new(:version, :host) do
        case platform
        when /x64-mingw(32|-ucrt)/
          "x86_64-w64-mingw32-"
-       when /(x86_64|aarch64)-linux-gnu/
+       when /(x86_64|aarch64)-linux-(gnu|musl)/
          # We do believe that we are on Linux and can use native tools
          ""
        when /x86_64.*darwin/
@@ -105,9 +114,9 @@ CrossRuby = Struct.new(:version, :host) do
     case platform
     when /64-mingw(32|-ucrt)/
       "pei-x86-64"
-    when "x86_64-linux-gnu"
+    when /x86_64-linux-(gnu|musl)/
       "elf64-x86-64"
-    when "aarch64-linux-gnu"
+    when /aarch64-linux-(gnu|musl)/
       "elf64-little"
     when "x86_64-darwin"
       "Mach-O 64-bit x86-64"
@@ -154,7 +163,7 @@ CrossRuby = Struct.new(:version, :host) do
     case platform
     when WINDOWS_PLATFORM_REGEX
       verify_entry_windows(dump, dll)
-    when LINUX_GNU_PLATFORM_REGEX
+    when LINUX_GNU_PLATFORM_REGEX, LINUX_MUSL_PLATFORM_REGEX
       verify_entry_linux(dll)
     when DARWIN_PLATFORM_REGEX
       verify_entry_darwin(dll)
@@ -199,7 +208,7 @@ CrossRuby = Struct.new(:version, :host) do
     end
   end
 
-  def allowed_dlls_linux
+  def allowed_dlls_linux_gnu
     suffix = (platform == "x86_64-linux-gnu" ? "x86-64" : "aarch64")
     [
       "ld-linux-#{suffix}.so",
@@ -211,6 +220,16 @@ CrossRuby = Struct.new(:version, :host) do
     ]
   end
 
+  def allowed_dlls_linux_musl
+    suffix = (platform == "x86_64-linux-gnu" ? "x86-64" : "aarch64")
+    [
+      "ld-linux-#{suffix}.so",
+      "libstdc++.so",
+      "libc.so",
+      "libgcc_s.so",
+    ]
+  end
+
   def allowed_dlls_darwin
     [
       "/usr/lib/libSystem.B.dylib",
@@ -218,12 +237,14 @@ CrossRuby = Struct.new(:version, :host) do
     ]
   end
 
-  def allowed_dlls
+  def allowed_dlls # rubocop:disable Metrics/MethodLength
     case platform
     when WINDOWS_PLATFORM_REGEX
       allowed_dlls_windows
     when LINUX_GNU_PLATFORM_REGEX
-      allowed_dlls_linux
+      allowed_dlls_linux_gnu
+    when LINUX_MUSL_PLATFORM_REGEX
+      allowed_dlls_linux_musl
     when DARWIN_PLATFORM_REGEX
       allowed_dlls_darwin
     else
@@ -248,7 +269,7 @@ CrossRuby = Struct.new(:version, :host) do
     case platform
     when DARWIN_PLATFORM_REGEX
       actual_dlls_darwin(dll)
-    when LINUX_GNU_PLATFORM_REGEX
+    when LINUX_GNU_PLATFORM_REGEX, LINUX_MUSL_PLATFORM_REGEX
       actual_dlls_linux(dump)
     when WINDOWS_PLATFORM_REGEX
       actual_dlls_windows(dump)
@@ -335,15 +356,10 @@ def pre_req(plat)
 end
 
 namespace "gem" do
-  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]
-
+  CROSS_RUBIES.find_all { |cr| cr.windows? || cr.linux_gnu? || cr.linux_musl? || cr.darwin? }.map(&:platform).uniq.each do |plat|
     desc "build native gem for #{plat} platform"
     task plat do
-      RakeCompilerDock.sh <<~RCD, platform: tag
+      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`"
       RCD
@@ -360,9 +376,12 @@ namespace "gem" do
   desc "build native gems for windows"
   multitask "windows" => CROSS_RUBIES.find_all(&:windows?).map(&:platform).uniq
 
-  desc "build native gems for linux"
+  desc "build native gems for linux-gnu"
   multitask "linux-gnu" => CROSS_RUBIES.find_all(&:linux_gnu?).map(&:platform).uniq
 
+  desc "build native gems for linux-musl"
+  multitask "linux-musl" => CROSS_RUBIES.find_all(&:linux_musl?).map(&:platform).uniq
+
   desc "build native gems for darwin"
   multitask "darwin" => CROSS_RUBIES.find_all(&:darwin?).map(&:platform).uniq
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-27 00:00:00.000000000 Z
+date: 2024-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement