expressir 1.2.9-arm64-darwin → 1.2.11-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8de8186773d901225e5c02e8e9e45d7992d30740032617a06d9b5c012ae1cdcb
-  data.tar.gz: 5e5f54aabef934bf43fbaff14869d61ba9ece8ad856a69ef46beb4ee9b440602
+  metadata.gz: ce94690d93c4aa512c6ad1c0e1693fef8ef52eb225fc4e4c51efc78ac29da9aa
+  data.tar.gz: ee673300d828a9be5f02653b9f267a3abee1bf1504267f184dd6a1c3b819baaf
 SHA512:
-  metadata.gz: a5aa966aa7c7f2c356301a8bccbeaf93cd78c027f9f4c3fda32cf3722990eaa57953c1f82ae7b8e9b4cf9d254c0726b069aa588fbbd58b3aa7511c1492ccf652
-  data.tar.gz: 2e560954bf512ecf024194e23f2d0668f7f3c6d177d3478cd41cfe9f378ce242e514dadbe0dce139a4e1cb4203a1a5dff946ea1110198e16a76c31afcb18219a
+  metadata.gz: d9179aabf5e9f19fb44456e434435c06fa46207ed019f827e2d3436425a364a2ea2f3398542b6f908767b374e27d212e2c7c5319f9d82ca8ac16768456c5c80d
+  data.tar.gz: 242658d764b5ae710ebd2bc88bb87f8b675776e09e0e65643bd4da594d2cbe28d03bd3f42287ba5719440903099de4b8befe4afe585bdd505add508b160ac44f

data/.cross_rubies

@@ -1,3 +1,8 @@
+3.2.0:x86_64-w64-mingw32
+3.2.0:x86_64-linux-gnu
+3.2.0:aarch64-linux-gnu
+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:aarch64-linux-gnu

data/.github/workflows/rake.yml

@@ -10,7 +10,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  BUNDLER_VER: 2.3.24
+  BUNDLER_VER: 2.4.22
 # Forcing bundler version to ensure that it is consistent everywhere and
 # does not cause bundler gem reinstalls
 # bundler/rubygems 2.3.22 is a minimal requirement to support gnu/musl differentiation
@@ -21,14 +21,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
       - name: Install Ruby
         uses: ruby/setup-ruby@master
         with:
-          ruby-version: 3.0
+          ruby-version: 3.1
           bundler: ${{ env.BUNDLER_VER }}
           bundler-cache: true
 
@@ -44,12 +44,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '3.1', '3.0', '2.7' ]
+        ruby: [ '3.2', '3.1', '3.0', '2.7' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -69,7 +69,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'
@@ -85,7 +85,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -117,7 +117,7 @@ jobs:
         host: [ linux, windows, darwin ]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -156,7 +156,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '3.1', '3.0', '2.7' ]
+        ruby: [ '3.2', '3.1', '3.0', '2.7' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
     steps:
       - name: Install Ruby
@@ -167,7 +167,7 @@ jobs:
           bundler: ${{ env.BUNDLER_VER }}
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -196,7 +196,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '3.1', '3.0', '2.7' ]
+        ruby: [ '3.2', '3.1', '3.0', '2.7' ]
     steps:
       - name: Install Ruby
         uses: ruby/setup-ruby@master
@@ -206,7 +206,7 @@ jobs:
           bundler: ${{ env.BUNDLER_VER }}
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Bundle
         run: bundle install --jobs 4 --retry 3
@@ -234,7 +234,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '3.1', '3.0', '2.7' ]
+        ruby: [ '3.2', '3.1', '3.0', '2.7' ]
     steps:
       - name: Install Ruby
         uses: ruby/setup-ruby@master
@@ -244,7 +244,7 @@ jobs:
           bundler: ${{ env.BUNDLER_VER }}
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Bundle
         run: bundle install --jobs 4 --retry 3
@@ -274,7 +274,7 @@ jobs:
 # Ruby 3.1 fails
 # https://github.com/lutaml/expressir/issues/103
       matrix:
-        ruby: [ '3.1', '3.0', '2.7' ]
+        ruby: [ '3.2', '3.1', '3.0', '2.7' ]
     steps:
       - name: Install Ruby
         uses: ruby/setup-ruby@master
@@ -284,7 +284,7 @@ jobs:
           bundler: ${{ env.BUNDLER_VER }}
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Bundle
         run: bundle install --jobs 4 --retry 3

data/expressir.gemspec

