expressir 1.3.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de9e0d0c1c24fa441fcf5b1f9fc1baeb034c4c37abc984b1416b96f37d7d80d8
-  data.tar.gz: 92bf31490bc79c314aa31e006931c28893bcdf0fbd0df0097b417662458ba48b
+  metadata.gz: 7d96c2cd6d31a1202a26d62331a0d6766c1e3b566250ff2e6f97db0f105d5f7e
+  data.tar.gz: 3fa00f8b74260b373398a36e4358a38fa8c05f3f2574fa27e38c3fd438d1f987
 SHA512:
-  metadata.gz: 61a5927f36841a123fd06395ba12ca0e201534332b5f88d9206b8299bf92668c370eb80b7063fbe0b2465ffb47b60bebfc76f14e25e3418cc8fb6150596762a6
-  data.tar.gz: 54dec20a6099a8f99425d50bc15cf3fea8233e26fe959c711359f1ec74039ca614ed102c8697e0d0fe9dcb13f675bc7ff53f84d5af82d8132f7c72f73fd996ea
+  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/codeql.yml

@@ -0,0 +1,47 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ main ]
+  schedule:
+    - cron: '0 23 * * 3'
+  workflow_dispatch:
+
+concurrency:
+  group: '${{ github.workflow }}-${{ github.job }}-${{ github.head_ref || github.ref_name }}'
+  cancel-in-progress: true
+
+env:
+  BUNDLER_VER: 2.4.22
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install Ruby
+        uses: ruby/setup-ruby@master
+        with:
+          ruby-version: 3.1
+          bundler: ${{ env.BUNDLER_VER }}
+          bundler-cache: false
+
+      - name: Bundle
+        run: bundle install --jobs 4 --retry 3
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: "ruby, cpp"
+
+      - name: Build native extension
+        run: bundle exec rake compile
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2

data/.github/workflows/rake.yml

@@ -8,6 +8,7 @@ on:
       - '**.adoc'
       - '**.md'
       - .github/workflows/release.yml
+      - .github/workflows/codeql.yml
   pull_request:
   workflow_dispatch:
 
@@ -16,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
@@ -77,11 +79,54 @@ jobs:
         run: bundle install --jobs 4 --retry 3
 
       - name: Process cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache
         with:
           path: lib/expressir/express/express_parser.*
-          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') }}
+          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'
+        run: bundle exec rake compile
+
+      - name: Run tests
+        run: |
+          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'
@@ -115,7 +160,7 @@ jobs:
         run: gem build expressir.gemspec
 
       - name: Package gem without native extension
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pkg-ruby
           path: expressir-*.gem
@@ -125,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
@@ -154,7 +199,7 @@ jobs:
         run: bundle exec rake gem:${{ matrix.platform }}
 
       - name: Package gem with native extension
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pkg-${{ matrix.platform }}
           path: pkg/*.gem
@@ -185,7 +230,7 @@ jobs:
         run: bundle install --jobs 4 --retry 3
 
       - name: Download packaged gem
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
          name: pkg-ruby
          path: pkg
@@ -195,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"
 
@@ -222,7 +310,7 @@ jobs:
         run: bundle install --jobs 4 --retry 3
 
       - name: Download packaged gem
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
          name: pkg-darwin
          path: pkg
@@ -233,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"
 
@@ -253,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
 
@@ -260,7 +352,7 @@ jobs:
         run: bundle install --jobs 4 --retry 3
 
       - name: Download packaged gem
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
          name: pkg-linux-gnu
          path: pkg
@@ -270,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"
 
@@ -298,7 +390,7 @@ jobs:
         run: bundle install --jobs 4 --retry 3
 
       - name: Download packaged gem
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
          name: pkg-windows
          path: pkg
@@ -308,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

@@ -15,6 +15,9 @@ concurrency:
   group: '${{ github.workflow }}-${{ github.job }}-${{ github.head_ref || github.ref_name }}'
   cancel-in-progress: true
 
+env:
+  BUNDLER_VER: 2.4.22
+
 jobs:
   bump:
     runs-on: ubuntu-latest
@@ -62,13 +65,13 @@ jobs:
           gem build expressir.gemspec | grep -o 'Version: .*' | awk '{print $2}' > version
 
       - if: matrix.platform == 'linux-gnu'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pkg-ruby
           path: expressir-*.gem
 
       - if: matrix.platform == 'linux-gnu'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: version
           path: version
@@ -84,7 +87,7 @@ jobs:
       # build gem WITH pre-built native extension
       - run: bundle exec rake gem:${{ matrix.platform }}
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: pkg-${{ matrix.platform }}
           path: pkg/*.gem
@@ -93,22 +96,22 @@ jobs:
     runs-on: ubuntu-latest
     needs: pack
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: pkg-ruby
           path: pkg
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: pkg-linux-gnu
           path: pkg
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: pkg-windows
           path: pkg
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: pkg-darwin
           path: pkg
@@ -130,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 }}
@@ -149,7 +152,7 @@ jobs:
           bundler: ${{ env.BUNDLER_VER }}
 
       - name: Download version
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
          name: version
 
@@ -170,7 +173,7 @@ jobs:
         run: apk --no-cache add bash build-base git ruby-dev gcc g++ automake
 
       - name: Download version
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
          name: version
 

data/.github/workflows/stress.yml

@@ -0,0 +1,53 @@
+name: stress
+
+on:
+  workflow_dispatch:
+
+concurrency:
+  group: '${{ github.workflow }}-${{ github.job }}-${{ github.head_ref || github.ref_name }}'
+  cancel-in-progress: true
+
+env:
+  BUNDLER_VER: 2.4.22
+  GC_STRESS: true
+
+jobs:
+  rake:
+    name: test on ruby-${{ matrix.ruby }} ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '3.2', '3.1', '3.0', '2.7' ]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Setup packages
+        if: startsWith(matrix.os, 'macos')
+        run: brew install autoconf automake libtool
+
+      - name: Install Ruby
+        uses: ruby/setup-ruby@master
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler: ${{ env.BUNDLER_VER }}
+          # 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: Build native extension
+        run: bundle exec rake compile
+
+      - name: Run tests
+        run: |
+          bundle exec rake
+          cat .rspec_status

data/.gitignore

@@ -14,7 +14,7 @@
 /lib/expressir/express/*/express_parser.bundle
 /lib/expressir/express/*/express_parser.so
 /spec/syntax/*-pretty.exp
-/ext/express-parser/rice-embed
+/ext/express_parser/rice-embed
 
 # rspec failure tracking
 .rspec_status

data/.gitmodules

@@ -1,5 +1,5 @@
-[submodule "ext/express-parser/antlr4-upstream"]
-	path = ext/express-parser/antlr4-upstream
+[submodule "ext/express_parser/antlr4-upstream"]
+	path = ext/express_parser/antlr4-upstream
 	url = https://github.com/antlr/antlr4
 [submodule "ext/express-grammar"]
 	path = ext/express-grammar

data/exe/generate-parser

@@ -18,7 +18,7 @@ generator = Antlr4Native::Generator.new(
 generator.generate
 
 # fix issues with generated parser
-parser_source_file = File.join("ext", "express-parser", "express_parser.cpp")
+parser_source_file = File.join("ext", "express_parser", "express_parser.cpp")
 parser_source_lines = File.read(parser_source_file).split("\n")
 
 # - add ParserProxy tokens method, simple compensation for missing exposed BufferedTokenStream

data/expressir.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.files         = `git ls-files`.split("\n")\
-    + Dir.glob("ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/**/*")
+    + Dir.glob("ext/express_parser/antlr4-upstream/runtime/Cpp/runtime/**/*")
 
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
 
@@ -28,18 +28,18 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.executables   = %w[expressir]
 
-  spec.extensions = File.join(*%w(ext express-parser extconf.rb))
+  spec.extensions = File.join(*%w(ext express_parser extconf.rb))
 
-  spec.add_runtime_dependency "rice", "~> 4.1"
+  spec.add_runtime_dependency "rice", "~> 4.2"
   spec.add_runtime_dependency "thor", "~> 1.0"
-  spec.add_development_dependency "antlr4-native", "~> 2.1.0"
+  spec.add_development_dependency "antlr4-native", "~> 2.2"
   spec.add_development_dependency "asciidoctor", "~> 2.0.13"
   spec.add_development_dependency "bundler", "~> 2.3"
   spec.add_development_dependency "byebug", "~> 11.1"
   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"