Skip to content

Commit 2b4f81a

Browse files
Cleanup stuff no longer needed since RubyGems 3.2.0 support was dropped
1 parent 7048172 commit 2b4f81a

File tree

4 files changed

+0
-38
lines changed

4 files changed

+0
-38
lines changed

bundler/lib/bundler/rubygems_ext.rb

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -179,37 +179,6 @@ def to_lock
179179
end
180180
end
181181

182-
# comparison is done order independently since rubygems 3.2.0.rc.2
183-
unless Gem::Requirement.new("> 1", "< 2") == Gem::Requirement.new("< 2", "> 1")
184-
class Requirement
185-
module OrderIndependentComparison
186-
def ==(other)
187-
return unless Gem::Requirement === other
188-
189-
if _requirements_sorted? && other._requirements_sorted?
190-
super
191-
else
192-
_with_sorted_requirements == other._with_sorted_requirements
193-
end
194-
end
195-
196-
protected
197-
198-
def _requirements_sorted?
199-
return @_requirements_sorted if defined?(@_requirements_sorted)
200-
strings = as_list
201-
@_requirements_sorted = strings == strings.sort
202-
end
203-
204-
def _with_sorted_requirements
205-
@_with_sorted_requirements ||= _requirements_sorted? ? self : self.class.new(as_list.sort)
206-
end
207-
end
208-
209-
prepend OrderIndependentComparison
210-
end
211-
end
212-
213182
if Gem::Requirement.new("~> 2.0").hash == Gem::Requirement.new("~> 2.0.0").hash
214183
class Requirement
215184
module CorrectHashForLambdaOperator

bundler/spec/commands/clean_spec.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -626,8 +626,6 @@ def should_not_have_gems(*gems)
626626
end
627627

628628
it "when using --force, it doesn't remove default gem binaries", :realworld do
629-
skip "does not work on rubygems versions where `--install_dir` doesn't respect --default" unless Gem::Installer.for_spec(loaded_gemspec, install_dir: "/foo").default_spec_file == "/foo/specifications/default/bundler-#{Bundler::VERSION}.gemspec" # Since rubygems 3.2.0.rc.2
630-
631629
default_irb_version = ruby "gem 'irb', '< 999999'; require 'irb'; puts IRB::VERSION", raise_on_error: false
632630
skip "irb isn't a default gem" if default_irb_version.empty?
633631

bundler/spec/install/gems/standalone_spec.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,6 @@
141141

142142
describe "with default gems and a lockfile", :ruby_repo do
143143
before do
144-
skip "does not work on rubygems versions where `--install_dir` doesn't respect --default" unless Gem::Installer.for_spec(loaded_gemspec, install_dir: "/foo").default_spec_file == "/foo/specifications/default/bundler-#{Bundler::VERSION}.gemspec" # Since rubygems 3.2.0.rc.2
145-
146144
realworld_system_gems "tsort --version 0.1.0"
147145

148146
necessary_system_gems = ["optparse --version 0.1.1", "psych --version 3.3.2", "logger --version 1.4.3", "etc --version 1.2.0", "stringio --version 3.1.0"]

bundler/spec/runtime/inline_spec.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -592,9 +592,6 @@ def confirm(msg, newline = nil)
592592
end
593593

594594
it "when requiring fileutils after does not show redefinition warnings", :realworld do
595-
dependency_installer_loads_fileutils = ruby "require 'rubygems/dependency_installer'; puts $LOADED_FEATURES.grep(/fileutils/)", raise_on_error: false
596-
skip "does not work if rubygems/dependency_installer loads fileutils, which happens until rubygems 3.2.0" unless dependency_installer_loads_fileutils.empty?
597-
598595
Dir.mkdir tmp("path_without_gemfile")
599596

600597
default_fileutils_version = ruby "gem 'fileutils', '< 999999'; require 'fileutils'; puts FileUtils::VERSION", raise_on_error: false

0 commit comments

Comments
 (0)