github/rebar
1
0
Fork 0
mirror of https://github.com/correl/rebar.git synced 2024-11-23 19:19:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #237 from norton/norton-17

Browse source 
Add partial support for Erlang/OTP 17
This commit is contained in:
Andrew Thompson 2014-04-09 11:39:24 -04:00
commit 0c7fe5fc7b
2 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/rebar_require_vsn.erl
View file

@ -34,7 +34,8 @@
eunit/2]). eunit/2]).
%% for internal use only %% for internal use only
-export([info/2]). -export([info/2,
version_tuple/2]).
%% =================================================================== %% ===================================================================
%% Public API %% Public API
@ -110,7 +111,7 @@ check_versions(Config) ->
end. end.
version_tuple(OtpRelease, Type) -> version_tuple(OtpRelease, Type) ->
case re:run(OtpRelease, "R(\\d+)B?-?(\\d+)?", [{capture, all, list}]) of case re:run(OtpRelease, "R?(\\d+)B?-?(\\d+)?", [{capture, all, list}]) of
{match, [_Full, Maj, Min]} -> {match, [_Full, Maj, Min]} ->
{list_to_integer(Maj), list_to_integer(Min)}; {list_to_integer(Maj), list_to_integer(Min)};
{match, [_Full, Maj]} -> {match, [_Full, Maj]} ->

23
test/rebar_require_vsn_tests.erl Normal file
View file

@ -0,0 +1,23 @@
-module(rebar_require_vsn_tests).
-compile(export_all).
-include_lib("eunit/include/eunit.hrl").
version_tuple_test_() ->
[%% typical cases
?_assert(rebar_require_vsn:version_tuple("R15B", "eunit") =:= {15, 0}),
?_assert(rebar_require_vsn:version_tuple("R15B01", "eunit") =:= {15, 1}),
?_assert(rebar_require_vsn:version_tuple("R15B02", "eunit") =:= {15, 2}),
?_assert(rebar_require_vsn:version_tuple("R15B03-1", "eunit") =:= {15, 3}),
?_assert(rebar_require_vsn:version_tuple("R15B03", "eunit") =:= {15, 3}),
?_assert(rebar_require_vsn:version_tuple("R16B", "eunit") =:= {16, 0}),
?_assert(rebar_require_vsn:version_tuple("R16B01", "eunit") =:= {16, 1}),
?_assert(rebar_require_vsn:version_tuple("R16B02", "eunit") =:= {16, 2}),
?_assert(rebar_require_vsn:version_tuple("R16B03", "eunit") =:= {16, 3}),
?_assert(rebar_require_vsn:version_tuple("R16B03-1", "eunit") =:= {16, 3}),
?_assert(rebar_require_vsn:version_tuple("17", "eunit") =:= {17, 0}),
%% error cases
?_assertException(throw, rebar_abort, rebar_require_vsn:version_tuple("", "eunit")),
?_assertException(throw, rebar_abort, rebar_require_vsn:version_tuple("abc", "eunit"))
].