RubyGems - rubocop - Versions diffs - 0.34.2 → 0.35.0 - Mend

rubocop 0.34.2 → 0.35.0

Potentially problematic release.

This version of rubocop might be problematic. Click here for more details.

Files changed (102) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +86 -0
data/README.md +103 -31
data/config/default.yml +32 -2
data/config/disabled.yml +24 -0
data/config/enabled.yml +20 -2
data/lib/rubocop.rb +13 -0
data/lib/rubocop/ast_node.rb +48 -0
data/lib/rubocop/cli.rb +9 -0
data/lib/rubocop/config.rb +8 -6
data/lib/rubocop/config_loader.rb +30 -8
data/lib/rubocop/cop/commissioner.rb +1 -1
data/lib/rubocop/cop/cop.rb +19 -6
data/lib/rubocop/cop/lint/circular_argument_reference.rb +33 -2
data/lib/rubocop/cop/lint/debugger.rb +9 -56
data/lib/rubocop/cop/lint/end_alignment.rb +29 -9
data/lib/rubocop/cop/lint/eval.rb +6 -2
data/lib/rubocop/cop/lint/format_parameter_mismatch.rb +24 -6
data/lib/rubocop/cop/lint/literal_in_condition.rb +0 -5
data/lib/rubocop/cop/lint/non_local_exit_from_iterator.rb +10 -1
data/lib/rubocop/cop/lint/parentheses_as_grouped_expression.rb +1 -1
data/lib/rubocop/cop/lint/space_before_first_arg.rb +1 -1
data/lib/rubocop/cop/lint/unused_block_argument.rb +6 -0
data/lib/rubocop/cop/lint/unused_method_argument.rb +8 -0
data/lib/rubocop/cop/metrics/abc_size.rb +1 -1
data/lib/rubocop/cop/mixin/access_modifier_node.rb +1 -1
data/lib/rubocop/cop/mixin/autocorrect_alignment.rb +1 -1
data/lib/rubocop/cop/mixin/autocorrect_unless_changing_ast.rb +26 -3
data/lib/rubocop/cop/mixin/check_assignment.rb +2 -3
data/lib/rubocop/cop/mixin/configurable_enforced_style.rb +59 -12
data/lib/rubocop/cop/mixin/configurable_max.rb +1 -1
data/lib/rubocop/cop/mixin/configurable_naming.rb +1 -1
data/lib/rubocop/cop/mixin/first_element_line_break.rb +41 -0
data/lib/rubocop/cop/mixin/negative_conditional.rb +1 -1
data/lib/rubocop/cop/mixin/safe_assignment.rb +3 -14
data/lib/rubocop/cop/mixin/statement_modifier.rb +2 -2
data/lib/rubocop/cop/performance/detect.rb +5 -1
data/lib/rubocop/cop/performance/fixed_size.rb +50 -0
data/lib/rubocop/cop/performance/size.rb +1 -1
data/lib/rubocop/cop/performance/string_replacement.rb +14 -8
data/lib/rubocop/cop/rails/pluralization_grammar.rb +97 -0
data/lib/rubocop/cop/style/align_hash.rb +1 -12
data/lib/rubocop/cop/style/align_parameters.rb +19 -7
data/lib/rubocop/cop/style/and_or.rb +42 -13
data/lib/rubocop/cop/style/block_comments.rb +4 -2
data/lib/rubocop/cop/style/block_delimiters.rb +57 -18
data/lib/rubocop/cop/style/braces_around_hash_parameters.rb +1 -1
data/lib/rubocop/cop/style/command_literal.rb +2 -10
data/lib/rubocop/cop/style/copyright.rb +5 -3
data/lib/rubocop/cop/style/documentation.rb +9 -6
data/lib/rubocop/cop/style/dot_position.rb +6 -0
data/lib/rubocop/cop/style/double_negation.rb +4 -15
data/lib/rubocop/cop/style/each_with_object.rb +17 -4
data/lib/rubocop/cop/style/empty_line_between_defs.rb +1 -5
data/lib/rubocop/cop/style/encoding.rb +10 -4
data/lib/rubocop/cop/style/extra_spacing.rb +23 -13
data/lib/rubocop/cop/style/first_array_element_line_break.rb +41 -0
data/lib/rubocop/cop/style/first_hash_element_line_break.rb +35 -0
data/lib/rubocop/cop/style/first_method_argument_line_break.rb +37 -0
data/lib/rubocop/cop/style/first_method_parameter_line_break.rb +42 -0
data/lib/rubocop/cop/style/for.rb +2 -1
data/lib/rubocop/cop/style/if_unless_modifier.rb +31 -0
data/lib/rubocop/cop/style/indent_hash.rb +67 -37
data/lib/rubocop/cop/style/indentation_width.rb +1 -1
data/lib/rubocop/cop/style/leading_comment_space.rb +3 -2
data/lib/rubocop/cop/style/method_call_parentheses.rb +8 -0
data/lib/rubocop/cop/style/method_def_parentheses.rb +10 -7
data/lib/rubocop/cop/style/multiline_operation_indentation.rb +8 -13
data/lib/rubocop/cop/style/nested_modifier.rb +97 -0
data/lib/rubocop/cop/style/next.rb +18 -0
data/lib/rubocop/cop/style/parallel_assignment.rb +57 -15
data/lib/rubocop/cop/style/predicate_name.rb +7 -2
data/lib/rubocop/cop/style/regexp_literal.rb +2 -10
data/lib/rubocop/cop/style/single_line_methods.rb +7 -5
data/lib/rubocop/cop/style/single_space_before_first_arg.rb +1 -1
data/lib/rubocop/cop/style/space_around_operators.rb +2 -0
data/lib/rubocop/cop/style/special_global_vars.rb +4 -2
data/lib/rubocop/cop/style/stabby_lambda_parentheses.rb +108 -0
data/lib/rubocop/cop/style/trailing_comma.rb +9 -6
data/lib/rubocop/cop/style/trailing_underscore_variable.rb +23 -2
data/lib/rubocop/cop/style/unneeded_percent_q.rb +31 -20
data/lib/rubocop/cop/style/variable_name.rb +5 -0
data/lib/rubocop/cop/style/word_array.rb +2 -1
data/lib/rubocop/cop/team.rb +17 -4
data/lib/rubocop/cop/util.rb +5 -0
data/lib/rubocop/cop/variable_force/locatable.rb +1 -1
data/lib/rubocop/formatter/base_formatter.rb +1 -1
data/lib/rubocop/formatter/disabled_config_formatter.rb +22 -10
data/lib/rubocop/formatter/simple_text_formatter.rb +1 -1
data/lib/rubocop/node_pattern.rb +390 -0
data/lib/rubocop/options.rb +48 -36
data/lib/rubocop/processed_source.rb +3 -1
data/lib/rubocop/rake_task.rb +1 -1
data/lib/rubocop/remote_config.rb +60 -0
data/lib/rubocop/result_cache.rb +4 -2
data/lib/rubocop/runner.rb +33 -10
data/lib/rubocop/token.rb +2 -1
data/lib/rubocop/version.rb +1 -1
data/lib/rubocop/warning.rb +11 -0
data/relnotes/v0.35.0.md +210 -0
data/rubocop.gemspec +2 -2
metadata +20 -6

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 706a61d96efb82b99fada36b2472fb0adc32ce09
-  data.tar.gz: 107b525881e8a174454969957a9e2e1b823f66f1
+  metadata.gz: faeefb30bb3d8f71a9a27ac9fe972b4f489c12e4
+  data.tar.gz: 931e6ba95fc0119b48dbaaa5144ed67121bcd256
 SHA512:
