Skip to content

Commit f5767e6

Browse files
Merge pull request #8762 from rubygems/deivid-rodriguez/cleanups
Cleanup dead code, RubyGems 3.3 is no longer supported
2 parents 0bde387 + 945a29a commit f5767e6

2 files changed

Lines changed: 0 additions & 20 deletions

File tree

bundler/spec/commands/newgem_spec.rb

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,6 @@ def ignore_paths
386386

387387
it "has no rubocop offenses when using --ext=rust and --linter=rubocop flag" do
388388
skip "ruby_core has an 'ast.rb' file that gets in the middle and breaks this spec" if ruby_core?
389-
skip "RubyGems incompatible with Rust builder" if ::Gem::Version.new("3.3.11") > ::Gem.rubygems_version
390389

391390
bundle "gem #{gem_name} --ext=rust --linter=rubocop"
392391
bundle_exec_rubocop
@@ -395,7 +394,6 @@ def ignore_paths
395394

396395
it "has no rubocop offenses when using --ext=rust, --test=minitest, and --linter=rubocop flag" do
397396
skip "ruby_core has an 'ast.rb' file that gets in the middle and breaks this spec" if ruby_core?
398-
skip "RubyGems incompatible with Rust builder" if ::Gem::Version.new("3.3.11") > ::Gem.rubygems_version
399397

400398
bundle "gem #{gem_name} --ext=rust --test=minitest --linter=rubocop"
401399
bundle_exec_rubocop
@@ -404,7 +402,6 @@ def ignore_paths
404402

405403
it "has no rubocop offenses when using --ext=rust, --test=rspec, and --linter=rubocop flag" do
406404
skip "ruby_core has an 'ast.rb' file that gets in the middle and breaks this spec" if ruby_core?
407-
skip "RubyGems incompatible with Rust builder" if ::Gem::Version.new("3.3.11") > ::Gem.rubygems_version
408405

409406
bundle "gem #{gem_name} --ext=rust --test=rspec --linter=rubocop"
410407
bundle_exec_rubocop
@@ -413,7 +410,6 @@ def ignore_paths
413410

414411
it "has no rubocop offenses when using --ext=rust, --test=test-unit, and --linter=rubocop flag" do
415412
skip "ruby_core has an 'ast.rb' file that gets in the middle and breaks this spec" if ruby_core?
416-
skip "RubyGems incompatible with Rust builder" if ::Gem::Version.new("3.3.11") > ::Gem.rubygems_version
417413

418414
bundle "gem #{gem_name} --ext=rust --test=test-unit --linter=rubocop"
419415
bundle_exec_rubocop
@@ -1724,24 +1720,10 @@ def create_temporary_dir(dir)
17241720
end
17251721
end
17261722

1727-
context "--ext parameter set with rust and old RubyGems" do
1728-
it "fails in friendly way" do
1729-
if ::Gem::Version.new("3.3.11") <= ::Gem.rubygems_version
1730-
skip "RubyGems compatible with Rust builder"
1731-
end
1732-
1733-
expect do
1734-
bundle ["gem", gem_name, "--ext=rust"].compact.join(" ")
1735-
end.to raise_error(RuntimeError, /too old to build Rust extension/)
1736-
end
1737-
end
1738-
17391723
context "--ext parameter set with rust" do
17401724
let(:flags) { "--ext=rust" }
17411725

17421726
before do
1743-
skip "RubyGems incompatible with Rust builder" if ::Gem::Version.new("3.3.11") > ::Gem.rubygems_version
1744-
17451727
bundle ["gem", gem_name, flags].compact.join(" ")
17461728
end
17471729

bundler/spec/install/gems/standalone_spec.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@
147147

148148
it "works and points to the vendored copies, not to the default copies" do
149149
necessary_gems_in_bundle_path = ["optparse --version 0.1.1", "psych --version 3.3.2", "logger --version 1.4.3", "etc --version 1.4.3", "stringio --version 3.1.0"]
150-
necessary_gems_in_bundle_path += ["yaml --version 0.1.1"] if Gem.rubygems_version < Gem::Version.new("3.4.a")
151150
realworld_system_gems(*necessary_gems_in_bundle_path, path: scoped_gem_path(bundled_app("bundle")))
152151

153152
build_gem "foo", "1.0.0", to_system: true, default: true do |s|
@@ -186,7 +185,6 @@
186185
it "works for gems with extensions and points to the vendored copies, not to the default copies" do
187186
simulate_platform "arm64-darwin-23" do
188187
necessary_gems_in_bundle_path = ["optparse --version 0.1.1", "psych --version 3.3.2", "logger --version 1.4.3", "etc --version 1.4.3", "stringio --version 3.1.0", "shellwords --version 0.2.0", "open3 --version 0.2.1"]
189-
necessary_gems_in_bundle_path += ["yaml --version 0.1.1"] if Gem.rubygems_version < Gem::Version.new("3.4.a")
190188
realworld_system_gems(*necessary_gems_in_bundle_path, path: scoped_gem_path(bundled_app("bundle")))
191189

192190
build_gem "baz", "1.0.0", to_system: true, default: true, &:add_c_extension

0 commit comments

Comments
 (0)