Merging w/ bitbucket

20 files changed, 48 insertions, 6 deletions

diff --git a/src/rebar.erl b/src/rebar.erl
index 5050326..c00191d 100644
--- a/src/rebar.erl
+++ b/src/rebar.erl
@@ -1,3 +1,5 @@
+%% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
 %% -------------------------------------------------------------------
 %%
 %% rebar: Erlang Build Tools
diff --git a/src/rebar_app_utils.erl b/src/rebar_app_utils.erl
index f879537..dbd085e 100644
--- a/src/rebar_app_utils.erl
+++ b/src/rebar_app_utils.erl
@@ -1,3 +1,5 @@
+%% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
 %% -------------------------------------------------------------------
 %%
 %% rebar: Erlang Build Tools
diff --git a/src/rebar_config.erl b/src/rebar_config.erl
index 2e24ddf..0ca9b41 100644
--- a/src/rebar_config.erl
+++ b/src/rebar_config.erl
@@ -1,3 +1,5 @@
+%% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
 %% -------------------------------------------------------------------
 %%
 %% rebar: Erlang Build Tools
diff --git a/src/rebar_core.erl b/src/rebar_core.erl
index c3ad968..9cb1b57 100644
--- a/src/rebar_core.erl
+++ b/src/rebar_core.erl
@@ -1,3 +1,5 @@
+%% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
 %% -------------------------------------------------------------------
 %%
 %% rebar: Erlang Build Tools
@@ -50,16 +52,19 @@ run(Args) ->
     ok = application:load(rebar),
 
     %% Parse getopt options
-    case getopt:parse(option_spec_list(), Args) of
+    OptSpecList = option_spec_list(),
+    case getopt:parse(OptSpecList, Args) of
+        {ok, {_Options, []}} ->
+            %% no command to run specified
+            getopt:usage(OptSpecList, "rebar");
         {ok, {Options, NonOptArgs}} ->
             case proplists:get_bool(help, Options) of
                 true ->
-                    %% display usage info
-                    getopt:usage(option_spec_list(), "rebar");
+                    %% display help
+                    getopt:usage(OptSpecList, "rebar");
                 false ->
                     %% Set global variables based on getopt options
                     set_global_flag(Options, verbose),
-                    set_global_flag(Options, quiet),
                     set_global_flag(Options, force),
 
                     %% run rebar with supplied options
@@ -67,7 +72,7 @@ run(Args) ->
             end;
         {error, {Reason, Data}} ->
             ?ERROR("Error: ~s ~p~n~n", [Reason, Data]),
-            getopt:usage(option_spec_list(), "rebar")
+            getopt:usage(OptSpecList, "rebar")
     end.
 
 run2(Args) ->
@@ -112,7 +117,6 @@ option_spec_list() ->
      %% {Name, ShortOpt, LongOpt, ArgSpec, HelpMsg}
      {help,    $h, "help",    undefined, "Show the program options"},
      {verbose, $v, "verbose", undefined, "Be verbose about what gets done"},
-     {quiet,   $q, "quiet",   undefined, "Be quiet about what gets done"},
      {force,   $f, "force",   undefined, "Force"}
     ].
 
diff --git a/src/rebar_ct.erl b/src/rebar_ct.erl
index 41487ab..2a03b11 100644
--- a/src/rebar_ct.erl
+++ b/src/rebar_ct.erl
@@ -1,3 +1,5 @@
+%% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
 %% -------------------------------------------------------------------
 %%
 %% rebar: Erlang Build Tools
diff --git a/src/rebar_deps.erl b/src/rebar_deps.erl
index b4bf267..530dcd7 100644
--- a/src/rebar_deps.erl
+++ b/src/rebar_deps.erl
@@ -1,3 +1,5 @@
+%% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
 %% -------------------------------------------------------------------
 %%
 %% rebar: Erlang Build Tools
diff --git a/src/rebar_erlc_compiler.erl b/src/rebar_erlc_compiler.erl
index a2dc399..68b1d75 100644
--- a/src/rebar_erlc_compiler.erl
+++ b/src/rebar_erlc_compiler.erl
@@ -1,3 +1,5 @@
+%% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
 %% -------------------------------------------------------------------
 %%
 %% rebar: Erlang Build Tools
diff --git a/src/rebar_erlydtl_compiler.erl b/src/rebar_erlydtl_compiler.erl
index dd0b7c7..862c5ed 100644
--- a/src/rebar_erlydtl_compiler.erl
+++ b/src/rebar_erlydtl_compiler.erl
@@ -1,3 +1,5 @@
+%% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
 %% -------------------------------------------------------------------
 %%
 %% rebar: Erlang Build Tools
