rubocop 0.31.0 → 0.35.0

data/README.md

@@ -1,13 +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)
-[![Gratipay](http://img.shields.io/gratipay/bbatsov.svg)](https://www.gratipay.com/bbatsov/)
 
 <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/>
@@ -25,9 +24,11 @@ automatically fix some of the problems for you.
 
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/bbatsov/rubocop?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-You can support my work on RuboCop and [all my other projects](https://github.com/bbatsov) via [gratipay](https://www.gratipay.com/bbatsov).
+You can support my work on RuboCop via
+[Salt](https://salt.bountysource.com/teams/rubocop) and
+[Gratipay](https://gratipay.com/rubocop/).
 
-[![Support via Gratipay](https://cdn.rawgit.com/gratipay/gratipay-badge/2.1.3/dist/gratipay.png)](https://gratipay.com/bbatsov)
+[![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
@@ -70,8 +71,14 @@ specific RuboCop release.**
     - [LightTable](#lighttable)
     - [RubyMine](#rubymine)
     - [Other Editors](#other-editors)
+- [Git pre-commit hook integration](#git-pre-commit-hook-integration)
 - [Guard integration](#guard-integration)
 - [Rake integration](#rake-integration)
+- [Caching](#caching)
+    - [Cache Validity](#cache-validity)
+    - [Enabling and Disabling the Cache](#enabling-and-disabling-the-cache)
+    - [Cache Path](#cache-path)
+    - [Cache Pruning](#cache-pruning)
 - [Extensions](#extensions)
   - [Loading Extensions](#loading-extensions)
   - [Custom Cops](#custom-cops)
@@ -90,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
 ```
 
@@ -105,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
 ```
 
@@ -151,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
 ```
 
@@ -159,9 +166,12 @@ Command flag              | Description
 --------------------------|------------------------------------------------------------
 `-v/--version`            | Displays the current version and exits.
 `-V/--verbose-version`    | Displays the current version plus the version of Parser and Ruby.
+`-L/--list-target-files`  | List all files RuboCop will inspect.
 `-F/--fail-fast`          | Inspects in modification time order and stops after first file with offenses.
+`-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.
@@ -172,8 +182,10 @@ Command flag              | Description
 `--only`                  | Run only the specified cop(s) and/or cops in the specified departments.
 `--except`                | Run all cops enabled by configuration except the specified cop(s) and/or departments.
 `--auto-gen-config`       | Generate a configuration file acting as a TODO list.
+`--exclude-limit`         | Limit how many individual files `--auto-gen-config` can list in `Exclude` parameters, default is 15.
 `--show-cops`             | Shows available cops and their configuration.
 `--fail-level`            | Minimum [severity](#severity) for exit with error code. Full severity name or upper case initial can be given. Normally, auto-corrected offenses are ignored. Use `A` or `autocorrect` if you'd like them to trigger failure.
+`-s/--stdin`              | Pipe source from STDIN. This is useful for editor integration.
 
 ### Cops
 
@@ -196,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
 ```
 
@@ -219,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
 ```
 
@@ -258,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
@@ -275,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
@@ -367,6 +435,15 @@ Metrics/LineLength:
   Enabled: false
 ```
 
+Most cops are enabled by default. Some cops, configured in [config/disabled.yml](https://github.com/bbatsov/rubocop/blob/master/config/disabled.yml), are disabled by default. The cop enabling process can be altered by setting `DisabledByDefault` to `true`.
+
+```yaml
+AllCops:
+  DisabledByDefault: true
+```
+
+All cops are then disabled by default, and only cops appearing in user configuration files are enabled. `Enabled: true` does not have to be set for cops in user configuration. They will be enabled anyway.
+
 #### Severity
 
 Each cop has a default severity level based on which department it belongs
@@ -384,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
@@ -399,10 +490,18 @@ Style/PerlBackrefs:
 If you have a code base with an overwhelming amount of offenses, it can
 be a good idea to use `rubocop --auto-gen-config` and add an
 `inherit_from: .rubocop_todo.yml` in your `.rubocop.yml`. The generated
-file `.rubocop_todo.yml` contains configuration to disable all cops that
-currently detect an offense in the code. Then you can start removing the
-entries in the generated file one by one as you work through all the
-offenses in the code.
+file `.rubocop_todo.yml` contains configuration to disable cops that
+currently detect an offense in the code by excluding the offending
+files, or disabling the cop altogether once a file count limit has been
+reached.
+
+By adding the option `--exclude-limit COUNT`, e.g., `rubocop
+--auto-gen-config --exclude-limit 5`, you can change how many files are
+excluded before the cop is entirely disabled. The default COUNT is 15.
+
+Then you can start removing the entries in the generated
+`.rubocop_todo.yml` file one by one as you work through all the offenses
+in the code.
 
 ## Disabling Cops within Source Code
 
@@ -445,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
 
@@ -480,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
@@ -500,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
@@ -527,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
@@ -546,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 &&/||.
@@ -557,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.
@@ -576,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
 ```
 
@@ -641,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
@@ -663,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
 ```
 
@@ -686,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
@@ -705,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.
 
@@ -721,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
 
@@ -738,6 +837,18 @@ provides basic RuboCop integration for RubyMine/IntelliJ IDEA.
 Here's one great opportunity to contribute to RuboCop - implement
 RuboCop integration for your favorite editor.
 
+## Git pre-commit hook integration
+
+[overcommit](https://github.com/brigade/overcommit) is a fully configurable and
+extendable Git commit hook manager. To use RuboCop with overcommit, add the
+following to your `.overcommit.yml` file:
+
+```yaml
+PreCommit:
+  RuboCop:
+    enabled: true
+```
+
 ## Guard integration
 
 If you're fond of [Guard](https://github.com/guard/guard) you might
@@ -779,6 +890,56 @@ RuboCop::RakeTask.new(:rubocop) do |task|
 end
 ```
 
+## Caching
+
+Large projects containing hundreds or even thousands of files can take
+a really long time to inspect, but RuboCop has functionality to
+mitigate this problem. There's a caching mechanism that stores
+information about offenses found in inspected files.
+
+### Cache Validity
+
+Later runs will be able to retrieve this information and present the
+stored information instead of inspecting the file again. This will be
+done if the cache for the file is still valid, which it is if there
+are no changes in:
+* the contents of the inspected file
+* 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)
+
+### Enabling and Disabling the Cache
+
+The caching functionality is enabled if the configuration parameter
+`AllCops: UseCache` is `true`, which it is by default. The command
+line option `--cache false` can be used to turn off caching, thus
+overriding the configuration parameter. If `AllCops: UseCache` is set
+to `false` in the local `.rubocop.yml`, then it's `--cache true` that
+overrides the setting.
+
+### Cache Path
+
+By default, the cache is stored in in a subdirectory of the temporary
+directory, `/tmp/rubocop_cache/` on Unix-like systems. The
+configuration parameter `AllCops: CacheRootDirectory` can be used to
+set it to a different path. One reason to use this option could be
+that there's a network disk where users on different machines want to
+have a common RuboCop cache. Another could be that a Continuous
+Integration system allows directories, but not a temporary directory,
+to be saved between runs.
+
+### Cache Pruning
+
+Each time a file has changed, its offenses will be stored under a new
+key in the cache. This means that the cache will continue to grow
+until we do something to stop it. The configuration parameter
+`AllCops: MaxFilesInCache` sets a limit, and when the number of files
+in the cache exceeds that limit, the oldest files will be automatially
+removed from the cache.
+
 ## Extensions
 
 It's possible to extend RuboCop with custom cops and formatters.
@@ -821,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
 
@@ -832,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
 ```
 
@@ -855,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!
@@ -870,11 +1031,11 @@ priority right now. Writing a new cop is a great way to dive into RuboCop!
 Of course, bug reports and suggestions for improvements are always
 welcome. GitHub pull requests are even better! :-)
 
-You can also support my work on RuboCop and
-[all my other projects](https://github.com/bbatsov) via
-[gratipay](https://www.gratipay.com/bbatsov).
+You can also support my work on RuboCop via
+[Salt](https://salt.bountysource.com/teams/rubocop) and
+[Gratipay](https://gratipay.com/rubocop/).
 
-[![Support via Gratipay](https://cdn.rawgit.com/gratipay/gratipay-badge/2.1.3/dist/gratipay.png)](https://gratipay.com/bbatsov)
+[![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

@@ -38,10 +38,32 @@ 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.
   StyleGuideCopsOnly: false
+  # All cops except the ones in disabled.yml are enabled by default. Change
+  # this behavior by overriding DisabledByDefault. When DisabledByDefault is
+  # true, all cops in the default configuration are disabled, and and only cops
+  # in user configuration are enabled. This makes cops opt-in instead of
+  # opt-out. Note that when DisabledByDefault is true, cops in user
+  # configuration will be enabled even if they don't set the Enabled parameter.
+  DisabledByDefault: false
+  # Enables the result cache if true. Can be overridden by the --cache command
+  # line option.
+  UseCache: true
+  # Threshold for how many files can be stored in the result cache before some
+  # of the files are automatically removed.
+  MaxFilesInCache: 20000
+  # The cache will be stored in "rubocop_cache" under this directory. The name
+  # "/tmp" is special and will be converted to the system temporary directory,
+  # which is "/tmp" on Unix-like systems, but could be something else on other
+  # systems.
+  CacheRootDirectory: /tmp
 
 # Indent private/protected/public as deep as method definitions
 Style/AccessModifierIndentation:
@@ -165,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.
@@ -376,6 +403,12 @@ Style/Encoding:
     - always
   AutoCorrectEncodingComment: '# encoding: utf-8'
 
+Style/ExtraSpacing:
+  # When true, allows most uses of extra spacing if the intent is to align
+  # things with the previous or next line, not counting empty lines or comment
+  # lines.
+  AllowForAlignment: true
+
 Style/FileName:
   # File names listed in AllCops:Include are excluded by default. Add extra
   # excludes here.
@@ -461,6 +494,7 @@ Style/IndentHash:
   SupportedStyles:
     - special_inside_parentheses
     - consistent
+    - align_braces
 
 Style/LambdaCall:
   EnforcedStyle: call
@@ -494,6 +528,7 @@ Style/MethodDefParentheses:
   SupportedStyles:
     - require_parentheses
     - require_no_parentheses
+    - require_no_parentheses_except_multiline
 
 Style/MethodName:
   EnforcedStyle: snake_case
@@ -510,6 +545,15 @@ Style/MultilineOperationIndentation:
 Style/NumericLiterals:
   MinDigits: 5
 
+Style/OptionHash:
+  # A list of parameter names that will be flagged by this cop.
+  SuspiciousParamNames:
+    - options
+    - opts
+    - args
+    - params
+    - parameters
+
 # Allow safe assignment in conditions.
 Style/ParenthesesAroundCondition:
   AllowSafeAssignment: true
@@ -533,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
@@ -591,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:
@@ -603,6 +657,16 @@ Style/StringLiteralsInInterpolation:
     - single_quotes
     - double_quotes
 
+Style/StringMethods:
+  # Mapping from undesired method to desired_method
+  # e.g. to use `to_sym` over `intern`:
+  #
+  # StringMethods:
+  #   PreferredMethods:
+  #     intern: to_sym
+  PreferredMethods:
+    intern: to_sym
+
 Style/SpaceAroundBlockParameters:
   EnforcedStyleInsidePipes: no_space
   SupportedStyles:
@@ -643,6 +707,12 @@ Style/SpaceInsideHashLiteralBraces:
     - space
     - no_space
 
+Style/SpaceInsideStringInterpolation:
+  EnforcedStyle: no_space
+  SupportedStyles:
+    - space
+    - no_space
+
 Style/SymbolProc:
   # A list of method names to be ignored by the check.
   # The names should be fairly unique, otherwise you'll end up ignoring lots of code.
@@ -794,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:
@@ -805,15 +884,15 @@ Rails/ActionFilter:
     - app/controllers/**/*.rb
 
 Rails/Date:
-  # The value `always` disallows usage of `Date.today`, `Date.current`,
+  # The value `strict` disallows usage of `Date.today`, `Date.current`,
   # `Date#to_time` etc.
-  # The value `acceptable` allows usage of `Date.current`, `Date.yesterday`, etc
+  # The value `flexible` allows usage of `Date.current`, `Date.yesterday`, etc
   # (but not `Date.today`) which are overriden by ActiveSupport to handle current
   # time zone.
-  EnforcedStyle: always
+  EnforcedStyle: flexible
   SupportedStyles:
-    - always
-    - acceptable
+    - strict
+    - flexible
 
 Rails/DefaultScope:
   Include:
@@ -847,12 +926,12 @@ Rails/ScopeArgs:
     - app/models/**/*.rb
 
 Rails/TimeZone:
-  # The value `always` means that `Time` should be used with `zone`.
-  # The value `acceptable` allows usage of `in_time_zone` instead of `zone`.
-  EnforcedStyle: always
+  # The value `strict` means that `Time` should be used with `zone`.
+  # The value `flexible` allows usage of `in_time_zone` instead of `zone`.
+  EnforcedStyle: flexible
   SupportedStyles:
-    - always
-    - acceptable
+    - strict
+    - flexible
 
 Rails/Validation:
   Include: