Improve coverage for builds and rebar integration

Author: José Valim

lib/mix/lib/mix/project.ex

@@ -253,7 +253,7 @@ defmodule Mix.Project do
     target = Path.join(app, "ebin")
 
     cond do
-      opts[:symlink_ebin?] ->
+      opts[:symlink_ebin] ->
         Mix.Utils.symlink_or_copy(source, target)
       match?({ :ok, _ }, :file.read_link(target)) ->
         File.rm_rf!(target)

lib/mix/lib/mix/tasks/deps.compile.ex

@@ -163,7 +163,7 @@ defmodule Mix.Tasks.Deps.Compile do
   defp build_structure(dest, build, config) do
     File.cd! dest, fn ->
       config = Keyword.put(config, :app_path, build)
-      Mix.Project.build_structure(config, symlink_ebin?: true)
+      Mix.Project.build_structure(config, symlink_ebin: true)
     end
   end
 end

lib/mix/lib/mix/utils.ex

@@ -320,21 +320,25 @@ defmodule Mix.Utils do
   """
   def symlink_or_copy(source, target) do
     if File.exists?(source) do
-      case :file.make_symlink(source, target) do
-        :ok -> :ok
-        { :error, :eexist } ->
-          case :file.read_link(target) do
-            { :ok, _ } -> :ok
-            { :error, _ } -> do_copy(source, target)
-          end
-        { :error, _ } -> do_copy(source, target)
+      source_list = String.to_char_list!(source)
+      case :file.read_link(target) do
+        { :ok, ^source_list } -> :ok
+        { :error, :enoent } ->
+          do_symlink_or_copy(source, target)
+        { :error, _ } ->
+          File.rm_rf!(target)
+          do_symlink_or_copy(source, target)
       end
+    else
+      { :error, :enoent }
     end
   end
 
-  defp do_copy(source, target) do
-    File.rm_rf!(target)
-    File.cp_r!(source, Path.join(target, "."))
+  defp do_symlink_or_copy(source, target) do
+    case :file.make_symlink(source, target) do
+      :ok -> :ok
+      { :error, _ } -> File.cp_r!(source, Path.join(target, "."))
+    end
   end
 
   @doc """

lib/mix/test/fixtures/rebar_dep/apps/another/rebar.config

@@ -76,4 +76,26 @@ defmodule Mix.ProjectTest do
       Mix.Project.get!
     end
   end
+
+  test "builds the project structure" do
+    in_fixture "archive", fn ->
+      config = [app_path: "_build/archive"]
+      assert Mix.Project.build_structure(config) == :ok
+      assert File.dir?("_build/archive/ebin")
+      assert :file.read_link("_build/archive/priv") == { :ok, Path.expand('priv') }
+    end
+  end
+
+  test "builds the project structure with ebin symlink" do
+    in_fixture "archive", fn ->
+      config = [app_path: "_build/archive"]
+      assert Mix.Project.build_structure(config, symlink_ebin: true) == :ok
+      assert :file.read_link("_build/archive/ebin") == { :ok, Path.expand('ebin') }
+      assert :file.read_link("_build/archive/priv") == { :ok, Path.expand('priv') }
+
+      assert Mix.Project.build_structure(config) == :ok
+      assert File.dir?("_build/archive/ebin")
+      assert :file.read_link("_build/archive/priv") == { :ok, Path.expand('priv') }
+    end
+  end
 end

lib/mix/test/fixtures/rebar_dep/ebin/.gitkeep

@@ -76,11 +76,14 @@ defmodule Mix.RebarTest do
       assert_received { :mix_shell, :info, ["* Compiling git_rebar"] }
       assert_received { :mix_shell, :info, ["* Compiling rebar_dep"] }
       assert :git_rebar.any_function == :ok
+      assert :rebar_dep.any_function == :ok
 
       load_paths = Mix.Deps.loaded
         |> Enum.map(&Mix.Deps.load_paths(&1))
         |> Enum.concat
 
+      assert File.exists?("_build/lib/rebar_dep/ebin/rebar_dep.beam")
+      assert File.exists?("_build/lib/git_rebar/ebin/git_rebar.beam")
       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

lib/mix/test/mix/project_test.exs

@@ -77,4 +77,20 @@ defmodule Mix.UtilsTest do
     time = { { 2000, 1, 1 }, { 0, 0, 0 } }
     assert Mix.Utils.extract_stale([{ "hello", time }], [__FILE__]) == []
   end
+
+  test :symlink_or_copy do
+    in_fixture "archive", fn ->
+      File.mkdir_p!("_build/archive")
+      assert Mix.Utils.symlink_or_copy(Path.expand("ebin"), "_build/archive/ebin") == :ok
+      assert :file.read_link("_build/archive/ebin") == { :ok, Path.expand('ebin') }
+    end
+  end
+
+  test :symlink_or_copy_removes_previous_directories do
+    in_fixture "archive", fn ->
+      File.mkdir_p!("_build/archive/ebin")
+      assert Mix.Utils.symlink_or_copy(Path.expand("ebin"), "_build/archive/ebin") == :ok
+      assert :file.read_link("_build/archive/ebin") == { :ok, Path.expand('ebin') }
+    end
+  end
 end