diff options
author | tothlac <tothlac@gmail.com> | 2018-11-11 17:12:41 +0100 |
---|---|---|
committer | tothlac <tothlac@gmail.com> | 2018-11-17 16:10:07 +0100 |
commit | 5facb035fe67a0e2683c6460833ac1ec8baa8c82 (patch) | |
tree | 11360f01f78aa869d6bb2211c6f6d65d0ab1567d /src/rebar_prv_alias.erl | |
parent | 5944b14f570ee3b42debe71f4628c7ef7824984c (diff) |
Support alias format {Namespace, Cmd} and {Namespace, Cmd, Args} (#1940)
Diffstat (limited to 'src/rebar_prv_alias.erl')
-rw-r--r-- | src/rebar_prv_alias.erl | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/rebar_prv_alias.erl b/src/rebar_prv_alias.erl index 736417b..ce56f29 100644 --- a/src/rebar_prv_alias.erl +++ b/src/rebar_prv_alias.erl @@ -73,8 +73,12 @@ desc(Cmds) -> "Equivalent to running: rebar3 do " ++ rebar_string:join(lists:map(fun to_desc/1, Cmds), ","). -to_desc({Cmd, Args}) -> +to_desc({Cmd, Args}) when is_list(Args) -> atom_to_list(Cmd) ++ " " ++ Args; +to_desc({Namespace, Cmd}) -> + atom_to_list(Namespace) ++ " " ++ atom_to_list(Cmd); +to_desc({Namespace, Cmd, Args}) -> + atom_to_list(Namespace) ++ " " ++ atom_to_list(Cmd) ++ " " ++ Args; to_desc(Cmd) -> atom_to_list(Cmd). @@ -98,6 +102,12 @@ make_args(Cmds) -> lists:map(fun make_tuple/1, lists:map(fun make_arg/1, Cmds))). +make_arg({Namespace, Command, Args}) when is_atom(Namespace), is_atom(Command) -> + {make_atom(Namespace), + make_atom(Command), + make_list([make_string(A) || A <- split_args(Args)])}; +make_arg({Namespace, Command}) when is_atom(Namespace), is_atom(Command) -> + {make_atom(Namespace), make_atom(Command)}; make_arg({Cmd, Args}) -> {make_string(Cmd), make_list([make_string(A) || A <- split_args(Args)])}; make_arg(Cmd) -> @@ -117,6 +127,9 @@ make_string(Atom) when is_atom(Atom) -> make_string(String) when is_list(String) -> {string, 1, String}. +make_atom(Atom) when is_atom(Atom) -> + {atom, 1, Atom}. + %% In case someone used the long option format, the option needs to get %% separated from its value. split_args(Args) -> |