Simplify manifest API and put tests back on green

Author: José Valim

lib/mix/lib/mix/tasks/compile.elixir.ex

@@ -78,16 +78,17 @@ defmodule Mix.Tasks.Compile.Elixir do
     to_compile = Mix.Utils.extract_files(elixirc_paths, compile_exts)
     to_watch   = Mix.Utils.extract_files(elixirc_paths, watch_exts)
 
-    force = opts[:force]
     stale = if Mix.Utils.stale?(Mix.Project.config_files, [manifest]) do
       force = true
       to_watch
     else
+      force = opts[:force]
       Mix.Utils.extract_stale(to_watch, [manifest])
     end
 
     if force or stale != [] do
       File.mkdir_p! compile_path
+      Code.prepend_path compile_path
       compile_files opts[:quick], project, compile_path, to_compile, stale, opts
       :ok
     else
@@ -103,19 +104,17 @@ defmodule Mix.Tasks.Compile.Elixir do
   end
 
   defp compile_files(false, project, compile_path, to_compile, _stale, opts) do
-    Mix.Utils.read_manifest Path.join(compile_path, @manifest), fn file ->
-      Path.join(compile_path, file) <> ".beam" |> File.rm
+    previous = Mix.Utils.read_manifest(Path.join(compile_path, @manifest))
+
+    Enum.each previous, fn entry ->
+      Path.join(compile_path, entry <> ".beam") |> File.rm
     end
 
     set_compiler_opts(project, opts, [])
+    compiled = compile_files to_compile, compile_path
+    compiled = lc { mod, _ } inlist compiled, do: atom_to_binary(mod)
 
-    { _current, to_remove } =
-      Mix.Utils.update_manifest Path.join(compile_path, @manifest), fn ->
-        compiled = compile_files to_compile, compile_path
-        lc { mod, _ } inlist compiled, do: atom_to_binary(mod)
-      end
-
-    lc f inlist to_remove, do: File.rm(Path.join(compile_path, f) <> ".beam")
+    Mix.Utils.update_manifest(Path.join(compile_path, @manifest), compiled)
   end
 
   defp set_compiler_opts(project, opts, extra) do

lib/mix/lib/mix/utils.ex

@@ -106,13 +106,12 @@ defmodule Mix.Utils do
   end
 
   @doc """
-  Read the manifest.
+  Reads the manifest and return each entry.
   """
-  def read_manifest(file, fun) do
-    if File.exists?(file) do
-      Enum.each File.stream!(file), fn file ->
-        fun.(String.rstrip(file, ?\n))
-      end
+  def read_manifest(file) do
+    case File.read(file) do
+      { :ok, contents } -> String.split(contents, "\n")
+      { :error, _ } -> []
     end
   end
 
@@ -123,15 +122,8 @@ defmodule Mix.Utils do
   function is compared to the manifest in order do detect
   the files removed from the manifest file.
   """
-  def update_manifest(file, fun) do
-    old =
-      case File.read(file) do
-        { :ok, contents } -> String.split(contents, "\n")
-        { :error, _ } -> []
-      end
-    current = fun.()
-    File.write!(file, Enum.join(current, "\n"))
-    { current, old -- current }
+  def update_manifest(file, new) do
+    File.write!(file, Enum.join(new, "\n"))
   end
 
   @doc """