Print app name on Mix.shell.cmd/1/2

Author: José Valim

lib/mix/lib/mix/shell.ex

@@ -26,11 +26,21 @@ defmodule Mix.Shell do
   defcallback yes?(message :: String.t) :: boolean
 
   @doc """
-  Executes the given command and returns
-  its exit status.
+  Executes the given command and returns its exit status.
   """
   defcallback cmd(command :: String.t) :: integer
 
+  @doc """
+  Executes the given command and returns its exit status.
+
+  ## Options
+
+    * `:print_app` - when false, does not print the app name
+      when the command outputs something.
+
+  """
+  defcallback cmd(command :: String.t, options :: Keyword.t) :: integer
+
   @doc """
   Prints the current application to shell if
   it was not printed yet.

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

@@ -21,8 +21,12 @@ defmodule Mix.Shell.IO do
   Executes the given command and prints its output
   to stdout as it comes.
   """
-  def cmd(command) do
-    Mix.Shell.cmd(command, &IO.write(&1))
+  def cmd(command, opts \\ []) do
+    print_app? = Keyword.get(opts, :print_app, true)
+    Mix.Shell.cmd(command, fn data ->
+      if print_app?, do: print_app()
+      IO.write(data)
+    end)
   end
 
   @doc """

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

@@ -53,8 +53,10 @@ defmodule Mix.Shell.Process do
   Executes the given command and forwards its messages to
   the current process.
   """
-  def cmd(command) do
+  def cmd(command, opts \\ []) do
+    print_app? = Keyword.get(opts, :print_app, true)
     Mix.Shell.cmd(command, fn(data) ->
+      if print_app?, do: print_app()
       send self, {:mix_shell, :run, [data]}
     end)
   end

lib/mix/lib/mix/tasks/cmd.ex

@@ -16,7 +16,6 @@ defmodule Mix.Tasks.Cmd do
   than zero.
   """
   def run(args) do
-    Mix.shell.print_app
     case Mix.shell.cmd(Enum.join(args, " ")) do
       0 -> :ok
       s -> exit(s)

lib/mix/lib/mix/tasks/deps.compile.ex

@@ -114,7 +114,8 @@ defmodule Mix.Tasks.Deps.Compile do
   end
 
   defp do_rebar(%Mix.Dep{app: app} = dep, config) do
-    do_command dep, rebar_cmd(app), "compile skip_deps=true deps_dir=#{inspect config[:deps_path]}"
+    do_command dep, rebar_cmd(app), false,
+               "compile skip_deps=true deps_dir=#{inspect config[:deps_path]}"
   end
 
   defp rebar_cmd(app) do
@@ -141,22 +142,20 @@ defmodule Mix.Tasks.Deps.Compile do
     else
       "make"
     end
-    Mix.shell.info("==> #{dep.app} (#{command})")
-    do_command(dep, command)
+    do_command(dep, command, true)
   end
 
-  defp do_compile(%Mix.Dep{app: app, opts: opts} = dep) do
+  defp do_compile(%Mix.Dep{opts: opts} = dep) do
     if command = opts[:compile] do
-      Mix.shell.info("#{app}: #{command}")
-      do_command(dep, command)
+      do_command(dep, command, true)
     else
       false
     end
   end
 
-  defp do_command(%Mix.Dep{app: app, opts: opts}, command, extra \\ "") do
-    File.cd! opts[:dest], fn ->
-      if Mix.shell.cmd("#{command} #{extra}") != 0 do
+  defp do_command(%Mix.Dep{app: app} = dep, command, print_app?, extra \\ "") do
+    Mix.Dep.in_dependency dep, fn _ ->
+      if Mix.shell.cmd("#{command} #{extra}", print_app: print_app?) != 0 do
         Mix.raise "Could not compile dependency #{app}, #{command} command failed. " <>
           "If you want to recompile this dependency, please run: mix deps.compile #{app}"
       end

lib/mix/lib/mix/tasks/new.ex

@@ -112,7 +112,7 @@ defmodule Mix.Tasks.New do
     "    [applications: [:logger],\n     mod: {#{mod}, []}]"
   end
 
-  defp do_generate_umbrella(app, mod, path, _opts) do
+  defp do_generate_umbrella(_app, mod, path, _opts) do
     assigns = [mod: mod]
 
     create_file ".gitignore", gitignore_text