if no config is specified search for a `relcool.config` in the path

2 files changed, 44 insertions, 16 deletions

diff --git a/test/rclt_command_SUITE.erl b/test/rclt_command_SUITE.erl
index 46449e9..1c6accf 100644
--- a/test/rclt_command_SUITE.erl
+++ b/test/rclt_command_SUITE.erl
@@ -25,7 +25,6 @@
          all/0,
          normal_passing_case/1,
          lib_fail_case/1,
-         output_fail_case/1,
          spec_parse_fail_case/1,
          config_fail_case/1]).
 
@@ -42,7 +41,7 @@ end_per_suite(_Config) ->
     ok.
 
 all() ->
-    [normal_passing_case, lib_fail_case, output_fail_case, config_fail_case].
+    [normal_passing_case, lib_fail_case, config_fail_case].
 
 normal_passing_case(Config) ->
     DataDir = proplists:get_value(data_dir, Config),
@@ -82,18 +81,6 @@ lib_fail_case(Config) ->
     ?assertMatch({error, {_, {not_directory, Lib2}}},
                  rcl_cmd_args:args2state(getopt:parse(relcool:opt_spec_list(), CmdLine))).
 
-
-output_fail_case(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    UnwritableDir = filename:join([DataDir, "unwritable"]),
-    ok = rcl_util:mkdir_p(UnwritableDir),
-    ok = file:change_mode(UnwritableDir, 8#555),
-    CanNotCreate = filename:join([UnwritableDir, "out-dir-should-not-create"]),
-
-    CmdLine = ["-o", CanNotCreate],
-    ?assertMatch({error, {_, {unable_to_create_output_dir, CanNotCreate}}},
-                 rcl_cmd_args:args2state(getopt:parse(relcool:opt_spec_list(), CmdLine))).
-
 spec_parse_fail_case(_Config) ->
     Spec = "aaeu:3333:33.22a44",
     CmdLine = ["-g", Spec],
diff --git a/test/rclt_release_SUITE.erl b/test/rclt_release_SUITE.erl
index c13672a..4ac44d9 100644
--- a/test/rclt_release_SUITE.erl
+++ b/test/rclt_release_SUITE.erl
@@ -25,7 +25,8 @@
          init_per_testcase/2,
          all/0,
          make_release/1,
-         make_overridden_release/1]).
+         make_overridden_release/1,
+         make_implicit_config_release/1]).
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("eunit/include/eunit.hrl").
@@ -49,7 +50,7 @@ init_per_testcase(_, Config) ->
      {state, State} | Config].
 
 all() ->
-    [make_release, make_overridden_release].
+    [make_release, make_overridden_release, make_implicit_config_release].
 
 make_release(Config) ->
     LibDir1 = proplists:get_value(lib1, Config),
@@ -136,6 +137,46 @@ make_overridden_release(Config) ->
                                                OverrideApp ++ "-" ++ OverrideVsn])),
     ?assertMatch(OverrideAppDir, Real).
 
+make_implicit_config_release(Config) ->
+    LibDir1 = proplists:get_value(lib1, Config),
+    FooRoot = filename:join([LibDir1, "foodir1", "foodir2"]),
+    filelib:ensure_dir(filename:join([FooRoot, "tmp"])),
+    [(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"]),
+    write_config(ConfigFile,
+                 [{release, {foo, "0.0.1"},
+                   [goal_app_1,
+                    goal_app_2]}]),
+    OutputDir = filename:join([proplists:get_value(data_dir, Config),
+                               create_random_name("relcool-output")]),
+    ok = file:set_cwd(FooRoot),
+    {ok, FooRoot} = file:get_cwd(),
+    {ok, State} = relcool:do(undefined, undefined, [], [LibDir1], 2,
+                              OutputDir, []),
+    [{{foo, "0.0.1"}, Release}] = ec_dictionary:to_list(rcl_state:releases(State)),
+    ?assert(ec_file:exists(OutputDir)),
+
+    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)).
 
 
 %%%===================================================================