Fix testcases, add multi-app upgrade support

todo:
- relock stuff
- default to all apps needing upgrade
- more tests?
- pkgs?

2 files changed, 75 insertions, 22 deletions

diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index 0e54324..dab4c24 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -252,7 +252,22 @@ update_src_deps(Profile, Level, SrcDeps, PkgDeps, SrcApps, State, Upgrade, Seen,
                                          true ->
                                              ok
                                      end,
-                                     {SrcDepsAcc, PkgDepsAcc, SrcAppsAcc, StateAcc, SeenAcc, LocksAcc};
+                                     %% scan for app children here if upgrading
+                                     case Upgrade of
+                                        false ->
+                                            {SrcDepsAcc, PkgDepsAcc, SrcAppsAcc, StateAcc, SeenAcc, LocksAcc};
+                                        true ->
+                                            {SrcDepsAcc1, PkgDepsAcc1, SrcAppsAcc1, StateAcc2, LocksAcc1} =
+                                            handle_dep(AppInfo
+                                                       ,SrcDepsAcc
+                                                       ,PkgDepsAcc
+                                                       ,SrcAppsAcc
+                                                       ,Level
+                                                       ,StateAcc
+                                                       ,LocksAcc),
+
+                                    {SrcDepsAcc1, PkgDepsAcc1, SrcAppsAcc1, StateAcc2, SeenAcc, LocksAcc1}
+                                     end;
                                  false ->
                                      {SeenAcc1, StateAcc1} = maybe_lock(Profile, AppInfo, SeenAcc, StateAcc, Level),
                                      {SrcDepsAcc1, PkgDepsAcc1, SrcAppsAcc1, StateAcc2, LocksAcc1} =
@@ -302,10 +317,10 @@ handle_upgrade(AppInfo, SrcDeps, PkgDeps, SrcApps, Level, State, Locks) ->
                               ,Locks);
 
                 false ->
-                    {SrcDeps, PkgDeps, SrcApps, State, Locks}
+                    {[AppInfo|SrcDeps], PkgDeps, SrcApps, State, Locks}
             end;
         _StillLocked ->
-            {SrcDeps, PkgDeps, SrcApps, State, Locks}
+            {[AppInfo|SrcDeps], PkgDeps, SrcApps, State, Locks}
     end.
 
 handle_dep(AppInfo, SrcDeps, PkgDeps, SrcApps, Level, State, Locks) ->
@@ -452,8 +467,9 @@ fetch_app(AppInfo, AppDir) ->
             Result
     end.
 
-maybe_upgrade(_AppInfo, _AppDir, false) ->
-    false;
+maybe_upgrade(AppInfo, AppDir, false) ->
+    Source = rebar_app_info:source(AppInfo),
+    rebar_fetch:needs_update(AppDir, Source);
 maybe_upgrade(AppInfo, AppDir, true) ->
     Source = rebar_app_info:source(AppInfo),
     case rebar_fetch:needs_update(AppDir, Source) of
diff --git a/src/rebar_prv_upgrade.erl b/src/rebar_prv_upgrade.erl
index e43841c..b9c6495 100644
--- a/src/rebar_prv_upgrade.erl
+++ b/src/rebar_prv_upgrade.erl
@@ -29,47 +29,84 @@ init(State) ->
                                                    {module, ?MODULE},
                                                    {bare, false},
                                                    {deps, ?DEPS},
-                                                   {example, "rebar upgrade cowboy"},
+                                                   {example, "rebar upgrade cowboy[,ranch]"},
                                                    {short_desc, "Upgrade dependency."},
                                                    {desc, ""},
                                                    {opts, [
-                                                          {package, undefined, undefined, string, "Package to upgrade."}
+                                                          {package, undefined, undefined, string, "Packages to upgrade."}
                                                           ]}])),
     {ok, State1}.
 
 -spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
 do(State) ->
     {Args, _} = rebar_state:command_parsed_args(State),
-    Name = ec_cnv:to_binary(proplists:get_value(package, Args)),
+    Names = parse_names(ec_cnv:to_binary(proplists:get_value(package, Args))),
+    %% TODO: support many names. Only a subtree can be updated per app
+    %%       mentioned. When no app is named, unlock *everything*
     Locks = rebar_state:get(State, {locks, default}, []),
