expressir 1.2.0-x86_64-darwin → 1.2.4-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c22fd11d6952d738289537aaeba0b3e6eed0c67e9bc8b2d89a2aa6ee18cf0678
-  data.tar.gz: efd45ad880298c145bc01007a9767b7573adf982e5acebb1c69612b31eda9692
+  metadata.gz: 596253e028087e7bd843297fd101f9a8787688753d8b4c8482e00e64c823e4c8
+  data.tar.gz: 0e752d5ab11ba75e8286511346d4c40649e6fff4f4b1aa0b7ed8cfc95502873e
 SHA512:
-  metadata.gz: 6530f1cae01d755b4f455b06cf289ebbbed7d0cf69f93238c32ca3affc0e7a0249d226dd9e86e74e22577e8c3150180a6f5d97b15c2c66dc5d48bc92edfd338b
-  data.tar.gz: 5b8bf3398ece079c0ee0a6972bc4c41aa455d821c7fc42b4746bcc1070fa5802037bfc5d2303f7d5366f28488e6f9ace1d432279765ac4898a7e56d72264038b
+  metadata.gz: 81c916894ca43b0445bd17e6ad9ba3a73aa68b16c3d0875f3fd193eb7e1eca3e49388f3743d0ed57672d0d67b5cf8b5f87c9a5c9c1ace54f52a46f2136e22b3c
+  data.tar.gz: 542550cac5af1a44c39c4a638888559e55a194832e025a22e6b6614584eb349950172d2ebef80be4b460dcdcf4024f77fcbb226de65614706c9d0b933e60d4d2

data/.cross_rubies

@@ -1,30 +1,21 @@
+3.1.0:i686-w64-mingw32
+3.1.0:x86_64-w64-mingw32
+3.1.0:i686-linux-gnu
+3.1.0:x86_64-linux-gnu
+3.1.0:aarch64-linux-gnu
+3.1.0:x86_64-darwin
+3.1.0:arm64-darwin
 3.0.0:i686-w64-mingw32
 3.0.0:x86_64-w64-mingw32
 3.0.0:i686-linux-gnu
 3.0.0:x86_64-linux-gnu
+3.0.0:aarch64-linux-gnu
 3.0.0:x86_64-darwin
 3.0.0:arm64-darwin
 2.7.0:i686-w64-mingw32
 2.7.0:x86_64-w64-mingw32
 2.7.0:i686-linux-gnu
 2.7.0:x86_64-linux-gnu
+2.7.0:aarch64-linux-gnu
 2.7.0:x86_64-darwin
 2.7.0:arm64-darwin
-2.6.0:i686-w64-mingw32
-2.6.0:x86_64-w64-mingw32
-2.6.0:i686-linux-gnu
-2.6.0:x86_64-linux-gnu
-2.6.0:x86_64-darwin
-2.6.0:arm64-darwin
-2.5.0:i686-w64-mingw32
-2.5.0:x86_64-w64-mingw32
-2.5.0:i686-linux-gnu
-2.5.0:x86_64-linux-gnu
-2.5.0:x86_64-darwin
-2.5.0:arm64-darwin
-2.4.0:i686-w64-mingw32
-2.4.0:x86_64-w64-mingw32
-2.4.0:i686-linux-gnu
-2.4.0:x86_64-linux-gnu
-2.4.0:x86_64-darwin
-2.4.0:arm64-darwin

data/.github/workflows/rake.yml

