Merge branch 'master' into Fix_return_type_of__Process_detach__to_return__Process__Waiter_

Author: soutaro

.github/workflows/windows.yml

@@ -20,7 +20,9 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - name: rake-compiler
-        run: gem install rake-compiler
+      - name: bundle install
+        run: |
+          bundle config set without profilers libs
+          bundle install
       - name: compile
-        run: rake compile
+        run: bundle exec rake compile

.gitignore

@@ -19,4 +19,10 @@ lib/**/*.bundle
 lib/**/*.so
 lib/**/*.dll
 doc/
+
+include/rbs/constants.h
+include/rbs/ruby_objs.h
+src/constants.c
+src/ruby_objs.c
+
 **/*.gem

.rubocop.yml

@@ -28,11 +28,17 @@ RBS/Lint:
   Exclude:
     - 'sig/**/*'
     - 'test/**/*'
+RBS/Lint/TopLevelInterface:
+  Enabled: false
+RBS/Lint/TopLevelTypeAlias:
+  Enabled: false
 RBS/Style:
   Enabled: false
   Exclude:
     - 'sig/**/*'
     - 'test/**/*'
+RBS/Style/EmptyArgument:
+  Enabled: true
 RBS/Style/InitializeReturnType:
   Enabled: true
 

Gemfile

@@ -14,22 +14,29 @@ gem "rubocop-on-rbs" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1'
 gem "json"
 gem "json-schema"
 gem "goodcheck"
-gem "dbm"
 gem 'digest'
 gem 'tempfile'
 gem "rdoc"
-gem "bigdecimal"
-gem "abbrev"
-gem "base64"
-gem "mutex_m"
-gem "nkf"
 gem "fileutils"
 gem "raap"
+gem "activesupport"
 
-# Performance profiling and benchmarking
-gem 'stackprof'
-gem 'memory_profiler'
-gem 'benchmark-ips'
+group :libs do
+  # Libraries required for stdlib test
+  gem "abbrev"
+  gem "base64"
+  gem "bigdecimal"
+  gem "dbm"
+  gem "mutex_m"
+  gem "nkf"
+end
+
+group :profilers do
+  # Performance profiling and benchmarking
+  gem 'stackprof'
+  gem 'memory_profiler'
+  gem 'benchmark-ips'
+end
 
 # Test gems
 gem "rbs-amber", path: "test/assets/test-gem"

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbs (3.7.0.dev.0)
+    rbs (3.7.0.dev.1)
       logger
 
 PATH
@@ -13,8 +13,9 @@ GEM
   remote: https://rubygems.org/
   specs:
     abbrev (0.1.2)
-    activesupport (7.2.1)
+    activesupport (8.0.0)
       base64
+      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
@@ -24,10 +25,12 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
     base64 (0.2.0)
+    benchmark (0.4.0)
     benchmark-ips (2.14.0)
     bigdecimal (3.1.8)
     concurrent-ruby (1.3.4)
@@ -46,7 +49,7 @@ GEM
       strong_json (>= 1.1, < 2.2)
     i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    json (2.7.2)
+    json (2.8.2)
     json-schema (5.0.0)
       addressable (~> 2.8)
     language_server-protocol (3.17.0.3)
@@ -64,7 +67,7 @@ GEM
       net-protocol
     nkf (0.2.0)
     parallel (1.26.3)
-    parser (3.3.5.0)
+    parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
     power_assert (2.0.3)
@@ -98,7 +101,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.66.1)
+    rubocop (1.68.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -108,18 +111,18 @@ GEM
       rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.3)
+    rubocop-ast (1.36.1)
       parser (>= 3.3.1.0)
-    rubocop-on-rbs (1.0.0)
+    rubocop-on-rbs (1.2.0)
       rbs (~> 3.5)
       rubocop (~> 1.61)
       zlib
     rubocop-rubycw (0.1.6)
       rubocop (~> 1.0)
     ruby-progressbar (1.13.0)
-    securerandom (0.3.1)
+    securerandom (0.3.2)
     stackprof (0.2.26)
-    steep (1.8.0)
+    steep (1.8.3)
       activesupport (>= 5.1)
       concurrent-ruby (>= 1.1.10)
       csv (>= 3.0.9)
@@ -146,14 +149,16 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.6.0)
-    zlib (3.1.1)
+    uri (1.0.2)
+    zlib (3.2.0)
 
 PLATFORMS
   ruby
   x86_64-darwin-20
 
 DEPENDENCIES
   abbrev
+  activesupport
   base64
   benchmark-ips
   bigdecimal

Rakefile

@@ -43,7 +43,15 @@ task :confirm_annotation do
   sh "git diff --exit-code core stdlib"
 end
 
+task :templates do
+  sh "bundle exec ruby templates/template.rb include/rbs/constants.h"
+  sh "bundle exec ruby templates/template.rb include/rbs/ruby_objs.h"
+  sh "bundle exec ruby templates/template.rb src/constants.c"
+  sh "bundle exec ruby templates/template.rb src/ruby_objs.c"
+end
+
 task :compile => "ext/rbs_extension/lexer.c"
+Rake::Task[:compile].prereqs.prepend :templates
 
 task :test_doc do
   files = Dir.chdir(File.expand_path('..', __FILE__)) do
@@ -63,7 +71,12 @@ task :validate => :compile do
   # Skip RBS validation because Ruby CI runs without rubygems
   case skip_rbs_validation = ENV["SKIP_RBS_VALIDATION"]
   when nil
-    libs << "rbs"
+    begin
+      Gem::Specification.find_by_name("rbs")
+      libs << "rbs"
+    rescue Gem::MissingSpecError
+      STDERR.puts "🚨🚨🚨🚨 Skipping `rbs` gem because it's not found"
+    end
   when "true"
     # Skip
   else
@@ -90,7 +103,7 @@ task :stdlib_test => :compile do
   if ENV["RANDOMIZE_STDLIB_TEST_ORDER"] == "true"
     test_files.shuffle!
   end
-  
+
   sh "#{ruby} -Ilib #{bin}/test_runner.rb #{test_files.join(' ')}"
   # TODO: Ractor tests need to be run in a separate process
   sh "#{ruby} -Ilib #{bin}/test_runner.rb test/stdlib/Ractor_test.rb"