expressir 1.3.0.pre.2 → 1.3.0.pre.5

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5085ab1404256459d6563172f11a8a60d4ec9a806a17e0d2ddde89c38fa34c35
4
- data.tar.gz: 9453e11c12706e6723794193b10d54b2e0539ab72570b8aa0ff15c7de81594e2
3
+ metadata.gz: 234091187e90c927260db45776f797d28b3b45e3fde6387a6f720002182057e1
4
+ data.tar.gz: 941febf34a1f5590b3c479f1217dde9979eb3d4777f46167b58ec3db2aeadb41
5
5
  SHA512:
6
- metadata.gz: 8c6756552aebff926d2bc1974f1a6ab3556972cece14bc3d31893a1619fc21d2e0aeae1bfb621f7c81c2080aa9ae8fd3d42022d33a671f480121fbe544d47066
7
- data.tar.gz: fbdbc405c508e247301045c507c518afaf4b985e789092ff88d06a5fe3a70da5e5ebed78a1f8aa7da4f0dbb296ceda6ee6b5212034c428252c5ad7995f8dfa45
6
+ metadata.gz: d119caf451a09b60b3f22852944f1907963482d0835e4fa0d043a138fd923b4816d5cef71ddcae8f2a1ff19413fc3362df19c0082cfd3e08c249940b762a6247
7
+ data.tar.gz: 1275a96c888bff061eb5e112122a88134809cdf11c5a30e1f47e13f2a62572b7196d875e51662ea8b711fdab346421430249361c802f2029203ea7f8245fab57
@@ -7,7 +7,6 @@ on:
7
7
  - 'docs/**'
8
8
  - '**.adoc'
9
9
  - '**.md'
10
- - .github/workflows/alpine.yml
11
10
  - .github/workflows/release.yml
12
11
  pull_request:
13
12
  workflow_dispatch:
@@ -69,7 +68,13 @@ jobs:
69
68
  with:
70
69
  ruby-version: ${{ matrix.ruby }}
71
70
  bundler: ${{ env.BUNDLER_VER }}
72
- bundler-cache: true
71
+ # Rice gem has issues with bundler cache
72
+ # more info https://github.com/lutaml/expressir/runs/2097658383?check_suite_focus=true#step:7:2126
73
+ # but it is not the only issue
74
+ bundler-cache: false
75
+
76
+ - name: Bundle
77
+ run: bundle install --jobs 4 --retry 3
73
78
 
74
79
  - name: Process cache
75
80
  uses: actions/cache@v3
@@ -99,10 +104,9 @@ jobs:
99
104
  - name: Setup Ruby
100
105
  uses: ruby/setup-ruby@master
101
106
  with:
102
- ruby-version: '3.0'
103
- # bundler-cache: true important to not use cache because it leads to "cannot find -lrice"
104
- # more info https://github.com/lutaml/expressir/runs/2097658383?check_suite_focus=true#step:7:2126
107
+ ruby-version: '3.1'
105
108
  bundler: ${{ env.BUNDLER_VER }}
109
+ bundler-cache: false
106
110
 
107
111
  - name: Bundle
108
112
  run: bundle install --jobs 4 --retry 3
@@ -131,9 +135,8 @@ jobs:
131
135
  - name: Setup Ruby
132
136
  uses: ruby/setup-ruby@master
133
137
  with:
134
- ruby-version: '3.0'
135
- # bundler-cache: true important to not use cache because it leads to "cannot find -lrice"
136
- # more info https://github.com/lutaml/expressir/runs/2097658383?check_suite_focus=true#step:7:2126
138
+ ruby-version: '3.1'
139
+ bundler-cache: false
137
140
  bundler: ${{ env.BUNDLER_VER }}
138
141
 
139
142
  - name: Bundle
@@ -46,6 +46,7 @@ jobs:
46
46
  - uses: actions/checkout@v4
47
47
  with:
48
48
  submodules: recursive
49
+ #ref: main # https://github.com/actions/checkout/issues/439#issuecomment-830862188
49
50
 
50
51
  - uses: ruby/setup-ruby@master
51
52
  with:
@@ -150,19 +151,15 @@ jobs:
150
151
  uses: actions/download-artifact@v3
151
152
  with:
152
153
  name: version
153
- path: version
154
154
 
155
155
  - name: Install gem
156
156
  run: gem install expressir -v $(cat version)
157
157
 
158
158
  - name: Verify
159
- run: |
160
- cd $(ruby -e "puts RbConfig::TOPDIR + '\/lib\/ruby\/gems\/' + RbConfig::CONFIG['ruby_version'] + '\/gems\/expressir*'")
161
- ruby bin/rspec
162
- cat .rspec_status || echo ".rspec_status was not found"
159
+ run: expressir version
163
160
 
164
161
  verify-alpine:
165
- name: Verify published gem on Alpine
162
+ name: Verify published gem on alpine
166
163
  needs: publish
167
164
  runs-on: ubuntu-latest
168
165
  container:
@@ -175,13 +172,9 @@ jobs:
175
172
  uses: actions/download-artifact@v3
176
173
  with:
177
174
  name: version
178
- path: version
179
175
 
180
176
  - name: Install gem
181
177
  run: gem install expressir -v $(cat version)
182
178
 
183
179
  - name: Verify
184
- run: |
185
- cd $(ruby -e "puts RbConfig::TOPDIR + '\/lib\/ruby\/gems\/' + RbConfig::CONFIG['ruby_version'] + '\/gems\/expressir*'")
186
- ruby bin/rspec
187
- cat .rspec_status || echo ".rspec_status was not found"
180
+ run: expressir version
data/Rakefile CHANGED
@@ -6,7 +6,7 @@ require "yard"
6
6
 
