Merge pull request #307 from tsloughter/master

Mainly exclude_apps

5 files changed, 100 insertions, 119 deletions

diff --git a/src/rlx_app_discovery.erl b/src/rlx_app_discovery.erl
index 6ac8d11..3d58185 100644
--- a/src/rlx_app_discovery.erl
+++ b/src/rlx_app_discovery.erl
@@ -118,8 +118,10 @@ resolve_app_metadata(State, LibDirs) ->
              end] of
         [] ->
             SkipApps = rlx_state:skip_apps(State),
-            AppMeta1 = [App || {ok, App} <- setup_overrides(State, AppMeta0),
-                               not lists:keymember(rlx_app_info:name(App), 1, SkipApps)],
+            ExcludeApps = rlx_state:exclude_apps(State),
+            AppMeta1 = [rm_exclude_apps(App, ExcludeApps) ||
+                           {ok, App} <- setup_overrides(State, AppMeta0),
+                               not lists:keymember(rlx_app_info:name(App), 1, SkipApps++ExcludeApps)],
             ec_cmd_log:debug(rlx_state:log(State),
                              fun() ->
                                      ["Resolved the following OTP Applications from the system: \n",
@@ -129,6 +131,11 @@ resolve_app_metadata(State, LibDirs) ->
         Errors ->
             ?RLX_ERROR(Errors)
     end.
+%% Apps listed in {exclude_apps, [...]} must be removed from applications lists
+rm_exclude_apps(App, ExcludeApps) ->
+    ActiveApps = lists:subtract(rlx_app_info:active_deps(App), ExcludeApps),
+    LibraryApps = lists:subtract(rlx_app_info:library_deps(App), ExcludeApps),
+    rlx_app_info:library_deps(rlx_app_info:active_deps(App, ActiveApps), LibraryApps).
 
 app_name({warning, _}) ->
     undefined;
diff --git a/src/rlx_config.erl b/src/rlx_config.erl
index 045bf33..df08342 100644
--- a/src/rlx_config.erl
+++ b/src/rlx_config.erl
@@ -182,6 +182,8 @@ load_terms({add_providers, Providers0}, {ok, State0}) ->
     end;
 load_terms({skip_apps, SkipApps0}, {ok, State0}) ->
     {ok, rlx_state:skip_apps(State0, SkipApps0)};
+load_terms({exclude_apps, ExcludeApps0}, {ok, State0}) ->
+    {ok, rlx_state:exclude_apps(State0, ExcludeApps0)};
 load_terms({debug_info, DebugInfo}, {ok, State0}) ->
     {ok, rlx_state:debug_info(State0, DebugInfo)};
 load_terms({overrides, Overrides0}, {ok, State0}) ->
diff --git a/src/rlx_prv_assembler.erl b/src/rlx_prv_assembler.erl
index ee81631..9799204 100644
--- a/src/rlx_prv_assembler.erl
+++ b/src/rlx_prv_assembler.erl
@@ -203,9 +203,49 @@ copy_app_(App, AppDir, TargetDir, IncludeSrc) ->
     remove_symlink_or_directory(TargetDir),
     case rlx_app_info:link(App) of
         true ->
-            link_directory(AppDir, TargetDir);
+            link_directory(AppDir, TargetDir),
+            rewrite_app_file(App, AppDir);
         false ->
-            copy_directory(AppDir, TargetDir, IncludeSrc)
+            copy_directory(AppDir, TargetDir, IncludeSrc),
+            rewrite_app_file(App, TargetDir)
+    end.
+
+%% If excluded apps exist in this App's applications list we must write a new .app
+rewrite_app_file(App, TargetDir) ->
+    Name = rlx_app_info:name(App),
+    ActiveDeps = rlx_app_info:active_deps(App),
+    IncludedDeps = rlx_app_info:library_deps(App),
+    AppFile = filename:join([TargetDir, "ebin", ec_cnv:to_list(Name) ++ ".app"]),
+
+    {ok, [{application, AppName, AppData}]} = file:consult(AppFile),
+    OldActiveDeps = proplists:get_value(applications, AppData, []),
+    OldIncludedDeps = proplists:get_value(included_applications, AppData, []),
+
+    case {OldActiveDeps, OldIncludedDeps} of
+        {ActiveDeps, IncludedDeps} ->
+            ok;
+        _ ->
+            AppData1 = lists:keyreplace(applications
+                                       ,1
+                                       ,AppData
+                                       ,{applications, ActiveDeps}),
+            AppData2 = lists:keyreplace(included_applications
+                                       ,1
+                                       ,AppData1
+                                       ,{included_applications, IncludedDeps}),
+            Spec = io_lib:format("~p.\n", [{application, AppName, AppData2}]),
+            write_file_if_contents_differ(AppFile, Spec)
+    end.
+
+write_file_if_contents_differ(Filename, Bytes) ->
+    ToWrite = iolist_to_binary(Bytes),
+    case file:read_file(Filename) of
+        {ok, ToWrite} ->
+            ok;
+        {ok,  _} ->
+            file:write_file(Filename, ToWrite);
+        {error,  _} ->
+            file:write_file(Filename, ToWrite)
     end.
 
 remove_symlink_or_directory(TargetDir) ->
diff --git a/src/rlx_state.erl b/src/rlx_state.erl
index f21b682..3bd818a 100644
--- a/src/rlx_state.erl
+++ b/src/rlx_state.erl
@@ -36,6 +36,8 @@
          overrides/2,
          skip_apps/1,
          skip_apps/2,
+         exclude_apps/1,
+         exclude_apps/2,
          debug_info/1,
          debug_info/2,
          goals/1,
@@ -104,6 +106,7 @@
                   sys_config :: file:filename() | undefined,
                   overrides=[] :: [{AppName::atom(), Directory::file:filename()}],
                   skip_apps=[] :: [AppName::atom()],
+                  exclude_apps=[] :: [AppName::atom()],
                   debug_info=keep :: keep | strip,
                   configured_releases :: releases(),
                   realized_releases :: releases(),
@@ -186,6 +189,15 @@ skip_apps(#state_t{skip_apps=Apps}) ->
 skip_apps(State, SkipApps) ->
     State#state_t{skip_apps=SkipApps}.
 
+-spec exclude_apps(t()) -> [AppName::atom()].
+exclude_apps(#state_t{exclude_apps=Apps}) ->
+    Apps.
+
+%% @doc the application overrides for the system
+-spec exclude_apps(t(), [AppName::atom()]) -> t().
+exclude_apps(State, SkipApps) ->
+    State#state_t{exclude_apps=SkipApps}.
+
 -spec debug_info(t()) -> keep | strip.
 debug_info(#state_t{debug_info=DebugInfo}) ->
     DebugInfo.
diff --git a/test/rlx_release_SUITE.erl b/test/rlx_release_SUITE.erl
index f123e79..eeab491 100644
--- a/test/rlx_release_SUITE.erl
+++ b/test/rlx_release_SUITE.erl
@@ -29,6 +29,7 @@
          make_scriptless_release/1,
          make_overridden_release/1,
          make_skip_app_release/1,
+         make_exclude_app_release/1,
          make_auto_skip_empty_app_release/1,
          make_app_type_none_release/1,
          make_rerun_overridden_release/1,
@@ -68,7 +69,7 @@ init_per_testcase(_, Config) ->
 all() ->
     [make_release, make_extend_release, make_scriptless_release,
      make_overridden_release, make_auto_skip_empty_app_release,
-     make_skip_app_release, make_app_type_none_release,
+     make_skip_app_release, make_exclude_app_release, make_app_type_none_release,
      make_implicit_config_release, make_rerun_overridden_release,
      overlay_release, make_goalless_release, make_depfree_release,
      make_invalid_config_release, make_relup_release, make_relup_release2,
@@ -77,13 +78,14 @@ all() ->
 
 make_release(Config) ->
     LibDir1 = proplists:get_value(lib1, Config),
+
     [(fun({Name, Vsn}) ->
               rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], [])
       end)(App)
-     ||
+    ||
         App <-
             [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()}
-             || _ <- lists:seq(1, 100)]],
+            || _ <- lists:seq(1, 100)]],
 
     rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel,non_goal_1], []),
     rlx_test_utils:create_app(LibDir1, "lib_dep_1", "0.0.1", [stdlib,kernel], []),
