Merge pull request #2844 from CocoaPods/fix/2603

Fixing #2603 formatting issue

CHANGELOG.md

@@ -16,6 +16,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
 
 ##### Bug Fixes
 
+* Fix an output formatting issue with various commands like `pod search`
+  and `pod trunk`.
+  [Olivier Halligon](https://github.com/AliSoftware)
+  [#2603](https://github.com/CocoaPods/CocoaPods/issues/2603)
+
 * Show a helpful error message if the old resolver incorrectly activated a
   pre-release version that now leads to a version conflict.  
   [Samuel Giddins](https://github.com/segiddins)

lib/cocoapods/user_interface.rb

@@ -191,17 +191,22 @@ module Pod
 
       # Prints a message with a label.
       #
-      def labeled(label, value, justification = 16)
+      def labeled(label, value, justification = 12)
         if value
-          ''.tap do |t|
-            t << "    - #{label}:".ljust(justification)
+          title = "- #{label}:".ljust(justification)
+          output = begin
             if value.is_a?(Array)
-              separator = "\n  - "
-              puts_indented t << separator << value.join(separator)
+              lines = [wrap_string(title, self.indentation_level)]
+              value.each do |v|
+                lines << wrap_string("- #{v}", self.indentation_level + 2)
+              end
+              lines.join("\n")
             else
-              puts_indented t << value.to_s << "\n"
-            end
+              wrap_string(title + "#{value}", self.indentation_level)
+            end + "\n"
           end
+          puts output
+          output
         end
       end