Pārlūkot izejas kodu

update hg username and email match in templates

pull/284/head
Tristan Sloughter pirms 10 gadiem
vecāks
revīzija
e4bf78a96a
2 mainītis faili ar 25 papildinājumiem un 3 dzēšanām
  1. +1
    -1
      src/rebar_templater.erl
  2. +24
    -2
      test/rebar_new_SUITE.erl

+ 1
- 1
src/rebar_templater.erl Parādīt failu

@ -156,7 +156,7 @@ default_author_and_email() ->
%% Ok, try mecurial
case rebar_utils:sh("hg showconfig ui.username", [return_on_error]) of
{ok, NameEmail} ->
case re:run(NameEmail, [{capture, [1,2], list}]) of
case re:run(NameEmail, "^(.*) <(.*)>$", [{capture, [1,2], list}]) of
{match, [Name, Email]} ->
{Name, Email};
_ ->

+ 24
- 2
test/rebar_new_SUITE.erl Parādīt failu

@ -6,7 +6,7 @@
-include_lib("common_test/include/ct.hrl").
-include_lib("eunit/include/eunit.hrl").
all() -> [app, app_with_fallbacks].
all() -> [app_git_user, app_hg_user, app_with_fallbacks].
init_per_testcase(Case, Config0) ->
@ -31,7 +31,7 @@ mock_empty_escript_templates() ->
meck:new(rebar_utils, [passthrough]),
meck:expect(rebar_utils, escript_foldl, fun(_,_,_) -> {ok, []} end).
app(Config) ->
app_git_user(Config) ->
meck:expect(rebar_utils, sh, fun("git config --global user.name", _) -> {ok, "gitname"};
("git config --global user.email", _) -> {ok, "git@email.com"}
end),
@ -73,6 +73,28 @@ app_with_fallbacks(Config) ->
{filename:join(["src", Name++"_app.erl"]), [Name]}
]).
app_hg_user(Config) ->
meck:expect(rebar_utils, sh, fun("hg showconfig ui.username", _) -> {ok, "hgname <hg@email.com>"};
(_, _) -> {error, fallback}
end),
Name = ?config(name, Config),
rebar_test_utils:run_and_check(
Config, [],
["new", "test_app", Name],
{ok, []}
),
validate_files(
Config, Name,
[{"LICENSE", ["hgname", "hg@email.com"]},
{"README.md", [Name]},
{".gitignore", []},
{"rebar.config", []},
{filename:join(["src", Name++".app.src"]), [Name]},
{filename:join(["src", Name++"_sup.erl"]), [Name]},
{filename:join(["src", Name++"_app.erl"]), [Name]}
]).
validate_files(_Config, Name, Checks) ->
[begin
Path = filename:join([Name, File]),

Notiek ielāde…
Atcelt
Saglabāt