@@ -8,72 +8,84 @@ on:
 jobs:
   rake:
     name: test on ruby-${{ matrix.ruby }} ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}   
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.7', '2.6', '2.5' ]
+        ruby: [ '3.1', '3.0', '2.7' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
         include:
-          - ruby: '3.0'
+          - ruby: 'head'
             os: 'ubuntu-latest'
             experimental: true
-          - ruby: '3.0'
+          - ruby: 'head'
             os: 'windows-latest'
             experimental: true
-          - ruby: '3.0'
+          - ruby: 'head'
             os: 'macos-latest'
             experimental: true
 
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v2
         with:
           submodules: recursive
 
-      - if: matrix.os == 'macos-latest'
+      - name: Setup packages
+        if: startsWith(matrix.os, 'macos')
         run: brew install autoconf automake libtool
 
-      - uses: ruby/setup-ruby@v1
+      - name: Install Ruby
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
-      - uses: actions/cache@v2
+      - name: Process cache
+        uses: actions/cache@v2
+        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') }}
 
-      - if: hashFiles('lib/expressir/express/express_parser.*') == ''
+      - name: Build native extension
+        if: steps.cache.outputs.cache-hit != 'true'
         run: bundle exec rake compile
 
-      - run: bundle exec rake
+      - name: Run tests
+        run: bundle exec rake
 
   # test release workflow
   pack:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         host: [ linux, windows, darwin ]
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v2
         with:
           submodules: recursive
 
-      - uses: ruby/setup-ruby@v1
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.6'
+          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
 
-      - run: bundle install --jobs 4 --retry 3
+      - name: Bundle
+        run: bundle install --jobs 4 --retry 3
 
-      # build gem WITHOUT pre-built native extension
-      - run: gem build expressir.gemspec
+      - name: Build gem without native extension
+        if: matrix.host == 'linux'
+        run: gem build expressir.gemspec
 
-      - if: matrix.host == 'linux'
+      - name: Package gem without native extension
+        if: matrix.host == 'linux'
         uses: actions/upload-artifact@v2
         with:
           name: pkg-ruby
@@ -87,10 +99,11 @@ jobs:
           sudo swapon /compile.swap
           sudo swapon --all --verbose
 
-      # build gem WITH pre-built native extension
-      - run: bundle exec rake gem:${{ matrix.host }}
+      - name: Build gem with native extension
+        run: bundle exec rake gem:${{ matrix.host }}
 
-      - uses: actions/upload-artifact@v2
+      - name: Package gem with native extension
+        uses: actions/upload-artifact@v2
         with:
           name: pkg-${{ matrix.host }}
           path: pkg/*.gem

data/.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.6'
+          ruby-version: '3.0'
 
       - if: ${{ github.event_name == 'workflow_dispatch' }} # unfortunatelly cannot keep this condition on job level
         run: |
@@ -41,10 +41,11 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: recursive
+          ref: main # https://github.com/actions/checkout/issues/439#issuecomment-830862188
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.6'
+          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
 
@@ -101,7 +102,7 @@ jobs:
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.6'
+          ruby-version: '3.0'
 
       - run: ls -l pkg/
 

data/.gitignore

@@ -15,3 +15,4 @@
 .rspec_status
 
 /ext/express-parser/rice-embed
+/lib/expressir/express/express_parser.so

data/.gitmodules

@@ -1,3 +1,3 @@
 [submodule "ext/express-parser/antlr4-upstream"]
 	path = ext/express-parser/antlr4-upstream
-	url = git://github.com/antlr/antlr4
+	url = https://github.com/antlr/antlr4

data/expressir.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Ribose Inc."]
   spec.email         = ["open.source@ribose.com'"]
 
-  spec.summary       = "ISO EXPRESS parser in Ruby, tools for accessing EXPRESS data models."
-  spec.description   = "ISO EXPRESS parser in Ruby, tools for accessing EXPRESS data models."
+  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."
   spec.homepage      = "https://github.com/lutaml/expressir"
   spec.license       = "MIT"
 

data/lib/expressir/express/parser.rb

@@ -33,23 +33,26 @@ module Expressir
       def self.from_file(file, skip_references: nil, include_source: nil)
         input = File.read(file)
 
-        parser = ::ExpressParser::Parser.parse(input)
+      # An important note re memory management
+      # parse, syntax, visitor methods return complex tree structures created in netive (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 theu are not freed 
+        @parser = ::ExpressParser::Parser.parse(input)
+        @parse_tree = @parser.syntax()
 
-        parse_tree = parser.syntax()
+        @visitor = Visitor.new(@parser.tokens, include_source: include_source)
+        @repository = @visitor.visit(@parse_tree)
 
-        visitor = Visitor.new(parser.tokens, include_source: include_source)
-        repository = visitor.visit(parse_tree)
-
-        repository.schemas.each do |schema|
+        @repository.schemas.each do |schema|
           schema.file = file.to_s
         end
 
         unless skip_references
-          resolve_references_model_visitor = ResolveReferencesModelVisitor.new
-          resolve_references_model_visitor.visit(repository)
+          @resolve_references_model_visitor = ResolveReferencesModelVisitor.new
+          @resolve_references_model_visitor.visit(@repository)
         end
 
-        repository
+        @repository
       end
 
       # Parses Express files into an Express model
@@ -65,16 +68,16 @@ module Expressir
           repository.schemas
         end.flatten
 
-        repository = Model::Repository.new(
+        @repository = Model::Repository.new(
           schemas: schemas
         )
 
-        unless skip_references
-          resolve_references_model_visitor = ResolveReferencesModelVisitor.new
-          resolve_references_model_visitor.visit(repository)
+        unless @skip_references
+          @resolve_references_model_visitor = ResolveReferencesModelVisitor.new
+          @resolve_references_model_visitor.visit(@repository)
         end
 
-        repository
+        @repository
       end
     end
   end

data/lib/expressir/express/visitor.rb

@@ -138,7 +138,9 @@ module Expressir
       end
 
       def attach_remarks(ctx, node)
-        remark_tokens = get_tokens(ctx).select{|x| x.channel == REMARK_CHANNEL}
+        remark_tokens = get_tokens(ctx)
+        remark_tokens = remark_tokens.select{ |x| x.channel == REMARK_CHANNEL
+      }
 
         # skip already attached remarks
         remark_tokens = remark_tokens.select{|x| !@attached_remark_tokens.include?(x)}

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "1.2.0".freeze
+  VERSION = "1.2.4".freeze
 end

data/rakelib/cross-ruby.rake

@@ -44,6 +44,8 @@ CrossRuby = Struct.new(:version, :host) do
         "x86-mingw32"
       when /\Ax86_64.*linux/
         "x86_64-linux"
+      when /\A(arm64|aarch64).*linux/
+        "aarch64-linux"
       when /\Ai[3-6]86.*linux/
         "x86-linux"
       when /\Ax86_64-darwin/
@@ -63,6 +65,8 @@ CrossRuby = Struct.new(:version, :host) do
         "i686-w64-mingw32-"
       when "x86_64-linux"
         "x86_64-redhat-linux-"
+      when "aarch64-linux"
+        "aarch64-redhat-linux-"
       when "x86-linux"
         "i686-redhat-linux-"
       when /x86_64.*darwin/
@@ -82,6 +86,8 @@ CrossRuby = Struct.new(:version, :host) do
       "pei-i386"
     when "x86_64-linux"
       "elf64-x86-64"
+    when "aarch64-linux"
+      "elf64-arm64"
     when "x86-linux"
       "elf32-i386"
     when "x86_64-darwin"
@@ -245,12 +251,14 @@ def gem_builder(plat)
 end
 
 namespace "gem" do
+  REDHAT_PREREQ = "sudo yum install -y git"
+  UBUNTU_PREREQ = "sudo apt-get update -y && sudo apt-get install -y automake autoconf libtool build-essential"
   CROSS_RUBIES.find_all { |cr| cr.windows? || cr.linux? || cr.darwin? }.map(&:platform).uniq.each do |plat|
     pre_req = case plat
               when /\linux/
-                "sudo yum install -y git"
+                "if [[ $(awk -F= '/^NAME/{print $2}' /etc/os-release) == '\"Ubuntu\"' ]]; then #{UBUNTU_PREREQ}; else #{REDHAT_PREREQ}; fi"
               else
-                "sudo apt-get update -y && sudo apt-get install -y automake autoconf libtool build-essential"
+                "#{UBUNTU_PREREQ}"
               end
     desc "build native gem for #{plat} platform"
     task plat do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.4
 platform: x86_64-darwin
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2022-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -178,7 +178,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.0
-description: ISO EXPRESS parser in Ruby, tools for accessing EXPRESS data models.
+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'
 executables:
@@ -212,11 +213,9 @@ files:
 - lib/expressir/cli.rb
 - lib/expressir/cli/ui.rb
 - lib/expressir/config.rb
-- lib/expressir/express/2.4/express_parser.bundle
-- lib/expressir/express/2.5/express_parser.bundle
-- lib/expressir/express/2.6/express_parser.bundle
 - 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/cache.rb
 - lib/expressir/express/formatter.rb
 - lib/expressir/express/hyperlink_formatter.rb
@@ -382,10 +381,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.7'
   - - "<"
     - !ruby/object:Gem::Version
-      version: 3.1.dev
+      version: 3.2.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -395,5 +394,5 @@ requirements: []
 rubygems_version: 3.3.4
 signing_key:
 specification_version: 4
-summary: ISO EXPRESS parser in Ruby, tools for accessing EXPRESS data models.
+summary: ISO EXPRESS parser and tools in Ruby.
 test_files: []