Ensure path dependencies are compiled on mix deps.get

Author: José Valim

lib/mix/lib/mix/scm/path.ex

@@ -18,8 +18,8 @@ defmodule Mix.SCM.Path do
         path = "../#{app}"
 
         opts
-          |> Keyword.put(:path, path)
           |> Keyword.put(:dest, Path.expand(path))
+          |> Keyword.put_new(:path, path)
           |> Keyword.put_new(:env, Mix.env)
       true ->
         nil
@@ -40,7 +40,7 @@ defmodule Mix.SCM.Path do
 
   def checkout(opts) do
     path = Mix.Utils.relative_to_cwd opts[:dest]
-    raise Mix.Error, message: "Cannot checkout path dependency. Expected a dependency at #{path}"
+    raise Mix.Error, message: "cannot checkout path dependency, expected a dependency at #{path}"
   end
 
   def update(opts) do

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

@@ -48,7 +48,6 @@ defmodule Mix.Tasks.Deps.Compile do
       shell.info "* Compiling #{app}"
 
       deps_path = opts[:dest]
-
       root_path = Path.expand(Mix.project[:deps_path])
 
       config = [
@@ -123,7 +122,7 @@ defmodule Mix.Tasks.Deps.Compile do
     end
 
     Mix.Task.run "local.rebar", []
-    Mix.Rebar.local_rebar_cmd || raise Mix.Error, message: "Rebar instalation failed"
+    Mix.Rebar.local_rebar_cmd || raise Mix.Error, message: "rebar instalation failed"
   end
 
   defp do_command(app, command, extra // "") do

lib/mix/lib/mix/tasks/deps.get.ex

@@ -49,31 +49,39 @@ defmodule Mix.Tasks.Deps.Get do
 
   defp deps_getter(dep, { acc, lock }) do
     shell = Mix.shell
-    dep = check_lock(dep, lock)
-
-    if out_of_date?(dep) do
-      Mix.Dep[app: app, scm: scm, opts: opts] = dep
-      shell.info "* Getting #{format_dep(dep)}"
-
-      old  = lock[app]
-      opts = Keyword.put(opts, :lock, old)
-
-      new =
-        if scm.checked_out?(opts) do
-          scm.update(opts)
+    Mix.Dep[app: app, scm: scm, opts: opts] = dep = check_lock(dep, lock)
+
+    cond do
+      # Path dependencies are specially handled because they cannot
+      # be fetched although they are always compiled afterwards
+      scm == Mix.SCM.Path ->
+        { dep, { [app|acc], lock } }
+
+      # If the dependency is not available or we have a lock mismatch
+      out_of_date?(dep) ->
+        shell.info "* Getting #{format_dep(dep)}"
+
+        old  = lock[app]
+        opts = Keyword.put(opts, :lock, old)
+
+        new =
+          if scm.checked_out?(opts) do
+            scm.update(opts)
+          else
+            scm.checkout(opts)
+          end
+
+        if new do
+          # Update the dependency returned so it is now
+          # available and nested dependencies can be fetched
+          { Mix.Deps.update(dep), { [app|acc], Keyword.put(lock, app, new) } }
         else
-          scm.checkout(opts)
+          { dep, { acc, lock } }
         end
 
-      if new do
-        # Update the dependency returned so it is now
-        # available and nested dependencies can be fetched
-        { Mix.Deps.update(dep), { [app|acc], Keyword.put(lock, app, new) } }
-      else
+      # The dependency is ok or has some other error
+      true ->
         { dep, { acc, lock } }
-      end
-    else
-      { dep, { acc, lock } }
     end
   end
 end

lib/mix/lib/mix/tasks/deps.update.ex

@@ -73,7 +73,7 @@ defmodule Mix.Tasks.Deps.Update do
 
   defp check_unavailable!(dep) do
     unless available?(dep) do
-      raise Mix.Error, message: "Cannot update dependency #{dep.app} because " <>
+      raise Mix.Error, message: "cannot update dependency #{dep.app} because " <>
         "it isn't available, run `mix deps.get` first"
     end
     dep

lib/mix/test/mix/tasks/deps_test.exs

@@ -263,10 +263,12 @@ defmodule Mix.Tasks.DepsTest do
       Mix.Tasks.Deps.Get.run []
       message = "* Getting git_repo [git: #{inspect fixture_path("git_repo")}]"
       assert_received { :mix_shell, :info, [^message] }
+      assert_received { :mix_shell, :info, ["* Compiling deps_repo"] }
       assert_received { :mix_shell, :info, ["Generated git_repo.app"] }
 
       Mix.Tasks.Deps.Update.run ["--all"]
       assert_received { :mix_shell, :info, ["* Updating deps_repo (0.1.0) [path: \"custom/deps_repo\"]"] }
+      assert_received { :mix_shell, :info, ["* Compiling deps_repo"] }
     end
   after
     Mix.Project.pop