Clear project stack in mix teardown

Author: ericmj

lib/iex/test/iex/helpers_test.exs

@@ -300,7 +300,6 @@ defmodule IEx.HelpersTest do
     end
   after
     # Clean up the old version left over after l()
-    :code.purge(Sample)
     cleanup_modules([Sample])
   end
 
@@ -331,7 +330,6 @@ defmodule IEx.HelpersTest do
     end
   after
     # Clean up old version produced by the r helper
-    :code.purge(Sample)
     cleanup_modules([Sample])
   end
 
@@ -350,7 +348,6 @@ defmodule IEx.HelpersTest do
       assert :sample.hello == :bye
     end
   after
-    :code.purge(:sample)
     cleanup_modules([:sample])
   end
 
@@ -393,8 +390,8 @@ defmodule IEx.HelpersTest do
   defp cleanup_modules(mods) do
     Enum.each mods, fn mod ->
       File.rm("#{mod}.beam")
+      :code.purge(mod)
       true = :code.delete(mod)
-      :code.purge mod
     end
   end
 

lib/mix/lib/mix/project_stack.ex

@@ -43,6 +43,11 @@ defmodule Mix.ProjectStack do
     call :output_app?
   end
 
+  @spec clear_stack() :: :ok
+  def clear_stack do
+    cast :clear_stack
+  end
+
   @doc """
   Enables the recursion for the project at the top of the stack.
   Returns true if recursion was enabled or false if the project
@@ -158,6 +163,10 @@ defmodule Mix.ProjectStack do
     { :noreply, state.update_post_config(&Keyword.merge(&1, value)) }
   end
 
+  def handle_cast(:clear_stack, State[] = state) do
+    { :noreply, state.stack([]).post_config([]) }
+  end
+
   def handle_cast({ :write_cache, key, value }, State[] = state) do
     { :noreply, state.update_cache(&Dict.put(&1, key, value)) }
   end
@@ -193,4 +202,4 @@ defmodule Mix.ProjectStack do
   defp project_to_tuple(Project[name: name, config: config, file: file]) do
     { name, config, file }
   end
-end
+end

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

@@ -4,11 +4,6 @@ defmodule Mix.Tasks.Loadpaths do
   @moduledoc """
   Load the application and its dependencies paths.
 
-  ## Configuration
-
-  * `:load_paths` extra load paths to be added.
-    They are added with lower priority than the app ones.
-
   ## Command line options
 
   * `--no-deps` - do not load dependencies

lib/mix/lib/mix/tasks/local.ex

@@ -27,6 +27,6 @@ defmodule Mix.Tasks.Local do
   end
 
   defp format(expression, args) do
-    :io_lib.format(expression, args) |> iolist_to_binary
+    :io_lib.format(expression, args) |> String.from_char_list!
   end
 end

lib/mix/test/mix/deps/lock_test.exs

@@ -8,11 +8,6 @@ defmodule Mix.Deps.LockTest do
     :ok
   end
 
-  teardown do
-    Mix.Project.pop
-    :ok
-  end
-
   test "creates new lock and manifest files" do
     in_fixture "no_mixfile", fn ->
       Mix.Deps.Lock.write [foo: :bar]

lib/mix/test/mix/deps_test.exs

@@ -41,8 +41,6 @@ defmodule Mix.DepsTest do
       assert Enum.find deps, &match?(Mix.Dep[app: :uncloned, status: { :unavailable, _ }], &1)
       assert Enum.find deps, &match?(Mix.Dep[app: :optional, status: { :unavailable, _ }], &1)
     end
-  after
-    Mix.Project.pop
   end
 
   test "use mix version for dependencies" do
@@ -52,8 +50,6 @@ defmodule Mix.DepsTest do
       deps = Mix.Deps.loaded
       assert Enum.find deps, &match?(Mix.Dep[app: :ok, status: { :ok, _ }], &1)
     end
-  after
-    Mix.Project.pop
   end
 
   test "raises when no SCM is specified" do
@@ -64,8 +60,6 @@ defmodule Mix.DepsTest do
             "expected one of :git, :path or :in_umbrella"
       assert_raise Mix.Error, msg, fn -> Mix.Deps.loaded end
     end
-  after
-    Mix.Project.pop
   end
 
   test "does not set the manager before the dependency was loaded" do
@@ -79,8 +73,6 @@ defmodule Mix.DepsTest do
         assert nil?(dep.manager)
         { dep, acc or true }
       end)
-  after
-    Mix.Project.pop
   end
 
   defmodule NestedDepsApp do