@@ -115,13 +117,6 @@ make_release(Config) ->
 
 make_extend_release(Config) ->
     LibDir1 = proplists:get_value(lib1, Config),
-    [(fun({Name, Vsn}) ->
-              rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], [])
-      end)(App)
-     ||
-        App <-
-            [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()}
-             || _ <- lists:seq(1, 100)]],
 
     rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel,non_goal_1], []),
     rlx_test_utils:create_app(LibDir1, "lib_dep_1", "0.0.1", [stdlib,kernel], []),
@@ -157,13 +152,6 @@ make_extend_release(Config) ->
 
 make_invalid_config_release(Config) ->
     LibDir1 = proplists:get_value(lib1, Config),
-    [(fun({Name, Vsn}) ->
-              rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], [])
-      end)(App)
-     ||
-        App <-
-            [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()}
-             || _ <- lists:seq(1, 100)]],
 
     rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel,non_goal_1], []),
     rlx_test_utils:create_app(LibDir1, "lib_dep_1", "0.0.1", [stdlib,kernel], []),
@@ -184,13 +172,6 @@ make_invalid_config_release(Config) ->
 
 make_scriptless_release(Config) ->
     LibDir1 = proplists:get_value(lib1, Config),
-    [(fun({Name, Vsn}) ->
-              rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], [])
-      end)(App)
-     ||
-        App <-
-            [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()}
-             || _ <- lists:seq(1, 100)]],
 
     rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel,non_goal_1], []),
     rlx_test_utils:create_app(LibDir1, "lib_dep_1", "0.0.1", [stdlib,kernel], []),
