Make pretty-printing a dependency consistentseg-allow-bundler-dep-conflicts

4 files changed, 15 insertions, 10 deletions

diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index 0e39cf710c..7157c46b98 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -567,10 +567,7 @@ module Bundler
     end
 
     def pretty_dep(dep, source = false)
-      msg = String.new(dep.name)
-      msg << " (#{dep.requirement})" unless dep.requirement == Gem::Requirement.default
-      msg << " from the `#{dep.source}` source" if source && dep.source
-      msg
+      SharedHelpers.pretty_dependency(dep, source)
     end
 
     # Check if the specs of the given source changed
diff --git a/lib/bundler/installer.rb b/lib/bundler/installer.rb
index 52397194c1..c47012973b 100644
--- a/lib/bundler/installer.rb
+++ b/lib/bundler/installer.rb
@@ -211,7 +211,8 @@ module Bundler
           next unless dep.name == "bundler".freeze
           next if dep.requirement.satisfied_by?(bundler_version)
 
-          Bundler.ui.warn "#{spec.name} (#{spec.version}) has dependency #{dep}" \
+          Bundler.ui.warn "#{spec.name} (#{spec.version}) has dependency" \
+            " #{SharedHelpers.pretty_dependency(dep)}" \
             ", which is unsatisfied by the current bundler version #{VERSION}" \
             ", so the dependency is being ignored"
         end
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb
index 761dcc42d3..93c9d669c4 100644
--- a/lib/bundler/resolver.rb
+++ b/lib/bundler/resolver.rb
@@ -5,11 +5,7 @@ module Bundler
 
     class Molinillo::VersionConflict
       def printable_dep(dep)
-        if dep.is_a?(Bundler::Dependency)
-          DepProxy.new(dep, dep.platforms.join(", ")).to_s.strip
-        else
-          dep.to_s
-        end
+        SharedHelpers.pretty_dependency(dep)
       end
 
       def message
diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb
index 39f0423f7f..07880387f0 100644
--- a/lib/bundler/shared_helpers.rb
+++ b/lib/bundler/shared_helpers.rb
@@ -176,6 +176,17 @@ module Bundler
         "\nEither installing with `--full-index` or running `bundle update #{spec.name}` should fix the problem."
     end
 
+    def pretty_dependency(dep, print_source = false)
+      msg = String.new(dep.name)
+      msg << " (#{dep.requirement})" unless dep.requirement == Gem::Requirement.default
+      if dep.is_a?(Bundler::Dependency)
+        platform_string = dep.platforms.join(", ")
+        msg << " " << platform_string if !platform_string.empty? && platform_string != Gem::Platform::RUBY
+      end
+      msg << " from the `#{dep.source}` source" if print_source && dep.source
+      msg
+    end
+
   private
 
     def find_gemfile(order_matters = false)