-  metadata.gz: 3e2e7a1a59ce5f66a66b013e53a1c864db55583de28c4dae467e8e095f985f0a7f8a81f52132f346308ff358fe9cc04d6db12d9a20275b6afa8fb2ca83944056
-  data.tar.gz: 52fa283a415fabac9ac2fcf6e06c2450381ecca66cffef48bcccc09729992bfafa8b5ffd2a044c5f936a31ed51932618d18bc593727d5bce823fb22c15370825
+  metadata.gz: 1e5163d89e311a7a520b2a690fb75b69450ce1ddbb4d8632205f97cdb821305020d4afed08abb8de02065cb11bb9485d91f4a00c89aa91923cb2b8a6d9c1da22
+  data.tar.gz: 5d6a0610ea94aa62673d3ffe75436af19db27e18b0f05b9ac22d4a2af323f349c412a24580f4b8db6a3c22574e58ac77be83527eaeec309c50e7be4d38a89901

data/CHANGELOG.md CHANGED

@@ -2,6 +2,81 @@
 ## master (unreleased)
+## 0.35.0 (07/11/2015)
+### New features
+* [#2028](https://github.com/bbatsov/rubocop/issues/2028): New config `ExtraDetails` supports addition of `Details` param to all cops to allow extra details on offense to be displayed. ([@tansaku][])
+* [#2036](https://github.com/bbatsov/rubocop/issues/2036): New cop `Style/StabbyLambdaParentheses` will find and correct cases where a stabby lambda's paramaters are not wrapped in parentheses. ([@hmadison][])
+* [#2246](https://github.com/bbatsov/rubocop/pull/2246): `Style/TrailingUnderscoreVariable` will now register an offense for `*_`. ([@rrosenblum][])
+* [#2246](https://github.com/bbatsov/rubocop/pull/2246): `Style/TrailingUnderscoreVariable` now has a configuration to remove named underscore variables (Defaulted to false). ([@rrosenblum][])
+* [#2276](https://github.com/bbatsov/rubocop/pull/2276): New cop `Performance/FixedSize` will register an offense when calling `length`, `size`, or `count` on statically sized objected (strings, symbols, arrays, and hashes). ([@rrosenblum][])
+* New cop `Style/NestedModifier` checks for nested `if`, `unless`, `while` and `until` modifier statements. ([@lumeet][])
+* [#2270](https://github.com/bbatsov/rubocop/pull/2270): Add a new `inherit_gem` configuration to inherit a config file from an installed gem [(originally requested in #290)](https://github.com/bbatsov/rubocop/issues/290). ([@jhansche][])
+* Allow `StyleGuide` parameters in local configuration for all cops, so users can add references to custom style guide documents. ([@cornelius][])
+* `UnusedMethodArgument` cop allows configuration to skip keyword arguments. ([@apiology][])
+* [#2318](https://github.com/bbatsov/rubocop/pull/2318): `Lint/Debugger` cop now checks for `Pry.rescue`. ([@rrosenblum][])
+* [#2277](https://github.com/bbatsov/rubocop/pull/2277): New cop `Style/FirstArrayElementLineBreak` checks for a line break before the first element in a multi-line array. ([@panthomakos][])
+* [#2277](https://github.com/bbatsov/rubocop/pull/2277): New cop `Style/FirstHashElementLineBreak` checks for a line break before the first element in a multi-line hash. ([@panthomakos][])
+* [#2277](https://github.com/bbatsov/rubocop/pull/2277): New cop `Style/FirstMethodArgumentLineBreak` checks for a line break before the first argument in a multi-line method call. ([@panthomakos][])
+* [#2277](https://github.com/bbatsov/rubocop/pull/2277): New cop `Style/FirstMethodParameterLineBreak` checks for a line break before the first parameter in a multi-line method parameter definition. ([@panthomakos][])
+* Add `Rails/PluralizationGrammar` cop, checks for incorrect grammar when using methods like `3.day.ago`, when you should write `3.days.ago`. ([@maxjacobson][])
+* [#2347](https://github.com/bbatsov/rubocop/pull/2347): `Lint/Eval` cop does not warn about "security risk" when eval argument is a string literal without interpolations. ([@alexdowad][])
+* [#2335](https://github.com/bbatsov/rubocop/issues/2335): `Style/VariableName` cop checks naming style of method parameters. ([@alexdowad][])
+* [#2329](https://github.com/bbatsov/rubocop/pull/2329): New style `braces_for_chaining` for `Style/BlockDelimiters` cop enforces braces on a multi-line block if its return value is being chained with another method. ([@panthomakos][])
+* `Lint/LiteralInCondition` warns if a symbol or dynamic symbol is used as a condition. ([@alexdowad][])
+* [#2369](https://github.com/bbatsov/rubocop/issues/2369): `Style/TrailingComma` doesn't add a trailing comma to a multiline method chain which is the only arg to a method call. ([@alexdowad][])
+* `CircularArgumentReference` cop updated to lint for ordinal circular argument references on top of optional keyword arguments. ([@maxjacobson][])
+* Added ability to download shared rubocop config files from remote urls. ([@ptrippett][])
+* [#1601](https://github.com/bbatsov/rubocop/issues/1601): Add `IgnoreEmptyMethods` config parameter for `Lint/UnusedMethodArgument` and `IgnoreEmptyBlocks` config parameter for `Lint/UnusedBlockArgument` cops. ([@alexdowad][])
+* [#1729](https://github.com/bbatsov/rubocop/issues/1729): `Style/MethodDefParentheses` supports new 'require_no_parentheses_except_multiline' style. ([@alexdowad][])
+* [#2173](https://github.com/bbatsov/rubocop/issues/2173): `Style/AlignParameters` also checks parameter alignment for method definitions. ([@alexdowad][])
+* [#1825](https://github.com/bbatsov/rubocop/issues/1825): New `NameWhitelist` configuration parameter for `Style/PredicateName` can be used to suppress errors on known-good predicate names. ([@alexdowad][])
+* `Style/Documentation` recognizes 'Constant = Class.new' as a class definition. ([@alexdowad][])
+* [#1608](https://github.com/bbatsov/rubocop/issues/1608): Add new 'align_braces' style for `Style/IndentHash`. ([@alexdowad][])
+* `Style/Next` can autocorrect. ([@alexdowad][])
+### Bug Fixes
+* [#2265](https://github.com/bbatsov/rubocop/issues/2265): Handle unary `+` in `ExtraSpacing` cop. ([@jonas054][])
+* [#2275](https://github.com/bbatsov/rubocop/pull/2275): Copy default `Exclude` into `Exclude` lists in `.rubocop_todo.yml`. ([@jonas054][])
+* `Style/IfUnlessModifier` accepts blocks followed by a chained call. ([@lumeet][])
+* [#2261](https://github.com/bbatsov/rubocop/issues/2261): Make relative `Exclude` paths in `$HOME/.rubocop_todo.yml` be relative to current directory. ([@jonas054][])
+* [#2286](https://github.com/bbatsov/rubocop/issues/2286): Handle auto-correction of empty method when `AllowIfMethodIsEmpty` is `false` in `Style/SingleLineMethods`. ([@jonas054][])
+* [#2246](https://github.com/bbatsov/rubocop/pull/2246): Do not register an offense for `Style/TrailingUnderscoreVariable` when the underscore variable is preceeded by a splat variable. ([@rrosenblum][])
+* [#2292](https://github.com/bbatsov/rubocop/pull/2292): Results should not be stored in the cache if affected by errors (crashes). ([@jonas054][])
+* [#2280](https://github.com/bbatsov/rubocop/issues/2280): Avoid reporting space between hash literal keys and values in `Style/ExtraSpacing`. ([@jonas054][])
+* [#2284](https://github.com/bbatsov/rubocop/issues/2284): Fix result cache being shared between ruby versions. ([@miquella][])
+* [#2285](https://github.com/bbatsov/rubocop/issues/2285): Fix `ConfigurableNaming#class_emitter_method?` error when handling singleton class methods. ([@palkan][])
+* [#2295](https://github.com/bbatsov/rubocop/issues/2295): Fix Performance/Detect autocorrect to handle rogue newlines. ([@palkan][])
+* [#2294](https://github.com/bbatsov/rubocop/issues/2294): Do not register an offense in `Performance/StringReplacement` for regex with options. ([@rrosenblum][])
+* Fix `Style/UnneededPercentQ` condition for single-quoted literal containing interpolation-like string. ([@eagletmt][])
+* [#2324](https://github.com/bbatsov/rubocop/issues/2324): Handle `--only Lint/Syntax` and `--except Lint/Syntax` correctly. ([@jonas054][])
+* [#2317](https://github.com/bbatsov/rubocop/issues/2317): Handle `case` as an argument correctly in `Lint/EndAlignment`. ([@lumeet][])
+* [#2287](https://github.com/bbatsov/rubocop/issues/2287): Fix auto-correct of lines with only whitespace in `Style/IndentationWidth`. ([@lumeet][])
+* [#2331](https://github.com/bbatsov/rubocop/issues/2331): Do not register an offense in `Performance/Size` for `count` with an argument. ([@rrosenblum][])
+* Handle a backslash at the end of a line in `Style/SpaceAroundOperators`. ([@lumeet][])
+* Don't warn about lack of "leading space" in a =begin/=end comment. ([@alexdowad][])
+* [#2307](https://github.com/bbatsov/rubocop/issues/2307): In `Lint/FormatParameterMismatch`, don't register an offense if either argument to % is not a literal. ([@alexdowad][])
+* [#2356](https://github.com/bbatsov/rubocop/pull/2356): `Style/Encoding` will now place the encoding comment on the second line if the first line is a shebang. ([@rrosenblum][])
+* `Style/InitialIndentation` cop doesn't error out when a line begins with an integer literal. ([@alexdowad][])
+* [#2296](https://github.com/bbatsov/rubocop/issues/2296): In `Style/DotPosition`, don't "correct" (and break) a method call which has a line comment (or blank line) between the dot and the selector. ([@alexdowad][])
+* [#2272](https://github.com/bbatsov/rubocop/issues/2272): `Lint/NonLocalExitFromIterator` does not warn about `return` in a block which is passed to `Module#define_method`. ([@alexdowad][])
+* [#2262](https://github.com/bbatsov/rubocop/issues/2262): Replace `Rainbow` reference with `Colorizable#yellow`. ([@minustehbare][])
+* [#2068](https://github.com/bbatsov/rubocop/issues/2068): Display warning if `Style/Copyright` is misconfigured. ([@alexdowad][])
+* [#2321](https://github.com/bbatsov/rubocop/issues/2321): In `Style/EachWithObject`, don't replace reduce with each_with_object if the accumulator parameter is assigned to in the block. ([@alexdowad][])
+* [#1981](https://github.com/bbatsov/rubocop/issues/1981): `Lint/UselessAssignment` doesn't erroneously identify assignments in identical if branches as useless. ([@alexdowad][])
+* [#2323](https://github.com/bbatsov/rubocop/issues/2323): `Style/IfUnlessModifier` cop parenthesizes autocorrected code when necessary due to operator precedence, to avoid changing its meaning. ([@alexdowad][])
+* [#2003](https://github.com/bbatsov/rubocop/issues/2003): Make `Lint/UnneededDisable` work with `--auto-correct`. ([@jonas054][])
+* Default RuboCop cache dir moved to per-user folders. ([@br3nda][])
+* [#2393](https://github.com/bbatsov/rubocop/pull/2393): `Style/MethodCallParentheses` doesn't fail on `obj.method ||= func()`. ([@alexdowad][])
+* [#2344](https://github.com/bbatsov/rubocop/pull/2344): When autocorrecting, `Style/ParallelAssignment` reorders assignment statements, if necessary, to avoid breaking code. ([@alexdowad][])
+* `Style/MultilineOperationAlignment` does not try to align the receiver and selector of a method call if both are on the LHS of an assignment. ([@alexdowad][])
+### Changes
+* [#2194](https://github.com/bbatsov/rubocop/issues/2194): Allow any options with `--auto-gen-config`. ([@agrimm][])
 ## 0.34.2 (21/09/2015)
 ### Bug Fixes
@@ -1622,3 +1697,14 @@
 [@mrfoto]: https://github.com/mrfoto
 [@karreiro]: https://github.com/karreiro
 [@dreyks]: https://github.com/dreyks
+[@hmadison]: https://github.com/hmadison
+[@miquella]: https://github.com/miquella
+[@jhansche]: https://github.com/jhansche
+[@cornelius]: https://github.com/cornelius
+[@eagletmt]: https://github.com/eagletmt
+[@apiology]: https://github.com/apiology
+[@alexdowad]: https://github.com/alexdowad
+[@minustehbare]: https://github.com/minustehbare
+[@tansaku]: https://github.com/tansaku
+[@ptrippett]: https://github.com/ptrippett
+[@br3nda]: https://github.com/br3nda

data/README.md CHANGED

@@ -1,12 +1,12 @@
 [![Gem Version](https://badge.fury.io/rb/rubocop.svg)](http://badge.fury.io/rb/rubocop)
 [![Dependency Status](https://gemnasium.com/bbatsov/rubocop.svg)](https://gemnasium.com/bbatsov/rubocop)
 [![Build Status](https://travis-ci.org/bbatsov/rubocop.svg?branch=master)](https://travis-ci.org/bbatsov/rubocop)
-[![Coverage Status](http://img.shields.io/coveralls/bbatsov/rubocop/master.svg)](https://coveralls.io/r/bbatsov/rubocop)
+[![Coverage Status](https://img.shields.io/coveralls/bbatsov/rubocop/master.svg)](https://coveralls.io/r/bbatsov/rubocop)
 [![Code Climate](https://codeclimate.com/github/bbatsov/rubocop/badges/gpa.svg)](https://codeclimate.com/github/bbatsov/rubocop)
 [![Inline docs](http://inch-ci.org/github/bbatsov/rubocop.svg)](http://inch-ci.org/github/bbatsov/rubocop)
 <p align="center">
-  <img src="https://raw.github.com/bbatsov/rubocop/master/logo/rubo-logo-horizontal.png" alt="RuboCop Logo"/>
+  <img src="https://raw.githubusercontent.com/bbatsov/rubocop/master/logo/rubo-logo-horizontal.png" alt="RuboCop Logo"/>
 </p>
 > Role models are important. <br/>
@@ -26,9 +26,9 @@ automatically fix some of the problems for you.
 You can support my work on RuboCop via
 [Salt](https://salt.bountysource.com/teams/rubocop) and
-[Gratipay](https://www.gratipay.com/rubocop).
+[Gratipay](https://gratipay.com/rubocop/).
-[![Support via Gratipay](https://cdn.rawgit.com/gratipay/gratipay-badge/2.1.3/dist/gratipay.png)](https://gratipay.com/rubocop)
+[![Support via Gratipay](https://cdn.rawgit.com/gratipay/gratipay-badge/2.1.3/dist/gratipay.png)](https://gratipay.com/rubocop/)
 **This documentation tracks the `master` branch of RuboCop. Some of
 the features and settings discussed here might not be available in
@@ -97,13 +97,13 @@ specific RuboCop release.**
 **RuboCop**'s installation is pretty standard:
-```
+```sh
 $ gem install rubocop
 ```
 If you'd rather install RuboCop using `bundler`, don't require it in your `Gemfile`:
-```
+```rb
 gem 'rubocop', require: false
 ```
@@ -112,13 +112,13 @@ gem 'rubocop', require: false
 Running `rubocop` with no arguments will check all Ruby source files
 in the current directory:
-```
+```sh
 $ rubocop
 ```
 Alternatively you can pass `rubocop` a list of files and directories to check:
-```
+```sh
 $ rubocop app spec lib/something.rb
 ```
@@ -158,7 +158,7 @@ test.rb:4:5: W: end at 4, 4 is not aligned with if at 2, 2
 For more details check the available command-line options:
-```
+```sh
 $ rubocop -h
 ```
@@ -171,6 +171,7 @@ Command flag              | Description
 `-C/--cache`              | Store and reuse results for faster operation.
 `-d/--debug`              | Displays some extra debug output.
 `-D/--display-cop-names`  | Displays cop names in offense messages.
+`-E/--extra-details`      | Displays extra details in offense messages.
 `-c/--config`             | Run with specified config file.
 `-f/--format`             | Choose a formatter.
 `-o/--out`                | Write output to a file instead of STDOUT.
@@ -207,7 +208,7 @@ code. RuboCop implements in a portable way all built-in MRI lint
 checks (`ruby -wc`) and adds a lot of extra lint checks of its
 own. You can run only the lint cops like this:
-```
+```sh
 $ rubocop -l
 ```
@@ -230,7 +231,7 @@ Rails cops are specific to the Ruby on Rails framework. Unlike style
 and lint cops they are not used by default and you have to request them
 specifically:
-```
+```sh
 $ rubocop -R
 ```
@@ -269,6 +270,11 @@ Metrics/LineLength:
 ### Inheritance
+RuboCop supports inheriting configuration from one or more supplemental
+configuration files at runtime.
+#### Inheriting from another configuration file in the project
 The optional `inherit_from` directive is used to include configuration
 from one or more files. This makes it possible to have the common
 project settings in the `.rubocop.yml` file at the project root, and
@@ -286,6 +292,57 @@ inherit_from:
   - ../conf/.rubocop.yml
 ```
+### Inheriting configuration from a remote URL
+The optional `inherit_from` directive can contain a full url to a remote
+file. This makes it possible to have common project settings stored on a http
+server and shared between many projects. You can inherit from both remote and
+local files in the same config.
+The same inheritance rules apply to remote URLs and inheriting from local
+files where the first file in the list has the lowest precedence and the
+last one has the highest. The format for multiple inheritance using URLs is:
+```yaml
+inherit_from:
+  - http://www.example.com/rubocop.yml
+  - ../.rubocop.yml
+```
+#### Inheriting configuration from a dependency gem
+The optional `inherit_gem` directive is used to include configuration from
+one or more gems external to the current project. This makes it possible to
+inherit a shared dependency's RuboCop configuration that can be used from
+multiple disparate projects.
+Configurations inherited in this way will be essentially *prepended* to the
+`inherit_from` directive, such that the `inherit_gem` configurations will be
+loaded first, then the `inherit_from` relative file paths will be loaded
+(overriding the configurations from the gems), and finally the remaining
+directives in the configuration file will supersede any of the inherited
+configurations. This means the configurations inherited from one or more gems
+have the lowest precedence of inheritance.
+The directive should be formatted as a YAML Hash using the gem name as the
+key and the relative path within the gem as the value:
+```yaml
+inherit_gem:
+  rubocop: config/default.yml
+  my-shared-gem: .rubocop.yml
+  cucumber: conf/rubocop.yml
+```
+**Note**: If the shared dependency is declared using a [Bundler](http://bundler.io/)
+Gemfile and the gem was installed using `bundle install`, it would be
+necessary to also invoke RuboCop using Bundler in order to find the
+dependency's installation path at runtime:
+```
+$ bundle exec rubocop <options...>
+```
 ### Defaults
 The file
@@ -404,6 +461,20 @@ Metrics/CyclomaticComplexity:
   Severity: warning
 ```
+## Details
+Individual cops can be embellished with extra details in offense messages:
+```yaml
+Metrics/LineLength:
+  Details: >-
+    If lines are too short, text becomes hard to read because you must
+    constantly jump from one line to the next while reading. If lines are too
+    long, the line jumping becomes too hard because you "lose the line" while
+    going back to the start of the next line.  80 characters is a good
+    compromise.
+```
 #### AutoCorrect
 Cops that support the `--auto-correct` option can have that support
@@ -473,7 +544,7 @@ You can enable multiple formatters at the same time by specifying `-f/--format`
 The `-o/--out` option applies to the previously specified `-f/--format`,
 or the default `progress` format if no `-f/--format` is specified before the `-o/--out` option.
-```bash
+```sh
 # Simple format to $stdout.
 $ rubocop --format simple
@@ -508,7 +579,7 @@ and at the end it displays all detected offenses in the `clang` format.
 A `.` represents a clean file, and each of the capital letters means
 the severest offense (convention, warning, error or fatal) found in a file.
-```
+```sh
 $ rubocop
 Inspecting 26 files
 ..W.C....C..CWCW.C...WC.CC
@@ -528,7 +599,7 @@ lib/foo.rb:6:5: C: Missing top-level class documentation comment.
 The `clang` formatter displays the offenses in a manner similar to `clang`:
-```
+```sh
 $ rubocop test.rb
 Inspecting 1 file
 W
@@ -555,9 +626,9 @@ test.rb:4:5: W: end at 4, 4 is not aligned with if at 2, 2
 The `fuubar` style formatter displays a progress bar
 and shows details of offenses in the `clang` format as soon as they are detected.
-This is inspired by the [Fuubar](https://github.com/jeffkreeftmeijer/fuubar) formatter for RSpec.
+This is inspired by the [Fuubar](https://github.com/thekompanee/fuubar) formatter for RSpec.
-```
+```sh
 $ rubocop --format fuubar
 lib/foo.rb.rb:1:1: C: Use snake_case for methods and variables.
 def badName
@@ -574,7 +645,7 @@ lib/bar.rb:13:14: W: File.exists? is deprecated in favor of File.exist?.
 The `emacs` formatter displays the offenses in a format suitable for consumption by `Emacs` (and possibly other tools).
-```
+```sh
 $ rubocop --format emacs test.rb
 /Users/bozhidar/projects/test.rb:1:1: C: Use snake_case for methods and variables.
 /Users/bozhidar/projects/test.rb:2:3: C: Favor modifier if/unless usage when you have a single-line body. Another good alternative is the usage of control flow &&/||.
@@ -585,7 +656,7 @@ $ rubocop --format emacs test.rb
 The name of the formatter says it all :-)
-```
+```sh
 $ rubocop --format simple test.rb
 == test.rb ==
 C:  1:  5: Use snake_case for method names.
@@ -604,7 +675,7 @@ Sometimes you might want to just open all files with offenses in your
 favorite editor. This formatter outputs just the names of the files
 with offenses in them and makes it possible to do something like:
-```
+```sh
 $ rubocop --format files | xargs vim
 ```
@@ -669,7 +740,7 @@ see where most of your style cleanup is going to be spent.
 With this in mind, you can use the offense count formatter to outline the offended
 cops and the number of offenses found for each by running:
-```
+```sh
 $ rubocop --format offenses
 87   Documentation
@@ -691,7 +762,7 @@ $ rubocop --format offenses
 Useful for CI environments. It will create an HTML report like [this](http://f.cl.ly/items/0M3029412x3O091a1X1R/expected.html).
-```
+```sh
 $ rubocop --format html -o rubocop.html
 ```
@@ -714,7 +785,7 @@ RuboCop supports the following Ruby implementations:
 Emacs interface for RuboCop. It allows you to run RuboCop inside Emacs
 and quickly jump between problems in your code.
-[flycheck](https://github.com/lunaryorn/flycheck) > 0.9 also supports
+[flycheck](https://github.com/flycheck/flycheck) > 0.9 also supports
 RuboCop and uses it by default when available.
 ### Vim
@@ -733,7 +804,7 @@ useful.
 ### Brackets
-The [brackets-rubocop](https://github.com/smockle/brackets-rubocop)
+The [brackets-rubocop](https://github.com/smockle-archive/brackets-rubocop)
 extension displays RuboCop results in Brackets.
 It can be installed via the extension manager in Brackets.
@@ -749,7 +820,7 @@ The [atom-lint](https://github.com/yujinakayama/atom-lint) package
 runs RuboCop and highlights the offenses in Atom.
 You can also use the [linter-rubocop](https://github.com/AtomLinter/linter-rubocop)
-plugin for Atom's [linter](https://github.com/AtomLinter/Linter).
+plugin for Atom's [linter](https://github.com/atom-community/linter).
 ### LightTable
@@ -836,6 +907,7 @@ are no changes in:
 * RuboCop configuration for the file
 * the options given to `rubocop`, with some exceptions that have no
   bearing on which offenses are reported
+* the Ruby version used to invoke `rubocop`
 * version of the `rubocop` program (or to be precise, anything in the
   source code of the invoked `rubocop` program)
@@ -910,9 +982,9 @@ or implement all formatter API methods by duck typing.
 Please see the documents below for more formatter API details.
-* [RuboCop::Formatter::BaseFormatter](http://rubydoc.info/gems/rubocop/RuboCop/Formatter/BaseFormatter)
-* [RuboCop::Cop::Offense](http://rubydoc.info/gems/rubocop/RuboCop/Cop/Offense)
-* [Parser::Source::Range](http://rubydoc.info/github/whitequark/parser/Parser/Source/Range)
+* [RuboCop::Formatter::BaseFormatter](http://www.rubydoc.info/gems/rubocop/RuboCop/Formatter/BaseFormatter)
+* [RuboCop::Cop::Offense](http://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Offense)
+* [Parser::Source::Range](http://www.rubydoc.info/github/whitequark/parser/Parser/Source/Range)
 #### Using Custom Formatter in Command Line
@@ -921,7 +993,7 @@ You can tell RuboCop to use your custom formatter with a combination of
 For example, when you have defined `MyCustomFormatter` in
 `./path/to/my_custom_formatter.rb`, you would type this command:
-```
+```sh
 $ rubocop --require ./path/to/my_custom_formatter --format MyCustomFormatter
 ```
@@ -944,7 +1016,7 @@ The logo is licensed under a
 ## Contributors
-Here's a [list](https://github.com/bbatsov/rubocop/contributors) of
+Here's a [list](https://github.com/bbatsov/rubocop/graphs/contributors) of
 all the people who have contributed to the development of RuboCop.
 I'm extremely grateful to each and every one of them!
@@ -961,9 +1033,9 @@ welcome. GitHub pull requests are even better! :-)
 You can also support my work on RuboCop via
 [Salt](https://salt.bountysource.com/teams/rubocop) and
-[Gratipay](https://www.gratipay.com/rubocop).
+[Gratipay](https://gratipay.com/rubocop/).
-[![Support via Gratipay](https://cdn.rawgit.com/gratipay/gratipay-badge/2.1.3/dist/gratipay.png)](https://gratipay.com/rubocop)
+[![Support via Gratipay](https://cdn.rawgit.com/gratipay/gratipay-badge/2.1.3/dist/gratipay.png)](https://gratipay.com/rubocop/)
 ## Mailing List

data/config/default.yml CHANGED

@@ -38,6 +38,10 @@ AllCops:
   # behavior by overriding DisplayStyleGuide, or by giving the
   # -S/--display-style-guide option.
   DisplayStyleGuide: false
+  # Extra details are not displayed in offense messages by default. Change
+  # behaviour by overriding ExtraDetails, or by giving the
+  # -E/--extra-details option.
+  ExtraDetails: false
   # Additional cops that do not reference a style guide rule may be enabled by
   # default. Change behavior by overriding StyleGuideCopsOnly, or by giving
   # the --only-guide-cops option.
@@ -183,6 +187,11 @@ Style/BlockDelimiters:
     # method) but exceptions are permitted in the `ProceduralMethods`,
     # `FunctionalMethods` and `IgnoredMethods` sections below.
     - semantic
+    # The `braces_for_chaining` style enforces braces around single line blocks
+    # and do..end around multi-line blocks, except for multi-line blocks whose
+    # return value is being chained with another method (in which case braces
+    # are enforced).
+    - braces_for_chaining
   ProceduralMethods:
     # Methods that are known to be procedural in nature but look functional from
     # their usage, e.g.
@@ -485,6 +494,7 @@ Style/IndentHash:
   SupportedStyles:
     - special_inside_parentheses
     - consistent
+    - align_braces
 Style/LambdaCall:
   EnforcedStyle: call
@@ -518,6 +528,7 @@ Style/MethodDefParentheses:
   SupportedStyles:
     - require_parentheses
     - require_no_parentheses
+    - require_no_parentheses_except_multiline
 Style/MethodName:
   EnforcedStyle: snake_case
@@ -566,16 +577,20 @@ Style/PercentQLiterals:
     - upper_case_q # Always use %Q
 Style/PredicateName:
-  # Predicate name prefices.
+  # Predicate name prefixes.
   NamePrefix:
     - is_
     - has_
     - have_
-  # Predicate name prefices that should be removed.
+  # Predicate name prefixes that should be removed.
   NamePrefixBlacklist:
     - is_
     - has_
     - have_
+  # Predicate names which, despite having a blacklisted prefix, or no ?,
+  # should still be accepted
+  NameWhitelist:
+    - is_a?
 Style/RaiseArgs:
   EnforcedStyle: exploded
@@ -624,6 +639,12 @@ Style/SingleLineBlockParams:
 Style/SingleLineMethods:
   AllowIfMethodIsEmpty: true
+Style/StabbyLambdaParentheses:
+  EnforcedStyle: require_parentheses
+  SupportedStyles:
+    - require_parentheses
+    - require_no_parentheses
 Style/StringLiterals:
   EnforcedStyle: single_quotes
   SupportedStyles:
@@ -843,6 +864,15 @@ Lint/DefEndAlignment:
     - def
   AutoCorrect: false
+# Checks for unused block arguments
+Lint/UnusedBlockArgument:
+  IgnoreEmptyBlocks: true
+# Checks for unused method arguments.
+Lint/UnusedMethodArgument:
+  AllowUnusedKeywordArguments: false
+  IgnoreEmptyMethods: true
 ##################### Rails ##################################
 Rails/ActionFilter: