Merge pull request #714 from jonathanhefner/say_status-indent-multiline

Indent multiline messages in say_status

Author: rafaelfranca

lib/thor/shell/basic.rb

@@ -128,13 +128,14 @@ def say_error(message = "", color = nil, force_new_line = (message.to_s !~ /( |\
       def say_status(status, message, log_status = true)
         return if quiet? || log_status == false
         spaces = "  " * (padding + 1)
-        color  = log_status.is_a?(Symbol) ? log_status : :green
-
         status = status.to_s.rjust(12)
+        margin = " " * status.length + spaces
+
+        color  = log_status.is_a?(Symbol) ? log_status : :green
         status = set_color status, color, true if color
 
-        buffer = "#{status}#{spaces}#{message}"
-        buffer = "#{buffer}\n" unless buffer.end_with?("\n")
+        message = message.to_s.chomp.gsub(/(?<!\A)^/, margin)
+        buffer = "#{status}#{spaces}#{message}\n"
 
         stdout.print(buffer)
         stdout.flush

spec/shell/basic_spec.rb

@@ -283,6 +283,20 @@ def shell
       shell.say_status(:create, "")
     end
 
+    it "indents a multiline message" do
+      status = :foobar
+      lines = ["first line", "second line", "  third line", "    fourth line"]
+
+      expect($stdout).to receive(:print) do |string|
+        formatted_status = string[/^\s*#{status}\s*/]
+        margin = " " * formatted_status.length
+
+        expect(string).to eq(formatted_status + lines.join("\n#{margin}") + "\n")
+      end
+
+      shell.say_status(status, lines.join("\n") + "\n")
+    end
+
     it "does not print a message if base is muted" do
       expect(shell).to receive(:mute?).and_return(true)
       expect($stdout).not_to receive(:print)