rubocop 0.83.0 → 0.84.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02ede8c9af1fb47b66ac79a0d93d577a5384f82f5076e1e64631ca761c4d3f6b
-  data.tar.gz: 2f22e7716a7068013b131636217a77189f2ca506e53c8613c407c18f8028600e
+  metadata.gz: 92b169f3f7a5c04a2ce3b9b674328a49e078a8f19b5560e5135eee1ddb4f0428
+  data.tar.gz: 6057deda8dd47bbf92038a03ce0bd4d35139c220f5fede6049f5e3da9fcc7ad0
 SHA512:
-  metadata.gz: 936fdee12ea43542b66ab1cccc0514f1a7076dbd671386cccf376e61633b12e51c88feba3e652e77c925a2f5df4e0646bf568af453032bd2cb6eafdd9ea66d48
-  data.tar.gz: 23ec3628be52fd219206cd866c7e46757cdae9c8bd5c29334a7471c856f19becb03af7da2dd6f12a12c1f876f4eb900d10f9c8fdd7ad669c1bf2dea4cb333145
+  metadata.gz: 073154f4f62eed603c4b4d947b5dcdc308d1f0aebcffe11daad2b0d21820272f9d13d89e40403292a5497d6d9722e405f9f6cb16071c69214fc10a074eef5254
+  data.tar.gz: 69c0e58d557d71c898cf6c43bed3fb6a5df83650e239e470bf0bb56cf4a2722895f2c8b9fb36775e752a2dafc80893f719166e204a4d5f136c82c0f6a03bc321

data/README.md

@@ -53,7 +53,7 @@ haven't reached version 1.0 yet). To prevent an unwanted RuboCop update you
 might want to use a conservative version lock in your `Gemfile`:
 
 ```rb
-gem 'rubocop', '~> 0.83.0', require: false
+gem 'rubocop', '~> 0.84.0', require: false
 ```
 
 ## Quickstart
@@ -132,7 +132,7 @@ If you're working in a company that's making significant use of RuboCop we'd app
 to become a RuboCop sponsor.
 
 You can support the development of RuboCop via
-[Salt](https://salt.bountysource.com/teams/rubocop),
+[GitHub Sponsors](https://github.com/sponsors/bbatsov),
 [Patreon](https://www.patreon.com/bbatsov),
 [PayPal](https://paypal.me/bbatsov)
 and [Open Collective](https://opencollective.com/rubocop).

data/config/default.yml

@@ -468,6 +468,13 @@ Layout/EmptyLinesAroundAttributeAccessor:
   StyleGuide: '#empty-lines-around-attribute-accessor'
   Enabled: pending
   VersionAdded: '0.83'
+  VersionChanged: '0.84'
+  AllowAliasSyntax: true
+  AllowedMethods:
+    - alias_method
+    - public
+    - protected
+    - private
 
 Layout/EmptyLinesAroundBeginBody:
   Description: "Keeps track of empty lines around begin-end bodies."
@@ -861,9 +868,9 @@ Layout/LineLength:
   StyleGuide: '#80-character-limits'
   Enabled: true
   VersionAdded: '0.25'
-  VersionChanged: '0.78'
+  VersionChanged: '0.84'
   AutoCorrect: false
-  Max: 80
+  Max: 120
   # To make it possible to copy or click on URIs in the code, we allow lines
   # containing a URI to be longer than Max.
   AllowHeredoc: true
@@ -1370,6 +1377,11 @@ Lint/DeprecatedClassMethods:
   Enabled: true
   VersionAdded: '0.19'
 
+Lint/DeprecatedOpenSSLConstant:
+  Description: "Don't use algorithm constants for `OpenSSL::Cipher` and `OpenSSL::Digest`."
+  Enabled: pending
+  VersionAdded: '0.84'
+
 Lint/DisjunctiveAssignmentInConstructor:
   Description: 'In constructor, plain assignment is preferred over disjunctive.'
   Enabled: true
@@ -2274,7 +2286,7 @@ Style/AndOr:
   VersionChanged: '0.25'
   # Whether `and` and `or` are banned only in conditionals (conditionals)
   # or completely (always).
-  EnforcedStyle: always
+  EnforcedStyle: conditionals
   SupportedStyles:
     - always
     - conditionals
@@ -2694,6 +2706,11 @@ Style/DoubleNegation:
   StyleGuide: '#no-bang-bang'
   Enabled: true
   VersionAdded: '0.19'
+  VersionChanged: '0.84'
+  EnforcedStyle: allowed_in_returns
+  SupportedStyles:
+    - allowed_in_returns
+    - forbidden
 
 Style/EachForSimpleLoop:
   Description: >-

data/lib/rubocop.rb

@@ -1,73 +1,23 @@
 # frozen_string_literal: true
 
-require 'parser'
 require 'rainbow'
 
 require 'English'
 require 'set'
-require 'forwardable'
 require 'unicode/display_width/no_string_ext'
+require 'rubocop-ast'
+require_relative 'rubocop/ast_aliases'
 
 require_relative 'rubocop/version'
 
 require_relative 'rubocop/core_ext/string'
+require_relative 'rubocop/ext/processed_source'
+
 require_relative 'rubocop/path_util'
 require_relative 'rubocop/file_finder'
 require_relative 'rubocop/platform'
 require_relative 'rubocop/name_similarity'
-require_relative 'rubocop/node_pattern'
 require_relative 'rubocop/string_interpreter'
-require_relative 'rubocop/ast/sexp'
-require_relative 'rubocop/ast/node'
-require_relative 'rubocop/ast/node/mixin/method_identifier_predicates'
-require_relative 'rubocop/ast/node/mixin/binary_operator_node'
-require_relative 'rubocop/ast/node/mixin/collection_node'
-require_relative 'rubocop/ast/node/mixin/conditional_node'
-require_relative 'rubocop/ast/node/mixin/hash_element_node'
-require_relative 'rubocop/ast/node/mixin/method_dispatch_node'
-require_relative 'rubocop/ast/node/mixin/modifier_node'
-require_relative 'rubocop/ast/node/mixin/numeric_node'
-require_relative 'rubocop/ast/node/mixin/parameterized_node'
-require_relative 'rubocop/ast/node/mixin/predicate_operator_node'
-require_relative 'rubocop/ast/node/mixin/basic_literal_node'
-require_relative 'rubocop/ast/node/alias_node'
-require_relative 'rubocop/ast/node/and_node'
-require_relative 'rubocop/ast/node/args_node'
-require_relative 'rubocop/ast/node/array_node'
-require_relative 'rubocop/ast/node/block_node'
-require_relative 'rubocop/ast/node/break_node'
-require_relative 'rubocop/ast/node/case_match_node'
-require_relative 'rubocop/ast/node/case_node'
-require_relative 'rubocop/ast/node/class_node'
-require_relative 'rubocop/ast/node/def_node'
-require_relative 'rubocop/ast/node/defined_node'
-require_relative 'rubocop/ast/node/ensure_node'
-require_relative 'rubocop/ast/node/for_node'
-require_relative 'rubocop/ast/node/forward_args_node'
-require_relative 'rubocop/ast/node/float_node'
-require_relative 'rubocop/ast/node/hash_node'
-require_relative 'rubocop/ast/node/if_node'
-require_relative 'rubocop/ast/node/int_node'
-require_relative 'rubocop/ast/node/keyword_splat_node'
-require_relative 'rubocop/ast/node/module_node'
-require_relative 'rubocop/ast/node/or_node'
-require_relative 'rubocop/ast/node/pair_node'
-require_relative 'rubocop/ast/node/range_node'
-require_relative 'rubocop/ast/node/regexp_node'
-require_relative 'rubocop/ast/node/resbody_node'
-require_relative 'rubocop/ast/node/retry_node'
-require_relative 'rubocop/ast/node/return_node'
-require_relative 'rubocop/ast/node/self_class_node'
-require_relative 'rubocop/ast/node/send_node'
-require_relative 'rubocop/ast/node/str_node'
-require_relative 'rubocop/ast/node/super_node'
-require_relative 'rubocop/ast/node/symbol_node'
-require_relative 'rubocop/ast/node/until_node'
-require_relative 'rubocop/ast/node/when_node'
-require_relative 'rubocop/ast/node/while_node'
-require_relative 'rubocop/ast/node/yield_node'
-require_relative 'rubocop/ast/builder'
-require_relative 'rubocop/ast/traversal'
 require_relative 'rubocop/error'
 require_relative 'rubocop/warning'
 
@@ -216,7 +166,7 @@ require_relative 'rubocop/cop/layout/empty_lines_around_attribute_accessor'
 require_relative 'rubocop/cop/layout/empty_lines_around_begin_body'
 require_relative 'rubocop/cop/layout/empty_lines_around_block_body'
 require_relative 'rubocop/cop/layout/empty_lines_around_class_body'
-require_relative 'rubocop/cop/layout/empty_lines_around_exception_handling_keywords' # rubocop:disable Layout/LineLength
+require_relative 'rubocop/cop/layout/empty_lines_around_exception_handling_keywords'
 require_relative 'rubocop/cop/layout/empty_lines_around_method_body'
 require_relative 'rubocop/cop/layout/empty_lines_around_module_body'
 require_relative 'rubocop/cop/layout/empty_lines'
@@ -291,6 +241,7 @@ require_relative 'rubocop/cop/lint/boolean_symbol'
 require_relative 'rubocop/cop/lint/circular_argument_reference'
 require_relative 'rubocop/cop/lint/debugger'
 require_relative 'rubocop/cop/lint/deprecated_class_methods'
+require_relative 'rubocop/cop/lint/deprecated_open_ssl_constant'
 require_relative 'rubocop/cop/lint/disjunctive_assignment_in_constructor'
 require_relative 'rubocop/cop/lint/duplicate_case_condition'
 require_relative 'rubocop/cop/lint/duplicate_hash_key'
@@ -468,11 +419,9 @@ require_relative 'rubocop/cop/style/lambda'
 require_relative 'rubocop/cop/style/lambda_call'
 require_relative 'rubocop/cop/style/line_end_concatenation'
 require_relative 'rubocop/cop/style/method_call_without_args_parentheses'
-# rubocop:disable Layout/LineLength
 require_relative 'rubocop/cop/style/method_call_with_args_parentheses'
 require_relative 'rubocop/cop/style/method_call_with_args_parentheses/omit_parentheses'
 require_relative 'rubocop/cop/style/method_call_with_args_parentheses/require_parentheses'
-# rubocop:enable Layout/LineLength
 require_relative 'rubocop/cop/style/method_called_on_do_end_block'
 require_relative 'rubocop/cop/style/method_def_parentheses'
 require_relative 'rubocop/cop/style/method_missing_super'
@@ -614,10 +563,8 @@ require_relative 'rubocop/config_obsoletion'
 require_relative 'rubocop/config_store'
 require_relative 'rubocop/config_validator'
 require_relative 'rubocop/target_finder'
-require_relative 'rubocop/token'
 require_relative 'rubocop/comment_config'
 require_relative 'rubocop/magic_comment'
-require_relative 'rubocop/processed_source'
 require_relative 'rubocop/result_cache'
 require_relative 'rubocop/runner'
 require_relative 'rubocop/cli'

data/lib/rubocop/ast_aliases.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# These aliases are for compatibility.
+module RuboCop
+  NodePattern = AST::NodePattern
+  ProcessedSource = AST::ProcessedSource
+  Token = AST::Token
+end

data/lib/rubocop/cli/command/show_cops.rb

@@ -42,18 +42,14 @@ module RuboCop
                             selected_cops_of_department(registry, department)
                           end
 
-          if show_all
-            puts "# Department '#{department}' (#{selected_cops.length}):"
-          end
+          puts "# Department '#{department}' (#{selected_cops.length}):" if show_all
 
           print_cop_details(selected_cops)
         end
 
         def print_cop_details(cops)
           cops.each do |cop|
-            if cop.new(@config).support_autocorrect?
-              puts '# Supports --auto-correct'
-            end
+            puts '# Supports --auto-correct' if cop.new(@config).support_autocorrect?
             puts "#{cop.cop_name}:"
             puts config_lines(cop)
             puts

data/lib/rubocop/config.rb

@@ -86,9 +86,7 @@ module RuboCop
 
       excludes = for_all_cops['Exclude'] ||= []
       highest_config.for_all_cops['Exclude'].each do |path|
-        unless path.is_a?(Regexp) || absolute?(path)
-          path = File.join(File.dirname(highest_config.loaded_path), path)
-        end
+        path = File.join(File.dirname(highest_config.loaded_path), path) unless path.is_a?(Regexp) || absolute?(path)
         excludes << path unless excludes.include?(path)
       end
     end

data/lib/rubocop/config_loader.rb

@@ -95,9 +95,7 @@ module RuboCop
         end
 
         merge_with_default(config, config_file).tap do |merged_config|
-          unless possible_new_cops?(config)
-            warn_on_pending_cops(merged_config.pending_cops)
-          end
+          warn_on_pending_cops(merged_config.pending_cops) unless possible_new_cops?(config)
         end
       end
 
@@ -207,9 +205,7 @@ module RuboCop
       def write_config_file(file_name, file_string, rubocop_yml_contents)
         File.open(file_name, 'w') do |f|
           f.write "inherit_from:#{file_string}\n"
-          if /\S/.match?(rubocop_yml_contents)
-            f.write "\n#{rubocop_yml_contents}"
-          end
+          f.write "\n#{rubocop_yml_contents}" if /\S/.match?(rubocop_yml_contents)
         end
       end
 
@@ -227,9 +223,7 @@ module RuboCop
 
         puts "configuration from #{absolute_path}" if debug?
 
-        unless hash.is_a?(Hash)
-          raise(TypeError, "Malformed configuration in #{absolute_path}")
-        end
+        raise(TypeError, "Malformed configuration in #{absolute_path}") unless hash.is_a?(Hash)
 
         hash
       end

data/lib/rubocop/config_loader_resolver.rb

@@ -71,9 +71,7 @@ module RuboCop
         end
       end
 
-      if disabled_by_default
-        config = handle_disabled_by_default(config, default_configuration)
-      end
+      config = handle_disabled_by_default(config, default_configuration) if disabled_by_default
 
       opts = { inherit_mode: config['inherit_mode'] || {},
                unset_nil: unset_nil }
@@ -117,9 +115,7 @@ module RuboCop
         # internal setting that's not documented in the manual. It will cause a
         # cop to be enabled later, when logic surrounding enabled/disabled it
         # run, even though its department is disabled.
-        if derived_hash[key]['Enabled']
-          derived_hash[key]['Enabled'] = 'override_department'
-        end
+        derived_hash[key]['Enabled'] = 'override_department' if derived_hash[key]['Enabled']
       end
     end
 

data/lib/rubocop/cop/autocorrect_logic.rb

@@ -43,8 +43,7 @@ module RuboCop
       def disable_offense(node)
         range = node.location.expression
         eol_comment = " # rubocop:todo #{cop_name}"
-        needed_line_length = range.column +
-                             (range.source_line + eol_comment).length
+        needed_line_length = (range.source_line + eol_comment).length
         if needed_line_length <= max_line_length
           disable_offense_at_end_of_line(range_of_first_line(range),
                                          eol_comment)

data/lib/rubocop/cop/corrector.rb

@@ -85,9 +85,7 @@ module RuboCop
       def insert_before(node_or_range, content)
         range = to_range(node_or_range)
         # TODO: Fix Cops using bad ranges instead
-        if range.end_pos > @source_buffer.source.size
-          range = range.with(end_pos: @source_buffer.source.size)
-        end
+        range = range.with(end_pos: @source_buffer.source.size) if range.end_pos > @source_buffer.source.size
 
         @source_rewriter.insert_before(range, content)
       end

data/lib/rubocop/cop/correctors/alignment_corrector.rb

@@ -48,9 +48,7 @@ module RuboCop
           return if taboo_ranges.any? { |t| within?(range, t) }
 
           if column_delta.positive?
-            unless range.resize(1).source == "\n"
-              corrector.insert_before(range, ' ' * column_delta)
-            end
+            corrector.insert_before(range, ' ' * column_delta) unless range.resize(1).source == "\n"
           elsif /\A[ \t]+\z/.match?(range.source)
             remove(range, corrector)
           end
@@ -92,9 +90,7 @@ module RuboCop
         end
 
         def calculate_range(expr, line_begin_pos, column_delta)
-          if column_delta.positive?
-            return range_between(line_begin_pos, line_begin_pos)
-          end
+          return range_between(line_begin_pos, line_begin_pos) if column_delta.positive?
 
           starts_with_space =
             expr.source_buffer.source[line_begin_pos].start_with?(' ')

data/lib/rubocop/cop/correctors/parentheses_corrector.rb

@@ -10,9 +10,7 @@ module RuboCop
             corrector.remove(node.loc.begin)
             corrector.remove(node.loc.end)
 
-            if ternary_condition?(node) && next_char_is_question_mark?(node)
-              corrector.insert_after(node.loc.end, ' ')
-            end
+            corrector.insert_after(node.loc.end, ' ') if ternary_condition?(node) && next_char_is_question_mark?(node)
           end
         end
 

data/lib/rubocop/cop/correctors/space_corrector.rb

@@ -35,9 +35,7 @@ module RuboCop
 
         def add_space(processed_source, corrector, left_token, right_token)
           @processed_source = processed_source
-          unless left_token.space_after?
-            corrector.insert_after(left_token.pos, ' ')
-          end
+          corrector.insert_after(left_token.pos, ' ') unless left_token.space_after?
           return if right_token.space_before?
 
           corrector.insert_before(right_token.pos, ' ')

data/lib/rubocop/cop/gemspec/ordered_dependencies.rb

@@ -68,9 +68,7 @@ module RuboCop
               gem_name(current),
               gem_name(previous)
             )
-            unless get_dependency_name(previous) == get_dependency_name(current)
-              next
-            end
+            next unless get_dependency_name(previous) == get_dependency_name(current)
 
             register_offense(previous, current)
           end

data/lib/rubocop/cop/generator.rb

@@ -58,7 +58,7 @@ module RuboCop
                 # TODO: Implement the cop in here.
                 #
                 # In many cases, you can use a node matcher for matching node pattern.
-                # See https://github.com/rubocop-hq/rubocop/blob/master/lib/rubocop/node_pattern.rb
+                # See https://github.com/rubocop-hq/rubocop-ast/blob/master/lib/rubocop/node_pattern.rb
                 #
                 # For example
                 MSG = 'Use `#good_method` instead of `#bad_method`.'

data/lib/rubocop/cop/ignored_node.rb

@@ -10,9 +10,7 @@ module RuboCop
 
       def part_of_ignored_node?(node)
         ignored_nodes.map(&:loc).any? do |ignored_loc|
-          if ignored_loc.expression.begin_pos > node.source_range.begin_pos
-            next false
-          end
+          next false if ignored_loc.expression.begin_pos > node.source_range.begin_pos
 
           ignored_end_pos = if ignored_loc.respond_to?(:heredoc_body)
                               ignored_loc.heredoc_end.end_pos

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

@@ -99,9 +99,7 @@ module RuboCop
           lambda do |corrector|
             line = range_by_whole_lines(node.source_range)
 
-            unless previous_line_empty?(node.first_line)
-              corrector.insert_before(line, "\n")
-            end
+            corrector.insert_before(line, "\n") unless previous_line_empty?(node.first_line)
 
             correct_next_line_if_denied_style(corrector, node, line)
           end
@@ -120,9 +118,7 @@ module RuboCop
         def correct_next_line_if_denied_style(corrector, node, line)
           case style
           when :around
-            unless next_line_empty?(node.last_line)
-              corrector.insert_after(line, "\n")
-            end
+            corrector.insert_after(line, "\n") unless next_line_empty?(node.last_line)
           when :only_before
             if next_line_empty?(node.last_line)
               range = next_empty_line_range(node)

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

@@ -3,7 +3,9 @@
 module RuboCop
   module Cop
     module Layout
-      # Checks for a newline after attribute accessor.
+      # Checks for a newline after an attribute accessor or a group of them.
+      # `alias` syntax and `alias_method`, `public`, `protected`, and `private` methods are allowed by default.
+      # These are customizable with `AllowAliasSyntax` and `AllowedMethods` options.
       #
       # @example
       #   # bad
@@ -26,6 +28,38 @@ module RuboCop
       #   def do_something
       #   end
       #
+      # @example AllowAliasSyntax: true (default)
+      #   # good
+      #   attr_accessor :foo
+      #   alias :foo? :foo
+      #
+      #   def do_something
+      #   end
+      #
+      # @example AllowAliasSyntax: false
+      #   # bad
+      #   attr_accessor :foo
+      #   alias :foo? :foo
+      #
+      #   def do_something
+      #   end
+      #
+      #   # good
+      #   attr_accessor :foo
+      #
+      #   alias :foo? :foo
+      #
+      #   def do_something
+      #   end
+      #
+      # @example AllowedMethods: ['private']
+      #   # good
+      #   attr_accessor :foo
+      #   private :foo
+      #
+      #   def do_something
+      #   end
+      #
       class EmptyLinesAroundAttributeAccessor < Cop
         include RangeHelp
 
@@ -36,7 +70,7 @@ module RuboCop
           return if next_line_empty?(node.last_line)
 
           next_line_node = next_line_node(node)
-          return if next_line_node.nil? || attribute_accessor?(next_line_node)
+          return unless require_empty_line?(next_line_node)
 
           add_offense(node)
         end
@@ -55,12 +89,36 @@ module RuboCop
           processed_source[line].blank?
         end
 
+        def require_empty_line?(node)
+          return false unless node&.respond_to?(:type)
+
+          !allow_alias?(node) && !attribute_or_allowed_method?(node)
+        end
+
         def next_line_node(node)
           node.parent.children[node.sibling_index + 1]
         end
 
-        def attribute_accessor?(node)
-          node.send_type? && node.attribute_accessor?
+        def allow_alias?(node)
+          allow_alias_syntax? && node.alias_type?
+        end
+
+        def attribute_or_allowed_method?(node)
+          return false unless node.send_type?
+
+          node.attribute_accessor? || allowed_method?(node.method_name)
+        end
+
+        def allow_alias_syntax?
+          cop_config.fetch('AllowAliasSyntax', true)
+        end
+
+        def allowed_method?(name)
+          allowed_methods.include?(name.to_s)
+        end
+
+        def allowed_methods
+          cop_config.fetch('AllowedMethods', [])
         end
       end
     end