@@ -226,13 +207,7 @@ make_overridden_release(Config) ->
     DataDir = proplists:get_value(data_dir, Config),
     OverrideDir1 = filename:join([DataDir, rlx_test_utils:create_random_name("override_dir_")]),
     LibDir1 = proplists:get_value(lib1, Config),
-    [(fun({Name, Vsn}) ->
-              rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], [])
-      end)(App)
-     ||
-        App <-
-            [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()}
-             || _ <- lists:seq(1, 100)]],
+
     OverrideApp = rlx_test_utils:create_random_name("override_app"),
     OverrideVsn = rlx_test_utils:create_random_vsn(),
     OverrideAppDir = filename:join(OverrideDir1, OverrideApp ++ "-" ++ OverrideVsn),
@@ -274,13 +249,6 @@ make_overridden_release(Config) ->
 
 make_skip_app_release(Config) ->
     LibDir1 = proplists:get_value(lib1, Config),
-    [(fun({Name, Vsn}) ->
-              rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], [])
-      end)(App)
-     ||
-        App <-
-            [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()}
-             || _ <- lists:seq(1, 100)]],
 
     rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel,non_goal_1], []),
     rlx_test_utils:create_app(LibDir1, "lib_dep_1", "0.0.1", [stdlib,kernel], []),
@@ -309,17 +277,38 @@ make_skip_app_release(Config) ->
     ?assertNot(lists:member({goal_app_2, "0.0.1"}, AppSpecs)),
     ?assert(lists:member({lib_dep_1, "0.0.1", load}, AppSpecs)).
 