7
7
  RSpec::Core::RakeTask.new(:spec)
8
8
 
9
- task default: %i[compile spec]
9
+ task default: :spec
10
10
 
11
11
  GEMSPEC = Gem::Specification.load("expressir.gemspec")
12
12
 
@@ -625,7 +625,6 @@ void expresslexerLexerInitialize() {
625
625
  390,1,0,0,0,15,0,1383,1393,1407,1415,1425,1429,1433,1439,1441,1448,1458,
626
626
  1460,1474,1482,2,0,2,0,0,1,0
627
627
  };
628
-
629
628
  staticData->serializedATN = antlr4::atn::SerializedATNView(serializedATNSegment, sizeof(serializedATNSegment) / sizeof(serializedATNSegment[0]));
630
629
 
631
630
  antlr4::atn::ATNDeserializer deserializer;
@@ -43,8 +43,6 @@ if cross_build
43
43
  when /darwin/
44
44
  $CXXFLAGS << " -mmacosx-version-min=10.15 -fno-c++-static-destructors"
45
45
  $DLDFLAGS << " -mmacosx-version-min=10.15"
46
- when /linux/
47
- $DLDFLAGS << " -static-libgcc -static-libstdc++"
48
46
  end
49
47
  else
50
48
  require "mkmf-rice"
@@ -1,4 +1,9 @@
1
- require_relative 'extension'
1
+ begin
2
+ RUBY_VERSION =~ /(\d+\.\d+)/
3
+ require_relative "#{$1}/express_parser"
4
+ rescue LoadError
5
+ require_relative "express_parser"
6
+ end
2
7
  require 'expressir/express/visitor'
3
8
  require 'expressir/express/resolve_references_model_visitor'
4
9
 
@@ -1,4 +1,9 @@
1
- require_relative 'extension'
1
+ begin
2
+ RUBY_VERSION =~ /(\d+\.\d+)/
3
+ require_relative "#{$1}/express_parser"
4
+ rescue LoadError
5
+ require_relative "express_parser"
6
+ end
2
7
  require "expressir/model"
3
8
  require "set"
4
9
 
@@ -26,6 +31,8 @@ require "set"
26
31
  # - prevents segfault in ANTLR4 C++ runtime, not sure why they are caused
27
32
  # - e.g. see visit_schema_decl
28
33
 
34
+ require 'objspace'
35
+
29
36
  module Expressir
30
37
  module Express
31
38
  class Visitor < ::ExpressParser::Visitor
@@ -1,3 +1,3 @@
1
1
  module Expressir
2
- VERSION = "1.3.0.pre.2".freeze
2
+ VERSION = "1.3.0.pre.5".freeze
3
3
  end
@@ -335,15 +335,16 @@ def pre_req(plat)
335
335
  end
336
336
 
337
337
  namespace "gem" do
338
- CROSS_RUBIES.find_all { |cr| cr.windows? || cr.linux_gnu? || cr.darwin? }.map { |cr| { platform: cr.platform, tag: cr.tag } }
338
+ CROSS_RUBIES.find_all { |cr| cr.windows? || cr.linux_gnu? || cr.darwin? }
339
+ .map { |cr| { platform: cr.platform, tag: cr.tag } }
339
340
  .uniq { |hash| hash[:platform] }.each do |hash|
340
341
  plat = hash[:platform]
341
342
  tag = hash[:tag]
343
+
342
344
  desc "build native gem for #{plat} platform"
343
345
  task plat do
344
346
  RakeCompilerDock.sh <<~RCD, platform: tag
345
- #{pre_req(plat)} &&
346
- gem install bundler --no-document &&
347
+ #{pre_req(plat)} && gem install bundler --no-document &&
347
348
  bundle && bundle exec rake gem:#{plat}:builder MAKE="nice make -j`nproc`"
348
349
  RCD
349
350
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: expressir
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.0.pre.2
4
+ version: 1.3.0.pre.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2023-12-13 00:00:00.000000000 Z
11
+ date: 2023-12-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rice
@@ -596,7 +596,6 @@ files:
596
596
  - lib/expressir/cli/ui.rb
597
597
  - lib/expressir/config.rb
598
598
  - lib/expressir/express/cache.rb
599
- - lib/expressir/express/extension.rb
600
599
  - lib/expressir/express/formatter.rb
601
600
  - lib/expressir/express/hyperlink_formatter.rb
602
601
  - lib/expressir/express/model_visitor.rb
@@ -1,30 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- begin
4
- # native precompiled gems package shared libraries in <gem_dir>/lib/nokogiri/<ruby_version>
5
- ::RUBY_VERSION =~ /(\d+\.\d+)/
6
- require_relative "#{Regexp.last_match(1)}/express_parser"
7
- rescue LoadError => e
8
- # if /musl/.match?(RUBY_PLATFORM)
9
- # warn(<<~EOM)
10
- #
11
- # ERROR: It looks like you're trying to use Expressir as a precompiled native gem on a musl system.
12
- #
13
- # #{e.message}
14
- #
15
- # If that's the case, then please install Expressir via the `ruby` platform gem:
16
- # gem install expressir --platform=ruby
17
- # or:
18
- # bundle config set force_ruby_platform true
19
- #
20
- #
21
- # EOM
22
- # raise e
23
- # end
24
-
25
- # use "require" instead of "require_relative" because non-native gems will place C extension files
26
- # in Gem::BasicSpecification#extension_dir after compilation (during normal installation), which
27
- # is in $LOAD_PATH but not necessarily relative to this file
28
- require "expressir/express/express_parser"
29
- end
30
-