Merge branch 'release/2.4.3'

CHANGELOG.md

@@ -4,6 +4,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased][unreleased]
 
+## [2.4.3] - 30-01-2019
+### Added
+### Changed
+### Fixed
+- [(fix) Add -n parameter to accept release name](https://github.com/lrascao/rebar3_appup_utils/pull/58)
+- [filter map spec list](https://github.com/lrascao/rebar3_appup_utils/pull/56)
+
 ## [2.4.2] - 16-12-2018
 ### Added
 ### Changed

src/rebar3_appup_generate.erl

@@ -59,6 +59,7 @@ init(State) ->
             {bare, true},                 % The task can be run by the user, always true
             {deps, ?DEPS},                % The list of dependencies
             {opts, [                      % list of options understood by the plugin
+                {relname, $n, "relname", string, "Release name"},
                 {previous, $p, "previous", string, "location of the previous release"},
                 {previous_version, $p, "previous_version", string, "version of the previous release"},
                 {current, $c, "current", string, "location of the current release"},
@@ -87,7 +88,7 @@ do(State) ->
     PluginInfo = rebar3_appup_utils:appup_plugin_appinfo(Apps),
     PluginDir = rebar_app_info:dir(PluginInfo),
 
-    Name = get_release_name(State),
+    Name = rebar3_appup_utils:get_release_name(State),
     rebar_api:debug("release name: ~p", [Name]),
 
     %% check for overload of the current release
@@ -655,6 +656,8 @@ diff_supervisor_spec(_, _) ->
 supervisor_spec_workers([], Acc) -> Acc;
 supervisor_spec_workers([{_, {Mod, _F, _A}, _, _, worker, _} | Rest], Acc) ->
     supervisor_spec_workers(Rest, Acc ++ [Mod]);
+supervisor_spec_workers([#{start := {Mod, _F, _A}, type := worker} | Rest], Acc) ->
+    supervisor_spec_workers(Rest, Acc ++ [Mod]);
 supervisor_spec_workers([_ | Rest], Acc) ->
     supervisor_spec_workers(Rest, Acc).
 
@@ -729,18 +732,6 @@ get_current_rel_path(State, Name) ->
         Path -> Path
     end.
 
--spec get_release_name(State) -> Res when
-      State :: rebar_state:t(),
-      Res :: string().
-get_release_name(State) ->
-    RelxConfig = rebar_state:get(State, relx, []),
-    case lists:keyfind(release, 1, RelxConfig) of
-        {release, {Name0, _Ver}, _} ->
-            atom_to_list(Name0);
-        {release, {Name0, _Ver}, _, _} ->
-            atom_to_list(Name0)
-    end.
-
 %%------------------------------------------------------------------------------
 %%
 %% Add pre and post instructions to the instuctions created by appup generate.

src/rebar3_appup_plugin.app.src

@@ -19,7 +19,7 @@
 %% -------------------------------------------------------------------
 {application, rebar3_appup_plugin, [
         {description, "A rebar3 plugin for handling .appup files"},
-        {vsn, "2.4.2"},
+        {vsn, "2.4.3"},
         {registered, []},
         {applications,
             [

src/rebar3_appup_tar.erl

@@ -55,13 +55,7 @@ init(State) ->
 -spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
 %% @spec do(rebar_state:t()) -> {'ok',rebar_state:t()} | {'error',string()}.
 do(State) ->
-    RelxConfig = rebar_state:get(State, relx, []),
-    Name = case lists:keyfind(release, 1, RelxConfig) of
-               {release, {Name0, _Ver}, _} ->
-                   atom_to_list(Name0);
-               {release, {Name0, _Ver}, _, _} ->
-                   atom_to_list(Name0)
-           end,
+    Name = rebar3_appup_utils:get_release_name(State),
     rebar_api:debug("release name: ~p", [Name]),
 
     RelDir = filename:join([rebar_dir:base_dir(State),

src/rebar3_appup_utils.erl

@@ -19,7 +19,8 @@
 %% -------------------------------------------------------------------
 -module(rebar3_appup_utils).
 
--export([prop_check/3,
+-export([get_release_name/1,
+         prop_check/3,
          make_proplist/2,
          find_files/3,
          find_files_by_ext/2, find_files_by_ext/3,
@@ -35,6 +36,14 @@
          find_app_by_name/2,
          vsn/1]).
 
+-spec get_release_name(State) -> Res when
+    State :: rebar_state:t(),
+    Res :: string().
+get_release_name(State) ->
+    RelxConfig = rebar_state:get(State, relx, []),
+    {release, {Name0, _Ver}, _} = lists:keyfind(release, 1, RelxConfig),
+    atom_to_list(Name0).
+
 %% Helper function for checking values and aborting when needed
 %% @spec prop_check(boolean(),_,_) -> any().
 prop_check(true, _, _) -> true;