diff options
author | Tristan Sloughter <[email protected]> | 2013-09-09 20:16:55 -0500 |
---|---|---|
committer | Tristan Sloughter <[email protected]> | 2013-09-11 20:07:33 -0500 |
commit | ff0a11dc7b2e2ef902c97a62595b29e9bc89029a (patch) | |
tree | a96c523adba91117ee3ce4cfa557155c0cc303db /src/rlx_cmd_args.erl | |
parent | 2f54b2d5360c52fff2c3f8fde73b29b6069174ea (diff) | |
download | relx-ff0a11dc7b2e2ef902c97a62595b29e9bc89029a.tar.gz relx-ff0a11dc7b2e2ef902c97a62595b29e9bc89029a.tar.bz2 relx-ff0a11dc7b2e2ef902c97a62595b29e9bc89029a.zip |
allow multiple actions, including new action tar
Diffstat (limited to 'src/rlx_cmd_args.erl')
-rw-r--r-- | src/rlx_cmd_args.erl | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/src/rlx_cmd_args.erl b/src/rlx_cmd_args.erl index 1a8e7f2..4fbadba 100644 --- a/src/rlx_cmd_args.erl +++ b/src/rlx_cmd_args.erl @@ -32,24 +32,21 @@ -spec args2state([getopt:option()], [string()]) -> {ok, {rlx_state:t(), [string()]}} | relx:error(). -args2state(Opts, Target) - when erlang:length(Target) == 0; erlang:length(Target) == 1 -> +args2state(Opts, Targets) -> RelName = rlx_util:to_atom(proplists:get_value(relname, Opts, undefined)), RelVsn = proplists:get_value(relvsn, Opts, undefined), - case convert_target(Target) of - {ok, AtomizedTarget} -> + case convert_targets(Targets) of + {ok, AtomizedTargets} -> case create_log(Opts, [{relname, RelName}, {relvsn, RelVsn}]) of Error = {error, _} -> Error; {ok, CommandLineConfig} -> - handle_config(Opts, AtomizedTarget, CommandLineConfig) + handle_config(Opts, AtomizedTargets, CommandLineConfig) end; Error -> Error - end; -args2state(_Opts, Targets) -> - ?RLX_ERROR({invalid_targets, Targets}). + end. -spec format_error(Reason::term()) -> iolist(). format_error({invalid_targets, Targets}) -> @@ -88,25 +85,33 @@ format_error({invalid_target, Target}) -> %%%=================================================================== %%% Internal Functions %%%=================================================================== --spec handle_config([getopt:option()], atom(), proplists:proplist()) -> +-spec handle_config([getopt:option()], [atom()], proplists:proplist()) -> {ok, {rlx_state:t(), [string()]}} | relx:error(). -handle_config(Opts, Target, CommandLineConfig) -> +handle_config(Opts, Targets, CommandLineConfig) -> case validate_config(proplists:get_value(config, Opts, [])) of Error = {error, _} -> Error; {ok, Config} -> - {ok, rlx_state:new([{config, Config} | CommandLineConfig], Target)} + {ok, rlx_state:new([{config, Config} | CommandLineConfig], Targets)} end. --spec convert_target([string()]) -> {ok, release | relup} | relx:error(). -convert_target([]) -> - {ok, release}; -convert_target(["release"]) -> - {ok, release}; -convert_target(["relup"]) -> - {ok, relup}; -convert_target(Target) -> +-spec convert_targets([string()]) -> {ok, release | relup} | relx:error(). +convert_targets(Targets) -> + convert_targets(Targets, []). + +-spec convert_targets([string()], [string()]) -> {ok, release | relup} | relx:error(). +convert_targets([], []) -> + {ok, [release]}; +convert_targets([], Acc) -> + {ok, Acc}; +convert_targets(["release" | T], Acc) -> + convert_targets(T, [release | Acc]); +convert_targets(["relup" | T], Acc) -> + convert_targets(T, [relup | Acc]); +convert_targets(["tar" | T], Acc) -> + convert_targets(T, [tar | Acc]); +convert_targets([Target | _T], _Acc) -> ?RLX_ERROR({invalid_target, Target}). -spec validate_config(file:filename() | undefined) -> |