Merge pull request #474 from tsloughter/fix_plugin_install

fixing plugin install and paths

1 files changed, 34 insertions, 14 deletions

diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index 80fdbc3..eb24a9d 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -37,7 +37,10 @@
 
 -export([handle_deps/3,
          handle_deps/4,
-         handle_deps/5]).
+         handle_deps/5,
+
+         find_cycles/1,
+         cull_compile/2]).
 
 -export_type([dep/0]).
 
@@ -76,6 +79,10 @@ do(State) ->
         {Apps, State1} =
             lists:foldl(fun deps_per_profile/2, {[], State}, lists:reverse(Profiles)),
 
+        State2 = rebar_state:update_all_deps(State1, Apps),
+        CodePaths = [rebar_app_info:ebin_dir(A) || A <- Apps],
+        State3 = rebar_state:update_code_paths(State2, all_deps, CodePaths),
+
         Source = ProjectApps ++ Apps,
         case find_cycles(Source) of
             {cycles, Cycles} ->
@@ -84,7 +91,7 @@ do(State) ->
                 {error, Error};
             {no_cycle, Sorted} ->
                 ToCompile = cull_compile(Sorted, ProjectApps),
-                {ok, rebar_state:deps_to_build(State1, ToCompile)}
+                {ok, rebar_state:deps_to_build(State3, ToCompile)}
         end
     catch
         %% maybe_fetch will maybe_throw an exception to break out of some loops
@@ -158,11 +165,7 @@ handle_deps(Profile, State0, Deps, Upgrade, Locks) ->
                              ,lists:ukeysort(2, SrcApps)
                              ,lists:ukeysort(2, Solved)),
 
-    State5 = rebar_state:update_all_deps(State4, AllDeps),
-    CodePaths = [rebar_app_info:ebin_dir(A) || A <- AllDeps],
-    State6 = rebar_state:update_code_paths(State5, all_deps, CodePaths),
-
-    {ok, AllDeps, State6}.
+    {ok, AllDeps, State4}.
 
 %% ===================================================================
 %% Internal functions
@@ -224,7 +227,22 @@ handle_pkg_dep(Profile, Pkg, Packages, Upgrade, DepsDir, Fetched, Seen, Locks, S
     Level = rebar_app_info:dep_level(AppInfo),
     {NewSeen, NewState} = maybe_lock(Profile, AppInfo, Seen, State, Level),
     {_, AppInfo1} = maybe_fetch(AppInfo, Profile, Upgrade, Seen, NewState),
-    {[AppInfo1 | Fetched], NewSeen, NewState}.
+
+    Profiles = rebar_state:current_profiles(State),
+    Name = rebar_app_info:name(AppInfo1),
+    C = rebar_config:consult(rebar_app_info:dir(AppInfo1)),
+    BaseDir = rebar_state:get(State, base_dir, []),
+    S1 = rebar_state:new(rebar_state:set(rebar_state:new(), base_dir, BaseDir),
+                        C, rebar_app_info:dir(AppInfo1)),
+    S2 = rebar_state:apply_profiles(S1, Profiles),
+    S3 = rebar_state:apply_overrides(S2, Name),
+    AppInfo2 = rebar_app_info:state(AppInfo1, S3),
+
+    %% Dep may have plugins to install. Find and install here.
+    S4 = rebar_plugins:handle_plugins(rebar_state:get(S3, plugins, []), S3),
+    AppInfo3 = rebar_app_info:state(AppInfo2, S4),
+
+    {[AppInfo3 | Fetched], NewSeen, NewState}.
 
 maybe_lock(Profile, AppInfo, Seen, State, Level) ->
     case rebar_app_info:is_checkout(AppInfo) of
@@ -383,14 +401,16 @@ handle_dep(State, DepsDir, AppInfo, Locks, Level) ->
     AppInfo1 = rebar_app_info:state(AppInfo, S3),
 
     %% Dep may have plugins to install. Find and install here.
-    State1 = rebar_plugins:handle_plugins(rebar_state:get(S3, plugins, []), State),
-    Deps = rebar_state:get(S3, deps, []),
+    S4 = rebar_plugins:handle_plugins(rebar_state:get(S3, plugins, []), S3),
+    AppInfo2 = rebar_app_info:state(AppInfo1, S4),
+
     %% Upgrade lock level to be the level the dep will have in this dep tree
+    Deps = rebar_state:get(S4, deps, []),
     NewLocks = [{DepName, Source, LockLevel+Level} ||
-                   {DepName, Source, LockLevel} <- rebar_state:get(S3, {locks, default}, [])],
-    AppInfo2 = rebar_app_info:deps(AppInfo1, rebar_state:deps_names(Deps)),
-    {SrcDeps, PkgDeps} = parse_deps(DepsDir, Deps, S3, Locks, Level+1),
-    {AppInfo2, SrcDeps, PkgDeps, Locks++NewLocks, State1}.
+                   {DepName, Source, LockLevel} <- rebar_state:get(S4, {locks, default}, [])],
+    AppInfo3 = rebar_app_info:deps(AppInfo2, rebar_state:deps_names(Deps)),
+    {SrcDeps, PkgDeps} = parse_deps(DepsDir, Deps, S4, Locks, Level+1),
+    {AppInfo3, SrcDeps, PkgDeps, Locks++NewLocks, State}.
 
 -spec maybe_fetch(rebar_app_info:t(), atom(), boolean(),
                   sets:set(binary()), rebar_state:t()) -> {boolean(), rebar_app_info:t()}.