From 932eb2e34335f0f6a4ee845cb5e2e8acec71c831 Mon Sep 17 00:00:00 2001
From: Tuncer Ayaz <tuncer.ayaz@gmail.com>
Date: Tue, 11 Jan 2011 11:54:10 +0100
Subject: [PATCH] Simplify rebar_core

---
 src/rebar_core.erl | 40 +++++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/src/rebar_core.erl b/src/rebar_core.erl
index 353a218..edf220f 100644
--- a/src/rebar_core.erl
+++ b/src/rebar_core.erl
@@ -120,7 +120,7 @@ parse_args(Args) ->
     case getopt:parse(OptSpecList, Args) of
         {ok, {Options, NonOptArgs}} ->
             %% Check options and maybe halt execution
-            {ok, continue} = show_info_maybe_halt(Options, NonOptArgs),
+            ok = show_info_maybe_halt(Options, NonOptArgs),
 
             %% Set global variables based on getopt options
             set_global_flag(Options, verbose),
@@ -165,31 +165,25 @@ set_global_flag(Options, Flag) ->
 %% show info and maybe halt execution
 %%
 show_info_maybe_halt(Opts, NonOptArgs) ->
-    case proplists:get_bool(help, Opts) of
-        true ->
+    false = show_info_maybe_halt(help, Opts, fun help/0),
+    false = show_info_maybe_halt(commands, Opts, fun commands/0),
+    false = show_info_maybe_halt(version, Opts, fun version/0),
+    case NonOptArgs of
+        [] ->
+            ?CONSOLE("No command to run specified!~n",[]),
             help(),
+            halt(1);
+        _ ->
+            ok
+    end.
+
+show_info_maybe_halt(O, Opts, F) ->
+    case proplists:get_bool(O, Opts) of
+        true ->
+            F(),
             halt(0);
         false ->
-            case proplists:get_bool(commands, Opts) of
-                true ->
-                    commands(),
-                    halt(0);
-                false ->
-                    case proplists:get_bool(version, Opts) of
-                        true ->
-                            version(),
-                            halt(0);
-                        false ->
-                            case NonOptArgs of
-                                [] ->
-                                    ?CONSOLE("No command to run specified!~n",[]),
-                                    help(),
-                                    halt(1);
-                                _ ->
-                                    {ok, continue}
-                            end
-                    end
-            end
+            false
     end.
 
 %%