Move the umbrella check to Mix.Project.recur

We have named the function from Mix.Project.recursive
to recur in order to imply action.

Author: José Valim

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

@@ -123,8 +123,8 @@ defmodule Mix.Deps.Converger do
 
     try do
       Mix.env(env)
-      Mix.Project.in_project(app, opts[:dest], post_config, fn config ->
-        { config, Enum.reverse Mix.Deps.Project.all }
+      Mix.Project.in_project(app, opts[:dest], post_config, fn project ->
+        { project, Enum.reverse Mix.Deps.Project.all }
       end)
     after
       Mix.env(old_env)

lib/mix/lib/mix/project.ex

@@ -142,26 +142,33 @@ defmodule Mix.Project do
   end
 
   @doc """
-  Run fun for every application in the umbrella project. Changes current
-  project and working directory.
+  Runs `fun` in the current project.
+
+  The goal of this function is to transparently abstract umbrella projects.
+  So if you want to gather data from a project, like beam files, you can
+  use this function to transparently go through the project, regardless
+  if it is an umbrella project or not.
   """
-  def recursive(fun) do
-    apps_path = config[:apps_path]
-    paths = Path.wildcard(Path.join(apps_path, "*"))
-
-    projects = Enum.map paths, fn path ->
-      dir = Path.basename(path)
-      app = dir |> String.downcase |> binary_to_atom
-      { app, path }
-    end
+  def recur(fun) do
+    if apps_path = config[:apps_path] do
+      paths = Path.wildcard(Path.join(apps_path, "*"))
+
+      projects = Enum.map paths, fn path ->
+        dir = Path.basename(path)
+        app = dir |> String.downcase |> binary_to_atom
+        { app, path }
+      end
 
-    projects = topsort_projects(projects, Path.expand(apps_path))
+      projects = topsort_projects(projects, Path.expand(apps_path))
 
-    results = Enum.map projects, fn { app, app_path } ->
-      in_project(app, app_path, fun)
-    end
+      results = Enum.map projects, fn { app, app_path } ->
+        in_project(app, app_path, fun)
+      end
 
-    results
+      results
+    else
+      [fun.(get)]
+    end
   end
 
   @doc """
@@ -185,22 +192,17 @@ defmodule Mix.Project do
   Returns the paths this project compiles to.
   """
   def compile_paths do
-    if umbrella? do
-      List.flatten recursive(fn _ -> compile_paths end)
-    else
-      [ Path.expand config[:compile_path] ]
-    end
+    recur(fn _ -> Path.expand config[:compile_path] end)
   end
 
   @doc """
   Returns all load paths for this project.
   """
   def load_paths do
-    paths = if umbrella? do
-      List.flatten recursive(fn _ -> load_paths end)
-    else
-      Enum.map config[:load_paths], Path.expand(&1)
-    end
+    paths =
+      recur(fn _ ->
+        Enum.map(config[:load_paths], Path.expand(&1))
+      end) |> List.concat
     paths ++ compile_paths
   end
 

lib/mix/lib/mix/task.ex

@@ -138,8 +138,8 @@ defmodule Mix.Task do
       module = get(task)
       Mix.Server.cast({ :add_task, task, app })
 
-      if Mix.Project.umbrella? && recursive?(module) do
-        Mix.Project.recursive(fn _ -> module.run(args) end)
+      if recursive?(module) do
+        Mix.Project.recur(fn _ -> module.run(args) end)
       else
         module.run(args)
       end

lib/mix/lib/mix/tasks/escriptize.ex

@@ -100,14 +100,7 @@ defmodule Mix.Tasks.Escriptize do
   end
 
   defp all_beams() do
-    if Mix.Project.umbrella? do
-      beams = Mix.Project.recursive fn _ ->
-        get_beams()
-      end
-      List.concat(beams)
-    else
-      get_beams()
-    end
+    Mix.Project.recur(fn _ -> get_beams() end) |> List.concat
   end
 
   defp get_beams() do
@@ -119,12 +112,7 @@ defmodule Mix.Tasks.Escriptize do
   end
 
   defp all_files() do
-    if Mix.Project.umbrella? do
-      files = Mix.Project.recursive(fn _ -> get_compiled_files() end)
-      List.concat(files)
-    else
-      get_compiled_files()
-    end
+    Mix.Project.recur(fn _ -> get_compiled_files() end) |> List.concat
   end
 
   defp get_compiled_files() do