Update from Upstream

1 files changed, 75 insertions, 35 deletions

diff --git a/test/rebar_test_utils.erl b/test/rebar_test_utils.erl
index 8c177c9..944efa0 100644
--- a/test/rebar_test_utils.erl
+++ b/test/rebar_test_utils.erl
@@ -1,11 +1,12 @@
 -module(rebar_test_utils).
 -include_lib("common_test/include/ct.hrl").
 -include_lib("eunit/include/eunit.hrl").
--export([init_rebar_state/1, init_rebar_state/2, run_and_check/4, check_results/3]).
+-export([init_rebar_state/1, init_rebar_state/2, run_and_check/3, run_and_check/4, check_results/3]).
 -export([expand_deps/2, flat_deps/1, top_level_deps/1]).
 -export([create_app/4, create_plugin/4, create_eunit_app/4, create_empty_app/4,
-         create_config/2, create_config/3, package_app/3]).
--export([create_random_name/1, create_random_vsn/0, write_src_file/2]).
+         create_config/2, create_config/3, package_app/4]).
+-export([create_random_name/1, create_random_vsn/0, write_src_file/2,
+         random_element/1]).
 
 %% Pick the right random module
 -ifdef(rand_only).
@@ -34,8 +35,10 @@ init_rebar_state(Config, Name) ->
     Verbosity = rebar3:log_level(),
     rebar_log:init(command_line, Verbosity),
     GlobalDir = filename:join([DataDir, "cache"]),
