expressir 1.1.0 → 1.2.3

data/ext/express-parser/extconf.rb

@@ -21,7 +21,7 @@ src_paths = [
 if cross_build
   rice_subdir = "rice-embed"
   rice_root = Gem.loaded_specs["rice"].full_gem_path
-  rice_src = File.join(rice_root, "rice")
+  rice_src = File.join(rice_root, "include", "rice")
   rice_embed = File.join(__dir__, rice_subdir)
   unless File.exists?(rice_embed)
     FileUtils.mkdir_p(rice_embed)
@@ -30,7 +30,7 @@ if cross_build
     File.delete(*Dir.glob("#{rice_embed}/**/Makefile"))
   end
 
-  src_paths.push("#{rice_subdir}/rice", "#{rice_subdir}/rice/detail")
+  src_paths.push("#{rice_subdir}/include")
 
   $INCFLAGS << " -I#{__dir__}/#{rice_subdir}"
 
@@ -39,6 +39,9 @@ if cross_build
     $CXXFLAGS << " -O3 -Wa,-mbig-obj"
     # workaround for LoadError: 127: The specified procedure could not be found.
     $DLDFLAGS << " -static -static-libgcc -static-libstdc++"
+  elsif RbConfig::CONFIG['target_os'] =~ /darwin/
+    $CXXFLAGS << " -mmacosx-version-min=10.14 -Wno-register -fno-c++-static-destructors"
+    $DLDFLAGS << " -mmacosx-version-min=10.14"
   end
 else
   require 'mkmf-rice'
@@ -46,7 +49,7 @@ else
   dir_config(extension_name)
 end
 
-$CPPFLAGS << " -std=c++14 -DANTLR4CPP_STATIC -DHAVE_CXX11"
+$CPPFLAGS << " -std=c++17 -DANTLR4CPP_STATIC -DHAVE_CXX11"
 $INCFLAGS << " -I#{__dir__}/#{antlr4_src}"
 $srcs = []
 

data/lib/expressir/model/repository.rb

@@ -1,13 +1,11 @@
 module Expressir
   module Model
-      # Specified in ISO 10303-11:2004
-      # - section 10 Scope and visibility
-      # - section 10.3.13 Schema
+    # Multi-schema global scope
     class Repository < ModelElement
-      model_attr_accessor :schemas, 'Array<Schema>'
+      model_attr_accessor :schemas, 'Array<Declarations::Schema>'
 
       # @param [Hash] options
-      # @option options [Array<Schema>] :schemas
+      # @option options [Array<Declarations::Schema>] :schemas
       def initialize(options = {})
         @schemas = options[:schemas] || []
 

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "1.1.0".freeze
+  VERSION = "1.2.3".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.1.0
+  version: 1.2.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-29 00:00:00.000000000 Z
+date: 2022-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 4.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 4.0.3
 - !ruby/object:Gem::Dependency
   name: asciidoctor
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +192,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:
@@ -206,6 +207,7 @@ files:
 - ".github/workflows/release.yml"
 - ".gitignore"
 - ".gitmodules"
+- ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".yardopts"
@@ -741,8 +743,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.2.33
 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: []