Extract error message from TSort::Cyclic and print

Also updated test case to include check on error message

1 files changed, 4 insertions, 3 deletions

diff --git a/lib/bundler/spec_set.rb b/lib/bundler/spec_set.rb
index 74c9dde41e..41f46dba56 100644
--- a/lib/bundler/spec_set.rb
+++ b/lib/bundler/spec_set.rb
@@ -111,9 +111,10 @@ module Bundler
       rake = @specs.find { |s| s.name == 'rake' }
       begin
         @sorted ||= ([rake] + tsort).compact.uniq
-      rescue TSort::Cyclic
-        raise CyclicDependencyError, "Unfortunately, your Gemfile contains gems" \
-          " that each depend on each other, so it's not possible to to install this " \
+      rescue TSort::Cyclic => error
+        gemstr = error.message.scan(/@name="(.*?)"/).flatten.join(" and ")
+        raise CyclicDependencyError, "Your Gemfile includes gems #{gemstr}" \
+          " that each depend on other, so it's not possible to to install this" \
           " bundle. Remove one of the gems from your Gemfile to continue."
       end
     end