[Resolver] Fix grammar for the case of a single-gem circular dependency error

1 files changed, 3 insertions, 2 deletions

diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb
index 2707a85385..083865becf 100644
--- a/lib/bundler/resolver.rb
+++ b/lib/bundler/resolver.rb
@@ -202,10 +202,11 @@ module Bundler
     rescue Molinillo::VersionConflict => e
       raise VersionConflict.new(e.conflicts.keys.uniq, e.message)
     rescue Molinillo::CircularDependencyError => e
-      names = e.dependencies.reverse_each.map { |d| "gem '#{d.name}'"}
+      names = e.dependencies.sort_by(&:name).map { |d| "gem '#{d.name}'"}
       raise CyclicDependencyError, "Your Gemfile requires gems that depend" \
         " on each other, creating an infinite loop. Please remove" \
-        " either #{names.join(' or ')} and try again."
+        " #{names.count > 1 ? 'either ' : '' }#{names.join(' or ')}" \
+        " and try again."
     end
 
     include Molinillo::UI