Do not write manifest down if there was a compilation error, closes #1833

Author: José Valim

lib/mix/lib/mix/shell.ex

@@ -61,7 +61,7 @@ defmodule Mix.Shell do
         command = command
           |> String.replace("\"", "\\\"")
           |> :binary.bin_to_list
-        'sh -c ' ++ command
+        'sh -c "' ++ command ++ '"'
 
       { :win32, osname } ->
         command = :binary.bin_to_list(command)

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

@@ -42,8 +42,9 @@ defmodule Mix.Tasks.Compile.Elixir do
             Kernel.ParallelCompiler.files :lists.usort(stale),
               each_module: &each_module(pid, compile_path, cwd, &1, &2, &3),
               each_file: &each_file(&1)
+            :gen_server.cast(pid, { :write, manifest })
           after
-            :gen_server.call(pid, { :stop, manifest })
+            :gen_server.call(pid, :stop)
           end
 
           :ok
@@ -57,13 +58,12 @@ defmodule Mix.Tasks.Compile.Elixir do
     defp each_module(pid, compile_path, cwd, source, module, binary) do
       bin  = atom_to_binary(module)
       beam = Path.join(compile_path, bin <> ".beam")
-      File.write!(beam, binary)
 
       deps = Kernel.LexicalTracker.remotes(module)
              |> :lists.usort |> Enum.map(&atom_to_binary(&1))
 
       relative = if cwd, do: Path.relative_to(source, cwd), else: source
-      :gen_server.cast(pid, { :store, beam, bin, relative, deps })
+      :gen_server.cast(pid, { :store, beam, bin, relative, deps, binary })
     end
 
     defp each_file(file) do
@@ -126,7 +126,8 @@ defmodule Mix.Tasks.Compile.Elixir do
 
     defp write_manifest(manifest, entries) do
       lines = Enum.map(entries, fn
-        { beam, module, source, deps } ->
+        { beam, module, source, deps, binary } ->
+          if binary, do: File.write!(beam, binary)
           [beam, module, source | deps] |> Enum.join("\t")
       end)
       Mix.Utils.write_manifest(manifest, lines)
@@ -135,20 +136,24 @@ defmodule Mix.Tasks.Compile.Elixir do
     # Callbacks
 
     def init(entries) do
-      { :ok, entries }
+      { :ok, Enum.map(entries, &Tuple.insert_at(&1, 4, nil)) }
     end
 
-    def handle_call({ :stop, manifest }, _from, entries) do
-      write_manifest(manifest, entries)
+    def handle_call(:stop, _from, entries) do
       { :stop, :normal, :ok, entries }
     end
 
     def handle_call(msg, from, state) do
       super(msg, from, state)
     end
 
-    def handle_cast({ :store, beam, module, source, deps }, entries) do
-      { :noreply, :lists.keystore(beam, 1, entries, { beam, module, source, deps }) }
+    def handle_cast({ :write, manifest }, entries) do
+      write_manifest(manifest, entries)
+      { :noreply, entries }
+    end
+
+    def handle_cast({ :store, beam, module, source, deps, binary }, entries) do
+      { :noreply, :lists.keystore(beam, 1, entries, { beam, module, source, deps, binary }) }
     end
 
     def handle_cast(msg, state) do

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

@@ -17,6 +17,23 @@ defmodule Mix.Tasks.Compile.ElixirTest do
     end
   end
 
+  test "does not write beam down on failures" do
+    import ExUnit.CaptureIO
+
+    in_fixture "only_mixfile", fn ->
+      File.mkdir_p!("lib")
+      File.write!("lib/a.ex", "raise %s(oops)")
+
+      capture_io fn ->
+        assert_raise RuntimeError, fn ->
+          Mix.Tasks.Compile.Elixir.run []
+        end
+      end
+
+      refute File.regular?("ebin/Elixir.A.beam")
+    end
+  end
+
   test "removes old artifact files" do
     in_fixture "no_mixfile", fn ->
       assert Mix.Tasks.Compile.Elixir.run([]) == :ok