airbnb · zachsabin · Nov 13, 2019 · Nov 9, 2019 · Nov 9, 2019 · Nov 9, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -3,10 +3,10 @@ cache:
   bundler: true
 sudo: false
 rvm:
-  - 2.2
   - 2.3
   - 2.4
   - 2.5
+  - 2.6
 install:
   - cd rubocop-airbnb
   - bundle install

diff --git a/rubocop-airbnb/.rubocop.yml b/rubocop-airbnb/.rubocop.yml
@@ -1,3 +1,6 @@
+require:
+  - rubocop-performance
+  - rubocop-rails
 inherit_from:
   - .rubocop_airbnb.yml
   - ./config/default.yml

diff --git a/rubocop-airbnb/CHANGELOG.md b/rubocop-airbnb/CHANGELOG.md
@@ -1,3 +1,11 @@
+# 3.0.0
+* Update to rubocop 0.76
+* Enable Rails/IgnoredSkipActionFilterOption
+* Enable Rails/ReflectionClassName
+* Disable and delete Airbnb/ClassName
+* Enable Layout/IndentFirstParameter
+* Drop support for Ruby 2.2
+
 # 2.0.0
 * Upgrade to rubocop-rspec 1.30.0, use ~> to allow for PATCH version flexibility
 * Upgrade to rubocop 0.58.0, use ~> to allow for PATCH version flexibility

diff --git a/rubocop-airbnb/README.md b/rubocop-airbnb/README.md
@@ -15,6 +15,11 @@ Just put this in your `Gemfile` it depends on the appropriate version of rubocop
 gem 'rubocop-airbnb'
 ```
 
+Note: If you want to run with Ruby 2.2 you will need to set your version to 2
+```
+gem 'rubocop-airbnb', '~> 2'
+```
+
 ## Usage
 
 You need to tell RuboCop to load the Airbnb extension. There are three

diff --git a/rubocop-airbnb/config/rubocop-airbnb.yml b/rubocop-airbnb/config/rubocop-airbnb.yml
@@ -2,11 +2,6 @@
 # They are custom built for use inside Airbnb and address issues that we have experienced in
 # testing and production.
 
-Airbnb/ClassName:
-  Description: Use :class_name => "Model" instead of :class_name => Model.name
-    to avoid a long cascade of autoloading.
-  Enabled: true
-
 Airbnb/ClassOrModuleDeclaredInWrongFile:
   Description: Declare a class or module in the file that matches its namespace and name.
   Enabled: true

diff --git a/rubocop-airbnb/config/rubocop-gemspec.yml b/rubocop-airbnb/config/rubocop-gemspec.yml
@@ -7,3 +7,6 @@ Gemspec/RequiredRubyVersion:
   Enabled: false
   Include:
     - '**/*.gemspec'
+
+Gemspec/RubyVersionGlobalsUsage:
+  Enabled: true
diff --git a/rubocop-airbnb/config/rubocop-layout.yml b/rubocop-airbnb/config/rubocop-layout.yml
@@ -227,7 +227,7 @@ Layout/FirstMethodParameterLineBreak:
   Enabled: false
 
 # Supports --auto-correct
-Layout/FirstParameterIndentation:
+Layout/IndentFirstArgument:
   Description: Checks the indentation of the first parameter in a method call.
   Enabled: true
   EnforcedStyle: consistent
@@ -238,7 +238,7 @@ Layout/FirstParameterIndentation:
   - special_for_inner_method_call_in_parentheses
 
 # Supports --auto-correct
-Layout/IndentArray:
+Layout/IndentFirstArrayElement:
   Description: Checks the indentation of the first element in an array literal.
   Enabled: true
   EnforcedStyle: consistent
@@ -248,10 +248,9 @@ Layout/IndentAssignment:
   Description: Checks the indentation of the first line of the right-hand-side of a
     multi-line assignment.
   Enabled: true
-  IndentationWidth:
 
 # Supports --auto-correct
-Layout/IndentHash:
+Layout/IndentFirstHashElement:
   Description: Checks the indentation of the first key in a hash literal.
   Enabled: true
   EnforcedStyle: consistent
@@ -344,7 +343,6 @@ Layout/MultilineMethodCallIndentation:
   SupportedStyles:
   - aligned
   - indented
-  IndentationWidth:
 
 Layout/MultilineMethodDefinitionBraceLayout:
   Description: >-
@@ -474,11 +472,6 @@ Layout/SpaceInsideBlockBraces:
   EnforcedStyleForEmptyBraces: no_space
   SpaceBeforeBlockParameters: true
 
-Layout/SpaceInsideParens:
-  Description: 'No spaces after ( or before ).'
-  StyleGuide: '#spaces-braces'
-  Enabled: true
-
 Layout/SpaceInsideArrayLiteralBrackets:
   EnforcedStyle: no_space
   SupportedStyles:
@@ -558,3 +551,6 @@ Layout/TrailingWhitespace:
   Description: Avoid trailing whitespace.
   StyleGuide: https://github.com/rubocop-hq/ruby-style-guide#no-trailing-whitespace
   Enabled: true
+
+Layout/IndentFirstParameter:
+  Enabled: true
diff --git a/rubocop-airbnb/config/rubocop-lint.yml b/rubocop-airbnb/config/rubocop-lint.yml
@@ -80,6 +80,11 @@ Lint/EnsureReturn:
 Lint/ErbNewArguments:
   Enabled: false
 
+Lint/FlipFlop:
+  Description: Checks for flip flops
+  StyleGuide: https://github.com/rubocop-hq/ruby-style-guide#no-flip-flops
+  Enabled: false
+
 Lint/FloatOutOfRange:
   Description: Catches floating-point literals too large or small for Ruby to represent.
   Enabled: false
@@ -237,20 +242,20 @@ Lint/UnderscorePrefixedVariableName:
 Lint/UnifiedInteger:
   Enabled: false
 
-Lint/UnneededCopDisableDirective:
+Lint/RedundantCopDisableDirective:
   Description: >-
     Checks for rubocop:disable comments that can be removed.
     Note: this cop is not disabled when disabling all cops. It must be explicitly disabled.
   Enabled: true
 
-Lint/UnneededCopEnableDirective:
+Lint/RedundantCopEnableDirective:
   Description: Checks for rubocop:enable comments that can be removed.
   Enabled: true
 
-Lint/UnneededRequireStatement:
+Lint/RedundantRequireStatement:
   Enabled: false
 
-Lint/UnneededSplatExpansion:
+Lint/RedundantSplatExpansion:
   Enabled: false
 
 Lint/UnreachableCode:

diff --git a/rubocop-airbnb/config/rubocop-naming.yml b/rubocop-airbnb/config/rubocop-naming.yml
@@ -83,3 +83,6 @@ Naming/VariableName:
 
 Naming/VariableNumber:
   Enabled: false
+
+Naming/RescuedExceptionsVariableName:
+  Enabled: false
diff --git a/rubocop-airbnb/config/rubocop-performance.yml b/rubocop-airbnb/config/rubocop-performance.yml
@@ -56,11 +56,6 @@ Performance/FlatMap:
 Performance/InefficientHashSearch:
   Enabled: false
 
-# Supports --auto-correct
-Performance/LstripRstrip:
-  Description: Use `strip` instead of `lstrip.rstrip`.
-  Enabled: false
-
 # Supports --auto-correct
 Performance/RangeInclude:
   Description: Use `Range#cover?` instead of `Range#include?`.
