overlay support

This includes support for overlays and fairly complete tests

1 files changed, 161 insertions, 2 deletions

diff --git a/test/rclt_release_SUITE.erl b/test/rclt_release_SUITE.erl
index b37fd12..f4f0ecc 100644
--- a/test/rclt_release_SUITE.erl
+++ b/test/rclt_release_SUITE.erl
@@ -27,7 +27,8 @@
          make_release/1,
          make_overridden_release/1,
          make_rerun_overridden_release/1,
-         make_implicit_config_release/1]).
+         make_implicit_config_release/1,
+         overlay_release/1]).
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("eunit/include/eunit.hrl").
@@ -52,7 +53,7 @@ init_per_testcase(_, Config) ->
 
 all() ->
     [make_release, make_overridden_release, make_implicit_config_release,
-     make_rerun_overridden_release].
+     make_rerun_overridden_release, overlay_release].
 
 make_release(Config) ->
     LibDir1 = proplists:get_value(lib1, Config),
@@ -235,6 +236,129 @@ make_rerun_overridden_release(Config) ->
                                                OverrideApp ++ "-" ++ OverrideVsn])),
     ?assertMatch(OverrideAppDir, Real).
 
+overlay_release(Config) ->
+    LibDir1 = proplists:get_value(lib1, Config),
+    [(fun({Name, Vsn}) ->
+              create_app(LibDir1, Name, Vsn, [kernel, stdlib], [])
+      end)(App)
+     ||
+        App <-
+            [{create_random_name("lib_app1_"), create_random_vsn()}
+             || _ <- lists:seq(1, 100)]],
+
+    create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel,non_goal_1], []),
+    create_app(LibDir1, "lib_dep_1", "0.0.1", [stdlib,kernel], []),
+    create_app(LibDir1, "goal_app_2", "0.0.1", [stdlib,kernel,goal_app_1,non_goal_2], []),
+    create_app(LibDir1, "non_goal_1", "0.0.1", [stdlib,kernel], [lib_dep_1]),
+    create_app(LibDir1, "non_goal_2", "0.0.1", [stdlib,kernel], []),
+
+    ConfigFile = filename:join([LibDir1, "relcool.config"]),
+    OverlayVars = filename:join([LibDir1, "vars.config"]),
+    Template = filename:join([LibDir1, "test_template"]),
+    write_config(ConfigFile,
+                 [{overlay_vars, OverlayVars},
+                  {overlay, [{mkdir, "{{target_dir}}/fooo"},
+                             {copy, OverlayVars,
+                              "{{target_dir}}/{{foo_dir}}/vars.config"},
+                             {template, Template,
+                              "{{target_dir}}/test_template_resolved"}]},
+                  {release, {foo, "0.0.1"},
+                   [goal_app_1,
+                    goal_app_2]}]),
+
+    VarsFile = filename:join([LibDir1, "vars.config"]),
+    write_config(VarsFile, [{yahoo, "yahoo"},
+                            {yahoo2, [{foo, "bar"}]},
+                            {foo_dir, "foodir"}]),
+
+    TemplateFile = filename:join([LibDir1, "test_template"]),
+    ok = file:write_file(TemplateFile, test_template_contents()),
+
+    OutputDir = filename:join([proplists:get_value(data_dir, Config),
+                               create_random_name("relcool-output")]),
+
+    {ok, State} = relcool:do(undefined, undefined, [], [LibDir1], 2,
+                              OutputDir, [ConfigFile]),
+
+    [{{foo, "0.0.1"}, Release}] = ec_dictionary:to_list(rcl_state:releases(State)),
+    AppSpecs = rcl_release:applications(Release),
+    ?assert(lists:keymember(stdlib, 1, AppSpecs)),
+    ?assert(lists:keymember(kernel, 1, AppSpecs)),
+    ?assert(lists:member({non_goal_1, "0.0.1"}, AppSpecs)),
+    ?assert(lists:member({non_goal_2, "0.0.1"}, AppSpecs)),
+    ?assert(lists:member({goal_app_1, "0.0.1"}, AppSpecs)),
+    ?assert(lists:member({goal_app_2, "0.0.1"}, AppSpecs)),
+    ?assert(lists:member({lib_dep_1, "0.0.1", load}, AppSpecs)),
+
+    ?assert(ec_file:exists(filename:join(OutputDir, "fooo"))),
+    ?assert(ec_file:exists(filename:join([OutputDir, "foodir", "vars.config"]))),
+
+    TemplateData = case file:consult(filename:join([OutputDir, test_template_resolved])) of
+                       {ok, Details} ->
+                           Details;
+                       Error ->
+                           erlang:throw({failed_to_consult, Error})
+                   end,
+
+    ?assertEqual(erlang:system_info(version),
+                 proplists:get_value(erts_vsn, TemplateData)),
+    ?assertEqual(erlang:system_info(version),
+                 proplists:get_value(release_erts_version, TemplateData)),
+    ?assertEqual("0.0.1",
+                 proplists:get_value(release_version, TemplateData)),
+    ?assertEqual(foo,
+                 proplists:get_value(release_name, TemplateData)),
+    ?assertEqual([kernel,stdlib,lib_dep_1,non_goal_2,non_goal_1,
+                  goal_app_1,goal_app_2],
+                 proplists:get_value(release_applications, TemplateData)),
+    ?assert(proplists:is_defined(std_version, TemplateData)),
+    ?assert(proplists:is_defined(kernel_version, TemplateData)),
+    ?assertEqual("0.0.1",
+                 proplists:get_value(non_goal_1_version, TemplateData)),
+    ?assertEqual("0.0.1",
+                 proplists:get_value(non_goal_2_version, TemplateData)),
+    ?assertEqual("0.0.1",
+                 proplists:get_value(goal_app_1_version, TemplateData)),
+    ?assertEqual("0.0.1",
+                 proplists:get_value(goal_app_2_version, TemplateData)),
+    ?assertEqual("0.0.1",
+                 proplists:get_value(lib_dep_1, TemplateData)),
+    ?assert(proplists:is_defined(lib_dep_1_dir, TemplateData)),
+    ?assertEqual([stdlib,kernel],
+                 proplists:get_value(lib_dep_1_active, TemplateData)),
+    ?assertEqual([],
+                 proplists:get_value(lib_dep_1_library, TemplateData)),
+    ?assertEqual("false",
+                 proplists:get_value(lib_dep_1_link, TemplateData)),
+    ?assertEqual("(2:debug)",
+                 proplists:get_value(log, TemplateData)),
+    ?assertEqual(OutputDir,
+                 proplists:get_value(output_dir, TemplateData)),
+    ?assertEqual(OutputDir,
+                 proplists:get_value(target_dir, TemplateData)),
+    ?assertEqual([],
+                 proplists:get_value(overridden, TemplateData)),
+    ?assertEqual([""],
+                 proplists:get_value(goals, TemplateData)),
+    ?assert(proplists:is_defined(lib_dirs, TemplateData)),
+    ?assert(proplists:is_defined(config_files, TemplateData)),
+    ?assertEqual([""],
+                 proplists:get_value(goals, TemplateData)),
+    ?assertEqual("undefined",
+                 proplists:get_value(sys_config, TemplateData)),
+    ?assert(proplists:is_defined(root_dir, TemplateData)),
+    ?assertEqual(foo,
+                 proplists:get_value(default_release_name, TemplateData)),
+    ?assertEqual("0.0.1",
+                 proplists:get_value(default_release_version, TemplateData)),
+    ?assertEqual("foo-0.0.1",
+                 proplists:get_value(default_release, TemplateData)),
+    ?assertEqual("yahoo",
+                 proplists:get_value(yahoo, TemplateData)),
+    ?assertEqual("bar",
+                 proplists:get_value(yahoo2_foo, TemplateData)),
+    ?assertEqual("foodir",
+                 proplists:get_value(foo_dir, TemplateData)).
 
 %%%===================================================================
 %%% Helper Functions
