Merge pull request #2834 from ruby/tsort

Merge pull request #2601 from ima1zumi/add-tsort-dep

Author: soutaro

.github/workflows/c-check.yml

@@ -44,6 +44,8 @@ jobs:
         run: |
           ruby -v
           gem update --system
+      - name: install erb
+        run: gem install erb
       - name: bin/setup
         run: |
           bin/setup

.github/workflows/comments.yml

@@ -26,6 +26,8 @@ jobs:
         run: |
           ruby -v
           gem update --system
+      - name: install erb
+        run: gem install erb
       - name: bin/setup
         run: |
           bin/setup

.github/workflows/ruby.yml

@@ -50,6 +50,8 @@ jobs:
         run: |
           ruby -v
           gem update --system
+      - name: install erb
+        run: gem install erb
       - name: bundle config set with
         run: |
           echo "NO_MINITEST=true" >> $GITHUB_ENV
@@ -110,6 +112,8 @@ jobs:
         run: |
           ruby -v
           gem update --system
+      - name: install erb
+        run: gem install erb
       - name: clang version
         run: clang --version
       - name: bin/setup

Gemfile.lock

@@ -3,6 +3,7 @@ PATH
   specs:
     rbs (3.10.2)
       logger
+      tsort
 
 PATH
   remote: test/assets/test-gem

rbs.gemspec

@@ -46,4 +46,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = ">= 3.1"
   spec.add_dependency "logger"
+  spec.add_dependency "tsort"
 end

test/rbs/cli_test.rb

@@ -1174,7 +1174,7 @@ def test_collection_install
           path: #{dir.join('gem_rbs_collection')}
         YAML
 
-        bundle_install('ast', 'abbrev', 'bigdecimal', 'logger')
+        bundle_install('ast', 'abbrev', 'bigdecimal', 'logger', 'tsort')
         _stdout, _stderr = run_rbs_collection("install", bundler: true)
 
         rbs_collection_lock = dir.join('rbs_collection.lock.yaml')
@@ -1240,7 +1240,7 @@ def test_collection_update
           path: #{dir.join('gem_rbs_collection')}
         YAML
 
-        bundle_install('ast', 'abbrev', 'bigdecimal', 'logger')
+        bundle_install('ast', 'abbrev', 'bigdecimal', 'logger', 'tsort')
         run_rbs_collection("update", bundler: true)
 
         assert dir.join('rbs_collection.lock.yaml').exist?
@@ -1280,7 +1280,7 @@ def test_collection_install_gemspec
         RUBY
         (dir/"sig").mkdir
 
-        bundle_install(:gemspec, "abbrev", "bigdecimal", "logger")
+        bundle_install(:gemspec, "abbrev", "bigdecimal", "logger", "tsort")
         stdout, _ = run_rbs_collection("install", bundler: true)
 
         assert_match(/Installing ast:(\d(\.\d)*)/, stdout)
@@ -1310,7 +1310,7 @@ def test_collection_install__mutex_m__config__bundled
           - name: mutex_m
         YAML
 
-        bundle_install("logger", ["mutex_m", ">= 0.3.0"])
+        bundle_install("logger", "tsort", ["mutex_m", ">= 0.3.0"])
         _stdout, stderr = run_rbs_collection("install", bundler: true)
 
         refute_match(/`mutex_m` as a stdlib in rbs-gem is deprecated./, stderr)
@@ -1343,7 +1343,7 @@ def test_collection_install__mutex_m__config__no_bundled
           - name: mutex_m
         YAML
 
-        bundle_install("logger", ["mutex_m", "0.2.0"])
+        bundle_install("logger", "tsort", ["mutex_m", "0.2.0"])
         _stdout, stderr = run_rbs_collection("install", bundler: true)
 
         assert_include stderr, '`mutex_m` as a stdlib in rbs-gem is deprecated.'
