Raise user friendly errors in case of Cyclic Dependency

Fixes #2506

1 files changed, 6 insertions, 1 deletions

diff --git a/lib/bundler/spec_set.rb b/lib/bundler/spec_set.rb
index 2cdffdc8..202993e4 100644
--- a/lib/bundler/spec_set.rb
+++ b/lib/bundler/spec_set.rb
@@ -109,7 +109,12 @@ module Bundler
 
     def sorted
       rake = @specs.find { |s| s.name == 'rake' }
-      @sorted ||= ([rake] + tsort).compact.uniq
+      begin
+        @sorted ||= ([rake] + tsort).compact.uniq
+      rescue TSort::Cyclic
+        raise CyclicDependencyError.new("Bundler has detected cyclic dependencies and can't" +
+            " proceed, update your Gemfile by removing cyclic dependency and rerun bundler.")
+      end
     end
 
     def lookup