expressir 1.2.10-x64-mingw32 → 1.3.0.pre.1-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e217b02dfe5e74d4c38acba8599dc6f9084f082e0dfa51b87fcbe825c6ad228
-  data.tar.gz: 0e1452521be4021bcc3be5fe7f46498dd3477733c5ba378ca260e3fde1187ada
+  metadata.gz: 047672b67876bbfd0e329cec39e8bd4d6abe0c81afea7dbf3b88161ace5f6389
+  data.tar.gz: 2c8b2871eff511c8f53972f4a78d2100fdd2cca9f71a69e2e684f69f7e1fbb3d
 SHA512:
-  metadata.gz: 9b55330392c9a08127b4acdb0b25f30b16018a837d3dc16ed52f573b593e90e5258e6659da61c4a0178935b35706f51ff1e71b748b7d26d6af7bcafce74cdd10
-  data.tar.gz: b297a6f502fbb02b8816351b11ff32cf1a6109229c30fd236b6fc8a01aa85e7577b5426c89a1e4e5dff5aa69cd1ffe62e6b5fd822c3fcf6847cbe30d8514691e
+  metadata.gz: 06c946580f7412078f1a64481c5882214e428bba12b70617f37841433a4ab80a9357c29589d72b46ae7605b6115fad3c4785333bde49c6915afa378fe5275fd0
+  data.tar.gz: 8f7d6f4d4447b95821a37a1cd0c6d40758a726900a9fc1d46457a7e34d8b37bcd9e7ad5397a54ebb6c211580bdb5848d3fd666c5bb6ab4385455763191990755

data/.github/workflows/rake.yml

@@ -3,7 +3,14 @@ name: rake
 on:
   push:
     branches: [ master, main ]
+    paths-ignore:
+      - 'docs/**'
+      - '**.adoc'
+      - '**.md'
+      - .github/workflows/alpine.yml
+      - .github/workflows/release.yml
   pull_request:
+  workflow_dispatch:
 
 concurrency:
   group: '${{ github.workflow }}-${{ github.job }}-${{ github.head_ref || github.ref_name }}'
@@ -69,7 +76,7 @@ jobs:
         id: cache
         with:
           path: lib/expressir/express/express_parser.*