@@ -85,11 +80,6 @@ Performance/RedundantMerge:
   Reference: https://github.com/JuanitoFatas/fast-ruby#hashmerge-vs-hash-code
   Enabled: false
 
-# Supports --auto-correct
-Performance/RedundantSortBy:
-  Description: Use `sort` instead of `sort_by { |x| x }`.
-  Enabled: false
-
 Performance/RegexpMatch:
   Enabled: false
 
@@ -99,12 +89,6 @@ Performance/ReverseEach:
   Reference: https://github.com/JuanitoFatas/fast-ruby#enumerablereverseeach-vs-enumerablereverse_each-code
   Enabled: false
 
-# Supports --auto-correct
-Performance/Sample:
-  Description: Use `sample` instead of `shuffle.first`, `shuffle.last`, and `shuffle[Fixnum]`.
-  Reference: https://github.com/JuanitoFatas/fast-ruby#arrayshufflefirst-vs-arraysample-code
-  Enabled: false
-
 # Supports --auto-correct
 Performance/Size:
   Description: Use `size` instead of `count` for counting the number of elements in
@@ -133,9 +117,6 @@ Performance/TimesMap:
 Performance/UnfreezeString:
   Enabled: false
 
-Performance/UnneededSort:
-  Enabled: false
-
 Performance/UriDefaultParser:
   Enabled: false
 
diff --git a/rubocop-airbnb/config/rubocop-rails.yml b/rubocop-airbnb/config/rubocop-rails.yml
@@ -206,3 +206,9 @@ Rails/Validation:
   Enabled: false
   Include:
   - app/models/**/*.rb
+
+Rails/IgnoredSkipActionFilterOption:
+  Enabled: true
+
+Rails/ReflectionClassName:
+  Enabled: true
diff --git a/rubocop-airbnb/config/rubocop-style.yml b/rubocop-airbnb/config/rubocop-style.yml
@@ -328,11 +328,6 @@ Style/ExpandPathArguments:
   Description: "Use `expand_path(__dir__)` instead of `expand_path('..', __FILE__)`."
   Enabled: false
 
-Style/FlipFlop:
-  Description: Checks for flip flops
-  StyleGuide: https://github.com/rubocop-hq/ruby-style-guide#no-flip-flops
-  Enabled: false
-
 Style/For:
   Description: Checks use of for or each in multiline loops.
   StyleGuide: https://github.com/rubocop-hq/ruby-style-guide#no-for-loops
