Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
soutaro merged 4 commits into from
Jan 30, 2026
+22 −23
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06726aa
Merge pull request #2601 from ima1zumi/add-tsort-dep
soutaro Jul 16, 2025
f341c58
Merge pull request #2833 from ruby/fix-ci
soutaro Jan 30, 2026
a7890af
Merge pull request #2795 from ksss/add-tsort
ksss Jan 9, 2026
5e5c50a
Delete `ObjectSpace.count_nodes` test
soutaro Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/c-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ jobs:
run: |
ruby -v
gem update --system
- name: install erb
run: gem install erb
- name: bin/setup
run: |
bin/setup
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/comments.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ jobs:
run: |
ruby -v
gem update --system
- name: install erb
run: gem install erb
- name: bin/setup
run: |
bin/setup
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/ruby.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ PATH
specs:
rbs (3.10.2)
logger
tsort

PATH
remote: test/assets/test-gem
Expand Down
1 change: 1 addition & 0 deletions rbs.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
24 changes: 12 additions & 12 deletions test/rbs/cli_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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?
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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.'
Expand Down Expand Up @@ -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.'
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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.'
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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.'
Expand Down Expand Up @@ -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)

Expand Down
11 changes: 0 additions & 11 deletions test/stdlib/ObjectSpace_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down