From 6d8567a7edbf206a0f595c22ecd17af0c46acb87 Mon Sep 17 00:00:00 2001
From: Fred Hebert <mononcqc@ferd.ca>
Date: Wed, 11 Feb 2015 20:06:49 +0000
Subject: Support multiple app upgrade & lock tests

- Many apps is supported through and through
- Not mentioning any app upgrades all apps
- Locks are refreshed on disk and tested as such after an upgrade
---
 src/rebar_prv_upgrade.erl | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/rebar_prv_upgrade.erl b/src/rebar_prv_upgrade.erl
index b9c6495..5ee2be6 100644
--- a/src/rebar_prv_upgrade.erl
+++ b/src/rebar_prv_upgrade.erl
@@ -40,35 +40,39 @@ init(State) ->
 -spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
 do(State) ->
     {Args, _} = rebar_state:command_parsed_args(State),
-    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),
+    Names = parse_names(ec_cnv:to_binary(proplists:get_value(package, Args)), Locks),
     case prepare_locks(Names, Deps, Locks, []) of
         {error, Reason} ->
             {error, Reason};
-        {Locks0, Unlocks0} ->
+        {Locks0, _Unlocks0} -> % unlocks may be useful for deletions
             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
+                {ok, State4} ->
+                    rebar_prv_lock:do(State4);
+                _ ->
+                    Res
             end
     end.
 
-parse_names(Bin) ->
-    lists:usort(re:split(Bin, <<" *, *">>, [trim])).
+-spec format_error(any()) -> iolist().
+format_error(Reason) ->
+    io_lib:format("~p", [Reason]).
+
+
+parse_names(Bin, Locks) ->
+    case lists:usort(re:split(Bin, <<" *, *">>, [trim])) of
+        %% Nothing submitted, use *all* apps
+        [<<"">>] -> [Name || {Name, _, 0} <- Locks];
+        [] -> [Name || {Name, _, 0} <- Locks];
+        %% Regular options
+        Other -> Other
+    end.
 
 prepare_locks([], _, Locks, Unlocks) ->
     {Locks, Unlocks};
@@ -109,7 +113,3 @@ unlock_higher_than(Level, [App = {_,_,AppLevel} | Apps], Locks, Unlocks) ->
        AppLevel =< Level -> unlock_higher_than(Level, Apps, [App | Locks], Unlocks)
     end.
 
--spec format_error(any()) -> iolist().
-format_error(Reason) ->
-    io_lib:format("~p", [Reason]).
-
-- 
cgit v1.1