+%% Test to ensure that an excluded app and its deps are not included in a release
+make_exclude_app_release(Config) ->
+    LibDir1 = proplists:get_value(lib1, Config),
+
+    rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel, non_goal_1], []),
+    rlx_test_utils:create_app(LibDir1, "non_goal_1", "0.0.1", [stdlib,kernel, non_goal_2], []),
+    rlx_test_utils:create_app(LibDir1, "non_goal_2", "0.0.1", [stdlib,kernel], []),
+
+    ConfigFile = filename:join([LibDir1, "relx.config"]),
+    rlx_test_utils:write_config(ConfigFile,
+                 [{release, {foo, "0.0.1"},
+                   [goal_app_1]},
+                  {exclude_apps, [non_goal_1]}]),
+    OutputDir = filename:join([proplists:get_value(data_dir, Config),
+                               rlx_test_utils:create_random_name("relx-output")]),
+    {ok, Cwd} = file:get_cwd(),
+    {ok, State} = relx:do(Cwd, undefined, undefined, [], [LibDir1], 3,
+                          OutputDir, [],
+                          ConfigFile),
+    [{{foo, "0.0.1"}, Release}] = ec_dictionary:to_list(rlx_state:realized_releases(State)),
+    AppSpecs = rlx_release:applications(Release),
+    ?assert(lists:keymember(stdlib, 1, AppSpecs)),
+    ?assert(lists:keymember(kernel, 1, AppSpecs)),
+    ?assertNot(lists:member({non_goal_1, "0.0.1"}, AppSpecs)),
+    ?assertNot(lists:member({non_goal_2, "0.0.1"}, AppSpecs)),
+    ?assert(lists:member({goal_app_1, "0.0.1"}, AppSpecs)).
+
 make_auto_skip_empty_app_release(Config) ->
     DataDir = proplists:get_value(data_dir, Config),
     EmptyAppDir1 = filename:join([DataDir, rlx_test_utils:create_random_name("skip_app_dir_")]),
     LibDir1 = proplists:get_value(lib1, Config),
-    [(fun({Name, Vsn}) ->
-              rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], [])
-      end)(App)
-     ||
-        App <-
-            [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()}
-             || _ <- lists:seq(1, 100)]],
+
     EmptyAppApp = rlx_test_utils:create_random_name("empty_app_app"),
     EmptyAppVsn = rlx_test_utils:create_random_vsn(),
     EmptyAppAppName = erlang:list_to_atom(EmptyAppApp),
@@ -356,13 +345,6 @@ make_auto_skip_empty_app_release(Config) ->
 
 make_app_type_none_release(Config) ->
     LibDir1 = proplists:get_value(lib1, Config),
-    [(fun({Name, Vsn}) ->
-              rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], [])
-      end)(App)
-     ||
-        App <-
-            [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()}
-             || _ <- lists:seq(1, 100)]],
 
     rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel,non_goal_1], []),
     rlx_test_utils:create_app(LibDir1, "lib_dep_1", "0.0.1", [stdlib,kernel], []),
@@ -395,13 +377,6 @@ 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}) ->
-              rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], [])
-      end)(App)
-     ||
-        App <-
-            [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()}
-             || _ <- lists:seq(1, 100)]],
 
     rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel,non_goal_1], []),
     rlx_test_utils:create_app(LibDir1, "lib_dep_1", "0.0.1", [stdlib,kernel], []),
@@ -435,13 +410,7 @@ make_rerun_overridden_release(Config) ->
     DataDir = proplists:get_value(data_dir, Config),
     OverrideDir1 = filename:join([DataDir, rlx_test_utils:create_random_name("override_dir_")]),
     LibDir1 = proplists:get_value(lib1, Config),
-    [(fun({Name, Vsn}) ->
-              rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], [])
-      end)(App)
-     ||
-        App <-
-            [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()}
-             || _ <- lists:seq(1, 100)]],
+
     OverrideApp = rlx_test_utils:create_random_name("override_app"),
     OverrideVsn = rlx_test_utils:create_random_vsn(),
     OverrideAppDir = filename:join(OverrideDir1, OverrideApp ++ "-"
@@ -492,13 +461,6 @@ make_rerun_overridden_release(Config) ->
 
 overlay_release(Config) ->
     LibDir1 = proplists:get_value(lib1, Config),
-    [(fun({Name, Vsn}) ->
-              rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], [])
-      end)(App)
-     ||
-        App <-
-            [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()}
-             || _ <- lists:seq(1, 100)]],
 
     rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel,non_goal_1], []),
     rlx_test_utils:create_app(LibDir1, "lib_dep_1", "0.0.1", [stdlib,kernel], []),
