Skip to content

Commit 05a307d

Browse files
Remove no longer needed fiddle hacks
RubyInstaller has released patch versions backporting their changes to not load `fiddle` on boot, so all these are no longer necessary.
1 parent 16c3535 commit 05a307d

File tree

4 files changed

+0
-13
lines changed

4 files changed

+0
-13
lines changed

bundler/spec/commands/clean_spec.rb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -638,11 +638,6 @@ def should_not_have_gems(*gems)
638638
s.executables = "irb"
639639
end
640640

641-
if Gem.win_platform? && RUBY_VERSION < "3.1.0"
642-
default_fiddle_version = ruby "require 'fiddle'; puts Gem.loaded_specs['fiddle'].version"
643-
realworld_system_gems "fiddle --version #{default_fiddle_version}"
644-
end
645-
646641
realworld_system_gems "tsort --version 0.1.0", "pathname --version 0.1.0", "set --version 1.0.1"
647642

648643
install_gemfile <<-G

bundler/spec/install/gems/standalone_spec.rb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,6 @@
128128
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
129129
skip "does not work on old rubies because the realworld gems that need to be installed don't support them" if RUBY_VERSION < "2.7.0"
130130

131-
if Gem.win_platform? && RUBY_VERSION < "3.1.0"
132-
default_fiddle_version = ruby "require 'fiddle'; puts Gem.loaded_specs['fiddle'].version"
133-
realworld_system_gems "fiddle --version #{default_fiddle_version}"
134-
end
135-
136131
realworld_system_gems "tsort --version 0.1.0"
137132

138133
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.0.1"]

bundler/spec/runtime/inline_spec.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,8 +449,6 @@ def confirm(msg, newline = nil)
449449

450450
realworld_system_gems "pathname --version 0.2.0"
451451

452-
realworld_system_gems "fiddle" # not sure why, but this is needed on Windows to boot rubygems successfully
453-
454452
realworld_system_gems "timeout uri" # this spec uses net/http which requires these default gems
455453

456454
script <<-RUBY, :dir => tmp("path_without_gemfile"), :env => { "BUNDLER_GEM_DEFAULT_DIR" => system_gem_path.to_s }

bundler/spec/runtime/setup_spec.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1309,7 +1309,6 @@ def lock_with(ruby_version = nil)
13091309
else
13101310
%w[io-console openssl]
13111311
end << "bundler"
1312-
exempts << "fiddle" if Gem.win_platform? && Gem.rubygems_version >= Gem::Version.new("2.7")
13131312
exempts << "uri" if Gem.ruby_version >= Gem::Version.new("2.7")
13141313
exempts << "pathname" if Gem.ruby_version >= Gem::Version.new("3.0")
13151314
exempts << "set" unless Gem.rubygems_version >= Gem::Version.new("3.2.6")

0 commit comments

Comments
 (0)