+    Repos = proplists:get_value(repos, Config, []),
     State = rebar_state:new([{base_dir, filename:join([AppsDir, "_build"])}
                             ,{global_rebar_dir, GlobalDir}
+                            ,{hex, [{repos, [#{name => R} || R <- Repos]}]}
                             ,{root_dir, AppsDir}]),
     [{apps, AppsDir}, {checkouts, CheckoutsDir}, {state, State} | Config].
 
@@ -79,6 +82,33 @@ run_and_check(Config, RebarConfig, Command, Expect) ->
         rebar_abort when Expect =:= rebar_abort -> rebar_abort
     end.
 
+run_and_check(Config, Command, Expect) ->
+    %% Assumes init_rebar_state has run first
+    AppDir = ?config(apps, Config),
+    {ok, Cwd} = file:get_cwd(),
+    try
+        ok = file:set_cwd(AppDir),
+        Res = rebar3:run(Command),
+        case Expect of
+            {error, Reason} ->
+                ?assertEqual({error, Reason}, Res);
+            {ok, Expected} ->
+                {ok, _} = Res,
+                check_results(AppDir, Expected, "*"),
+                Res;
+            {ok, Expected, ProfileRun} ->
+                {ok, _} = Res,
+                check_results(AppDir, Expected, ProfileRun),
+                Res;
+            return ->
+                Res
+        end
+    catch
+        rebar_abort when Expect =:= rebar_abort -> rebar_abort
+    after
+        ok = file:set_cwd(Cwd)
+    end.
+
 %% @doc Creates a dummy application including:
 %% - src/<file>.erl
 %% - src/<file>.app.src
@@ -167,14 +197,14 @@ expand_deps(pkg, [{Name, Vsn, Deps} | Rest]) ->
     [{Dep, expand_deps(pkg, Deps)} | expand_deps(pkg, Rest)];
 expand_deps(mixed, [{Name, Deps} | Rest]) ->
     Dep = if hd(Name) >= $a, hd(Name) =< $z ->
-            {pkg, string:to_upper(Name), "0.0.0", undefined}
+            {pkg, rebar_string:uppercase(Name), "0.0.0", undefined}
            ; hd(Name) >= $A, hd(Name) =< $Z ->
             {Name, ".*", {git, "https://example.org/user/"++Name++".git", "master"}}
     end,
     [{Dep, expand_deps(mixed, Deps)} | expand_deps(mixed, Rest)];
 expand_deps(mixed, [{Name, Vsn, Deps} | Rest]) ->
     Dep = if hd(Name) >= $a, hd(Name) =< $z ->
-            {pkg, string:to_upper(Name), Vsn, undefined}
+            {pkg, rebar_string:uppercase(Name), Vsn, undefined}
            ; hd(Name) >= $A, hd(Name) =< $Z ->
             {Name, Vsn, {git, "https://example.org/user/"++Name++".git", {tag, Vsn}}}
     end,
@@ -218,7 +248,7 @@ check_results(AppDir, Expected, ProfileRun) ->
     BuildDirs = filelib:wildcard(filename:join([AppDir, "_build", ProfileRun, "lib", "*"])),
     PluginDirs = filelib:wildcard(filename:join([AppDir, "_build", ProfileRun, "plugins", "*"])),
     GlobalPluginDirs = filelib:wildcard(filename:join([AppDir, "global", "plugins", "*"])),
-    CheckoutsDir = filename:join([AppDir, "_checkouts", "*"]),
+    CheckoutsDirs = filelib:wildcard(filename:join([AppDir, "_checkouts", "*"])),
     LockFile = filename:join([AppDir, "rebar.lock"]),
     Locks = lists:flatten(rebar_config:consult_lock_file(LockFile)),
 
@@ -230,7 +260,7 @@ check_results(AppDir, Expected, ProfileRun) ->
 
     Deps = rebar_app_discover:find_apps(BuildDirs, all),
     DepsNames = [{ec_cnv:to_list(rebar_app_info:name(App)), App} || App <- Deps],
-    Checkouts = rebar_app_discover:find_apps([CheckoutsDir], all),
+    Checkouts = rebar_app_discover:find_apps(CheckoutsDirs, all),
     CheckoutsNames = [{ec_cnv:to_list(rebar_app_info:name(App)), App} || App <- Checkouts],
     Plugins = rebar_app_discover:find_apps(PluginDirs, all),
     PluginsNames = [{ec_cnv:to_list(rebar_app_info:name(App)), App} || App <- Plugins],
@@ -263,6 +293,14 @@ check_results(AppDir, Expected, ProfileRun) ->
                         ok
                 end
         ; ({dep_not_exist, Name}) ->
+                ct:pal("Dep Not Exist Name: ~p", [Name]),
+                case lists:keyfind(Name, 1, DepsNames) of
+                    false ->
+                        ok;
+                    {Name, _App} ->
+                        error({app_found, Name})
+                end
+        ; ({app_not_exist, Name}) ->
                 ct:pal("App Not Exist Name: ~p", [Name]),
                 case lists:keyfind(Name, 1, DepsNames) of
                     false ->
@@ -349,7 +387,7 @@ check_results(AppDir, Expected, ProfileRun) ->
                                      iolist_to_binary(LockVsn))
                 end
         ;  ({release, Name, Vsn, ExpectedDevMode}) ->
-                ct:pal("Release: ~p-~s", [Name, Vsn]),
+                ct:pal("Release: ~p-~ts", [Name, Vsn]),
                 {ok, Cwd} = file:get_cwd(),
                 try
                     file:set_cwd(AppDir),
@@ -377,14 +415,14 @@ check_results(AppDir, Expected, ProfileRun) ->
                     file:set_cwd(Cwd)
                 end
         ;  ({tar, Name, Vsn}) ->
-                ct:pal("Tarball: ~s-~s", [Name, Vsn]),
+                ct:pal("Tarball: ~ts-~ts", [Name, Vsn]),
                 Tarball = filename:join([AppDir, "_build", "rel", Name, Name++"-"++Vsn++".tar.gz"]),
                 ?assertNotEqual([], filelib:is_file(Tarball))
         ;  ({file, Filename}) ->
-                ct:pal("Filename: ~s", [Filename]),
+                ct:pal("Filename: ~ts", [Filename]),
                 ?assert(filelib:is_file(Filename))
         ;  ({dir, Dirname}) ->
-                ct:pal("Directory: ~s", [Dirname]),
+                ct:pal("Directory: ~ts", [Dirname]),
                 ?assert(filelib:is_dir(Dirname))
         end, Expected).
 
@@ -425,15 +463,16 @@ erl_src_file(Name) ->
 
 plugin_src_file(Name) ->
     io_lib:format("-module('~s').\n"
-                 "-export([init/1]).\n"
+                 "-export([init/1, do/1]).\n"
                  "init(State) -> \n"
                  "Provider = providers:create([\n"
                  "{name, '~s'},\n"
                  "{module, '~s'}\n"
                  "]),\n"
-                 "{ok, rebar_state:add_provider(State, Provider)}.\n", [filename:basename(Name, ".erl"),
-                                                                        filename:basename(Name, ".erl"),
-                                                                        filename:basename(Name, ".erl")]).
+                 "{ok, rebar_state:add_provider(State, Provider)}.\n"
+                 "do(State) -> {ok, State}.\n", [filename:basename(Name, ".erl"),
+                                                 filename:basename(Name, ".erl"),
+                                                 filename:basename(Name, ".erl")]).
 
 erl_eunitized_src_file(Name) ->
     io_lib:format("-module('~s').\n"
@@ -466,24 +505,25 @@ get_app_metadata(Name, Vsn, Deps) ->
       {registered, []},
       {applications, Deps}]}.
 
