expressir 1.3.0.pre.2-x64-mingw32 → 1.3.0.pre.4-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1d81d3044a8afce37998e14e5943d4e47abc81f6695f3756f1707ff6cf61ecd
-  data.tar.gz: b08b7f30d1270023307bd76b56efb9631280d7957289c783ba8dd467ff5edfba
+  metadata.gz: e216fcf23591e05b80dbabf488ee94448435201a46e12f1c8d7c835136e24d1a
+  data.tar.gz: e9cd96006f2b1f515fca15d23d1f5215b6f5e66f09c354588555cbafd4bd88fa
 SHA512:
-  metadata.gz: '032766947c2896bd74091edadf42d0f50fd8eb1f39d7656577a34b39e3b97dee43daa2fa66e3642f0872682e4e08f3b974a4f320c80a944e03afef35a00bf84c'
-  data.tar.gz: 6c8b9cf00f356fa80b2e5c999fec701c962e9f4c58af43bd29ee641f92a038592153061e2320fc9ebc5c3636d99ea27076587fdce2c351439862ff54bd69b997
+  metadata.gz: 5b888bc82b97281db4ae070ee03aee6da5ad5d34f139a369cbcfdca8c079333ef63f0bc731657699fab5b52fe7dd04ac26c3d770a531de312beb37a40d6336b8
+  data.tar.gz: 8a38389c9b36aa4e1b44bc3cc3f41b027162030958f9c888a3c71ed96d40b909aa6689aa651f14fa7de5a2a938f0b99c6915e2c18149f36b04a67d216009f1ac

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

@@ -150,19 +150,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 +171,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/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.4".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.4
 platform: x64-mingw32
 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: thor
@@ -243,7 +243,6 @@ files:
 - lib/expressir/express/2.7/express_parser.so
 - lib/expressir/express/3.0/express_parser.so
 - 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
-