From 1c9c4d1d772fcbf4fdad09eea08f0a7e01c0c0f4 Mon Sep 17 00:00:00 2001 From: Joe DeVivo Date: Fri, 10 Jul 2015 10:19:11 -0700 Subject: Now you can specify {semver, "version"} where "version" is the prefix you use for tagging versions in git --- rebar.config | 2 +- rebar.lock | 2 +- src/rlx_config.erl | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/rebar.config b/rebar.config index 203a937..5a93b17 100644 --- a/rebar.config +++ b/rebar.config @@ -1,6 +1,6 @@ %% -*- mode: Erlang; fill-column: 80; comment-column: 75; -*- %% Dependencies ================================================================ -{deps, [{erlware_commons, "0.13.0"}, +{deps, [{erlware_commons, "0.14.0"}, {providers, "1.4.1"}, {getopt, "0.8.2"}, {bbmustache, "1.0.3"} diff --git a/rebar.lock b/rebar.lock index 921e6f3..287e3b0 100644 --- a/rebar.lock +++ b/rebar.lock @@ -1,4 +1,4 @@ [{<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.0.3">>},0}, {<<"providers">>,{pkg,<<"providers">>,<<"1.4.1">>},0}, - {<<"erlware_commons">>,{pkg,<<"erlware_commons">>,<<"0.13.0">>},0}, + {<<"erlware_commons">>,{pkg,<<"erlware_commons">>,<<"0.14.0">>},0}, {<<"getopt">>,{pkg,<<"getopt">>,<<"0.8.2">>},0}]. diff --git a/src/rlx_config.erl b/src/rlx_config.erl index 33e8f27..1f441ed 100644 --- a/src/rlx_config.erl +++ b/src/rlx_config.erl @@ -295,7 +295,9 @@ merge_configs([{Key, Value} | CliTerms], ConfigTerms) -> end. parse_vsn(Vsn) when Vsn =:= semver ; Vsn =:= "semver" -> - {ok, V} = ec_git_vsn:vsn([]), + parse_vsn({semver, "v"}); +parse_vsn({semver, Prefix}) -> + {ok, V} = ec_git_vsn:vsn({Prefix}), V; parse_vsn(Vsn) -> Vsn. -- cgit v1.2.3