@@ -278,3 +402,38 @@ create_random_vsn() ->
 write_config(Filename, Values) ->
     ok = ec_file:write(Filename,
                        [io_lib:format("~p.\n", [Val]) || Val <- Values]).
+
+test_template_contents() ->
+    "{erts_vsn, \"{{erts_vsn}}\"}.\n"
+        "{release_erts_version, \"{{release_erts_version}}\"}.\n"
+        "{release_name, {{release_name}}}.\n"
+        "{rel_vsn, \"{{release_version}}\"}.\n"
+        "{release_version, \"{{release_version}}\"}.\n"
+        "{release_applications, [{{ release_applications|join:\", \" }}]}.\n"
+        "{std_version, \"{{release.stdlib.version}}\"}.\n"
+        "{kernel_version, \"{{release.kernel.version}}\"}.\n"
+        "{non_goal_1_version, \"{{release.non_goal_1.version}}\"}.\n"
+        "{non_goal_2_version, \"{{release.non_goal_2.version}}\"}.\n"
+        "{goal_app_1_version, \"{{release.goal_app_1.version}}\"}.\n"
+        "{goal_app_2_version, \"{{release.goal_app_2.version}}\"}.\n"
+        "{lib_dep_1, \"{{release.lib_dep_1.version}}\"}.\n"
+        "{lib_dep_1_dir, \"{{release.lib_dep_1.dir}}\"}.\n"
+        "{lib_dep_1_active, [{{ release.lib_dep_1.active_dependencies|join:\", \" }}]}.\n"
+        "{lib_dep_1_library, [{{ release.lib_dep_1.library_dependencies|join:\", \" }}]}.\n"
+        "{lib_dep_1_link, \"{{release.lib_dep_1.link}}\"}.\n"
+        "{log, \"{{log}}\"}.\n"
+        "{output_dir, \"{{output_dir}}\"}.\n"
+        "{target_dir, \"{{target_dir}}\"}.\n"
+        "{overridden, [{{ overridden|join:\", \" }}]}.\n"
+        "{goals, [\"{{ goals|join:\", \" }}\"]}.\n"
+        "{lib_dirs, [\"{{ lib_dirs|join:\", \" }}\"]}.\n"
+        "{config_files, [\"{{ config_files|join:\", \" }}\"]}.\n"
+        "{providers, [{{ providers|join:\", \" }}]}.\n"
+        "{sys_config, \"{{sys_config}}\"}.\n"
+        "{root_dir, \"{{root_dir}}\"}.\n"
+        "{default_release_name, {{default_release_name}}}.\n"
+        "{default_release_version, \"{{default_release_version}}\"}.\n"
+        "{default_release, \"{{default_release}}\"}.\n"
+        "{yahoo, \"{{yahoo}}\"}.\n"
+        "{yahoo2_foo, \"{{yahoo2.foo}}\"}.\n"
+        "{foo_dir, \"{{foo_dir}}\"}.\n".