Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 10 additions & 5 deletions bundler/lib/bundler/rubygems_ext.rb
Original file line number Diff line number Diff line change
Expand Up @@ -334,11 +334,16 @@ def extensions_dir
require "rubygems/name_tuple"

class NameTuple
def self.new(name, version, platform="ruby")
if Gem::Platform === platform
super(name, version, platform.to_s)
else
super
# Versions of RubyGems before about 3.5.0 don't to_s the platform.
unless Gem::NameTuple.new("a", Gem::Version.new("1"), Gem::Platform.new("x86_64-linux")).platform.is_a?(String)
alias_method :initialize_with_platform, :initialize

def initialize(name, version, platform=Gem::Platform::RUBY)
if Gem::Platform === platform
initialize_with_platform(name, version, platform.to_s)
else
initialize_with_platform(name, version, platform)
end
end
end

Expand Down
20 changes: 20 additions & 0 deletions bundler/spec/other/ext_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,23 @@
run "Gem::SourceIndex.new([]).refresh!", raise_on_error: false
end
end

RSpec.describe "Gem::NameTuple" do
describe "#initialize" do
it "creates a Gem::NameTuple with equality regardless of platform type" do
gem_platform = Gem::NameTuple.new "a", v("1"), pl("x86_64-linux")
str_platform = Gem::NameTuple.new "a", v("1"), "x86_64-linux"
expect(gem_platform).to eq(str_platform)
expect(gem_platform.hash).to eq(str_platform.hash)
expect(gem_platform.to_a).to eq(str_platform.to_a)
end
end

describe "#lock_name" do
it "returns the lock name" do
expect(Gem::NameTuple.new("a", v("1.0.0"), pl("x86_64-linux")).lock_name).to eq("a (1.0.0-x86_64-linux)")
expect(Gem::NameTuple.new("a", v("1.0.0"), "ruby").lock_name).to eq("a (1.0.0)")
expect(Gem::NameTuple.new("a", v("1.0.0")).lock_name).to eq("a (1.0.0)")
end
end
end