Merge pull request #545 from tsloughter/master

Upgrade relx and add relup provider

4 files changed, 74 insertions, 8 deletions

diff --git a/src/rebar.app.src b/src/rebar.app.src
index 0ec0fcb..5abb643 100644
--- a/src/rebar.app.src
+++ b/src/rebar.app.src
@@ -48,6 +48,7 @@
                      rebar_prv_plugins,
                      rebar_prv_plugins_upgrade,
                      rebar_prv_release,
+                     rebar_prv_relup,
                      rebar_prv_report,
                      rebar_prv_shell,
                      rebar_prv_tar,
diff --git a/src/rebar_prv_release.erl b/src/rebar_prv_release.erl
index 982b392..dc58047 100644
--- a/src/rebar_prv_release.erl
+++ b/src/rebar_prv_release.erl
@@ -32,7 +32,6 @@ init(State) ->
 
 -spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
 do(State) ->
-    Caller = rebar_state:get(State, caller, api),
     Options = rebar_state:command_args(State),
     DepsDir = rebar_dir:deps_dir(State),
     ProjectAppDirs = lists:delete(".", ?DEFAULT_PROJECT_APP_DIRS),
@@ -48,12 +47,12 @@ do(State) ->
             [] ->
                 relx:main([{lib_dirs, LibDirs}
                           ,{output_dir, OutputDir}
-                          ,{caller, Caller}], AllOptions);
+                          ,{caller, api}], AllOptions);
             Config ->
                 relx:main([{lib_dirs, LibDirs}
                           ,{config, lists:reverse(Config)}
                           ,{output_dir, OutputDir}
-                          ,{caller, Caller}], AllOptions)
+                          ,{caller, api}], AllOptions)
         end,
         rebar_hooks:run_all_hooks(Cwd, post, ?PROVIDER, Providers, State),
         {ok, State}
diff --git a/src/rebar_prv_relup.erl b/src/rebar_prv_relup.erl
new file mode 100644
index 0000000..aed12a6
--- /dev/null
+++ b/src/rebar_prv_relup.erl
@@ -0,0 +1,67 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+
+-module(rebar_prv_relup).
+
+-behaviour(provider).
+
+-export([init/1,
+         do/1,
+         format_error/1]).
+
+-include("rebar.hrl").
+
+-define(PROVIDER, relup).
+-define(DEPS, [release]).
+
+%% ===================================================================
+%% Public API
+%% ===================================================================
+
+-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
+init(State) ->
+    Provider = providers:create([{name, ?PROVIDER},
+                                 {module, ?MODULE},
+                                 {bare, true},
+                                 {deps, ?DEPS},
+                                 {example, "rebar3 relup"},
+                                 {short_desc, "Create relup of releases."},
+                                 {desc, "Create relup of releases."},
+                                 {opts, relx:opt_spec_list()}]),
+    State1 = rebar_state:add_provider(State, Provider),
+    {ok, State1}.
+
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
+do(State) ->
+    Options = rebar_state:command_args(State),
+    DepsDir = rebar_dir:deps_dir(State),
+    ProjectAppDirs = lists:delete(".", ?DEFAULT_PROJECT_APP_DIRS),
+    LibDirs = rebar_utils:filtermap(fun ec_file:exists/1,
+                                   [?DEFAULT_CHECKOUTS_DIR, DepsDir | ProjectAppDirs]),
+    OutputDir = filename:join(rebar_dir:base_dir(State), ?DEFAULT_RELEASE_DIR),
+    AllOptions = string:join(["relup" | Options], " "),
+    Cwd = rebar_state:dir(State),
+    Providers = rebar_state:providers(State),
+    rebar_hooks:run_all_hooks(Cwd, pre, ?PROVIDER, Providers, State),
+    try
+        case rebar_state:get(State, relx, []) of
+            [] ->
+                relx:main([{lib_dirs, LibDirs}
+                          ,{output_dir, OutputDir}
+                          ,{caller, api}], AllOptions);
+            Config ->
+                relx:main([{lib_dirs, LibDirs}
+                          ,{config, lists:reverse(Config)}
+                          ,{output_dir, OutputDir}
+                          ,{caller, api}], AllOptions)
+        end,
+        rebar_hooks:run_all_hooks(Cwd, post, ?PROVIDER, Providers, State),
+        {ok, State}
+    catch
+        throw:T ->
+            {error, {rlx_prv_release, T}}
+    end.
+
+-spec format_error(any()) -> iolist().
+format_error(Reason) ->
+    io_lib:format("~p", [Reason]).
diff --git a/src/rebar_prv_tar.erl b/src/rebar_prv_tar.erl
index 0c04d72..17d7b0b 100644
--- a/src/rebar_prv_tar.erl
+++ b/src/rebar_prv_tar.erl
@@ -12,7 +12,7 @@
 -include("rebar.hrl").
 
 -define(PROVIDER, tar).
--define(DEPS, [compile]).
+-define(DEPS, [release]).
 
 %% ===================================================================
 %% Public API
@@ -32,14 +32,13 @@ init(State) ->
 
 -spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
 do(State) ->
-    Caller = rebar_state:get(State, caller, api),
     Options = rebar_state:command_args(State),
     DepsDir = rebar_dir:deps_dir(State),
     ProjectAppDirs = lists:delete(".", ?DEFAULT_PROJECT_APP_DIRS),
     LibDirs = rebar_utils:filtermap(fun ec_file:exists/1,
                                    [?DEFAULT_CHECKOUTS_DIR, DepsDir | ProjectAppDirs]),
     OutputDir = filename:join(rebar_dir:base_dir(State), ?DEFAULT_RELEASE_DIR),
-    AllOptions = string:join(["release", "tar" | Options], " "),
+    AllOptions = string:join(["tar" | Options], " "),
     Cwd = rebar_state:dir(State),
     Providers = rebar_state:providers(State),
     rebar_hooks:run_all_hooks(Cwd, pre, ?PROVIDER, Providers, State),
@@ -47,12 +46,12 @@ do(State) ->
         [] ->
             relx:main([{lib_dirs, LibDirs}
                       ,{output_dir, OutputDir}
-                      ,{caller, Caller}], AllOptions);
+                      ,{caller, api}], AllOptions);
         Config ->
             relx:main([{lib_dirs, LibDirs}
                       ,{config, lists:reverse(Config)}
                       ,{output_dir, OutputDir}
-                      ,{caller, Caller}], AllOptions)
+                      ,{caller, api}], AllOptions)
     end,
     rebar_hooks:run_all_hooks(Cwd, post, ?PROVIDER, Providers, State),
     {ok, State}.