diff --git a/Makefile b/Makefile index 40c260e..674ce69 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ SHELL_DEPS = sync TEST_DEPS = meck xref_runner dep_lager = git https://github.com/basho/lager.git 2.0.3 -dep_elvis_core = git https://github.com/inaka/elvis_core 0.2.7 +dep_elvis_core = git https://github.com/inaka/elvis_core 0.2.8-2 dep_getopt = git https://github.com/jcomellas/getopt v0.8.2 dep_jiffy = git https://github.com/davisp/jiffy 0.14.2 dep_ibrowse = git https://github.com/cmullaparthi/ibrowse v4.1.2 diff --git a/config/elvis-test.config b/config/elvis-test.config index 71d5865..c87496f 100644 --- a/config/elvis-test.config +++ b/config/elvis-test.config @@ -5,43 +5,19 @@ {config, [#{dirs => ["../../src"], filter => "*.erl", - rules => [{elvis_style, line_length, #{limit => 80, - skip_comments => false}}, - {elvis_style, no_tabs}, - {elvis_style, macro_names}, - {elvis_style, macro_module_names}, - {elvis_style, operator_spaces, #{rules => [{right, ","}, - {right, "++"}, - {left, "++"}]}}, - {elvis_style, nesting_level, #{level => 3}}, - {elvis_style, god_modules, #{limit => 25}}, - {elvis_style, no_if_expression}, - {elvis_style, invalid_dynamic_call, #{ignore => [elvis]}}, - {elvis_style, used_ignored_variable}, - {elvis_style, no_behavior_info}, - { - elvis_style, - module_naming_convention, - #{regex => "^([a-z][a-z0-9]*_?)*(_SUITE)?$", - ignore => []} - }, - {elvis_style, state_record_and_type}, - {elvis_style, no_spec_with_records} - ] + ruleset => erl_files }, #{dirs => ["."], filter => "Makefile", - rules => [{elvis_project, no_deps_master_erlang_mk, #{ignore => []}}, - {elvis_project, protocol_for_deps_erlang_mk, #{ignore => []}}] + ruleset => makefiles }, #{dirs => ["."], filter => "rebar.config", - rules => [{elvis_project, no_deps_master_rebar, #{ignore => []}}, - {elvis_project, protocol_for_deps_rebar, #{ignore => []}}] + ruleset => rebar_config }, #{dirs => ["."], filter => "elvis.config", - rules => [{elvis_project, old_configuration_format}] + ruleset => elvis_config } ] } diff --git a/config/elvis.config b/config/elvis.config index fc6305e..74c730c 100644 --- a/config/elvis.config +++ b/config/elvis.config @@ -5,52 +5,19 @@ {config, [#{dirs => ["src"], filter => "*.erl", - rules => [{elvis_style, line_length, #{limit => 80, - skip_comments => false}}, - {elvis_style, no_tabs}, - {elvis_style, no_trailing_whitespace}, - {elvis_style, macro_names}, - {elvis_style, macro_module_names}, - {elvis_style, operator_spaces, #{rules => [{right, ","}, - {right, "++"}, - {left, "++"}]}}, - {elvis_style, nesting_level, #{level => 3}}, - {elvis_style, god_modules, #{limit => 25}}, - {elvis_style, no_if_expression}, - {elvis_style, invalid_dynamic_call, #{ignore => [elvis]}}, - {elvis_style, used_ignored_variable}, - {elvis_style, no_behavior_info}, - { - elvis_style, - module_naming_convention, - #{regex => "^([a-z][a-z0-9]*_?)*(_SUITE)?$", - ignore => []} - }, - { - elvis_style, - function_naming_convention, - #{regex => "^([a-z][a-z0-9]*_?)*$"} - }, - {elvis_style, state_record_and_type}, - {elvis_style, no_spec_with_records}, - {elvis_style, dont_repeat_yourself, #{min_complexity => 10}}, - {elvis_style, no_debug_call, #{ignore => [elvis, - elvis_utils]}} - ] + ruleset => erl_files }, #{dirs => ["."], filter => "Makefile", - rules => [{elvis_project, no_deps_master_erlang_mk, #{ignore => []}}, - {elvis_project, protocol_for_deps_erlang_mk, #{ignore => []}}] + ruleset => makefiles }, #{dirs => ["."], filter => "rebar.config", - rules => [{elvis_project, no_deps_master_rebar, #{ignore => []}}, - {elvis_project, protocol_for_deps_rebar, #{ignore => []}}] + ruleset => rebar_config }, #{dirs => ["."], filter => "elvis.config", - rules => [{elvis_project, old_configuration_format}] + ruleset => elvis_config } ] } diff --git a/config/test.config b/config/test.config index b9e25a8..1d398af 100644 --- a/config/test.config +++ b/config/test.config @@ -5,45 +5,19 @@ {config, [#{dirs => ["../../test/examples"], filter => "**.erl", - rules => [{elvis_style, line_length, #{limit => 80, - skip_comments => false}}, - {elvis_style, no_tabs}, - {elvis_style, no_trailing_whitespace}, - {elvis_style, macro_names}, - {elvis_style, macro_module_names}, - {elvis_style, operator_spaces, #{rules => [{right, ","}, - {right, "++"}, - {left, "++"}]}}, - {elvis_style, nesting_level, #{level => 3}}, - {elvis_style, god_modules, #{limit => 25}}, - {elvis_style, no_if_expression}, - {elvis_style, invalid_dynamic_call, #{ignore => [elvis]}}, - {elvis_style, used_ignored_variable}, - {elvis_style, no_behavior_info}, - { - elvis_style, - module_naming_convention, - #{regex => "^([a-z][a-z0-9]*_?)*(_SUITE)?$", - ignore => []} - }, - {elvis_style, state_record_and_type}, - {elvis_style, no_spec_with_records}, - {elvis_style, dont_repeat_yourself, #{min_complexity => 5}} - ] + ruleset => erl_files }, #{dirs => ["."], filter => "Makefile", - rules => [{elvis_project, no_deps_master_erlang_mk, #{ignore => []}}, - {elvis_project, protocol_for_deps_erlang_mk, #{ignore => []}}] + ruleset => makefiles }, #{dirs => ["."], filter => "rebar.config", - rules => [{elvis_project, no_deps_master_rebar, #{ignore => []}}, - {elvis_project, protocol_for_deps_rebar, #{ignore => []}}] + ruleset => rebar_config }, #{dirs => ["."], filter => "elvis.config", - rules => [{elvis_project, old_configuration_format}] + ruleset => elvis_config } ] }, diff --git a/elvis.config b/elvis.config index 21a2b6e..74c730c 100644 --- a/elvis.config +++ b/elvis.config @@ -5,53 +5,19 @@ {config, [#{dirs => ["src"], filter => "*.erl", - rules => [{elvis_style, line_length, #{limit => 80, - skip_comments => false}}, - {elvis_style, no_tabs}, - {elvis_style, no_trailing_whitespace}, - {elvis_style, macro_names}, - {elvis_style, macro_module_names}, - {elvis_style, operator_spaces, #{rules => [{right, ","}, - {right, "++"}, - {left, "++"}]}}, - {elvis_style, nesting_level, #{level => 3}}, - {elvis_style, god_modules, #{limit => 25}}, - {elvis_style, no_if_expression}, - {elvis_style, invalid_dynamic_call, #{ignore => [elvis]}}, - {elvis_style, used_ignored_variable}, - {elvis_style, no_behavior_info}, - { - elvis_style, - module_naming_convention, - #{regex => "^([a-z][a-z0-9]*_?)*(_SUITE)?$", - ignore => []} - }, - { - elvis_style, - variable_naming_convention, - #{regex => "^([A-Z][0-9a-zA-Z]*)$", ignore => []} - }, - {elvis_style, state_record_and_type}, - {elvis_style, no_spec_with_records}, - {elvis_style, dont_repeat_yourself, #{min_complexity => 20}}, - {elvis_style, no_debug_call, #{ignore => [elvis, - elvis_utils]}}, - {elvis_style, no_nested_try_catch} - ] + ruleset => erl_files }, #{dirs => ["."], filter => "Makefile", - rules => [{elvis_project, no_deps_master_erlang_mk, #{ignore => []}}, - {elvis_project, protocol_for_deps_erlang_mk, #{ignore => []}}] + ruleset => makefiles }, #{dirs => ["."], filter => "rebar.config", - rules => [{elvis_project, no_deps_master_rebar, #{ignore => []}}, - {elvis_project, protocol_for_deps_rebar, #{ignore => []}}] + ruleset => rebar_config }, #{dirs => ["."], filter => "elvis.config", - rules => [{elvis_project, old_configuration_format}] + ruleset => elvis_config } ] }