Fix mix function names and docs

Author: ericmj

lib/mix/lib/mix/deps.ex

@@ -174,7 +174,7 @@ defmodule Mix.Deps do
   """
   def compile_paths(Mix.Dep[app: app, opts: opts] = dep) do
     if mix?(dep) do
-      Mix.Project.for_project app, opts[:dest], fn _ ->
+      Mix.Project.in_project app, opts[:dest], fn _ ->
         Mix.Project.compile_paths
       end
     else
@@ -187,7 +187,7 @@ defmodule Mix.Deps do
   """
   def load_paths(Mix.Dep[app: app, opts: opts] = dep) do
     if mix?(dep) do
-      paths = Mix.Project.for_project app, opts[:dest], fn _ ->
+      paths = Mix.Project.in_project app, opts[:dest], fn _ ->
         Mix.Project.load_paths
       end
       Enum.uniq paths
@@ -200,7 +200,7 @@ defmodule Mix.Deps do
   Returns if dependency is a mix project.
   """
   def mix?(dep) do
-    File.regular? Path.join(dep.opts[:dest], "mix.exs")
+    dep.project != nil
   end
 
   @doc """

lib/mix/lib/mix/project.ex

@@ -184,26 +184,27 @@ defmodule Mix.Project do
     end
 
     projects = topsort_projects(projects)
-    old_tasks = Mix.Task.clear
     results = Enum.map projects, fn { app, app_path } ->
-      for_project(app, app_path, fun)
+      in_project(app, app_path, fun)
     end
 
-    Mix.Task.set_tasks(old_tasks)
     results
   end
 
   @doc """
-  Run fun with project app on top of the stack.
+  Run fun in the context of project app and working directory app_path.
+  Optionally takes a post_config.
   """
-  def for_project(app, app_path, fun) do
+  def in_project(app, app_path, post_config // [], fun) do
     umbrella_path = apps_path
 
     File.cd! app_path, fn ->
-      Mix.Project.load_project(app)
-      result = fun.(umbrella_path)
-      Mix.Project.pop
-      Mix.Task.clear
+      load_project(app, post_config)
+      result = try do
+        fun.(umbrella_path)
+      after
+        Mix.Project.pop
+      end
       result
     end
   end
@@ -240,7 +241,7 @@ defmodule Mix.Project do
     end
 
     Enum.each projects, fn { app, app_path } ->
-      for_project app, app_path, fn apps_path ->
+      in_project app, app_path, fn apps_path ->
         Enum.each Mix.Deps.children, fn dep ->
           if Mix.Deps.available?(dep) and Mix.Deps.in_umbrella?(dep, apps_path) do
             :digraph.add_edge(graph, dep.app, app)

lib/mix/lib/mix/server.ex

@@ -74,13 +74,7 @@ defmodule Mix.Server do
   def handle_call(:output_app?, _from, config) do
     # Check that we haven't already outputted app and that we are part of an
     # umbrella project
-    umbrella = case config.projects do
-      [{ h, conf }|_] when h != nil -> conf[:apps_path] != nil
-      _ -> false
-    end
-    in_umbrella = Enum.any?(config.projects, fn { _, conf } -> conf[:apps_path] != nil end)
-    output = !config.io_done && !umbrella && in_umbrella
-
+    output = not config.io_done and not umbrella?(config) and in_umbrella?(config)
     { :reply, output, config.io_done(true) }
   end
 
@@ -139,4 +133,17 @@ defmodule Mix.Server do
   def handle_cast(request, config) do
     super(request, config)
   end
+
+  # Returns if project is part of an umbrella project
+  defp in_umbrella?(config) do
+    Enum.any? config.projects, fn { _, conf } -> conf[:apps_path] != nil end
+  end
+
+  # Returns if project is an umbrella project
+  defp umbrella?(config) do
+    case config.projects do
+      [ { h, conf } | _ ] when h != nil -> conf[:apps_path] != nil
+      _ -> false
+    end
+  end
 end