Merge pull request #718 from tsloughter/git-ref

add support for git ref and file content as app version

2 files changed, 36 insertions, 1 deletions

diff --git a/src/rlx_config.erl b/src/rlx_config.erl
index 4160bba..f86f593 100644
--- a/src/rlx_config.erl
+++ b/src/rlx_config.erl
@@ -346,6 +346,16 @@ merge_configs([{Key, Value} | CliTerms], ConfigTerms) ->
             merge_configs(CliTerms, lists:reverse(lists:keystore(Key, 1, lists:reverse(ConfigTerms), {Key, Value})))
     end.
 
+parse_vsn(Vsn) when Vsn =:= git ; Vsn =:= "git" ->
+    {ok, V} = ec_git_vsn:vsn(ec_git_vsn:new()),
+    V;
+parse_vsn({git, short}) ->
+    git_ref("--short");
+parse_vsn({git, long}) ->
+    git_ref("");
+parse_vsn({file, File}) ->
+    {ok, Vsn} = file:read_file(File),
+    binary_to_list(rlx_string:trim(Vsn, both, "\n"));
 parse_vsn(Vsn) when Vsn =:= semver ; Vsn =:= "semver" ->
     {ok, V} = ec_git_vsn:vsn(ec_git_vsn:new()),
     V;
@@ -357,3 +367,20 @@ parse_vsn({cmd, Command}) ->
     V;
 parse_vsn(Vsn) ->
     Vsn.
+
+git_ref(Arg) ->
+    case os:cmd("git rev-parse " ++ Arg ++ " HEAD") of
+        String ->
+            Vsn = rlx_string:trim(String, both, "\n"),
+            case length(Vsn) =:= 40 orelse length(Vsn) =:= 7 of
+                true ->
+                    Vsn;
+                false ->
+                    %% if the result isn't exactly either 40 or 7 characters then
+                    %% it must have failed
+                    {ok, Dir} = file:get_cwd(),
+                    ec_cmd_log:warn("Getting ref of git repo failed in ~ts. "
+                                    "Falling back to version 0", [Dir]),
+                    {plain, "0"}
+            end
+    end.
diff --git a/src/rlx_string.erl b/src/rlx_string.erl
index 1f9cc0c..d5f5046 100644
--- a/src/rlx_string.erl
+++ b/src/rlx_string.erl
@@ -2,14 +2,22 @@
 %% OTP-19 and OTP-21, where Unicode support means the deprecation
 %% of a lot of string functions.
 -module(rlx_string).
--export([concat/2, lexemes/2, join/2]).
+-export([concat/2, lexemes/2, join/2, trim/3]).
 
 -ifdef(unicode_str).
 concat(Str1, Str2) -> unicode:characters_to_list([Str1,Str2]).
 lexemes(Str, Separators) -> string:lexemes(Str, Separators).
+trim(Str, Direction, Cluster=[_]) -> string:trim(Str, Direction, Cluster).
 -else.
 concat(Str1, Str2) -> string:concat(Str1, Str2).
 lexemes(Str, Separators) -> string:tokens(Str, Separators).
+trim(Str, Direction, [Char]) ->
+    Dir = case Direction of
+              both -> both;
+              leading -> left;
+              trailing -> right
+          end,
+    string:strip(Str, Dir, Char).
 -endif.
 
 %% string:join/2 copy; string:join/2 is getting obsoleted