[#18] Updated config files. Created config/old folder to hold previous configuration file format.

Author: jfacorro

config/elvis-test.config

@@ -3,27 +3,36 @@
    elvis,
    [
     {config,
-     #{src_dirs => ["../../src"],
-       rules => [{elvis_style, line_length, [80]},
-                 {elvis_style, no_tabs, []},
-                 {elvis_style, macro_names, []},
-                 {elvis_style, macro_module_names, []},
-                 {elvis_style, operator_spaces, [{right, ","},
-                                                 {right, "++"},
-                                                 {left, "++"}]},
-                 {elvis_style, nesting_level, [3]},
-                 {elvis_style, god_modules, [25]},
-                 {elvis_style, no_if_expression, []},
-                 {elvis_style, invalid_dynamic_call, [elvis]},
-                 {elvis_style, used_ignored_variable, []},
-                 {elvis_style, no_behavior_info, []},
-                 {
-                   elvis_style,
-                   module_naming_convention,
-                   ["^([a-z][a-z0-9]*_?)*(_SUITE)?$", []]
-                 }
-                ]
-      }
+     [#{src_dirs => ["../../src"],
+        rules => [{elvis_style, line_length, [80]},
+                  {elvis_style, no_tabs, []},
+                  {elvis_style, macro_names, []},
+                  {elvis_style, macro_module_names, []},
+                  {elvis_style, operator_spaces, [{right, ","},
+                                                  {right, "++"},
+                                                  {left, "++"}]},
+                  {elvis_style, nesting_level, [3]},
+                  {elvis_style, god_modules, [25]},
+                  {elvis_style, no_if_expression, []},
+                  {elvis_style, invalid_dynamic_call, [elvis]},
+                  {elvis_style, used_ignored_variable, []},
+                  {elvis_style, no_behavior_info, []},
+                  {
+                    elvis_style,
+                    module_naming_convention,
+                    ["^([a-z][a-z0-9]*_?)*(_SUITE)?$", []]
+                  }
+                 ]
+       },
+      #{dirs => ["."],
+        filter => "Makefile",
+        rules => [{elvis_project, no_deps_master_erlang_mk, []}]
+       },
+      #{dirs => ["."],
+        filter => "rebar.config",
+        rules => [{elvis_project, no_deps_master_rebar, []}]
+       }
+     ]
     }
    ]
  }

config/elvis.config

@@ -23,7 +23,8 @@
                     module_naming_convention,
                     ["^([a-z][a-z0-9]*_?)*(_SUITE)?$", []]
                   }
-                 ]},
+                 ]
+       },
       #{dirs => ["."],
         filter => "Makefile",
         rules => [{elvis_project, no_deps_master_erlang_mk, []}]

config/old/elvis-test.config

@@ -0,0 +1,30 @@
+[
+ {
+   elvis,
+   [
+    {config,
+     #{src_dirs => ["../../src"],
+       rules => [{elvis_style, line_length, [80]},
+                 {elvis_style, no_tabs, []},
+                 {elvis_style, macro_names, []},
+                 {elvis_style, macro_module_names, []},
+                 {elvis_style, operator_spaces, [{right, ","},
+                                                 {right, "++"},
+                                                 {left, "++"}]},
+                 {elvis_style, nesting_level, [3]},
+                 {elvis_style, god_modules, [25]},
+                 {elvis_style, no_if_expression, []},
+                 {elvis_style, invalid_dynamic_call, [elvis]},
+                 {elvis_style, used_ignored_variable, []},
+                 {elvis_style, no_behavior_info, []},
+                 {
+                   elvis_style,
+                   module_naming_convention,
+                   ["^([a-z][a-z0-9]*_?)*(_SUITE)?$", []]
+                 }
+                ]
+      }
+    }
+   ]
+ }
+].

config/old.elvis.config config/old/elvis.configconfig/old.elvis.config renamed to config/old/elvis.config

@@ -23,7 +23,8 @@
                     module_naming_convention,
                     ["^([a-z][a-z0-9]*_?)*(_SUITE)?$", []]
                   }
-                 ]},
+                 ]
+       },
       #{dirs => ["."],
         filter => "Makefile",
         rules => [{elvis_project, no_deps_master_erlang_mk, []}]

config/test.config

@@ -185,7 +185,7 @@ filter_files(Files, Filter) ->
 -spec glob_to_regex(iodata()) -> iodata().
 glob_to_regex(Glob) ->
     Regex1 = re:replace(Glob, "\\.", "\\\\."),
-    re:replace(Regex1,"\\*",".*").
+    re:replace(Regex1,"\\*", ".*").
 
 %% @doc Takes a line, a character and a count, returning the indentation level
 %%      invalid if the number of character is not a multiple of count.

src/elvis_utils.erl

@@ -13,6 +13,7 @@
          rock_with_incomplete_config/1,
          rock_with_list_config/1,
          rock_with_file_config/1,
+         rock_with_old_config/1,
          %% Webhook
          run_webhook/1,
          run_webhook_ping/1,
@@ -118,6 +119,26 @@ rock_with_file_config(_Config) ->
     check_some_line_output(Fun, Expected, fun matches_regex/2),
     ok.
 
+-spec rock_with_old_config(config()) -> ok.
+rock_with_old_config(_Config) ->
+    ConfigPath = "../../config/old/elvis.config",
+    ElvisConfig = elvis_config:load_file(ConfigPath),
+    ok = try
+             elvis:rock(ElvisConfig),
+             ok
+         catch
+             throw:{invalid_config, _} -> fail
+         end,
+
+    ConfigPath1 = "../../config/old/elvis-test.config",
+    ElvisConfig1 = elvis_config:load_file(ConfigPath1),
+    ok = try
+             elvis:rock(ElvisConfig1),
+             ok
+         catch
+             throw:{invalid_config, _} -> fail
+         end.
+
 %%%%%%%%%%%%%%%
 %%% Webhook
 

test/elvis_SUITE.erl

@@ -70,7 +70,9 @@ check_staged_files(_Config) ->
     file:write_file(Filename, <<"sdsds">>, [append]),
 
     os:cmd("git add " ++ Filename),
-    [#{path := "temp_file_test"}] = elvis_git:staged_files(),
+    StagedFiles = elvis_git:staged_files(),
+    FilterFun = fun (#{path := Path}) -> Path == "temp_file_test" end,
+    [_] = lists:filter(FilterFun, StagedFiles),
     os:cmd("git reset " ++ Filename),
 
     file:delete(Filename).