@@ -1379,7 +1379,7 @@ def test_collection_install__mutex_m__config__stdlib_source
               type: stdlib
         YAML
 
-        bundle_install("logger")
+        bundle_install("logger", "tsort")
         _stdout, stderr = run_rbs_collection("install", bundler: true)
 
         assert_include stderr, '`mutex_m` as a stdlib in rbs-gem is deprecated.'
@@ -1410,7 +1410,7 @@ def test_collection_install__mutex_m__bundled
           path: #{dir.join('gem_rbs_collection')}
         YAML
 
-        bundle_install("logger", ["mutex_m", ">= 0.3.0"])
+        bundle_install("logger", "tsort", ["mutex_m", ">= 0.3.0"])
         _stdout, stderr = run_rbs_collection("install", bundler: true)
 
         refute_match(/`mutex_m` as a stdlib in rbs-gem is deprecated./, stderr)
@@ -1440,7 +1440,7 @@ def test_collection_install__mutex_m__no_bundled
           path: #{dir.join('gem_rbs_collection')}
         YAML
 
-        bundle_install("logger", ["mutex_m", "0.2.0"])
+        bundle_install("logger", "tsort", ["mutex_m", "0.2.0"])
         _stdout, stderr = run_rbs_collection("install", bundler: true)
 
         assert_include stderr, '`mutex_m` as a stdlib in rbs-gem is deprecated.'
@@ -1475,7 +1475,7 @@ def test_collection_install__mutex_m__dependency_no_bundled
           - name: mutex_m
         YAML
 
-        bundle_install("logger", "true_string")  # true_string is a soutaro's gem that doesn't have sig directory
+        bundle_install("logger", "tsort", "true_string")  # true_string is a soutaro's gem that doesn't have sig directory
 
         _stdout, stderr = run_rbs_collection("install", bundler: true)
 
@@ -1519,7 +1519,7 @@ def test_collection_install__mutex_m__rbs_dependency_and__gem_dependency
           - name: mutex_m
         YAML
 
-        bundle_install("logger", ["hola", { path: "gem" }])
+        bundle_install("logger", "tsort", ["hola", { path: "gem" }])
 
         (dir + RBS::Collection::Config::PATH).write(<<~YAML)
           sources:
@@ -1566,7 +1566,7 @@ def test_collection_install__pathname_set
           - name: cgi-escape
         YAML
 
-        bundle_install('ast', 'logger')
+        bundle_install('ast', 'logger', 'tsort')
         _stdout, stderr = run_rbs_collection("install", bundler: true)
 
         assert_include stderr, 'Cannot find `set` gem.'
@@ -1605,7 +1605,7 @@ def test_collection_install__set_pathname__manifest
           - name: cgi-escape
         YAML
 
-        bundle_install("logger", "true_string")  # true_string is a soutaro's gem that doesn't have sig directory
+        bundle_install("logger", "tsort", "true_string")  # true_string is a soutaro's gem that doesn't have sig directory
 
         _stdout, stderr = run_rbs_collection("install", bundler: true)
 

test/stdlib/ObjectSpace_test.rb

@@ -99,17 +99,6 @@ def test_count_imemo_objects
       ObjectSpace, :count_imemo_objects, { TOTAL: 0 }
   end
 
-  def test_count_nodes
-    ObjectSpace::trace_object_allocations do
-      assert_send_type "() -> Hash[Symbol, Integer]",
-        ObjectSpace, :count_nodes
-      assert_send_type "(Hash[Symbol, Integer]) -> Hash[Symbol, Integer]",
-        ObjectSpace, :count_nodes, {}
-      assert_send_type "(Hash[Symbol, Integer]) -> Hash[Symbol, Integer]",
-        ObjectSpace, :count_nodes, { TOTAL: 0 }
-    end
-  end
-
   def test_count_objects_size
     assert_send_type "() -> Hash[Symbol, Integer]",
       ObjectSpace, :count_objects_size