Skip to content

Commit

Permalink
Merge pull request #43 from inaka/jfacorro.14.nesting.level.rule
Browse files Browse the repository at this point in the history
[#14] Implement nesting level rule
  • Loading branch information
elbrujohalcon committed Jul 18, 2014
2 parents 288f27d + 8658ad1 commit c94464d
Show file tree
Hide file tree
Showing 12 changed files with 639 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ebin
*.beam
*.plt
erl_crash.dump
logs
log*/

# Ignore elvis escript
elvis
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PROJECT = elvis

DEPS = lager sync getopt jiffy ibrowse
DEPS = lager sync getopt jiffy ibrowse aleppo
TEST_DEPS = meck

dep_lager = https://github.com/basho/lager.git 2.0.3
Expand All @@ -9,6 +9,7 @@ dep_getopt = https://github.com/jcomellas/getopt v0.8.2
dep_meck = https://github.com/eproxus/meck master
dep_jiffy = https://github.com/davisp/jiffy 0.11.3
dep_ibrowse = https://github.com/cmullaparthi/ibrowse v4.1.1
dep_aleppo = https://github.com/inaka/aleppo master

include erlang.mk

Expand Down
7 changes: 4 additions & 3 deletions config/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
{elvis_style, no_tabs, []},
{elvis_style, macro_names, []},
{elvis_style, macro_module_names, []},
{elvis_style, operator_spaces, [{right, ","}, {right, "++"}, {left, "++"}]}
{elvis_style, operator_spaces, [{right, ","},
{right, "++"},
{left, "++"}]},
{elvis_style, nesting_level, [3]}
]
}
}
]
}
].

%
5 changes: 4 additions & 1 deletion config/elvis-test.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
{elvis_style, no_tabs, []},
{elvis_style, macro_names, []},
{elvis_style, macro_module_names, []},
{elvis_style, operator_spaces, [{right, ","}, {right, "++"}, {left, "++"}]}
{elvis_style, operator_spaces, [{right, ","},
{right, "++"},
{left, "++"}]},
{elvis_style, nesting_level, [3]}
]
}
}
Expand Down
5 changes: 4 additions & 1 deletion config/elvis.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
{elvis_style, no_tabs, []},
{elvis_style, macro_names, []},
{elvis_style, macro_module_names, []},
{elvis_style, operator_spaces, [{right, ","}, {right, "++"}, {left, "++"}]}
{elvis_style, operator_spaces, [{right, ","},
{right, "++"},
{left, "++"}]},
{elvis_style, nesting_level, [3]}
]
}
}
Expand Down
5 changes: 4 additions & 1 deletion config/test.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
{elvis_style, no_tabs, []},
{elvis_style, macro_names, []},
{elvis_style, macro_module_names, []},
{elvis_style, operator_spaces, [{right, ","}, {right, "++"}, {left, "++"}]}
{elvis_style, operator_spaces, [{right, ","},
{right, "++"},
{left, "++"}]},
{elvis_style, nesting_level, [3]}
]
}
}
Expand Down
Loading

0 comments on commit c94464d

Please sign in to comment.