@@ -101,8 +93,6 @@ defmodule Mix.DepsTest do
     in_fixture "deps_status", fn ->
       assert Enum.map(Mix.Deps.loaded, &(&1.app)) == [:git_repo, :deps_repo]
     end
-  after
-    Mix.Project.pop
   end
 
   test "nested optional deps are never added" do
@@ -127,8 +117,6 @@ defmodule Mix.DepsTest do
 
       assert Enum.map(Mix.Deps.loaded, &(&1.app)) == [:deps_repo]
     end
-  after
-    Mix.Project.pop
   end
 
   defmodule ConvergedDepsApp do
@@ -150,8 +138,6 @@ defmodule Mix.DepsTest do
     in_fixture "deps_status", fn ->
       assert Enum.map(Mix.Deps.loaded, &(&1.app)) == [:git_repo, :deps_repo]
     end
-  after
-    Mix.Project.pop
   end
 
   test "correctly order converged deps even with optional dependencies" do
@@ -176,7 +162,5 @@ defmodule Mix.DepsTest do
 
       assert Enum.map(Mix.Deps.loaded, &(&1.app)) == [:git_repo, :deps_repo]
     end
-  after
-    Mix.Project.pop
   end
 end

lib/mix/test/mix/project_test.exs

@@ -23,8 +23,6 @@ defmodule Mix.ProjectTest do
 
     assert { SampleProject, _config, "sample" } = Mix.Project.pop
     assert nil = Mix.Project.pop
-  after
-    Mix.Project.pop
   end
 
   test "does not allow the same project to be pushed twice" do
@@ -33,8 +31,6 @@ defmodule Mix.ProjectTest do
     assert_raise Mix.Error, %r/Mix.ProjectTest.SampleProject from "another"/, fn ->
       Mix.Project.push(SampleProject, "another")
     end
-  after
-    Mix.Project.pop
   end
 
   test "allows nil projects to be pushed twice" do
@@ -48,23 +44,17 @@ defmodule Mix.ProjectTest do
   test "retrieves configuration from projects" do
     Mix.Project.push(SampleProject)
     assert Mix.project[:hello] == "world"
-  after
-    Mix.Project.pop
   end
 
   test "removes private configuration" do
     Mix.Project.push(SampleProject)
     assert nil? Mix.project[:app_path]
-  after
-    Mix.Project.pop
   end
 
   test "reads environment info when a project is set" do
     Mix.env(:prod)
     Mix.Project.push(EnvProject)
     assert Mix.project[:hello] == "new"
-  after
-    Mix.Project.pop
   end
 
   test "retrieves configuration even when a project is not set" do

lib/mix/test/mix/rebar_test.exs

@@ -65,8 +65,6 @@ defmodule Mix.RebarTest do
         true
       end
     end)
-  after
-    Mix.Project.pop
   end
 
   test "recurs over sub dirs" do
@@ -111,7 +109,5 @@ defmodule Mix.RebarTest do
       assert Enum.any?(load_paths, &String.ends_with?(&1, "git_rebar/ebin"))
       assert Enum.any?(load_paths, &String.ends_with?(&1, "rebar_dep/ebin"))
     end
-  after
-    Mix.Project.pop
   end
 end

lib/mix/test/mix/tasks/clean_test.exs

@@ -21,11 +21,6 @@ defmodule Mix.Tasks.CleanTest do
     :ok
   end
 
-  teardown do
-    Mix.Project.pop
-    :ok
-  end
-
   test "removes the build application" do
     in_fixture "deps_status", fn ->
       Mix.Tasks.Compile.run ["--no-deps"]

lib/mix/test/mix/tasks/compile.app_test.exs

@@ -47,8 +47,6 @@ defmodule Mix.Tasks.Compile.AppTest do
 
       assert Mix.Tasks.Compile.App.run([]) == :noop
     end
-  after
-    Mix.Project.pop
   end
 
   test "use custom application settings" do
@@ -61,8 +59,6 @@ defmodule Mix.Tasks.Compile.AppTest do
       assert contents =~ "0.2.0"
       assert contents =~ "{maxT,infinity}"
     end
-  after
-    Mix.Project.pop
   end
 
   test "application properties validation" do
@@ -87,8 +83,6 @@ defmodule Mix.Tasks.Compile.AppTest do
       end
       Process.delete(:error)
     end
-  after
-    Mix.Project.pop
   end
 
   test ".app contains description and registered (as required by systools)" do
@@ -105,7 +99,5 @@ defmodule Mix.Tasks.Compile.AppTest do
 
       assert Mix.Tasks.Compile.App.run([]) == :noop
     end
-  after
-    Mix.Project.pop
   end
 end