Skip to content

Fix installation error of same version of default gems with local installation #6430

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
hsbt merged 2 commits into from
Mar 5, 2023
Merged

Fix installation error of same version of default gems with local installation #6430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0430551
Introduce Gem::Specification.find_by_full_name for finding conbinatio…
hsbt Mar 3, 2023
2157aa8
Build default gems same as fresh installtion.
hsbt Mar 3, 2023
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
8 changes: 8 additions & 0 deletions lib/rubygems/specification.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1021,6 +1021,12 @@ def self.find_by_name(name, *requirements)
Gem::Dependency.new(name, *requirements).to_spec
end

##
# Find the best specification matching a +full_name+.
def self.find_by_full_name(full_name)
stubs.find {|s| s.full_name == full_name }&.to_spec
end

##
# Return the best specification that contains the file matching +path+.

Expand Down Expand Up @@ -1606,6 +1612,8 @@ def build_args
def build_extensions # :nodoc:
return if extensions.empty?
return if default_gem?
# we need to fresh build when same name and version of default gems
return if self.class.find_by_full_name(full_name)&.default_gem?
return if File.exist? gem_build_complete_path
return if !File.writable?(base_dir)
return if !File.exist?(File.join(base_dir, "extensions"))
Expand Down
17 changes: 17 additions & 0 deletions test/rubygems/test_gem_specification.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3726,6 +3726,23 @@ def test_find_by_name_prerelease
assert Gem::Specification.find_by_name "b", ">1"
end

def test_find_by_full_name
pl = Gem::Platform.new "x86_64-linux"

a = util_spec "a", "1"
install_specs a

a_pl = util_spec("a", "1") {|s| s.platform = pl }
install_specs a_pl

assert_equal a, Gem::Specification.find_by_full_name("a-1")
assert_equal a_pl, Gem::Specification.find_by_full_name("a-1-x86_64-linux")

assert_nil Gem::Specification.find_by_full_name("a-2")
assert_nil Gem::Specification.find_by_full_name("b-1")
assert_nil Gem::Specification.find_by_full_name("a-1-arm64-linux")
end

def test_find_by_path
a = util_spec "foo", "1", nil, "lib/foo.rb"

Expand Down