diff options
author | Samuel E. Giddins <segiddins@segiddins.me> | 2015-07-31 18:49:12 -0700 |
---|---|---|
committer | Samuel E. Giddins <segiddins@segiddins.me> | 2015-07-31 21:01:18 -0700 |
commit | ef5b0ea82ea71e3b566b1702a812980a1b3b7a8c (patch) | |
tree | 72fdcc59465bcbc27cf0c285e2a14d1522d459a6 | |
parent | 4c53d0751f6572194e4eeeadd9dab2577f468dff (diff) | |
download | bundler-ef5b0ea82ea71e3b566b1702a812980a1b3b7a8c.tar.gz |
[Resolver] Ordering and 1.8.7 arent friends
-rw-r--r-- | lib/bundler/resolver.rb | 2 | ||||
-rw-r--r-- | spec/install/bundler_spec.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index bf08740d90..fc71dd4c33 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler/resolver.rb @@ -12,7 +12,7 @@ module Bundler o << %(\n) end o << %( In Gemfile:\n) - o << conflict.requirement_trees.map do |tree| + o << conflict.requirement_trees.sort_by {|t| t.reverse.map(&:name) }.map do |tree| t = "" depth = 2 tree.each do |req| diff --git a/spec/install/bundler_spec.rb b/spec/install/bundler_spec.rb index 567b8441e8..4bbfb135c1 100644 --- a/spec/install/bundler_spec.rb +++ b/spec/install/bundler_spec.rb @@ -119,10 +119,10 @@ describe "bundle install" do Resolving dependencies... Bundler could not find compatible versions for gem "activesupport": In Gemfile: + activesupport (= 2.3.5) + rails_fail was resolved to 1.0, which depends on activesupport (= 1.2.3) - - activesupport (= 2.3.5) E expect(out).to eq(nice_error) end |