rubocop 0.57.0 → 0.57.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18bcf8548b6c61400893885a6ef649baeae5d368
-  data.tar.gz: edd6b617b454f944d114b9a9e40f4bd7b60e6629
+  metadata.gz: e577b73a80f270f2f18699b1b34a563a60565d5c
+  data.tar.gz: 364776f0704be1ae1e85e158623f5ded6f81cc14
 SHA512:
-  metadata.gz: '08121a25d44c4a2a976adf2a1dcc894fa0c432443518e17dc07588294cdb2d18fecee5aea9e57bd21de7e0b8af125a37214fe9b4daabda4262ff4cfbac798626'
-  data.tar.gz: 4f5f292778ffa5e92480d931a0a12a784e0fc9e825aabcd9145adbe4704382feef4166b651ecfdb7522670501ff7a87781509da4995ac91ac14b3f485f8d5a37
+  metadata.gz: ee89c88fe1ad2bca660483e3e47bd7a59783f0989ff9e5b67d51cf182bfc9cbe9ea8d82e26ae5da2215ddbf23cb5c5bbbb84c28c9831da5d1ae8e34d9ba6e464
+  data.tar.gz: f6d4fbf74aff8a775ed6ff8f0336de11c40885c270aece677d8e45ebb0dbe3079b13b3015979734650f6fb4de7bbd80897ecf1f34004176115a3383a4e11823c

data/README.md

@@ -51,7 +51,7 @@ haven't reached version 1.0 yet). To prevent an unwanted RuboCop update you
 might want to use a conservative version locking in your `Gemfile`:
 
 ```rb
-gem 'rubocop', '~> 0.57.0', require: false
+gem 'rubocop', '~> 0.57.1', require: false
 ```
 
 ## Quickstart

data/lib/rubocop/config.rb

@@ -459,6 +459,11 @@ module RuboCop
         # There could be a custom cop with this name. If so, don't warn
         next if Cop::Cop.registry.contains_cop_matching?([name])
 
+        # Special case for inherit_mode, which is a directive that we keep in
+        # the configuration (even though it's not a cop), because it's easier
+        # to do so than to pass the value around to various methods.
+        next if name == 'inherit_mode'
+
         warn Rainbow("Warning: unrecognized cop #{name} found in " \
                      "#{smart_loaded_path}").yellow
       end

data/lib/rubocop/config_loader_resolver.rb

@@ -42,7 +42,7 @@ module RuboCop
         end
 
         hash['inherit_from'] = Array(hash['inherit_from'])
-        Array(config_path).reverse.each do |path|
+        Array(config_path).reverse_each do |path|
           # Put gem configuration first so local configuration overrides it.
           hash['inherit_from'].unshift gem_config_path(gem_name, path)
         end

data/lib/rubocop/cop/layout/indentation_consistency.rb

@@ -137,15 +137,58 @@ module RuboCop
 
         private
 
+        # Not all nodes define `bare_access_modifier?` (for example,
+        # `RuboCop::AST::DefNode` does not), so we must check `send_type?` first
+        # to avoid a NoMethodError.
+        def bare_access_modifier?(node)
+          node.send_type? && node.bare_access_modifier?
+        end
+
+        # Returns an integer representing the correct indentation, or nil to
+        # indicate that the correct indentation is that of the first child that
+        # is not an access modifier.
+        def base_column_for_normal_style(node)
+          first_child = node.children.first
+          return unless bare_access_modifier?(first_child)
+
+          # If, as is most common, the access modifier is indented deeper than
+          # the module (`access_modifier_indent > module_indent`) then the
+          # indentation of the access modifier determines the correct
+          # indentation.
+          #
+          # Otherwise, in the rare event that the access modifier is outdented
+          # to the level of the module (see `AccessModifierIndentation` cop) we
+          # return nil so that `check_alignment` will derive the correct
+          # indentation from the first child that is not an access modifier.
+          module_indent = display_column(node.parent.source_range)
+          access_modifier_indent = display_column(first_child.source_range)
+          access_modifier_indent if access_modifier_indent > module_indent
+        end
+
         def check(node)
