expressir 1.3.0.pre.2 → 1.3.0.pre.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5085ab1404256459d6563172f11a8a60d4ec9a806a17e0d2ddde89c38fa34c35
-  data.tar.gz: 9453e11c12706e6723794193b10d54b2e0539ab72570b8aa0ff15c7de81594e2
+  metadata.gz: 234091187e90c927260db45776f797d28b3b45e3fde6387a6f720002182057e1
+  data.tar.gz: 941febf34a1f5590b3c479f1217dde9979eb3d4777f46167b58ec3db2aeadb41
 SHA512:
-  metadata.gz: 8c6756552aebff926d2bc1974f1a6ab3556972cece14bc3d31893a1619fc21d2e0aeae1bfb621f7c81c2080aa9ae8fd3d42022d33a671f480121fbe544d47066
-  data.tar.gz: fbdbc405c508e247301045c507c518afaf4b985e789092ff88d06a5fe3a70da5e5ebed78a1f8aa7da4f0dbb296ceda6ee6b5212034c428252c5ad7995f8dfa45
+  metadata.gz: d119caf451a09b60b3f22852944f1907963482d0835e4fa0d043a138fd923b4816d5cef71ddcae8f2a1ff19413fc3362df19c0082cfd3e08c249940b762a6247
+  data.tar.gz: 1275a96c888bff061eb5e112122a88134809cdf11c5a30e1f47e13f2a62572b7196d875e51662ea8b711fdab346421430249361c802f2029203ea7f8245fab57

data/.github/workflows/rake.yml

@@ -7,7 +7,6 @@ on:
       - 'docs/**'
       - '**.adoc'
       - '**.md'
-      - .github/workflows/alpine.yml
       - .github/workflows/release.yml
   pull_request:
   workflow_dispatch:
@@ -69,7 +68,13 @@ 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
@@ -99,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
@@ -131,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

data/.github/workflows/release.yml

@@ -46,6 +46,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
+          #ref: main # https://github.com/actions/checkout/issues/439#issuecomment-830862188
 
       - uses: ruby/setup-ruby@master
         with:
@@ -150,19 +151,15 @@ jobs:
         uses: actions/download-artifact@v3
         with:
          name: version
-         path: version
 
       - name: Install gem
         run: gem install expressir -v $(cat version)
 
       - name: Verify
-        run: |
-          cd $(ruby -e "puts RbConfig::TOPDIR + '\/lib\/ruby\/gems\/' + RbConfig::CONFIG['ruby_version'] + '\/gems\/expressir*'")
-          ruby bin/rspec
-          cat .rspec_status || echo ".rspec_status was not found"
+        run: expressir version
 
   verify-alpine:
-    name: Verify published gem on Alpine
+    name: Verify published gem on alpine
     needs: publish
     runs-on: ubuntu-latest
     container:
@@ -175,13 +172,9 @@ jobs:
         uses: actions/download-artifact@v3
         with:
          name: version
-         path: version
 
       - name: Install gem
         run: gem install expressir -v $(cat version)
 
       - name: Verify
-        run: |
-          cd $(ruby -e "puts RbConfig::TOPDIR + '\/lib\/ruby\/gems\/' + RbConfig::CONFIG['ruby_version'] + '\/gems\/expressir*'")
-          ruby bin/rspec
-          cat .rspec_status || echo ".rspec_status was not found"
+        run: expressir version

data/Rakefile

@@ -6,7 +6,7 @@ require "yard"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task default: %i[compile spec]
+task default: :spec
 
 GEMSPEC = Gem::Specification.load("expressir.gemspec")
 

data/ext/express-parser/antlrgen/ExpressLexer.cpp

@@ -625,7 +625,6 @@ void expresslexerLexerInitialize() {
   	390,1,0,0,0,15,0,1383,1393,1407,1415,1425,1429,1433,1439,1441,1448,1458,
   	1460,1474,1482,2,0,2,0,0,1,0
   };
-
   staticData->serializedATN = antlr4::atn::SerializedATNView(serializedATNSegment, sizeof(serializedATNSegment) / sizeof(serializedATNSegment[0]));
 
   antlr4::atn::ATNDeserializer deserializer;

data/ext/express-parser/extconf.rb

@@ -43,8 +43,6 @@ if cross_build
   when /darwin/
     $CXXFLAGS << " -mmacosx-version-min=10.15 -fno-c++-static-destructors"
     $DLDFLAGS << " -mmacosx-version-min=10.15"
-  when /linux/
-    $DLDFLAGS << " -static-libgcc -static-libstdc++"
   end
 else
   require "mkmf-rice"

data/lib/expressir/express/parser.rb

@@ -1,4 +1,9 @@
-require_relative 'extension'
+begin
+  RUBY_VERSION =~ /(\d+\.\d+)/
+  require_relative "#{$1}/express_parser"
+rescue LoadError
+  require_relative "express_parser"
+end
 require 'expressir/express/visitor'
 require 'expressir/express/resolve_references_model_visitor'
 

data/lib/expressir/express/visitor.rb

@@ -1,4 +1,9 @@
-require_relative 'extension'
+begin
+  RUBY_VERSION =~ /(\d+\.\d+)/
+  require_relative "#{$1}/express_parser"
+rescue LoadError
+  require_relative "express_parser"
+end
 require "expressir/model"
 require "set"
 
@@ -26,6 +31,8 @@ require "set"
 # - prevents segfault in ANTLR4 C++ runtime, not sure why they are caused
 # - e.g. see visit_schema_decl
 
+require 'objspace'
+
 module Expressir
   module Express
     class Visitor < ::ExpressParser::Visitor

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "1.3.0.pre.2".freeze
+  VERSION = "1.3.0.pre.5".freeze
 end

data/rakelib/cross-ruby.rake

@@ -335,15 +335,16 @@ 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 } }
+  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: tag
-        #{pre_req(plat)} &&
-        gem install bundler --no-document &&
+        #{pre_req(plat)} && gem install bundler --no-document &&
         bundle && bundle exec rake gem:#{plat}:builder MAKE="nice make -j`nproc`"
       RCD
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 1.3.0.pre.2
+  version: 1.3.0.pre.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-13 00:00:00.000000000 Z
+date: 2023-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -596,7 +596,6 @@ files:
 - lib/expressir/cli/ui.rb
 - lib/expressir/config.rb
 - lib/expressir/express/cache.rb
-- lib/expressir/express/extension.rb
 - lib/expressir/express/formatter.rb
 - lib/expressir/express/hyperlink_formatter.rb
 - lib/expressir/express/model_visitor.rb

data/lib/expressir/express/extension.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-begin
-    # native precompiled gems package shared libraries in <gem_dir>/lib/nokogiri/<ruby_version>
-    ::RUBY_VERSION =~ /(\d+\.\d+)/
-    require_relative "#{Regexp.last_match(1)}/express_parser"
-  rescue LoadError => e
-#    if /musl/.match?(RUBY_PLATFORM)
-#      warn(<<~EOM)
-#  
-#        ERROR: It looks like you're trying to use Expressir as a precompiled native gem on a musl system.
-#  
-#          #{e.message}
-#  
-#          If that's the case, then please install Expressir via the `ruby` platform gem:
-#              gem install expressir --platform=ruby
-#          or:
-#              bundle config set force_ruby_platform true
-#  
-#  
-#      EOM
-#      raise e
-#    end
-  
-    # use "require" instead of "require_relative" because non-native gems will place C extension files
-    # in Gem::BasicSpecification#extension_dir after compilation (during normal installation), which
-    # is in $LOAD_PATH but not necessarily relative to this file
-    require "expressir/express/express_parser"
-  end
-