-package_app(AppDir, DestDir, PkgName) ->
-    Name = PkgName++".tar",
-    {ok, Fs} = rebar_utils:list_dir(AppDir),
-    ok = erl_tar:create(filename:join(DestDir, "contents.tar.gz"),
-                        lists:zip(Fs, [filename:join(AppDir,F) || F <- Fs]),
-                        [compressed]),
-    ok = file:write_file(filename:join(DestDir, "metadata.config"), "who cares"),
-    ok = file:write_file(filename:join(DestDir, "VERSION"), "3"),
-    {ok, Contents} = file:read_file(filename:join(DestDir, "contents.tar.gz")),
-    Blob = <<"3who cares", Contents/binary>>,
-    <<X:256/big-unsigned>> = crypto:hash(sha256, Blob),
-    BinChecksum = list_to_binary(string:to_upper(lists:flatten(io_lib:format("~64.16.0b", [X])))),
-    ok = file:write_file(filename:join(DestDir, "CHECKSUM"), BinChecksum),
-    PkgFiles = ["contents.tar.gz", "VERSION", "metadata.config", "CHECKSUM"],
+package_app(AppDir, DestDir, PkgName, PkgVsn) ->
+    AppSrc = filename:join(AppDir, "src"),
+    {ok, Fs} = rebar_utils:list_dir(AppSrc),
+    Files = lists:zip([filename:join("src", F) || F <- Fs], [filename:join(AppSrc,F) || F <- Fs]),
+    Metadata = #{<<"app">> => list_to_binary(PkgName),
+                 <<"version">> => list_to_binary(PkgVsn)},
+    {ok, {Tarball, <<Checksum:256/big-unsigned-integer>>}} = hex_tarball:create(Metadata, Files),
+
+    Name = PkgName++"-"++PkgVsn++".tar",
     Archive = filename:join(DestDir, Name),
-    ok = erl_tar:create(Archive,
-                        lists:zip(PkgFiles, [filename:join(DestDir,F) || F <- PkgFiles])),
-    {ok, BinFull} = file:read_file(Archive),
-    <<E:128/big-unsigned-integer>> = crypto:hash(md5, BinFull),
-    Etag = string:to_lower(lists:flatten(io_lib:format("~32.16.0b", [E]))),
-    {BinChecksum, Etag}.
+    file:write_file(Archive, Tarball),
+
+    <<E:128/big-unsigned-integer>> = crypto:hash(md5, Tarball),
+
+    Checksum1 = list_to_binary(
+                  rebar_string:uppercase(
+                    lists:flatten(io_lib:format("~64.16.0b", [Checksum])))),
+    {Checksum1, E}.
+
+random_element(Repos) ->
+    Index = ?random:uniform(length(Repos)),
+    lists:nth(Index, Repos).