Make Mix.Project.load_project private in favor of in_project

Author: José Valim

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

@@ -117,23 +117,17 @@ defmodule Mix.Deps.Converger do
 
   # The dependency contains a Mixfile, so let's
   # load it and retrieve its nested dependencies.
-  defp nested_deps(Mix.Dep[app: app, opts: opts], config) do
-    File.cd! opts[:dest], fn ->
-      env     = opts[:env] || :prod
-      old_env = Mix.env
+  defp nested_deps(Mix.Dep[app: app, opts: opts], post_config) do
+    env     = opts[:env] || :prod
+    old_env = Mix.env
 
-      try do
-        Mix.env(env)
-        project = Mix.Project.load_project(app, config)
-
-        try do
-          { project, Enum.reverse Mix.Deps.Project.all }
-        after
-          Mix.Project.pop
-        end
-      after
-        Mix.env(old_env)
-      end
+    try do
+      Mix.env(env)
+      Mix.Project.in_project(app, opts[:dest], post_config, fn config ->
+        { config, Enum.reverse Mix.Deps.Project.all }
+      end)
+    after
+      Mix.env(old_env)
     end
   end
 end

lib/mix/lib/mix/project.ex

@@ -128,7 +128,7 @@ defmodule Mix.Project do
   end
 
   @doc """
-  Returns if project is an umbrella project.
+  Returns true if project is an umbrella project.
   """
   def umbrella? do
     config[:apps_path] != nil
@@ -141,49 +141,22 @@ defmodule Mix.Project do
     Path.expand(config[:apps_path])
   end
 
-  @doc """
-  Loads mix.exs in the current directory or loads the project from the
-  mixfile cache and pushes the project to the project stack. Optionally
-  takes a post_config.
-  """
-  def load_project(app, post_config // []) do
-    if cached = Mix.Server.call({ :mixfile_cache, app }) do
-      Mix.Project.post_config(post_config)
-      Mix.Project.push(cached)
-      cached
-    else
-      old_proj = Mix.Project.get
-
-      if File.regular?("mix.exs") do
-        Mix.Project.post_config(post_config)
-        Code.load_file "mix.exs"
-      end
-
-      new_proj = Mix.Project.get
-
-      if old_proj == new_proj do
-        new_proj = nil
-        Mix.Project.push new_proj
-      end
-
-      Mix.Server.cast({ :mixfile_cache, app, new_proj })
-      new_proj
-    end
-  end
-
   @doc """
   Run fun for every application in the umbrella project. Changes current
   project and working directory.
   """
   def recursive(fun) do
-    paths = Path.wildcard(Path.join(Mix.project[:apps_path], "*"))
+    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
 
-    projects = topsort_projects(projects)
+    projects = topsort_projects(projects, Path.expand(apps_path))
+
     results = Enum.map projects, fn { app, app_path } ->
       in_project(app, app_path, fun)
     end
@@ -192,16 +165,15 @@ defmodule Mix.Project do
   end
 
   @doc """
-  Run fun in the context of project app and working directory app_path.
-  Optionally takes a post_config.
+  Runs the given `fun` inside the given project by changing
+  the current working directory and loading the given project
+  into the project stack.
   """
   def in_project(app, app_path, post_config // [], fun) do
-    umbrella_path = apps_path
-
     File.cd! app_path, fn ->
-      load_project(app, post_config)
+      cached = load_project(app, post_config)
       result = try do
-        fun.(umbrella_path)
+        fun.(cached)
       after
         Mix.Project.pop
       end
@@ -232,16 +204,43 @@ defmodule Mix.Project do
     paths ++ compile_paths
   end
 
+  # Loads mix.exs in the current directory or loads the project from the
+  # mixfile cache and pushes the project to the project stack.
+  defp load_project(app, post_config) do
+    if cached = Mix.Server.call({ :mixfile_cache, app }) do
+      Mix.Project.post_config(post_config)
+      Mix.Project.push(cached)
+      cached
+    else
+      old_proj = Mix.Project.get
+
+      if File.regular?("mix.exs") do
+        Mix.Project.post_config(post_config)
+        Code.load_file "mix.exs"
+      end
+
+      new_proj = Mix.Project.get
+
+      if old_proj == new_proj do
+        new_proj = nil
+        Mix.Project.push new_proj
+      end
+
+      Mix.Server.cast({ :mixfile_cache, app, new_proj })
+      new_proj
+    end
+  end
+
   # Sort projects in dependency order
-  defp topsort_projects(projects) do
+  defp topsort_projects(projects, apps_path) do
     graph = :digraph.new
 
     Enum.each projects, fn { app, app_path } ->
       :digraph.add_vertex(graph, app, app_path)
     end
 
     Enum.each projects, fn { app, app_path } ->
-      in_project app, app_path, fn apps_path ->
+      in_project app, app_path, fn _ ->
         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/test/mix/umbrella_test.exs

@@ -5,28 +5,27 @@ defmodule Mix.UmbrellaTest do
 
   test "compile umbrella" do
     in_fixture "umbrella_dep/deps/umbrella", fn ->
-      Mix.Project.load_project(:umbrella)
-      Mix.Task.run "compile"
-
-      assert_received { :mix_shell, :info, ["==> bar"] }
-      assert_received { :mix_shell, :info, ["Compiled lib/bar.ex"] }
-      assert_received { :mix_shell, :info, ["Generated bar.app"] }
-      assert_received { :mix_shell, :info, ["==> foo"] }
-      assert_received { :mix_shell, :info, ["Compiled lib/foo.ex"] }
-      assert_received { :mix_shell, :info, ["Generated foo.app"] }
+      Mix.Project.in_project(:umbrella, ".", fn _ ->
+        Mix.Task.run "compile"
+        assert_received { :mix_shell, :info, ["==> bar"] }
+        assert_received { :mix_shell, :info, ["Compiled lib/bar.ex"] }
+        assert_received { :mix_shell, :info, ["Generated bar.app"] }
+        assert_received { :mix_shell, :info, ["==> foo"] }
+        assert_received { :mix_shell, :info, ["Compiled lib/foo.ex"] }
+        assert_received { :mix_shell, :info, ["Generated foo.app"] }
+      end)
     end
   after
-    Mix.Project.pop
     purge [Umbrella.Mixfile, Foo, Foo.Mix, Bar, Bar.Mix]
   end
 
   test "umbrella as dependency" do
     in_fixture "umbrella_dep", fn ->
-      Mix.Project.load_project(:umbrella_dep)
-      Mix.Tasks.Deps.Compile.run []
-      Mix.Tasks.Deps.Loadpaths.run []
-
-      assert "hello world" == Bar.bar
+      Mix.Project.in_project(:umbrella_dep, ".", fn _ ->
+        Mix.Tasks.Deps.Compile.run []
+        Mix.Tasks.Deps.Loadpaths.run []
+        assert "hello world" == Bar.bar
+      end)
     end
   after
     Mix.Project.pop