+    Deps = rebar_state:get(State, deps),
+    case prepare_locks(Names, Deps, Locks, []) of
+        {error, Reason} ->
+            {error, Reason};
+        {Locks0, Unlocks0} ->
+            Deps0 = top_level_deps(Deps, Locks),
+            State1 = rebar_state:set(State, {deps, default}, Deps0),
+            State2 = rebar_state:set(State1, {locks, default}, Locks0),
+            State3 = rebar_state:set(State2, upgrade, true),
+            Res = rebar_prv_install_deps:do(State3),
+            case Res of
+                {ok, S} ->
+                    ct:pal("original locks ~p", [Locks]),
+                    ct:pal("new locks ~p", [Locks0]),
+                    ct:pal("old deps: ~p", [Deps]),
+                    ct:pal("new deps: ~p", [Deps0]),
+                    ct:pal("Unlocks: ~p", [Unlocks0]),
+                    %% TODO: replace new locks onto the old locks list
+                    rebar_prv_lock:do(S);
+                _ -> Res
+            end
+    end.
+
+parse_names(Bin) ->
+    lists:usort(re:split(Bin, <<" *, *">>, [trim])).
+
+prepare_locks([], _, Locks, Unlocks) ->
+    {Locks, Unlocks};
+prepare_locks([Name|Names], Deps, Locks, Unlocks) ->
     case lists:keyfind(Name, 1, Locks) of
         {_, _, 0} = Lock ->
-            Deps = rebar_state:get(State, deps),
-            case lists:keyfind(binary_to_atom(Name, utf8), 1, Deps) of
+            AtomName = binary_to_atom(Name, utf8),
+            case lists:keyfind(AtomName, 1, Deps) of
                 false ->
-                    {error, unknown_dependency};
+                    {error, {unknown_dependency, Name}};
                 Dep ->
                     Source = case Dep of
                         {_, Src} -> Src;
                         {_, _, Src} -> Src
                     end,
-                    NewLocks = unlock_higher_than(0, Locks -- [Lock]),
-                    State1 = rebar_state:set(State, {deps, default}, [{Name, Source, 0} | NewLocks]),
-                    State2 = rebar_state:set(State1, {locks, default}, NewLocks),
-                    State3 = rebar_state:set(State2, upgrade, true),
-                    rebar_prv_install_deps:do(State3)
+                    {NewLocks, NewUnlocks} = unlock_higher_than(0, Locks -- [Lock]),
+                    prepare_locks(Names,
+                                  %deps_like_locks(Deps, [{Name,Source,0} | NewLocks]),
+                                  Deps,
+                                  NewLocks,
+                                  [{Name, Source, 0} | NewUnlocks ++ Unlocks])
             end;
         {_, _, Level} when Level > 0 ->
-            {error, transitive_dependency};
+            {error, {transitive_dependency,Name}};
         false ->
-            {error, unknown_dependency}
+            {error, {unknown_dependency,Name}}
     end.
 
+top_level_deps(Deps, Locks) ->
+    [Dep || Dep <- Deps, lists:keymember(0, 3, Locks)].
+
+unlock_higher_than(Level, Locks) -> unlock_higher_than(Level, Locks, [], []).
 
-unlock_higher_than(_, []) -> [];
-unlock_higher_than(Level, [App = {_,_,AppLevel} | Apps]) ->
-    if AppLevel > Level  -> unlock_higher_than(Level, Apps);
-       AppLevel =< Level -> [App | unlock_higher_than(Level, Apps)]
+unlock_higher_than(_, [], Locks, Unlocks) ->
+    {Locks, Unlocks};
+unlock_higher_than(Level, [App = {_,_,AppLevel} | Apps], Locks, Unlocks) ->
+    if AppLevel > Level  -> unlock_higher_than(Level, Apps, Locks, [App | Unlocks]);
+       AppLevel =< Level -> unlock_higher_than(Level, Apps, [App | Locks], Unlocks)
     end.
 
 -spec format_error(any()) -> iolist().