expressir 1.2.9 → 1.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eaa506f3baadfef96b9ea1760f21a32c111a2e14d41be0e61a7794e68075e6e5
-  data.tar.gz: 621683d72768375aba6c302cd245191fed916930aa1c4490ec41ee7263b053e2
+  metadata.gz: b79076aac36b78a7fe98813df3e823d415f3187d764f37f127788a11b09c0d9d
+  data.tar.gz: 3377cce3900cfba2b64706fdcd360f5d4b293858fb1ed6032db735dd87437837
 SHA512:
-  metadata.gz: 7ff98f9a3e3ff7f73ea060665e64c63e77bee3030861f36f4a2287ece88498d227b9fd618396813dfe971f326e0c4e0055bde1678338e0df38ec37264d1590d3
-  data.tar.gz: b17547db600a3e6ec9acaa99870ab12d0f5b184d9669eeb0f7ffd3cea9de840fa6daa112160fe06e511394851c9c99259cf451d9733bbd6fa28e9b3a4ea281a5
+  metadata.gz: 2b893ab3be2df432d3e6b7a83faf09e64b30f2b289af52f92b1096a333b28d2ac57be7c58623b72a3640fd7e98238260b8f6c8a88cb89eea20e9272fbd56d9d0
+  data.tar.gz: a461bc5dde0e042c419b2c1e126695ccf759a4b969c2f2a57c3c01e09d2cfdb3249db2973cc4d63c0c4c3911be9b9c1170ee198fa06ea5062225eebd30730eae

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
 
@@ -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

@@ -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.10".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/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.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-09 00:00:00.000000000 Z
+date: 2023-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -142,14 +142,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