rubocop 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0005c0b6b6a9b9ee4037110fd8e9c71b9d79092b
-  data.tar.gz: 8d5bea9be330a3728f0f08d5025affc7d564e020
+  metadata.gz: c8589f766e3f0895be647fba9351e4fb39a59a9a
+  data.tar.gz: e19066dcc0432f7e529721251f23f9349fc37cab
 SHA512:
-  metadata.gz: fb25af1b50520d4c56c98958e653b5a963444d678e31754a362ae174946112420511575936b0dc6ce1fd3fcaa4eb80af1e996f856922403f1bc219f4c1fb2b76
-  data.tar.gz: 6b946667153c827780d2df4c7e315c063b3a5c2b4d72417e7578c6034ee981a47065dfc941dffa5494ccf88835a24887663dd93106062a6903c8fa0ea7ad0b93
+  metadata.gz: 8e7c61eb4754551ff087156bb63393b93661e8e1d49f44577ee2ec57e701f23303fac4b300ccf8249fee63f4c6925015d4107fbb5b2cb3bd98681e9c2313a68e
+  data.tar.gz: 3ff42ef90979b0a32df0411da3b6404c243efbbd3902cc3cb1b53d9a614892b5942c70a1077b2819692c403a51e4f69737933b64338784d30e6e7899307763b8

data/.gitignore

@@ -17,6 +17,9 @@ Gemfile.local
 # jeweler generated
 pkg
 
+# etags
+TAGS
+
 # Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
 #
 # * Create a file at ~/.gitignore

data/.rubocop_todo.yml

@@ -1,5 +1,5 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2014-04-29 22:57:01 +0200 using RuboCop version 0.21.0.
+# on 2014-05-17 17:36:04 +0200 using RuboCop version 0.21.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -7,14 +7,14 @@
 
 # Offense count: 7
 # Configuration parameters: CountComments.
-ClassLength:
-  Max: 119
+Style/ClassLength:
+  Max: 129
 
 # Offense count: 24
-CyclomaticComplexity:
+Style/CyclomaticComplexity:
   Max: 10
 
-# Offense count: 114
+# Offense count: 115
 # Configuration parameters: CountComments.
-MethodLength:
-  Max: 20
+Style/MethodLength:
+  Max: 21

data/CHANGELOG.md

@@ -2,6 +2,36 @@
 
 ## master (unreleased)
 