-          key: v4-${{ runner.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'
@@ -114,7 +121,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        host: [ linux, windows, darwin ]
+        platform: [ linux-gnu, windows, darwin ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -141,12 +148,12 @@ jobs:
           sudo swapon --all --verbose
 
       - name: Build gem with native extension
-        run: bundle exec rake gem:${{ matrix.host }}
+        run: bundle exec rake gem:${{ matrix.platform }}
 
       - name: Package gem with native extension
         uses: actions/upload-artifact@v3
         with:
-          name: pkg-${{ matrix.host }}
+          name: pkg-${{ matrix.platform }}
           path: pkg/*.gem
 
   verify-ruby:
@@ -227,8 +234,8 @@ jobs:
           ruby bin/rspec
           cat .rspec_status || echo ".rspec_status was not found"
 
-  verify-linux:
-    name: verify Linux binary gem on ruby-${{ matrix.ruby }}
+  verify-linux-gnu:
+    name: verify Linux (gnu) binary gem on ruby-${{ matrix.ruby }}
     needs: pack
     runs-on: ubuntu-latest
     strategy:
@@ -252,11 +259,11 @@ jobs:
       - name: Download packaged gem
         uses: actions/download-artifact@v3
         with:
-         name: pkg-linux
+         name: pkg-linux-gnu
          path: pkg
 
       - name: Install binary gem
-        run: gem install -l pkg/expressir-*-$(ruby -e "puts RUBY_PLATFORM").gem
+        run: gem install -l pkg/expressir-*-$(ruby -e "puts RUBY_PLATFORM")-gnu.gem
 
       - name: Verify
         run: |

data/.github/workflows/release.yml

@@ -30,8 +30,8 @@ jobs:
 
       - if: ${{ github.event_name == 'workflow_dispatch' }} # unfortunatelly cannot keep this condition on job level
         run: |
-          git config user.name github-actions
-          git config user.email github-actions@github.com
+          git config --global user.name github-actions
+          git config --global user.email github-actions@github.com
           gem install gem-release
           gem bump --version ${{ github.event.inputs.next_version }} --tag --push
 
@@ -41,12 +41,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        host: [ linux, windows, darwin ]
+        platform: [ linux-gnu, windows, darwin ]
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
-          ref: main # https://github.com/actions/checkout/issues/439#issuecomment-830862188
 
       - uses: ruby/setup-ruby@master
         with:
@@ -59,7 +58,7 @@ jobs:
       # build gem WITHOUT pre-built native extension
       - run: gem build expressir.gemspec
 
-      - if: matrix.host == 'linux'
+      - if: matrix.platform == 'linux-gnu'
         uses: actions/upload-artifact@v3
         with:
           name: pkg-ruby
@@ -74,11 +73,11 @@ jobs:
           sudo swapon --all --verbose
 
       # build gem WITH pre-built native extension
-      - run: bundle exec rake gem:${{ matrix.host }}
+      - run: bundle exec rake gem:${{ matrix.platform }}
 
       - uses: actions/upload-artifact@v3
         with:
-          name: pkg-${{ matrix.host }}
+          name: pkg-${{ matrix.platform }}
           path: pkg/*.gem
 
   publish:
@@ -92,7 +91,7 @@ jobs:
 
       - uses: actions/download-artifact@v3
         with:
-          name: pkg-linux
+          name: pkg-linux-gnu
           path: pkg
 
       - uses: actions/download-artifact@v3

data/Rakefile

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

data/expressir.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.name          = "expressir"
   spec.version       = Expressir::VERSION
   spec.authors       = ["Ribose Inc."]
-  spec.email         = ["open.source@ribose.com'"]
+  spec.email         = ["open.source@ribose.com"]
 
   spec.summary       = "ISO EXPRESS parser and tools in Ruby."
   spec.description   = "Expressir (“EXPRESS in Ruby”) is a Ruby parser for EXPRESS and a set of Ruby tools for accessing ISO EXPRESS data models."
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
 
   spec.extensions = File.join(*%w(ext express-parser extconf.rb))
 
-  spec.add_runtime_dependency "rice", "~> 4.0.3"
+  spec.add_runtime_dependency "rice", "~> 4.1"
   spec.add_runtime_dependency "thor", "~> 1.0"
   spec.add_development_dependency "antlr4-native", "~> 2.1.0"
   spec.add_development_dependency "asciidoctor", "~> 2.0.13"

data/lib/expressir/express/extension.rb

@@ -0,0 +1,30 @@
+# 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
+  

data/lib/expressir/express/parser.rb

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

data/lib/expressir/express/visitor.rb

@@ -1,9 +1,4 @@
-begin
-  RUBY_VERSION =~ /(\d+\.\d+)/
-  require_relative "#{$1}/express_parser"
-rescue LoadError
-  require_relative "express_parser"
-end
+require_relative 'extension'
 require "expressir/model"
 require "set"
 
@@ -31,8 +26,6 @@ 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.2.10".freeze
+  VERSION = "1.3.0.pre.1".freeze
 end

data/rakelib/antlr4-native.rake

@@ -48,7 +48,7 @@ def create_pp_class_definition(parser_source_lines)
 
     class ParserProxyExt : public Object {
       public:
-        ParserProxyExt(Object self, string file) {
+        ParserProxyExt(string file) {
           ifstream stream;
           stream.open(file);
           input = new ANTLRInputStream(stream);
@@ -115,7 +115,7 @@ def create_class_api(parser_source_lines)
       .define_method("token_index", &TokenProxy::getTokenIndex);
 
     rb_cParserExt = define_class_under<ParserProxyExt>(rb_mExpressParser, "ParserExt")
-      .define_constructor(Constructor<ParserProxyExt, Object, string>())
+      .define_constructor(Constructor<ParserProxyExt, string>())
       .define_method("syntax", &ParserProxyExt::syntax, Return().keepAlive())
       .define_method("tokens", &ParserProxyExt::getTokens)
       .define_method("visit", &ParserProxyExt::visit, Return().keepAlive());

data/rakelib/cross-ruby.rake

@@ -2,7 +2,7 @@ require "rbconfig"
 require "shellwords"
 
 WINDOWS_PLATFORM_REGEX = /mingw|mswin/.freeze
-LINUX_PLATFORM_REGEX = /linux/.freeze
+LINUX_GNU_PLATFORM_REGEX = /linux-gnu/.freeze
 DARWIN_PLATFORM_REGEX = /darwin/.freeze
 GLIBC_MIN_VERSION = "2.17".freeze
 
@@ -15,8 +15,8 @@ CrossRuby = Struct.new(:version, :host) do
     !!(platform =~ WINDOWS_PLATFORM_REGEX)
   end
 
-  def linux?
-    !!(platform =~ LINUX_PLATFORM_REGEX)
+  def linux_gnu?
+    !!(platform =~ LINUX_GNU_PLATFORM_REGEX)
   end
 
   def darwin?
@@ -59,10 +59,10 @@ CrossRuby = Struct.new(:version, :host) do
         else
           "x64-mingw32"
         end
-      when /\Ax86_64.*linux/
-        "x86_64-linux"
-      when /\A(arm64|aarch64).*linux/
-        "aarch64-linux"
+      when "x86_64-linux-gnu"
+        "x86_64-linux-gnu"
+      when "aarch64-linux-gnu"
+        "aarch64-linux-gnu"
       when /\Ax86_64-darwin/
         "x86_64-darwin"
       when /\Aarm64-darwin/
@@ -72,12 +72,24 @@ CrossRuby = Struct.new(:version, :host) do
       end
   end
 
+  def tag
+    @tag ||=
+      case platform
+      when "x86_64-linux-gnu"
+        "x86_64-linux"
+      when "aarch64-linux-gnu"
+        "aarch64-linux"
+      else
+        platform
+      end
+  end
+
   def tool(name)
     (@binutils_prefix ||=
        case platform
        when /x64-mingw(32|-ucrt)/
          "x86_64-w64-mingw32-"
-       when /(x86_64|aarch64)-linux/
+       when /(x86_64|aarch64)-linux-gnu/
          # We do believe that we are on Linux and can use native tools
          ""
        when /x86_64.*darwin/
@@ -93,9 +105,9 @@ CrossRuby = Struct.new(:version, :host) do
     case platform
     when /64-mingw(32|-ucrt)/
       "pei-x86-64"
-    when "x86_64-linux"
+    when "x86_64-linux-gnu"
       "elf64-x86-64"
-    when "aarch64-linux"
+    when "aarch64-linux-gnu"
       "elf64-little"
     when "x86_64-darwin"
       "Mach-O 64-bit x86-64"
@@ -142,7 +154,7 @@ CrossRuby = Struct.new(:version, :host) do
     case platform
     when WINDOWS_PLATFORM_REGEX
       verify_entry_windows(dump, dll)
-    when LINUX_PLATFORM_REGEX
+    when LINUX_GNU_PLATFORM_REGEX
       verify_entry_linux(dll)
     when DARWIN_PLATFORM_REGEX
       verify_entry_darwin(dll)
@@ -188,7 +200,7 @@ CrossRuby = Struct.new(:version, :host) do
   end
 
   def allowed_dlls_linux
-    suffix = (platform == "x86_64-linux" ? "x86-64" : "aarch64")
+    suffix = (platform == "x86_64-linux-gnu" ? "x86-64" : "aarch64")
     [
       "ld-linux-#{suffix}.so",
       "libc.so",
@@ -210,7 +222,7 @@ CrossRuby = Struct.new(:version, :host) do
     case platform
     when WINDOWS_PLATFORM_REGEX
       allowed_dlls_windows
-    when LINUX_PLATFORM_REGEX
+    when LINUX_GNU_PLATFORM_REGEX
       allowed_dlls_linux
     when DARWIN_PLATFORM_REGEX
       allowed_dlls_darwin
@@ -236,7 +248,7 @@ CrossRuby = Struct.new(:version, :host) do
     case platform
     when DARWIN_PLATFORM_REGEX
       actual_dlls_darwin(dll)
-    when LINUX_PLATFORM_REGEX
+    when LINUX_GNU_PLATFORM_REGEX
       actual_dlls_linux(dump)
     when WINDOWS_PLATFORM_REGEX
       actual_dlls_windows(dump)
@@ -291,7 +303,7 @@ def verify_dll(dll, cross_ruby)
   cross_ruby.verify_imports(dump, dll)
   #  Not sure if it is required, probably not
   #  I am keeping related code as a reference for future advances
-  #  cross_ruby.verify_glibc_version(dump, dll) if cross_ruby.linux?
+  #  cross_ruby.verify_glibc_version(dump, dll) if cross_ruby.linux_gnu?
 
   puts "#{dll}: passed shared library sanity checks"
 end
@@ -315,7 +327,7 @@ UBUNTU_PREREQ = "sudo apt-get update -y && sudo apt-get install -y automake auto
 
 def pre_req(plat)
   case plat
-  when /\linux/
+  when /linux/
     "if [[ $(awk -F= '/^NAME/{print $2}' /etc/os-release) == '\"Ubuntu\"' ]]; then #{UBUNTU_PREREQ}; else #{REDHAT_PREREQ}; fi"
   else
     UBUNTU_PREREQ.to_s
@@ -323,14 +335,16 @@ def pre_req(plat)
 end
 
 namespace "gem" do
-  CROSS_RUBIES.find_all { |cr| cr.windows? || cr.linux? || cr.darwin? }.map(&:platform).uniq.each do |plat|
+  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: plat
+      RakeCompilerDock.sh <<~RCD, platform: tag
         #{pre_req(plat)} &&
         gem install bundler --no-document &&
-        bundle &&
-        bundle exec rake gem:#{plat}:builder MAKE="nice make -j`nproc`"
+        bundle && bundle exec rake gem:#{plat}:builder MAKE="nice make -j`nproc`"
       RCD
     end
 
@@ -346,7 +360,7 @@ namespace "gem" do
   multitask "windows" => CROSS_RUBIES.find_all(&:windows?).map(&:platform).uniq
 
   desc "build native gems for linux"
-  multitask "linux" => CROSS_RUBIES.find_all(&:linux?).map(&:platform).uniq
+  multitask "linux-gnu" => CROSS_RUBIES.find_all(&:linux_gnu?).map(&:platform).uniq
 
   desc "build native gems for darwin"
   multitask "darwin" => CROSS_RUBIES.find_all(&:darwin?).map(&:platform).uniq
@@ -361,6 +375,7 @@ Rake::ExtensionTask.new("express_parser", GEMSPEC) do |ext|
   ext.cross_compile  = true
   ext.cross_platform = CROSS_RUBIES.map(&:platform).uniq
   ext.cross_config_options << "--enable-cross-build"
+
   ext.cross_compiling do |spec|
     spec.files.reject! { |path| File.fnmatch?("ext/*", path) }
     spec.dependencies.reject! { |dep| dep.name == "rice" }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 1.2.10
+  version: 1.3.0.pre.1
 platform: x64-mingw32
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-11 00:00:00.000000000 Z
+date: 2023-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -209,7 +209,7 @@ dependencies:
 description: Expressir (“EXPRESS in Ruby”) is a Ruby parser for EXPRESS and a set
   of Ruby tools for accessing ISO EXPRESS data models.
 email:
-- open.source@ribose.com'
+- open.source@ribose.com
 executables:
 - expressir
 extensions: []
@@ -243,6 +243,7 @@ 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
@@ -377,9 +378,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 3.1.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.26
 signing_key: