Ensure mix test print app name for umbrella

Author: José Valim

lib/mix/lib/mix/project_stack.ex

@@ -55,8 +55,8 @@ defmodule Mix.ProjectStack do
     end
   end
 
-  @spec output_app?() :: boolean
-  def output_app? do
+  @spec print_app?() :: boolean
+  def print_app? do
     get_and_update fn %{stack: stack} = state ->
       case stack do
         [h|t] ->

lib/mix/lib/mix/shell.ex

@@ -32,12 +32,19 @@ defmodule Mix.Shell do
   defcallback cmd(command :: String.t) :: integer
 
   @doc """
-  Returns if we should output application name to shell.
+  Prints the current application to shell if
+  it was not printed yet.
+  """
+  defcallback print_app() :: any
+
+  @doc """
+  Returns if we should print application name to shell.
+
   Calling this function automatically toggles its value
   to false.
   """
-  def output_app? do
-    Mix.ProjectStack.output_app?
+  def print_app? do
+    Mix.ProjectStack.print_app?
   end
 
   @doc """

lib/mix/lib/mix/shell/io.ex

@@ -6,28 +6,38 @@ defmodule Mix.Shell.IO do
 
   @behaviour Mix.Shell
 
+  @doc """
+  Prints the currently running application if it
+  was not printed yet.
+  """
+  def print_app do
+    if Mix.Shell.print_app? do
+      IO.puts "==> #{Mix.Project.config[:app]}"
+    end
+  end
+
   @doc """
   Executes the given command and prints its output
   to stdout as it comes.
   """
   def cmd(command) do
-    put_app
+    print_app
     Mix.Shell.cmd(command, &IO.write(&1))
   end
 
   @doc """
   Writes a message to the shell followed by new line.
   """
   def info(message) do
-    put_app
+    print_app
     IO.puts IO.ANSI.escape(message)
   end
 
   @doc """
   Writes an error message to the shell followed by new line.
   """
   def error(message) do
-    put_app
+    print_app
     IO.puts :stderr, IO.ANSI.escape "%{red,bright}#{message}"
   end
 
@@ -36,7 +46,7 @@ defmodule Mix.Shell.IO do
   input. Input will be consumed until enter is pressed.
   """
   def prompt(message) do
-    put_app
+    print_app
     IO.gets IO.ANSI.escape(message <> " ")
   end
 
@@ -46,7 +56,7 @@ defmodule Mix.Shell.IO do
   regex `~r/^Y(es)?$/i`.
   """
   def yes?(message) do
-    put_app
+    print_app
     got_yes? IO.gets(message <> IO.ANSI.escape(" [Yn] "))
   end
 
@@ -56,10 +66,4 @@ defmodule Mix.Shell.IO do
 
   # The io server may return :eof or :error
   defp got_yes?(_), do: false
-
-  defp put_app do
-    if Mix.Shell.output_app? do
-      IO.puts "==> #{Mix.Project.config[:app]}"
-    end
-  end
 end

lib/mix/lib/mix/shell/process.ex

@@ -39,12 +39,22 @@ defmodule Mix.Shell.Process do
     end
   end
 
+  @doc """
+  Prints the currently running application if it
+  was not printed yet.
+  """
+  def print_app do
+    if Mix.Shell.print_app? do
+      send self, {:mix_shell, :info, ["==> #{Mix.Project.config[:app]}"]}
+    end
+  end
+
   @doc """
   Executes the given command and forwards its messages to
   the current process.
   """
   def cmd(command) do
-    put_app
+    print_app
     Mix.Shell.cmd(command, fn(data) ->
       send self, {:mix_shell, :run, [data]}
     end)
@@ -54,15 +64,15 @@ defmodule Mix.Shell.Process do
   Forwards the message to the current process.
   """
   def info(message) do
-    put_app
+    print_app
     send self, {:mix_shell, :info, [IO.ANSI.escape(message, false)]}
   end
 
   @doc """
   Forwards the message to the current process.
   """
   def error(message) do
-    put_app
+    print_app
     send self, {:mix_shell, :error, [IO.ANSI.escape(message, false)]}
   end
 
@@ -76,7 +86,7 @@ defmodule Mix.Shell.Process do
   process inputs given. Value must be a string.
   """
   def prompt(message) do
-    put_app
+    print_app
     send self, {:mix_shell, :prompt, [IO.ANSI.escape(message, false)]}
 
     receive do
@@ -96,7 +106,7 @@ defmodule Mix.Shell.Process do
   process inputs given. Value must be `true` or `false`.
   """
   def yes?(message) do
-    put_app
+    print_app
     send self, {:mix_shell, :yes?, [IO.ANSI.escape(message, false)]}
 
     receive do
@@ -105,10 +115,4 @@ defmodule Mix.Shell.Process do
       0 -> raise "No shell process input given for yes?/1"
     end
   end
-
-  defp put_app do
-    if Mix.Shell.output_app? do
-      send self, {:mix_shell, :info, ["==> #{Mix.Project.config[:app]}"]}
-    end
-  end
 end

lib/mix/lib/mix/tasks/test.ex

@@ -152,6 +152,7 @@ defmodule Mix.Tasks.Test do
     # before requiring test_helper.exs so that the configuration is
     # available in test_helper.exs. Then configure exunit again so
     # that command line options override test_helper.exs
+    Mix.shell.print_app
     Mix.Task.run "app.start", args
     Application.load(:ex_unit)