+## 0.23.0 (02/06/2014)
+
+### New features
+
+* [#1117](https://github.com/bbatsov/rubocop/issues/1117): `BlockComments` cop does auto-correction. ([@jonas054][])
+* [#1124](https://github.com/bbatsov/rubocop/pull/1124): `TrivialAccessors` cop auto-corrects class-level accessors. ([@ggilder][])
+* [#1062](https://github.com/bbatsov/rubocop/pull/1062): New cop `InlineComment` checks for inline comments. ([@salbertson][])
+* [#1118](https://github.com/bbatsov/rubocop/issues/1118): Add checking and auto-correction of right brackets in `IndentArray` and `IndentHash`. ([@jonas054][])
+
+### Changes
+
+* [#1097](https://github.com/bbatsov/rubocop/issues/1097): Add optional namespace prefix to cop names: `Style/LineLength` instead of `LineLength` in config files, `--only` argument, `--show-cops` output, and `# rubocop:disable`. ([@jonas054][])
+* [#1075](https://github.com/bbatsov/rubocop/issues/1075): More strict limits on when to require trailing comma. ([@jonas054][])
+* Renamed `Rubocop` module to `RuboCop`. ([@bbatsov][])
+
+### Bugs fixed
+
+* [#1126](https://github.com/bbatsov/rubocop/pull/1126): Fix `--auto-gen-config` bug with `RegexpLiteral` where only the last file's results would be used. ([@ggilder][])
+* [#1104](https://github.com/bbatsov/rubocop/issues/1104): Fix `EachWithObject` with modifier if as body. ([@geniou][])
+* [#1106](https://github.com/bbatsov/rubocop/issues/1106): Fix `EachWithObject` with single method call as body. ([@geniou][])
+* Avoid the warning about ignoring syck YAML engine from JRuby. ([@jonas054][])
+* [#1111](https://github.com/bbatsov/rubocop/issues/1111): Fix problem in `EndOfLine` with reading non-UTF-8 encoded files. ([@jonas054][])
+* [#1115](https://github.com/bbatsov/rubocop/issues/1115): Fix `Next` to ignore super nodes. ([@geniou][])
+* [#1117](https://github.com/bbatsov/rubocop/issues/1117): Don't auto-correct indentation in scopes that contain block comments (`=begin`..`=end`). ([@jonas054][])
+* [#1123](https://github.com/bbatsov/rubocop/pull/1123): Support setter calls in safe assignment in `ParenthesesAroundCondition`. ([@jonas054][])
+* [#1090](https://github.com/bbatsov/rubocop/issues/1090): Correct handling of documentation vs annotation comment. ([@jonas054][])
+* [#1118](https://github.com/bbatsov/rubocop/issues/1118): Never write invalid ruby to a file in auto-correct. ([@jonas054][])
+* [#1120](https://github.com/bbatsov/rubocop/issues/1120): Don't change indentation of heredoc strings in auto-correct. ([@jonas054][])
+* [#1109](https://github.com/bbatsov/rubocop/issues/1109): Handle conditions with modifier ops in them in `ParenthesesAroundCondition`. ([@bbatsov][])
+
 ## 0.22.0 (20/04/2014)
 
 ### New features
@@ -14,6 +44,7 @@
 * Add auto-correct to `UnusedBlockArgument` and `UnusedMethodArgument` cops. ([@hannestyden][])
 * [#1074](https://github.com/bbatsov/rubocop/issues/1074): New cop `SpaceBeforeComment` checks for missing space between code and a comment on the same line. ([@jonas054][])
 * [#1089](https://github.com/bbatsov/rubocop/pull/1089): New option `-F`/`--fail-fast` inspects files in modification time order and stop after the first file with offenses. ([@jonas054][])
+* Add optional `require` directive to `.rubocop.yml` to load custom ruby files. ([@geniou][])
 
 ### Changes
 
@@ -70,7 +101,7 @@
 * [#976](https://github.com/bbatsov/rubocop/issues/976): Fix `EndAlignment` not handling element assignment correctly. ([@tamird][])
 * [#976](https://github.com/bbatsov/rubocop/issues/976): Fix `IndentationWidth` not handling element assignment correctly. ([@tamird][])
 * [#800](https://github.com/bbatsov/rubocop/issues/800): Do not report `[Corrected]` in `--auto-correct` mode if correction wasn't done. ([@jonas054][])
-* [#968](https://github.com/bbatsov/rubocop/issues/968): Fix bug when running Rubocop with `-c .rubocop.yml`. ([@bquorning][])
+* [#968](https://github.com/bbatsov/rubocop/issues/968): Fix bug when running RuboCop with `-c .rubocop.yml`. ([@bquorning][])
 * [#975](https://github.com/bbatsov/rubocop/pull/975): Fix infinite correction in `IndentationWidth`. ([@jonas054][])
 * [#986](https://github.com/bbatsov/rubocop/issues/986): When `--lint` is used together with `--only`, all lint cops are run in addition to the given cops. ([@jonas054][])
 * [#997](https://github.com/bbatsov/rubocop/issues/997): Fix handling of file paths for matching against `Exclude` property when `rubocop .` is called. ([@jonas054][])
@@ -936,3 +967,5 @@
 [@barunio]: https://github.com/barunio
 [@molawson]: https://github.com/molawson
 [@wndhydrnt]: https://github.com/wndhydrnt
+[@ggilder]: https://github.com/ggilder
+[@salbertson]: https://github.com/salbertson

data/Gemfile

@@ -9,5 +9,5 @@ end
 local_gemfile = 'Gemfile.local'
 
 if File.exist?(local_gemfile)
-  eval(File.read(local_gemfile)) # rubocop:disable Eval
+  eval(File.read(local_gemfile)) # rubocop:disable Lint/Eval
 end

data/README.md

@@ -41,9 +41,6 @@ automatically fix some of the problems for you.
     - [File List Formatter](#file-list-formatter)
     - [JSON Formatter](#json-formatter)
     - [Offense Count Formatter](#offense-count-formatter)
-    - [Custom Formatters](#custom-formatters)
-        - [Creating Custom Formatter](#creating-custom-formatter)
-        - [Using Custom Formatter in Command Line](#using-custom-formatter-in-command-line)
 - [Compatibility](#compatibility)
 - [Editor integration](#editor-integration)
     - [Emacs](#emacs)
@@ -56,6 +53,13 @@ automatically fix some of the problems for you.
     - [Other Editors](#other-editors)
 - [Guard integration](#guard-integration)
 - [Rake integration](#rake-integration)
+- [Extensions](#extensions)
+  - [Loading Extensions](#loading-extensions)
+  - [Custom Cops](#custom-cops)
+    - [Known Custom Cops](#known-custom-cops)
+  - [Custom Formatters](#custom-formatters)
+    - [Creating Custom Formatter](#creating-custom-formatter)
+    - [Using Custom Formatter in Command Line](#using-custom-formatter-in-command-line)
 - [Team](#team)
 - [Contributors](#contributors)
 - [Mailing List](#mailing-list)
@@ -135,7 +139,7 @@ Command flag              | Description
 `-c/--config`             | Run with specified config file
 `-f/--format`             | Choose a formatter
 `-o/--out`                | Write output to a file instead of STDOUT
-`-r/--require`            | Require Ruby file
+`-r/--require`            | Require Ruby file (see [Loading Extensions](#loading-extensions))
 `-R/--rails`              | Run extra Rails cops
 `-l/--lint`               | Run only lint cops
 `-a/--auto-correct`       | Auto-correct certain offenses *Note:* Experimental - use with caution
@@ -148,6 +152,8 @@ Command flag              | Description
 
 In RuboCop lingo the various checks performed on the code are called cops. There are several cop departments.
 
+You can also load [custom cops](#custom-cops).
+
 #### Style
 
 Most of the cops in RuboCop are so called style cops that check for
@@ -198,13 +204,16 @@ The file has the following format:
 ```yaml
 inherit_from: ../.rubocop.yml
 
-Encoding:
+Style/Encoding:
   Enabled: false
 
-LineLength:
+Style/LineLength:
   Max: 99
 ```
 
+**Note**: Qualifying cop name with its type, e.g., `Style`, is recommended,
+  but not necessary as long as the cop name is unique across all types.
+
 ### Inheritance
 
 The optional `inherit_from` directive is used to include configuration
@@ -284,7 +293,7 @@ paths match `app/models/*.rb`). All cops support the
 `Include` param.
 
 ```yaml
-DefaultScope:
+Rails/DefaultScope:
   Include:
     - app/models/*.rb
 ```
@@ -294,7 +303,7 @@ instance you might want to run some cop only on a specific file). All cops suppo
 `Exclude` param.
 
 ```yaml
-DefaultScope:
+Rails/DefaultScope:
   Exclude:
     - app/models/problematic.rb
 ```
@@ -302,7 +311,7 @@ DefaultScope:
 Specific cops can be disabled by setting `Enabled` to `false` for that specific cop.
 
 ```yaml
-LineLength:
+Style/LineLength:
   Enabled: false
 ```
 
@@ -310,7 +319,7 @@ Cops can customize their severity level. All cops support the `Severity` param.
 Allowed params are `refactor`, `convention`, `warning`, `error` and `fatal`.
 
 ```yaml
-CyclomaticComplexity:
+Style/CyclomaticComplexity:
   Severity: warning
 ```
 
@@ -330,9 +339,9 @@ One or more individual cops can be disabled locally in a section of a
 file by adding a comment such as
 
 ```ruby
-# rubocop:disable LineLength, StringLiterals
+# rubocop:disable Style/LineLength, Style/StringLiterals
 [...]
-# rubocop:enable LineLength, StringLiterals
+# rubocop:enable Style/LineLength, Style/StringLiterals
 ```
 
 You can also disable *all* cops with
@@ -347,7 +356,7 @@ One or more cops can be disabled on a single line with an end-of-line
 comment.
 
 ```ruby
-for x in (0..19) # rubocop:disable AvoidFor
+for x in (0..19) # rubocop:disable Style/AvoidFor
 ```
 
 ## Formatters
@@ -391,6 +400,8 @@ $ rubocop --output result.txt --format simple
 #           default format        $stdout
 ```
 
+You can also load [custom formatters](#custom-formatters).
+
 ### Progress Formatter (default)
 
 The default `progress` formatter outputs a character for each inspected file,
@@ -568,38 +579,6 @@ $ rubocop --format offenses
 134  Total
 ```
 
-### Custom Formatters
-
-You can customize RuboCop's output format with custom formatter.
-
-#### Creating Custom Formatter
-
-To implement a custom formatter, you need to subclass
-`Rubocop::Formatter::BaseFormatter` and override some methods,
-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)
-
-#### Using Custom Formatter in Command Line
-
-You can tell RuboCop to use your custom formatter with a combination of
-`--format` and `--require` option.
-For example, when you have defined `MyCustomFormatter` in
-`./path/to/my_custom_formatter.rb`, you would type this command:
-
-```
-$ rubocop --require ./path/to/my_custom_formatter --format MyCustomFormatter
-```
-
-Note: The path passed to `--require` is directly passed to `Kernel.require`.
-If your custom formatter file is not in `$LOAD_PATH`,
-you need to specify the path as relative path prefixed with `./` explicitly,
-or absolute path.
-
 ## Compatibility
 
 RuboCop supports the following Ruby implementations:
@@ -653,6 +632,9 @@ Installation instructions can be found [here](https://github.com/mrdougal/textma
 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).
+
 ### LightTable
 
 The [lt-rubocop](https://github.com/seancaffery/lt-rubocop) plugin
@@ -679,7 +661,7 @@ To use RuboCop in your `Rakefile` add the following:
 ```ruby
 require 'rubocop/rake_task'
 
-Rubocop::RakeTask.new
+RuboCop::RakeTask.new
 ```
 
 The above will use default values
@@ -688,7 +670,7 @@ The above will use default values
 require 'rubocop/rake_task'
 
 desc 'Run RuboCop on the lib directory'
-Rubocop::RakeTask.new(:rubocop) do |task|
+RuboCop::RakeTask.new(:rubocop) do |task|
   task.patterns = ['lib/**/*.rb']
   # only show the files with failures
   task.formatters = ['files']
@@ -697,6 +679,63 @@ Rubocop::RakeTask.new(:rubocop) do |task|
 end
 ```
 
+## Extensions
+
+It's possible to extend RuboCop with custom cops and formatters.
+
+### Loading Extensions
+
+Besides the `--require` command line option you can also specify ruby
+files that should be loaded with the optional `require` directive in the
+`.rubocop.yml` file:
+
+```yaml
+require:
+ - ../my/custom/file.rb
+ - rubocop-extension
+```
+
+Note: The pathes are directly passed to `Kernel.require`.  If your
+extension file is not in `$LOAD_PATH`, you need to specify the path as
+relative path prefixed with `./` explicitly, or absolute path.
+
+### Custom Cops
+
+You can configure the custom cops in your `.rubocop.yml` just like any
+other cop.
+
+#### Known Custom Cops
+
+* [rubocop-rspec](https://github.com/nevir/rubocop-rspec) -
+  RSpec-specific analysis
+
+### Custom Formatters
+
+You can customize RuboCop's output format with custom formatters.
+
+#### Creating Custom Formatter
+
+To implement a custom formatter, you need to subclass
+`RuboCop::Formatter::BaseFormatter` and override some methods,
+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)
+
+#### Using Custom Formatter in Command Line
+
+You can tell RuboCop to use your custom formatter with a combination of
+`--format` and `--require` option.
+For example, when you have defined `MyCustomFormatter` in
+`./path/to/my_custom_formatter.rb`, you would type this command:
+
+```
+$ rubocop --require ./path/to/my_custom_formatter --format MyCustomFormatter
+```
+
 ## Team
 
 Here's a list of RuboCop's core developers:

data/Rakefile

@@ -25,14 +25,14 @@ task :coverage do
 end
 
 desc 'Run RuboCop over itself'
-Rubocop::RakeTask.new(:internal_investigation)
+RuboCop::RakeTask.new(:internal_investigation)
 
 task default: [:spec, :internal_investigation]
 
 require 'yard'
 YARD::Rake::YardocTask.new
 
-Rubocop::RakeTask.new
+RuboCop::RakeTask.new
 
 task :console do
   require 'irb'

data/bin/rubocop

@@ -7,7 +7,7 @@ if RUBY_VERSION >= '1.9.2'
   require 'rubocop'
   require 'benchmark'
 
-  cli = Rubocop::CLI.new
+  cli = RuboCop::CLI.new
   result = 0
 
   time = Benchmark.realtime do

data/config/default.yml

@@ -18,14 +18,14 @@ AllCops:
   RunRailsCops: false
 
 # Indent private/protected/public as deep as method definitions
-AccessModifierIndentation:
+Style/AccessModifierIndentation:
   EnforcedStyle: indent
   SupportedStyles:
     - outdent
     - indent
 
 # Align the elements of a hash literal if they span more than one line.
-AlignHash:
+Style/AlignHash:
   # Alignment of entries using hash rocket as separator. Valid values are:
   #
   # key - left alignment of keys
@@ -88,7 +88,7 @@ AlignHash:
     - ignore_implicit
     - ignore_explicit
 
-AlignParameters:
+Style/AlignParameters:
   # Alignment of parameters in multi-line method calls.
   #
   # The `with_first_parameter` style aligns the following lines along the same column
@@ -107,28 +107,24 @@ AlignParameters:
     - with_first_parameter
     - with_fixed_indentation
 
-# Allow safe assignment in conditions.
-AssignmentInCondition:
-  AllowSafeAssignment: true
-
-BlockNesting:
+Style/BlockNesting:
   Max: 3
 
-BracesAroundHashParameters:
+Style/BracesAroundHashParameters:
   EnforcedStyle: no_braces
   SupportedStyles:
     - braces
     - no_braces
 
 # Indentation of `when`.
-CaseIndentation:
+Style/CaseIndentation:
   IndentWhenRelativeTo: case
   SupportedStyles:
     - case
     - end
   IndentOneStep: false
 
-ClassAndModuleChildren:
+Style/ClassAndModuleChildren:
   # Checks the style of children definitions at classes and modules.
   #
   # Basically there are two different styles:
@@ -149,12 +145,12 @@ ClassAndModuleChildren:
     - nested
     - compact
 
-ClassLength:
+Style/ClassLength:
   CountComments: false  # count full line comments?
   Max: 100
 
 # Align with the style guide.
-CollectionMethods:
+Style/CollectionMethods:
   # Mapping from undesired method to desired_method
   # e.g. to use `detect` over `find`:
   #
@@ -169,7 +165,7 @@ CollectionMethods:
     find_all: 'select'
 
 # Checks formatting of special comments
-CommentAnnotation:
+Style/CommentAnnotation:
   Keywords:
     - TODO
     - FIXME
@@ -178,56 +174,44 @@ CommentAnnotation:
     - REVIEW
 
 # Avoid complex methods.
-CyclomaticComplexity:
+Style/CyclomaticComplexity:
   Max: 6
 
 # Multi-line method chaining should be done with leading dots.
-DotPosition:
+Style/DotPosition:
   EnforcedStyle: leading
   SupportedStyles:
     - leading
     - trailing
 
 # Use empty lines between defs.
-EmptyLineBetweenDefs:
+Style/EmptyLineBetweenDefs:
   # If true, this parameter means that single line method definitions don't
   # need an empty line between them.
   AllowAdjacentOneLineDefs: false
 
 # Checks whether the source file has a utf-8 encoding comment or not
-Encoding:
+Style/Encoding:
   EnforcedStyle: always
   SupportedStyles:
     - when_needed
     - always
 
-# Align ends correctly.
-EndAlignment:
-  # The value `keyword` means that `end` should be aligned with the matching
-  # keyword (if, while, etc.).
-  # The value `variable` means that in assignments, `end` should be aligned
-  # with the start of the variable on the left hand side of `=`. In all other
-  # situations, `end` should still be aligned with the keyword.
-  AlignWith: keyword
-  SupportedStyles:
-    - keyword
-    - variable
-
-FileName:
+Style/FileName:
   Exclude:
     - '**/Rakefile'
     - '**/Gemfile'
     - '**/Capfile'
 
 # Checks use of for or each in multiline loops.
-For:
+Style/For:
   EnforcedStyle: each
   SupportedStyles:
     - for
     - each
 
 # Enforce the method used for string formatting.
-FormatString:
+Style/FormatString:
   EnforcedStyle: format
   SupportedStyles:
     - format
@@ -235,25 +219,25 @@ FormatString:
     - percent
 
 # Built-in global variables are allowed by default.
-GlobalVars:
+Style/GlobalVars:
   AllowedVariables: []
 
 # `MinBodyLength` defines the number of lines of the a body of an if / unless
 # needs to have to trigger this cop
-GuardClause:
+Style/GuardClause:
   MinBodyLength: 1
 
-HashSyntax:
+Style/HashSyntax:
   EnforcedStyle: ruby19
   SupportedStyles:
     - ruby19
     - hash_rockets
 
-IfUnlessModifier:
+Style/IfUnlessModifier:
   MaxLineLength: 80
 
 # Checks the indentation of the first key in a hash literal.
-IndentHash:
+Style/IndentHash:
   # The value `special_inside_parentheses` means that hash literals with braces
   # that have their opening brace on the same line as a surrounding opening
   # round parenthesis, shall have their first key indented relative to the
@@ -266,16 +250,16 @@ IndentHash:
     - special_inside_parentheses
     - consistent
 
-LambdaCall:
+Style/LambdaCall:
   EnforcedStyle: call
   SupportedStyles:
     - call
     - braces
 
-LineLength:
+Style/LineLength:
   Max: 80
 
-Next:
+Style/Next:
   # With `always` all conditions at the end of an iteration needs to be
   # replace by next - with `skip_modifier_ifs` the modifier if like this one
   # are ignored: [1, 2].each { |a| return 'yes' if a == 1 }
@@ -284,7 +268,7 @@ Next:
     - skip_modifier_ifs
     - always
 
-NonNilCheck:
+Style/NonNilCheck:
   # With `IncludeSemanticChanges` set to `true`, this cop reports offences for
   # `!x.nil?` and autocorrects that and `x != nil` to solely `x`, which is
   # **usually** OK, but might change behavior.
@@ -293,34 +277,34 @@ NonNilCheck:
   # offences for `!x.nil?` and does no changes that might change behavior.
   IncludeSemanticChanges: false
 
-MethodDefParentheses:
+Style/MethodDefParentheses:
   EnforcedStyle: require_parentheses
   SupportedStyles:
     - require_parentheses
     - require_no_parentheses
 
-MethodLength:
+Style/MethodLength:
   CountComments: false  # count full line comments?
   Max: 10
 
-MethodName:
+Style/MethodName:
   EnforcedStyle: snake_case
   SupportedStyles:
     - snake_case
     - camelCase
 
-NumericLiterals:
+Style/NumericLiterals:
   MinDigits: 5
 
-ParameterLists:
+Style/ParameterLists:
   Max: 5
   CountKeywordArgs: true
 
 # Allow safe assignment in conditions.
-ParenthesesAroundCondition:
+Style/ParenthesesAroundCondition:
   AllowSafeAssignment: true
 
-PercentLiteralDelimiters:
+Style/PercentLiteralDelimiters:
   PreferredDelimiters:
     '%':  ()
     '%i': ()
@@ -332,33 +316,33 @@ PercentLiteralDelimiters:
     '%W': ()
     '%x': ()
 
-PredicateName:
+Style/PredicateName:
   NamePrefixBlacklist:
     - is_
     - has_
     - have_
 
-RaiseArgs:
+Style/RaiseArgs:
   EnforcedStyle: exploded
   SupportedStyles:
     - compact # raise Exception.new(msg)
     - exploded # raise Exception, msg
 
 
-RedundantReturn:
+Style/RedundantReturn:
   # When true allows code like `return x, y`.
   AllowMultipleReturnValues: false
 
-RegexpLiteral:
+Style/RegexpLiteral:
   # The maximum number of (escaped) slashes that a slash-delimited regexp is
   # allowed to have. If there are more slashes, a %r regexp shall be used.
   MaxSlashes: 1
 
-Semicolon:
+Style/Semicolon:
   # Allow ; to separate several expressions on the same line.
   AllowAsExpressionSeparator: false
 
-SignalException:
+Style/SignalException:
   EnforcedStyle: semantic
   SupportedStyles:
     - only_raise
@@ -366,7 +350,7 @@ SignalException:
     - semantic
 
 
-SingleLineBlockParams:
+Style/SingleLineBlockParams:
   Methods:
     - reduce:
         - a
@@ -375,28 +359,28 @@ SingleLineBlockParams:
         - a
         - e
 
-SingleLineMethods:
+Style/SingleLineMethods:
   AllowIfMethodIsEmpty: true
 
-StringLiterals:
+Style/StringLiterals:
   EnforcedStyle: single_quotes
   SupportedStyles:
     - single_quotes
     - double_quotes
 
-SpaceAroundEqualsInParameterDefault:
+Style/SpaceAroundEqualsInParameterDefault:
   EnforcedStyle: space
   SupportedStyles:
     - space
     - no_space
 
-SpaceBeforeBlockBraces:
+Style/SpaceBeforeBlockBraces:
   EnforcedStyle: space
   SupportedStyles:
     - space
     - no_space
 
-SpaceInsideBlockBraces:
+Style/SpaceInsideBlockBraces:
   EnforcedStyle: space
   SupportedStyles:
     - space
@@ -406,20 +390,20 @@ SpaceInsideBlockBraces:
   # Space between { and |. Overrides EnforcedStyle if there is a conflict.
   SpaceBeforeBlockParameters: true
 
-SpaceInsideHashLiteralBraces:
+Style/SpaceInsideHashLiteralBraces:
   EnforcedStyle: space
   EnforcedStyleForEmptyBraces: no_space
   SupportedStyles:
     - space
     - no_space
 
-TrailingBlankLines:
+Style/TrailingBlankLines:
   EnforcedStyle: final_newline
   SupportedStyles:
     - final_newline
     - final_blank_line
 
-TrailingComma:
+Style/TrailingComma:
   EnforcedStyleForMultiline: no_comma
   SupportedStyles:
     - comma
@@ -427,7 +411,7 @@ TrailingComma:
 
 # TrivialAccessors doesn't require exact name matches and doesn't allow
 # predicated methods by default.
-TrivialAccessors:
+Style/TrivialAccessors:
   ExactNameMatch: false
   AllowPredicates: false
   # Allows trivial writers that don't end in an equal sign. e.g.
@@ -458,21 +442,39 @@ TrivialAccessors:
     - to_s
     - to_sym
 
-VariableName:
+Style/VariableName:
   EnforcedStyle: snake_case
   SupportedStyles:
     - snake_case
     - camelCase
 
-WhileUntilModifier:
+Style/WhileUntilModifier:
   MaxLineLength: 80
 
-WordArray:
+Style/WordArray:
   MinSize: 0
 
+##################### Lint ##################################
+
+# Allow safe assignment in conditions.
+Lint/AssignmentInCondition:
+  AllowSafeAssignment: true
+
+# Align ends correctly.
+Lint/EndAlignment:
+  # The value `keyword` means that `end` should be aligned with the matching
+  # keyword (if, while, etc.).
+  # The value `variable` means that in assignments, `end` should be aligned
+  # with the start of the variable on the left hand side of `=`. In all other
+  # situations, `end` should still be aligned with the keyword.
+  AlignWith: keyword
+  SupportedStyles:
+    - keyword
+    - variable
+
 ##################### Rails ##################################
 
-ActionFilter:
+Rails/ActionFilter:
   EnforcedStyle: action
   SupportedStyles:
     - action
@@ -480,22 +482,22 @@ ActionFilter:
   Include:
     - app/controllers/**/*.rb
 
-DefaultScope:
+Rails/DefaultScope:
   Include:
     - app/models/**/*.rb
 
-HasAndBelongsToMany:
+Rails/HasAndBelongsToMany:
   Include:
     - app/models/**/*.rb
 
-ReadWriteAttribute:
+Rails/ReadWriteAttribute:
   Include:
     - app/models/**/*.rb
 
-ScopeArgs:
+Rails/ScopeArgs:
   Include:
     - app/models/**/*.rb
 
-Validation:
+Rails/Validation:
   Include:
     - app/models/**/*.rb