@@ -360,10 +355,10 @@ Style/FrozenStringLiteralComment:
   Description: Add the frozen_string_literal comment to the top of files to help transition
     from Ruby 2.3.0 to Ruby 3.0.
   Enabled: false
-  EnforcedStyle: when_needed
   SupportedStyles:
-  - when_needed
   - always
+  - never
+  EnforcedStyle: always
 
 Style/GlobalVars:
   Description: Do not introduce global variables.
@@ -735,6 +730,11 @@ Style/RedundantSelf:
   StyleGuide: https://github.com/rubocop-hq/ruby-style-guide#no-self-unless-required
   Enabled: true
 
+# Supports --auto-correct
+Style/RedundantSortBy:
+  Description: Use `sort` instead of `sort_by { |x| x }`.
+  Enabled: false
+
 # Supports --auto-correct
 Style/RegexpLiteral:
   Description: Use / or %r around regular expressions.
@@ -763,6 +763,12 @@ Style/ReturnNil:
 Style/SafeNavigation:
   Enabled: false
 
+# Supports --auto-correct
+Style/Sample:
+  Description: Use `sample` instead of `shuffle.first`, `shuffle.last`, and `shuffle[Fixnum]`.
+  Reference: https://github.com/JuanitoFatas/fast-ruby#arrayshufflefirst-vs-arraysample-code
+  Enabled: false
+
 # Supports --auto-correct
 Style/SelfAssignment:
   Description: Checks for places where self-assignment shorthand should have been used.
@@ -856,6 +862,11 @@ Style/StringMethods:
   PreferredMethods:
     intern: to_sym
 
+# Supports --auto-correct
+Style/Strip:
+  Description: Use `strip` instead of `lstrip.rstrip`.
+  Enabled: false
+
 Style/StructInheritance:
   Description: Checks for inheritance from Struct.new.
   StyleGuide: https://github.com/rubocop-hq/ruby-style-guide#no-extend-struct-new
@@ -922,24 +933,27 @@ Style/UnlessElse:
   Enabled: true
 
 # Supports --auto-correct
-Style/UnneededCapitalW:
+Style/RedundantCapitalW:
   Description: Checks for %W when interpolation is not needed.
   Enabled: false
 
-Style/UnneededCondition:
+Style/RedundantCondition:
   Enabled: false
 
 # Supports --auto-correct
-Style/UnneededInterpolation:
+Style/RedundantInterpolation:
   Description: Checks for strings that are just an interpolated expression.
   Enabled: false
 
 # Supports --auto-correct
-Style/UnneededPercentQ:
+Style/RedundantPercentQ:
   Description: Checks for %q/%Q when single quotes or double quotes would do.
   StyleGuide: https://github.com/rubocop-hq/ruby-style-guide#percent-q
   Enabled: false
 
+Style/RedundantSort:
+  Enabled: false
+
 Style/UnpackFirst:
   Enabled: false
 

diff --git a/rubocop-airbnb/lib/rubocop/airbnb/version.rb b/rubocop-airbnb/lib/rubocop/airbnb/version.rb
@@ -3,6 +3,6 @@
 module RuboCop
   module Airbnb
     # Version information for the the Airbnb RuboCop plugin.
-    VERSION = '2.0.0'.freeze
+    VERSION = '3.0.0'
   end
 end
diff --git a/rubocop-airbnb/lib/rubocop/cop/airbnb/class_name.rb b/rubocop-airbnb/lib/rubocop/cop/airbnb/class_name.rb
diff --git a/rubocop-airbnb/lib/rubocop/cop/airbnb/continuation_slash.rb b/rubocop-airbnb/lib/rubocop/cop/airbnb/continuation_slash.rb
@@ -14,7 +14,7 @@ def enforce_violation(node)
         alias on_send enforce_violation
         alias on_if enforce_violation
 
-        Util::ASGN_NODES.each do |type|
+        RuboCop::AST::Node::ASSIGNMENTS.each do |type|
           define_method("on_#{type}") do |node|
             enforce_violation(node)
           end

diff --git a/rubocop-airbnb/rubocop-airbnb.gemspec b/rubocop-airbnb/rubocop-airbnb.gemspec
@@ -25,7 +25,9 @@ Gem::Specification.new do |spec|
     'Gemfile',
   ]
 
-  spec.add_dependency('rubocop', '~> 0.58.0')
+  spec.add_dependency('rubocop', '~> 0.76.0')
+  spec.add_dependency('rubocop-performance', '~> 1.5.0')
+  spec.add_dependency('rubocop-rails', '~> 2.3.2')
   spec.add_dependency('rubocop-rspec', '~> 1.30.0')
   spec.add_development_dependency('rspec', '~> 3.5')
 end