From e1b1152b219cf65c7f8cd3b77db5cf2156fcbab7 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Sat, 20 Sep 2014 22:36:54 -0500 Subject: slowly widdling away at dialyzer errors --- src/rebar_prv_release.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/rebar_prv_release.erl') diff --git a/src/rebar_prv_release.erl b/src/rebar_prv_release.erl index 4203c3a..66ad4b2 100644 --- a/src/rebar_prv_release.erl +++ b/src/rebar_prv_release.erl @@ -29,7 +29,7 @@ init(State) -> opts = []}), {ok, State1}. --spec do(rebar_state:t()) -> {ok, rebar_state:t()} | relx:error(). +-spec do(rebar_state:t()) -> {ok, rebar_state:t()}. do(Config) -> relx:main("release"), {ok, Config}. -- cgit v1.1 From 6356112cbbb32b09dd2f94ea856c3cbd32b1c085 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Sun, 21 Sep 2014 09:19:38 -0500 Subject: more dialyzer fun. no likey opaque types --- src/rebar_prv_release.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/rebar_prv_release.erl') diff --git a/src/rebar_prv_release.erl b/src/rebar_prv_release.erl index 66ad4b2..d724490 100644 --- a/src/rebar_prv_release.erl +++ b/src/rebar_prv_release.erl @@ -31,5 +31,5 @@ init(State) -> -spec do(rebar_state:t()) -> {ok, rebar_state:t()}. do(Config) -> - relx:main("release"), + relx:main(["release"]), {ok, Config}. -- cgit v1.1 From e9a3396e56679a11ac1caa3b47f1f196f0307d72 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Sat, 27 Sep 2014 14:12:11 -0500 Subject: return error messages from providers --- src/rebar_prv_release.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/rebar_prv_release.erl') diff --git a/src/rebar_prv_release.erl b/src/rebar_prv_release.erl index d724490..61c4990 100644 --- a/src/rebar_prv_release.erl +++ b/src/rebar_prv_release.erl @@ -29,7 +29,7 @@ init(State) -> opts = []}), {ok, State1}. --spec do(rebar_state:t()) -> {ok, rebar_state:t()}. +-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}. do(Config) -> relx:main(["release"]), {ok, Config}. -- cgit v1.1 From f84c358ad85b9fbf615adc21c8213e03d1b86690 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Wed, 1 Oct 2014 07:15:48 -0500 Subject: add clean provider --- src/rebar_prv_release.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/rebar_prv_release.erl') diff --git a/src/rebar_prv_release.erl b/src/rebar_prv_release.erl index 61c4990..2eee367 100644 --- a/src/rebar_prv_release.erl +++ b/src/rebar_prv_release.erl @@ -30,6 +30,6 @@ init(State) -> {ok, State1}. -spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}. -do(Config) -> +do(State) -> relx:main(["release"]), - {ok, Config}. + {ok, State}. -- cgit v1.1 From b37a5ae611aaf6b84a046fbe716f40c2aa8c75d8 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Fri, 3 Oct 2014 06:33:33 -0500 Subject: move providers to separate app --- src/rebar_prv_release.erl | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) (limited to 'src/rebar_prv_release.erl') diff --git a/src/rebar_prv_release.erl b/src/rebar_prv_release.erl index 2eee367..b151bb5 100644 --- a/src/rebar_prv_release.erl +++ b/src/rebar_prv_release.erl @@ -3,7 +3,7 @@ -module(rebar_prv_release). --behaviour(rebar_provider). +-behaviour(provider). -export([init/1, do/1]). @@ -19,17 +19,24 @@ -spec init(rebar_state:t()) -> {ok, rebar_state:t()}. init(State) -> - State1 = rebar_state:add_provider(State, #provider{name = ?PROVIDER, - provider_impl = ?MODULE, - bare = false, - deps = ?DEPS, - example = "rebar release", - short_desc = "Build release of project.", - desc = "", - opts = []}), + State1 = rebar_state:add_provider(State, providers:create([{name, ?PROVIDER}, + {module, ?MODULE}, + {bare, false}, + {deps, ?DEPS}, + {example, "rebar release"}, + {short_desc, "Build release of project."}, + {desc, ""}, + {opts, []}])), {ok, State1}. -spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}. do(State) -> - relx:main(["release"]), + Options = rebar_state:command_args(State), + AllOptions = string:join(["release" | Options], " "), + case rebar_state:get(State, relx, []) of + [] -> + relx:main(AllOptions); + Config -> + relx:main([{config, Config}], AllOptions) + end, {ok, State}. -- cgit v1.1 From 5483aba28830d8f903930ce7d786ea94254f6f4f Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Sat, 11 Oct 2014 19:46:19 -0500 Subject: update release provider to support relx opts --- src/rebar_prv_release.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/rebar_prv_release.erl') diff --git a/src/rebar_prv_release.erl b/src/rebar_prv_release.erl index b151bb5..6be639c 100644 --- a/src/rebar_prv_release.erl +++ b/src/rebar_prv_release.erl @@ -26,7 +26,7 @@ init(State) -> {example, "rebar release"}, {short_desc, "Build release of project."}, {desc, ""}, - {opts, []}])), + {opts, relx:opt_spec_list()}])), {ok, State1}. -spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}. -- cgit v1.1 From 1dce2d36cc75263db279abd7f282772ce0f0f3e6 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Wed, 22 Oct 2014 12:03:49 -0500 Subject: add format_error/2 provider callback to providers --- src/rebar_prv_release.erl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/rebar_prv_release.erl') diff --git a/src/rebar_prv_release.erl b/src/rebar_prv_release.erl index 6be639c..572f909 100644 --- a/src/rebar_prv_release.erl +++ b/src/rebar_prv_release.erl @@ -6,7 +6,8 @@ -behaviour(provider). -export([init/1, - do/1]). + do/1, + format_error/2]). -include("rebar.hrl"). @@ -40,3 +41,7 @@ do(State) -> relx:main([{config, Config}], AllOptions) end, {ok, State}. + +-spec format_error(any(), rebar_state:t()) -> {iolist(), rebar_state:t()}. +format_error(Reason, State) -> + {io_lib:format("~p", [Reason]), State}. -- cgit v1.1