Merge pull request #1186 from ericmj/mix-umbrella-deps

Add support for direct dependencies of umbrella project

Author: José Valim

lib/mix/lib/mix/deps/converger.ex

@@ -20,7 +20,7 @@ defmodule Mix.Deps.Converger do
   def all(rest, callback) do
     config = [ deps_path: Path.expand(Mix.project[:deps_path]),
                root_lockfile: Path.expand(Mix.project[:lockfile]) ]
-    main = Mix.Deps.Retriever.children(config) |> Enum.reverse
+    main = Mix.Deps.Retriever.children |> Enum.reverse
     all(main, [], [], main, config, callback, rest)
   end
 

lib/mix/lib/mix/deps/retriever.ex

@@ -8,8 +8,10 @@ defmodule Mix.Deps.Retriever do
   Gets all direct children for the current Mix.Project
   as a `Mix.Dep` record.
   """
-  def children(post_config // []) do
-    mix_children(post_config)
+  def children() do
+    # Don't run recursively for the top-level project
+    scms = Mix.SCM.available
+    (Mix.project[:deps] || []) |> Enum.map(update(&1, scms, nil))
   end
 
   @doc """

lib/mix/lib/mix/task.ex

@@ -80,11 +80,12 @@ defmodule Mix.Task do
   end
 
   @doc """
-  Checks if the task is defined for umbrella projects.
+  Checks if the task should be run recursively for all sub-apps in
+  umbrella projects. Returns true, false or :both.
   """
-  def recursive?(module) when is_atom(module) do
+  def recursive(module) when is_atom(module) do
     case List.keyfind module.__info__(:attributes), :recursive, 0 do
-      { :recursive, [bool] } -> bool
+      { :recursive, [setting] } -> setting
       _ -> false
     end
   end
@@ -120,13 +121,13 @@ defmodule Mix.Task do
   @doc """
   Runs a `task` with the given `args`.
 
-  If the task was not yet invoked, it returns `:ok`.
+  If the task was not yet invoked, it returns the task result.
 
   If the task was already invoked, it does not run the task
   again and simply aborts with `:noop`.
 
   It may raise an exception if the task was not found
-  or it is invalid. Check `get/2` for more information.
+  or it is invalid. Check `get/1` for more information.
   """
   def run(task, args // []) do
     task = to_binary(task)
@@ -138,8 +139,15 @@ defmodule Mix.Task do
       module = get(task)
       Mix.Server.cast({ :add_task, task, app })
 
-      if recursive?(module) do
-        Mix.Project.recur(fn _ -> module.run(args) end)
+      recursive = recursive(module)
+
+      if recursive do
+        res = if Mix.Project.umbrella? and recursive == :both do
+          [module.run(args)]
+        else
+          []
+        end
+        res ++ Mix.Project.recur(fn _ -> module.run(args) end)
       else
         module.run(args)
       end

lib/mix/lib/mix/tasks/deps.check.ex

@@ -5,7 +5,7 @@ defmodule Mix.Tasks.Deps.Check do
 
   @hidden true
   @shortdoc "Check if all dependencies are ok"
-  @recursive true
+  @recursive :both
 
   @moduledoc """
   Checks if all dependencies are valid and if not, abort.

lib/mix/lib/mix/tasks/deps.clean.ex

@@ -2,7 +2,7 @@ defmodule Mix.Tasks.Deps.Clean do
   use Mix.Task
 
   @shortdoc "Remove dependencies files"
-  @recursive true
+  @recursive :both
 
   @moduledoc """
   Clean dependencies.
@@ -34,4 +34,4 @@ defmodule Mix.Tasks.Deps.Clean do
       Mix.Task.run "deps.unlock", apps
     end
   end
-end
+end

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

@@ -2,7 +2,7 @@ defmodule Mix.Tasks.Deps.Compile do
   use Mix.Task
 
   @shortdoc "Compile dependencies"
-  @recursive true
+  @recursive :both
 
   @moduledoc """
   Compile dependencies.

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

@@ -4,7 +4,7 @@ defmodule Mix.Tasks.Deps do
   import Mix.Deps, only: [all: 0, format_dep: 1, format_status: 1, check_lock: 2]
 
   @shortdoc "List dependencies and their status"
-  @recursive true
+  @recursive :both
 
   @moduledoc """
   List all dependencies and their status.
@@ -28,4 +28,4 @@ defmodule Mix.Tasks.Deps do
       shell.info "  #{format_status dep}"
     end
   end
-end
+end

lib/mix/lib/mix/tasks/deps.get.ex

@@ -2,7 +2,7 @@ defmodule Mix.Tasks.Deps.Get do
   use Mix.Task
 
   @shortdoc "Get all out of date dependencies"
-  @recursive true
+  @recursive :both
 
   @moduledoc """
   Get all out of date dependencies, i.e. dependencies

lib/mix/lib/mix/tasks/deps.loadpaths.ex

@@ -5,7 +5,7 @@ defmodule Mix.Tasks.Deps.Loadpaths do
 
   @hidden true
   @shortdoc "Load all dependencies paths"
-  @recursive true
+  @recursive :both
 
   @moduledoc """
   Loads all dependencies. This is invoked directly

lib/mix/lib/mix/tasks/deps.unlock.ex

@@ -2,7 +2,7 @@ defmodule Mix.Tasks.Deps.Unlock do
   use Mix.Task
 
   @shortdoc "Unlock the given dependencies"
-  @recursive true
+  @recursive :both
 
   @moduledoc """
   Unlock the given dependencies. If no dependencies
@@ -22,4 +22,4 @@ defmodule Mix.Tasks.Deps.Unlock do
 
     Mix.Deps.Lock.write(lock)
   end
-end
+end