@@ -647,13 +609,6 @@ overlay_release(Config) ->
 
 make_goalless_release(Config) ->
     LibDir1 = proplists:get_value(lib1, Config),
-    [(fun({Name, Vsn}) ->
-              rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], [])
-      end)(App)
-     ||
-        App <-
-            [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()}
-             || _ <- lists:seq(1, 100)]],
 
     rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel,non_goal_1], []),
     rlx_test_utils:create_app(LibDir1, "lib_dep_1", "0.0.1", [], []),
@@ -673,13 +628,6 @@ make_goalless_release(Config) ->
 
 make_depfree_release(Config) ->
     LibDir1 = proplists:get_value(lib1, Config),
-    [(fun({Name, Vsn}) ->
-              rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], [])
-      end)(App)
-     ||
-        App <-
-            [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()}
-             || _ <- lists:seq(1, 100)]],
 
     rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [kernel,stdlib], []),
     rlx_test_utils:create_app(LibDir1, "lib_dep_1", "0.0.1", [kernel,stdlib], []),
@@ -702,13 +650,6 @@ make_depfree_release(Config) ->
 
 make_relup_release(Config) ->
     LibDir1 = proplists:get_value(lib1, Config),
-    [(fun({Name, Vsn}) ->
-              rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], [])
-      end)(App)
-     ||
-        App <-
-            [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()}
-             || _ <- lists:seq(1, 100)]],
 
     rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel,non_goal_1], []),
     rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.2", [stdlib,kernel,non_goal_1], []),
@@ -789,13 +730,6 @@ make_relup_release(Config) ->
 
 make_relup_release2(Config) ->
     LibDir1 = proplists:get_value(lib1, Config),
-    [(fun({Name, Vsn}) ->
-              rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], [])
-      end)(App)
-     ||
-        App <-
-            [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()}
-             || _ <- lists:seq(1, 100)]],
 
     rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel,non_goal_1], []),
     rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.2", [stdlib,kernel,non_goal_1], []),
@@ -893,13 +827,6 @@ make_one_app_top_level_release(Config) ->
 
 make_dev_mode_release(Config) ->
     LibDir1 = proplists:get_value(lib1, Config),
-    [(fun({Name, Vsn}) ->
-              rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], [])
-      end)(App)
-     ||
-        App <-
-            [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()}
-             || _ <- lists:seq(1, 100)]],
 
     rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel,non_goal_1], []),
     rlx_test_utils:create_app(LibDir1, "lib_dep_1", "0.0.1", [stdlib,kernel], []),
@@ -941,13 +868,6 @@ make_config_script_release(Config) ->
     LibDir1 = proplists:get_value(lib1, Config),
     FooRoot = filename:join([LibDir1, "foodir1", "foodir2"]),
     filelib:ensure_dir(filename:join([FooRoot, "tmp"])),
-    [(fun({Name, Vsn}) ->
-              rlx_test_utils:create_app(LibDir1, Name, Vsn, [kernel, stdlib], [])
-      end)(App)
-     ||
-        App <-
-            [{rlx_test_utils:create_random_name("lib_app1_"), rlx_test_utils:create_random_vsn()}
-             || _ <- lists:seq(1, 100)]],
 
     rlx_test_utils:create_app(LibDir1, "goal_app_1", "0.0.1", [stdlib,kernel,non_goal_1], []),
     rlx_test_utils:create_app(LibDir1, "lib_dep_1", "0.0.1", [stdlib,kernel], []),