Skip to content

Commit

Permalink
[rubygems/rubygems] No need to sort twice when filling versions
Browse files Browse the repository at this point in the history
  • Loading branch information
deivid-rodriguez authored and matzbot committed Apr 1, 2024
1 parent d342937 commit acbd91e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 5 additions & 3 deletions lib/bundler/gem_version_promoter.rb
Expand Up @@ -53,7 +53,7 @@ def level=(value)
# @return [Specification] A new instance of the Specification Array sorted and
# possibly filtered.
def sort_versions(package, specs)
specs = filter_dep_specs(specs, package) if strict
specs = filter_versions(package, specs)

sort_dep_specs(specs, package)
end
Expand All @@ -73,9 +73,9 @@ def pre?
pre == true
end

private
def filter_versions(package, specs)
return specs unless strict

def filter_dep_specs(specs, package)
locked_version = package.locked_version
return specs if locked_version.nil? || major?

Expand All @@ -89,6 +89,8 @@ def filter_dep_specs(specs, package)
end
end

private

def sort_dep_specs(specs, package)
locked_version = package.locked_version

Expand Down
2 changes: 1 addition & 1 deletion lib/bundler/resolver.rb
Expand Up @@ -275,7 +275,7 @@ def all_versions_for(package)
groups
end

sort_versions_by_preferred(package, versions)
@gem_version_promoter.filter_versions(package, versions)
end

def source_for(name)
Expand Down

0 comments on commit acbd91e

Please sign in to comment.