diff --git a/src/rebar_escripter.erl b/src/rebar_escripter.erl
index 6b07c27..19101b6 100644
--- a/src/rebar_escripter.erl
+++ b/src/rebar_escripter.erl
@@ -1,3 +1,5 @@
+%% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
 %% -------------------------------------------------------------------
 %%
 %% rebar: Erlang Build Tools
diff --git a/src/rebar_eunit.erl b/src/rebar_eunit.erl
index e3914fa..e32aa72 100644
--- a/src/rebar_eunit.erl
+++ b/src/rebar_eunit.erl
@@ -1,3 +1,5 @@
+%% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
 %% -------------------------------------------------------------------
 %%
 %% rebar: Erlang Build Tools
diff --git a/src/rebar_file_utils.erl b/src/rebar_file_utils.erl
index 09f90e2..ae1f376 100644
--- a/src/rebar_file_utils.erl
+++ b/src/rebar_file_utils.erl
@@ -1,3 +1,5 @@
+%% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
 %% -------------------------------------------------------------------
 %%
 %% rebar: Erlang Build Tools
diff --git a/src/rebar_lfe_compiler.erl b/src/rebar_lfe_compiler.erl
index 3776164..5447028 100644
--- a/src/rebar_lfe_compiler.erl
+++ b/src/rebar_lfe_compiler.erl
@@ -1,3 +1,5 @@
+%% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
 %% -------------------------------------------------------------------
 %%
 %% rebar: Erlang Build Tools
diff --git a/src/rebar_log.erl b/src/rebar_log.erl
index 3be8d30..4ec05c0 100644
--- a/src/rebar_log.erl
+++ b/src/rebar_log.erl
@@ -1,3 +1,5 @@
+%% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
 %% -------------------------------------------------------------------
 %%
 %% rebar: Erlang Build Tools
diff --git a/src/rebar_otp_app.erl b/src/rebar_otp_app.erl
index e9bf1d3..6f4935f 100644
--- a/src/rebar_otp_app.erl
+++ b/src/rebar_otp_app.erl
@@ -1,3 +1,5 @@
+%% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
 %% -------------------------------------------------------------------
 %%
 %% rebar: Erlang Build Tools
diff --git a/src/rebar_port_compiler.erl b/src/rebar_port_compiler.erl
index 6be6423..a602f01 100644
--- a/src/rebar_port_compiler.erl
+++ b/src/rebar_port_compiler.erl
@@ -1,3 +1,5 @@
+%% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
 %% -------------------------------------------------------------------
 %%
 %% rebar: Erlang Build Tools
diff --git a/src/rebar_protobuffs_compiler.erl b/src/rebar_protobuffs_compiler.erl
index 540df9f..c754747 100644
--- a/src/rebar_protobuffs_compiler.erl
+++ b/src/rebar_protobuffs_compiler.erl
@@ -1,3 +1,5 @@
+%% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
 %% -------------------------------------------------------------------
 %%
 %% rebar: Erlang Build Tools
diff --git a/src/rebar_rel_utils.erl b/src/rebar_rel_utils.erl
index 99d12f7..cf3e92e 100644
--- a/src/rebar_rel_utils.erl
+++ b/src/rebar_rel_utils.erl
@@ -1,3 +1,5 @@
+%% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
 %% -------------------------------------------------------------------
 %%
 %% rebar: Erlang Build Tools
diff --git a/src/rebar_reltool.erl b/src/rebar_reltool.erl
index 3b08be3..d16bc3f 100644
--- a/src/rebar_reltool.erl
+++ b/src/rebar_reltool.erl
@@ -1,3 +1,5 @@
+%% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
 %% -------------------------------------------------------------------
 %%
 %% rebar: Erlang Build Tools
diff --git a/src/rebar_subdirs.erl b/src/rebar_subdirs.erl
index 80a1ee3..81f588d 100644
--- a/src/rebar_subdirs.erl
+++ b/src/rebar_subdirs.erl
@@ -1,3 +1,5 @@
+%% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
 %% -------------------------------------------------------------------
 %%
 %% rebar: Erlang Build Tools
diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl
index d780419..05f9349 100644
--- a/src/rebar_utils.erl
+++ b/src/rebar_utils.erl
@@ -1,3 +1,5 @@
+%% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
 %% -------------------------------------------------------------------
 %%
 %% rebar: Erlang Build Tools