archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-25 05:55:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[rubygems/rubygems] Simplify SpecSet#sorted

Browse source 
a3f365bbaa
This commit is contained in:
David Rodríguez 2025-01-30 09:27:20 +01:00 • committed by Hiroshi SHIBATA
parent e59c90118e
commit c94cec27f7
No known key found for this signature in database
GPG key ID: F9CF13417264FAC2
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/bundler/spec_set.rb
View file

@ -295,16 +295,13 @@ module Bundler
end end
def sorted def sorted
rake = @specs.find {|s| s.name == "rake" } @sorted ||= ([@specs.find {|s| s.name == "rake" }] + tsort).compact.uniq
begin
@sorted ||= ([rake] + tsort).compact.uniq
rescue TSort::Cyclic => error rescue TSort::Cyclic => error
cgems = extract_circular_gems(error) cgems = extract_circular_gems(error)
raise CyclicDependencyError, "Your bundle requires gems that depend" \ raise CyclicDependencyError, "Your bundle requires gems that depend" \
" on each other, creating an infinite loop. Please remove either" \ " on each other, creating an infinite loop. Please remove either" \
" gem '#{cgems[0]}' or gem '#{cgems[1]}' and try again." " gem '#{cgems[0]}' or gem '#{cgems[1]}' and try again."
end end
end
def extract_circular_gems(error) def extract_circular_gems(error)
error.message.scan(/@name="(.*?)"/).flatten error.message.scan(/@name="(.*?)"/).flatten