expressir 1.3.0.pre.2-x86_64-darwin → 1.3.0.pre.4-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b54aceb89dded255239f157fa6e66ac0dc1e47251c76c2c9420c5919b04be51a
-  data.tar.gz: b6cc301684db88ad45b6afef125b57b5464fbb8d1d28242330eaa9b7a7f81538
+  metadata.gz: 3cf0e37d39ebb4226039c1a8986dce5e595bb0f3009c05449622286f06edf32e
+  data.tar.gz: 99dacc6528cdaa007b8dfd888f23e8f9954f91beb6da42aa5b5966801d05e9fa
 SHA512:
-  metadata.gz: fc93af15b627e0d9ecf917081fa1ec36c4775a6c2dc4f0f5f5e2e015212a826c711214362b879efc48e12c2b3e2bf769d932a89ddb1e6cc12d1417045b41c906
-  data.tar.gz: efdbbeb70e2d6ff64d27199cd9d240515fbef449e855ec3e24cbd898d80f9209277ee2805884efbd82fd0adf12bbab1d748d19f567a0837b458cea4b64b499f3
+  metadata.gz: ca03c39f6ee9bcb03ca18bf62d35694c3e493e9a59418cb87caa69bdcd72513c3c5cabca0dc2f1c42a8e7aa0bdb493f93922c2788c0420ce205159730e3a5064
+  data.tar.gz: 837a928f28cd6468703c0117a81ba1443c610f2adf91ed98c2c89aeadb79e03344514c9063d7355739d4871c541408db92d23d2a6c89a9f77b6d00dbc7c42a8e

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: x86_64-darwin
 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
@@ -245,7 +245,6 @@ files:
 - lib/expressir/express/3.1/express_parser.bundle
 - lib/expressir/express/3.2/express_parser.bundle
 - 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
-