Ensure aliases are invoked for recursive tasks

Closes #2650

Author: José Valim

lib/mix/lib/mix/task.ex

@@ -205,10 +205,14 @@ defmodule Mix.Task do
   information.
   """
   @spec run(task_name, [any]) :: any
-  def run(task, args \\ []) when is_binary(task) or is_atom(task) do
-    task = to_string(task)
-    proj = Mix.Project.get
+  def run(task, args \\ [])
 
+  def run(task, args) when is_atom(task) do
+    run(Atom.to_string(task), args)
+  end
+
+  def run(task, args) when is_binary(task) do
+    proj  = Mix.Project.get
     alias = Mix.Project.config[:aliases][String.to_atom(task)]
 
     cond do
@@ -217,26 +221,22 @@ defmodule Mix.Task do
         Mix.TasksServer.put({:task, task, proj})
         res
       Mix.TasksServer.run({:task, task, proj}) ->
-        run_task(task, args)
+        run_task(proj, task, args)
       true ->
         :noop
     end
   end
 
-  defp run_task(task, args) do
+  defp run_task(proj, task, args) do
     module = get!(task)
 
-    fun = fn proj ->
-      Mix.TasksServer.put({:task, task, proj})
-      module.run(args)
-    end
-
     if recursive(module) and Mix.Project.umbrella? and Mix.ProjectStack.enable_recursion do
-      res = recur(fun)
+      res = recur(fn _ -> run(task, args) end)
       Mix.ProjectStack.disable_recursion
       res
     else
-      fun.(Mix.Project.get)
+      Mix.TasksServer.put({:task, task, proj})
+      module.run(args)
     end
   end
 

lib/mix/test/mix/umbrella_test.exs

@@ -55,6 +55,25 @@ defmodule Mix.UmbrellaTest do
     end
   end
 
+  test "list deps for umbrella as dependency" do
+    in_fixture("umbrella_dep", fn ->
+      Mix.Project.in_project(:umbrella_dep, ".", fn _ ->
+        Mix.Task.run "deps"
+        assert_received {:mix_shell, :info, ["* umbrella (deps/umbrella)"]}
+        assert_received {:mix_shell, :info, ["* foo (apps/foo)"]}
+      end)
+    end)
+  end
+
+  test "compile for umbrella as dependency" do
+    in_fixture "umbrella_dep", fn ->
+      Mix.Project.in_project(:umbrella_dep, ".", fn _ ->
+        Mix.Task.run "deps.compile"
+        assert Bar.bar == "hello world"
+      end)
+    end
+  end
+
   defmodule CycleDeps do
     def project do
       [app: :umbrella_dep,
@@ -112,22 +131,25 @@ defmodule Mix.UmbrellaTest do
     end
   end
 
-  test "list deps for umbrella as dependency" do
-    in_fixture("umbrella_dep", fn ->
-      Mix.Project.in_project(:umbrella_dep, ".", fn _ ->
-        Mix.Task.run "deps"
-        assert_received {:mix_shell, :info, ["* umbrella (deps/umbrella)"]}
-        assert_received {:mix_shell, :info, ["* foo (apps/foo)"]}
-      end)
-    end)
-  end
+  test "uses dependency aliases" do
+    in_fixture "umbrella_dep/deps/umbrella", fn ->
+      Mix.Project.in_project :umbrella, ".", fn _ ->
+        File.write! "apps/bar/mix.exs", """
+        defmodule Bar.Mix do
+          use Mix.Project
 
-  test "compile for umbrella as dependency" do
-    in_fixture "umbrella_dep", fn ->
-      Mix.Project.in_project(:umbrella_dep, ".", fn _ ->
-        Mix.Task.run "deps.compile"
-        assert "hello world" == Bar.bar
-      end)
+          def project do
+            [app: :bar,
+             version: "0.1.0",
+             aliases: [compile: fn _ -> Mix.shell.info "no compile bar" end]]
+          end
+        end
+        """
+
+        Mix.Task.run "compile"
+        assert_receive {:mix_shell, :info, ["no compile bar"]}
+        refute_receive {:mix_shell, :info, ["Compiled lib/bar.ex"]}
+      end
     end
   end