@@ -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"
@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   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.2.1"
+  spec.add_development_dependency "rake-compiler-dock", "~> 1.3"
   spec.add_development_dependency "rspec", "~> 3.11"
   spec.add_development_dependency "rubocop", "1.58"
   spec.add_development_dependency "rubocop-performance", "~> 1.19"

data/lib/expressir/express/parser.rb

@@ -31,11 +31,12 @@ module Expressir
       # @param [Boolean] include_source attach original source code to model elements
       # @return [Model::Repository]
       def self.from_file(file, skip_references: nil, include_source: nil)
+        raise Errno::ENOENT, "File not found: #{file}" unless File.exist?(file)
 
       # An important note re memory management
       # parse, syntax, visitor methods return complex tree structures created in native (C++) extension
       # visit method references nodes and leaves of this structures but it is totally untransparent for Ruby GarbageCllector
-      # so in this class we keep those C++ structure marked for GC so they are not freed 
+      # so in this class we keep those C++ structure marked for GC so they are not freed
         @parser = ::ExpressParser::ParserExt.new(file.to_s)
         @parse_tree = @parser.syntax()
 

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "1.2.9".freeze
+  VERSION = "1.2.11".freeze
 end

data/lib/expressir.rb

@@ -3,6 +3,10 @@ require "expressir/version"
 require "expressir/cli"
 require "expressir/config"
 
+Dir[File.join(__dir__, "expressir", "express", "*.rb")].sort.each do |fea|
+  require fea
+end
+
 module Expressir
   class Error < StandardError; 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

@@ -166,7 +166,7 @@ CrossRuby = Struct.new(:version, :host) do
      "api-ms-win-crt-filesystem-l1-1-0.dll",
      "api-ms-win-crt-math-l1-1-0.dll",
      "libwinpthread-1.dll",
-     "x64-ucrt-ruby310.dll"]
+     "x64-ucrt-ruby#{api_ver_suffix}.dll"]
   end
   # rubocop:enable Metrics/MethodLength
 
@@ -195,6 +195,7 @@ CrossRuby = Struct.new(:version, :host) do
       "libm.so",
       "libstdc++.so",
       "libgcc_s.so",
+      "libpthread.so",
     ]
   end
 

data/spec/expressir/express/cache_spec.rb

@@ -33,6 +33,13 @@ RSpec.describe Expressir::Express::Cache do
   end
 
   describe ".from_file" do
+    it "throws an exception if the cache file does not exist" do |example|
+      print "\n[#{example.description}] "
+      expect do
+        Expressir::Express::Cache.from_file("non-existing-file", test_overwrite_version: TEST_VERSION)
+      end.to raise_error(Errno::ENOENT)
+    end
+
     it "parses a file" do |example|
       print "\n[#{example.description}] "
       temp_file = Tempfile.new

data/spec/expressir/express/parser_spec.rb

@@ -4,6 +4,13 @@ require "expressir/express/parser"
 
 RSpec.describe Expressir::Express::Parser do
   describe ".from_file" do
+    it "throws an exception if the file to parse does not exist" do |example|
+      print "\n[#{example.description}] "
+      expect do
+        Expressir::Express::Parser.from_file("non-existing-file")
+      end.to raise_error(Errno::ENOENT)
+    end
+
     it "parses a file (single.exp)" do |example|
       print "\n[#{example.description}] "
       exp_file = Expressir.root_path.join("spec", "syntax", "single.exp")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.2.11
 platform: arm64-darwin
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-09 00:00:00.000000000 Z
+date: 2023-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -243,6 +243,7 @@ files:
 - lib/expressir/express/2.7/express_parser.bundle
 - lib/expressir/express/3.0/express_parser.bundle
 - lib/expressir/express/3.1/express_parser.bundle
+- lib/expressir/express/3.2/express_parser.bundle
 - lib/expressir/express/cache.rb
 - lib/expressir/express/formatter.rb
 - lib/expressir/express/hyperlink_formatter.rb
@@ -364,7 +365,7 @@ metadata:
   homepage_uri: https://github.com/lutaml/expressir
   source_code_uri: https://github.com/lutaml/expressir
   changelog_uri: https://github.com/lutaml/expressir/releases
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -375,15 +376,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
   - - "<"
     - !ruby/object:Gem::Version
-      version: 3.2.dev
+      version: 3.3.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.4
-signing_key:
+rubygems_version: 3.3.26
+signing_key: 
 specification_version: 4
 summary: ISO EXPRESS parser and tools in Ruby.
 test_files: []