+          if style == :rails
+            check_rails_style(node)
+          else
+            check_normal_style(node)
+          end
+        end
+
+        def check_normal_style(node)
+          check_alignment(
+            node.children.reject { |child| bare_access_modifier?(child) },
+            base_column_for_normal_style(node)
+          )
+        end
+
+        def check_rails_style(node)
           children_to_check = [[]]
           node.children.each do |child|
             # Modifier nodes have special indentation and will be checked by
             # the AccessModifierIndentation cop. This cop uses them as dividers
             # in rails mode. Then consistency is checked only within each
             # section delimited by a modifier node.
-            if child.send_type? && child.bare_access_modifier?
-              children_to_check << [] if style == :rails
+            if bare_access_modifier?(child)
+              children_to_check << []
             else
               children_to_check.last << child
             end

data/lib/rubocop/cop/layout/indentation_width.rb

@@ -152,11 +152,17 @@ module RuboCop
           check_indentation(base, members.first)
 
           return unless members.any? && members.first.begin_type?
-          return unless indentation_consistency_style == 'rails'
 
-          each_member(members) do |member, previous_modifier|
-            check_indentation(previous_modifier, member,
-                              indentation_consistency_style)
+          if indentation_consistency_style == 'rails'
+            each_member(members) do |member, previous_modifier|
+              check_indentation(previous_modifier, member,
+                                indentation_consistency_style)
+            end
+          else
+            members.first.children.each do |member|
+              next if member.send_type? && member.access_modifier?
+              check_indentation(base, member)
+            end
           end
         end
 

data/lib/rubocop/cop/layout/leading_blank_lines.rb

@@ -8,25 +8,25 @@ module RuboCop
       #
       # @example
       #
-      # # bad
-      # # (start of file)
+      #   # bad
+      #   # (start of file)
       #
-      # class Foo
-      # end
+      #   class Foo
+      #   end
       #
-      # # bad
-      # # (start of file)
+      #   # bad
+      #   # (start of file)
       #
-      # # a comment
+      #   # a comment
       #
-      # # good
-      # # (start of file)
-      # class Foo
-      # end
+      #   # good
+      #   # (start of file)
+      #   class Foo
+      #   end
       #
-      # # good
-      # # (start of file)
-      # # a comment
+      #   # good
+      #   # (start of file)
+      #   # a comment
       class LeadingBlankLines < Cop
         MSG = 'Unnecessary blank line at the beginning of the source.'.freeze
 

data/lib/rubocop/cop/performance/reverse_each.rb

@@ -19,7 +19,7 @@ module RuboCop
         UNDERSCORE = '_'.freeze
 
         def_node_matcher :reverse_each?, <<-MATCHER
-          (send $(send array :reverse) :each)
+          (send $(send _ :reverse) :each)
         MATCHER
 
         def on_send(node)

data/lib/rubocop/cop/rails/bulk_change_table.rb

@@ -135,6 +135,7 @@ module RuboCop
         def on_def(node)
           return unless support_bulk_alter?
           return unless MIGRATIION_METHODS.include?(node.method_name)
+          return unless node.body
 
           recorder = AlterMethodsRecorder.new
 

data/lib/rubocop/cop/style/unneeded_condition.rb

@@ -22,6 +22,14 @@ module RuboCop
       #
       #   # good
       #   b || c
+      #
+      #   # good
+      #   if b
+      #     b
+      #   elsif cond
+      #     c
+      #   end
+      #
       class UnneededCondition < Cop
         include RangeHelp
 
@@ -53,6 +61,8 @@ module RuboCop
         end
 
         def offense?(node)
+          return false if node.elsif_conditional?
+
           condition, if_branch, else_branch = *node
 
           condition == if_branch && !node.elsif? && (

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '0.57.0'.freeze
+    STRING = '0.57.1'.freeze
 
     MSG = '%<version>s (using Parser %<parser_version>s, running on ' \
           '%<ruby_engine>s %<ruby_version>s %<ruby_platform>s)'.freeze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.57.0
+  version: 0.57.1
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement