aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Sloughter <[email protected]>2013-03-12 18:49:31 -0500
committerTristan Sloughter <[email protected]>2013-03-13 13:43:01 -0500
commitb69815402b3456699a47273a8c731850fb6b7871 (patch)
tree6c491fddb665ae86cb6113749549b7ca635ffc73
parent937c776c131c9e2e04aefc6b4f320e37b35115c2 (diff)
downloadrelx-b69815402b3456699a47273a8c731850fb6b7871.tar.gz
relx-b69815402b3456699a47273a8c731850fb6b7871.tar.bz2
relx-b69815402b3456699a47273a8c731850fb6b7871.zip
update do type spec for undefined config
-rw-r--r--src/rcl_prv_config.erl4
-rw-r--r--src/relcool.erl6
-rw-r--r--test/rclt_release_SUITE.erl5
3 files changed, 8 insertions, 7 deletions
diff --git a/src/rcl_prv_config.erl b/src/rcl_prv_config.erl
index 60655b1..1027edf 100644
--- a/src/rcl_prv_config.erl
+++ b/src/rcl_prv_config.erl
@@ -54,8 +54,8 @@ do(State) ->
-spec format_error(Reason::term()) -> iolist().
format_error({consult, ConfigFile, Reason}) ->
- io_lib:format("Unable to read file ~s: ~s", [ConfigFile,
- file:format_error(Reason)]);
+ io_lib:format("Unable to read file ~s: ~s", [ConfigFile,
+ file:format_error(Reason)]);
format_error({invalid_term, Term}) ->
io_lib:format("Invalid term in config file: ~p", [Term]).
diff --git a/src/relcool.erl b/src/relcool.erl
index c8c0cde..7750efa 100644
--- a/src/relcool.erl
+++ b/src/relcool.erl
@@ -70,7 +70,7 @@ main(Args) ->
%% @param OutputDir - The directory where the release should be built to
%% @param Configs - The list of config files for the system
-spec do(atom(), string(), [goal()], [file:name()], rcl_log:log_level(),
- [file:name()], file:name()) ->
+ [file:name()], file:name() | undefined) ->
ok | error() | {ok, rcl_state:t()}.
do(RelName, RelVsn, Goals, LibDirs, LogLevel, OutputDir, Config) ->
{ok, Cwd} = file:get_cwd(),
@@ -87,7 +87,7 @@ do(RelName, RelVsn, Goals, LibDirs, LogLevel, OutputDir, Config) ->
%% @param OutputDir - The directory where the release should be built to
%% @param Configs - The list of config files for the system
-spec do(file:name(), atom(), string(), [goal()], [file:name()],
- rcl_log:log_level(), [file:name()], file:name()) ->
+ rcl_log:log_level(), [file:name()], file:name() | undefined) ->
ok | error() | {ok, rcl_state:t()}.
do(RootDir, RelName, RelVsn, Goals, LibDirs, LogLevel, OutputDir, Configs) ->
do(RootDir, RelName, RelVsn, Goals, LibDirs, LogLevel, OutputDir, [], Configs).
@@ -104,7 +104,7 @@ do(RootDir, RelName, RelVsn, Goals, LibDirs, LogLevel, OutputDir, Configs) ->
%% @param Overrides - A list of overrides for the system
%% @param Configs - The list of config files for the system
-spec do(file:name(), atom(), string(), [goal()], [file:name()],
- rcl_log:log_level(), [file:name()], [{atom(), file:name()}], file:name()) ->
+ rcl_log:log_level(), [file:name()], [{atom(), file:name()}], file:name() | undefined) ->
ok | error() | {ok, rcl_state:t()}.
do(RootDir, RelName, RelVsn, Goals, LibDirs, LogLevel, OutputDir, Overrides, Config) ->
State = rcl_state:new([{relname, RelName},
diff --git a/test/rclt_release_SUITE.erl b/test/rclt_release_SUITE.erl
index 1104303..dd03b9f 100644
--- a/test/rclt_release_SUITE.erl
+++ b/test/rclt_release_SUITE.erl
@@ -244,7 +244,8 @@ make_implicit_config_release(Config) ->
ok = file:set_cwd(FooRoot),
{ok, FooRoot} = file:get_cwd(),
{ok, State} = relcool:do(undefined, undefined, [], [LibDir1], 2,
- OutputDir, []),
+ OutputDir, undefined),
+
[{{foo, "0.0.1"}, Release}] = ec_dictionary:to_list(rcl_state:releases(State)),
?assert(ec_file:exists(OutputDir)),
AppSpecs = rcl_release:applications(Release),
@@ -294,7 +295,7 @@ make_rerun_overridden_release(Config) ->
OutputDir, [{OverrideAppName, OverrideAppDir}],
ConfigFile),
- %% Now we run it again to see if it failse.
+ %% Now we run it again to see if it fails.
{ok, State} = relcool:do(Cwd,undefined, undefined, [], [LibDir1], 2,
OutputDir, [{OverrideAppName, OverrideAppDir}],
ConfigFile),