rubocop 0.87.0 → 0.87.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4ab19d9feaaa55fc107e42860eb4fe6a6f0106350edcfee8095b689845106d1
-  data.tar.gz: b096ab80d7f1c3e1e3ea5b4e32f74f0ce23dc5bf34c06b2fb80893c53cd058dc
+  metadata.gz: 766878b5fd031a287c24a96e8545398cf26adca7b6ea1a3f6b0a3bd15ee07dda
+  data.tar.gz: 8e33f8a7e7a15ada40bdfbba85c9568e8910c71871af11677f74499241d20c87
 SHA512:
-  metadata.gz: d9db7c5ac245ecc290c75144ca7baf37d3f8a39911238f4d8d2866ce019c91b0c0dc2a9cc296c71e2f49d972d16773de3c077734ecef7e5b01f7d693de51a001
-  data.tar.gz: b9a3b18f4a95be71f2518ef6a2a4946f05079f0239a41c11230e7f60ba509b9d511c160edb0fe288663d41432d1e82aba6b721f6c27604a23a64b0bac674216f
+  metadata.gz: dd87ec99764bc87637c84d50443a60611c87dabb23af42f5339b8911b60898b527e94bed74a1fb925d0ebe91d059041a1214dc7bb53a6d9c4e15a0bafab4c465
+  data.tar.gz: d747fdfd2254f1b13a332d145aef2fb205afe4aae67c9fddc41d0bdbd6eff13c6f72af18426497ac98ae68a492abcc297892a41e0f2e766ac428029b69e3b9b4

data/README.md

@@ -49,7 +49,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.87.0', require: false
+gem 'rubocop', '~> 0.87.1', require: false
 ```
 
 ## Quickstart

data/lib/rubocop.rb

@@ -115,6 +115,7 @@ require_relative 'rubocop/cop/mixin/trailing_body'
 require_relative 'rubocop/cop/mixin/trailing_comma'
 require_relative 'rubocop/cop/mixin/uncommunicative_name'
 require_relative 'rubocop/cop/mixin/unused_argument'
+require_relative 'rubocop/cop/mixin/visibility_help'
 
 require_relative 'rubocop/cop/utils/format_string'
 

data/lib/rubocop/config_loader.rb

@@ -119,7 +119,6 @@ module RuboCop
 
       def add_excludes_from_files(config, config_file)
         found_files = find_files_upwards(DOTFILE, config_file)
-        found_files = [find_user_dotfile, find_user_xdg_config].compact if found_files.empty?
 
         return if found_files.empty?
         return if PathUtil.relative_path(found_files.last) ==

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

@@ -134,6 +134,8 @@ module RuboCop
       #
       # @see https://rubystyle.guide#consistent-classes
       class ClassStructure < Cop
+        include VisibilityHelp
+
         HUMANIZED_NODE_TYPE = {
           casgn: :constants,
           defs: :class_methods,
@@ -141,14 +143,9 @@ module RuboCop
           sclass: :class_singleton
         }.freeze
 
-        VISIBILITY_SCOPES = %i[private protected public].freeze
         MSG = '`%<category>s` is supposed to appear before ' \
               '`%<previous>s`.'
 
-        def_node_matcher :visibility_block?, <<~PATTERN
-          (send nil? { :private :protected :public })
-        PATTERN
-
         # Validates code style on class declaration.
         # Add offense when find a node out of expected order.
         def on_class(class_node)
@@ -243,38 +240,6 @@ module RuboCop
             expected_order.index(classification).nil?
         end
 
-        def node_visibility(node)
-          scope = find_visibility_start(node)
-          scope&.method_name || :public
-        end
-
-        def find_visibility_start(node)
-          left_siblings_of(node)
-            .reverse
-            .find(&method(:visibility_block?))
-        end
-
-        # Navigate to find the last protected method
-        def find_visibility_end(node)
-          possible_visibilities = VISIBILITY_SCOPES - [node_visibility(node)]
-          right = right_siblings_of(node)
-          right.find do |child_node|
-            possible_visibilities.include?(node_visibility(child_node))
-          end || right.last
-        end
-
-        def siblings_of(node)
-          node.parent.children
-        end
-
-        def right_siblings_of(node)
-          siblings_of(node)[node.sibling_index..-1]
-        end
-
-        def left_siblings_of(node)
-          siblings_of(node)[0, node.sibling_index]
-        end
-
         def humanize_node(node)
           if node.def_type?
             return :initializer if node.method?(:initialize)

data/lib/rubocop/cop/lint/deprecated_open_ssl_constant.rb

@@ -15,7 +15,7 @@ module RuboCop
       #   OpenSSL::Cipher::AES.new(128, :GCM)
       #
       #   # good
-      #   OpenSSL::Cipher.new('AES-128-GCM')
+      #   OpenSSL::Cipher.new('aes-128-gcm')
       #
       # @example
       #
@@ -127,9 +127,9 @@ module RuboCop
         end
 
         def build_cipher_arguments(node, algorithm_name)
-          algorithm_parts = algorithm_name.split('-')
-          size_and_mode = sanitize_arguments(node.arguments)
-          "'#{(algorithm_parts + size_and_mode + ['CBC']).take(3).join('-')}'"
+          algorithm_parts = algorithm_name.downcase.split('-')
+          size_and_mode = sanitize_arguments(node.arguments).map(&:downcase)
+          "'#{(algorithm_parts + size_and_mode + ['cbc']).take(3).join('-')}'"
         end
       end
     end

data/lib/rubocop/cop/mixin/visibility_help.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    # Help methods for determining node visibility.
+    module VisibilityHelp
+      extend NodePattern::Macros
+
+      VISIBILITY_SCOPES = %i[private protected public].freeze
+
+      private
+
+      def node_visibility(node)
+        scope = find_visibility_start(node)
+        scope&.method_name || :public
+      end
+
+      def find_visibility_start(node)
+        left_siblings_of(node)
+          .reverse
+          .find(&method(:visibility_block?))
+      end
+
+      # Navigate to find the last protected method
+      def find_visibility_end(node)
+        possible_visibilities = VISIBILITY_SCOPES - [node_visibility(node)]
+        right = right_siblings_of(node)
+        right.find do |child_node|
+          possible_visibilities.include?(node_visibility(child_node))
+        end || right.last
+      end
+
+      def left_siblings_of(node)
+        siblings_of(node)[0, node.sibling_index]
+      end
+
+      def right_siblings_of(node)
+        siblings_of(node)[node.sibling_index..-1]
+      end
+
+      def siblings_of(node)
+        node.parent.children
+      end
+
+      def_node_matcher :visibility_block?, <<~PATTERN
+        (send nil? { :private :protected :public })
+      PATTERN
+    end
+  end
+end

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

@@ -33,6 +33,7 @@ module RuboCop
       #
       class AccessorGrouping < Cop
         include ConfigurableEnforcedStyle
+        include VisibilityHelp
 
         GROUPED_MSG = 'Group together all `%<accessor>s` attributes.'
         SEPARATED_MSG = 'Use one attribute per `%<accessor>s`.'
@@ -46,6 +47,7 @@ module RuboCop
             check(macro)
           end
         end
+        alias on_sclass on_class
         alias on_module on_class
 
         def autocorrect(node)
@@ -90,7 +92,9 @@ module RuboCop
 
         def sibling_accessors(send_node)
           send_node.parent.each_child_node(:send).select do |sibling|
-            sibling.macro? && sibling.method?(send_node.method_name)
+            accessor?(sibling) &&
+              sibling.method?(send_node.method_name) &&
+              node_visibility(sibling) == node_visibility(send_node)
           end
         end
 

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

@@ -21,15 +21,20 @@ module RuboCop
       #   end
       #
       class BisectedAttrAccessor < Cop
-        MSG = 'Combine both accessors into `attr_accessor :%<name>s`.'
+        include VisibilityHelp
+
+        MSG = 'Combine both accessors into `attr_accessor %<name>s`.'
 
         def on_class(class_node)
-          reader_names, writer_names = accessor_names(class_node)
+          VISIBILITY_SCOPES.each do |visibility|
+            reader_names, writer_names = accessor_names(class_node, visibility)
 
-          accessor_macroses(class_node).each do |macro|
-            check(macro, reader_names, writer_names)
+            accessor_macroses(class_node, visibility).each do |macro|
+              check(macro, reader_names, writer_names)
+            end
           end
         end
+        alias on_sclass on_class
         alias on_module on_class
 
         def autocorrect(node)
@@ -42,12 +47,12 @@ module RuboCop
 
         private
 
-        def accessor_names(class_node)
+        def accessor_names(class_node, visibility)
           reader_names = Set.new
           writer_names = Set.new
 
-          accessor_macroses(class_node).each do |macro|
-            names = macro.arguments.map(&:value)
+          accessor_macroses(class_node, visibility).each do |macro|
+            names = macro.arguments.map(&:source)
 
             names.each do |name|
               if attr_reader?(macro)
@@ -61,7 +66,7 @@ module RuboCop
           [reader_names, writer_names]
         end
 
-        def accessor_macroses(class_node)
+        def accessor_macroses(class_node, visibility)
           class_def = class_node.body
           return [] if !class_def || class_def.def_type?
 
@@ -72,7 +77,13 @@ module RuboCop
               class_def.each_child_node(:send)
             end
 
-          send_nodes.select { |node| node.macro? && (attr_reader?(node) || attr_writer?(node)) }
+          send_nodes.select { |node| attr_within_visibility_scope?(node, visibility) }
+        end
+
+        def attr_within_visibility_scope?(node, visibility)
+          node.macro? &&
+            (attr_reader?(node) || attr_writer?(node)) &&
+            node_visibility(node) == visibility
         end
 
         def attr_reader?(send_node)
@@ -85,7 +96,7 @@ module RuboCop
 
         def check(macro, reader_names, writer_names)
           macro.arguments.each do |arg_node|
-            name = arg_node.value
+            name = arg_node.source
 
             if (attr_reader?(macro) && writer_names.include?(name)) ||
                (attr_writer?(macro) && reader_names.include?(name))
@@ -95,20 +106,33 @@ module RuboCop
         end
 
         def replacement(macro, node)
-          rest_args = macro.arguments
-          rest_args.delete(node)
-          args = rest_args.map(&:source).join(', ')
+          class_node = macro.each_ancestor(:class, :sclass, :module).first
+          reader_names, writer_names = accessor_names(class_node, node_visibility(macro))
+
+          rest_args = rest_args(macro.arguments, reader_names, writer_names)
 
           if attr_reader?(macro)
-            if args.empty?
-              "attr_accessor #{node.source}"
-            else
-              "attr_accessor #{node.source}\n#{indent(macro)}#{macro.method_name} #{args}"
-            end
-          elsif args.empty?
+            attr_reader_replacement(macro, node, rest_args)
+          elsif rest_args.empty?
             ''
           else
-            "#{indent(macro)}#{macro.method_name} #{args}"
+            "#{macro.method_name} #{rest_args.map(&:source).join(', ')}"
+          end
+        end
+
+        def rest_args(args, reader_names, writer_names)
+          args.reject do |arg|
+            name = arg.source
+            reader_names.include?(name) && writer_names.include?(name)
+          end
+        end
+
+        def attr_reader_replacement(macro, node, rest_args)
+          if rest_args.empty?
+            "attr_accessor #{node.source}"
+          else
+            "attr_accessor #{node.source}\n"\
+            "#{indent(macro)}#{macro.method_name} #{rest_args.map(&:source).join(', ')}"
           end
         end
 

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

@@ -83,8 +83,8 @@ module RuboCop
 
         def delimiter?(node, char)
           delimiters = [
-            node.loc.begin.source.chars.last,
-            node.loc.end.source.chars.first
+            node.loc.begin.source[-1],
+            node.loc.end.source[0]
           ]
 
           delimiters.include?(char)

data/lib/rubocop/formatter/disabled_config_formatter.rb

@@ -115,7 +115,7 @@ module RuboCop
         output_buffer.puts "# Offense count: #{offense_count}" if @show_offense_counts
 
         cop_class = Cop::Cop.registry.find_by_cop_name(cop_name)
-        output_buffer.puts '# Cop supports --auto-correct.' if cop_class&.new&.support_autocorrect?
+        output_buffer.puts '# Cop supports --auto-correct.' if cop_class&.support_autocorrect?
 
         default_cfg = default_config(cop_name)
         return unless default_cfg

data/lib/rubocop/options.rb

@@ -174,8 +174,8 @@ module RuboCop
       option(opts, '-a', '--auto-correct') do
         @options[:safe_auto_correct] = true
       end
-      option(opts, '--safe-autocorrect') do
-        warn '--safe-autocorrect is deprecated; use --autocorrect'
+      option(opts, '--safe-auto-correct') do
+        warn '--safe-auto-correct is deprecated; use --auto-correct'
         @options[:safe_auto_correct] = @options[:auto_correct] = true
       end
       option(opts, '-A', '--auto-correct-all') do
@@ -472,7 +472,7 @@ module RuboCop
       safe:                             'Run only safe cops.',
       list_target_files:                'List all files RuboCop will inspect.',
       auto_correct:                     'Auto-correct offenses (only when it\'s safe).',
-      safe_autocorrect:                 '(same, deprecated)',
+      safe_auto_correct:                '(same, deprecated)',
       auto_correct_all:                 'Auto-correct offenses (safe and unsafe)',
       fix_layout:                       'Run only layout cops, with auto-correct on.',
       color:                            'Force color output on or off.',

data/lib/rubocop/rspec/expect_offense.rb

@@ -89,6 +89,16 @@ module RuboCop
     #       end
     #     RUBY
     #   end
+    #
+    # If you need to specify an offense on a blank line, use the empty `^{}` marker:
+    #
+    # @example `^{}` empty line offense
+    #
+    #   expect_offense(<<~RUBY)
+    #
+    #     ^{} Missing frozen string literal comment.
+    #     puts 1
+    #   RUBY
     module ExpectOffense
       def format_offense(source, **replacements)
         replacements.each do |keyword, value|
@@ -177,7 +187,7 @@ module RuboCop
 
       # Parsed representation of code annotated with the `^^^ Message` style
       class AnnotatedSource
-        ANNOTATION_PATTERN = /\A\s*\^+ /.freeze
+        ANNOTATION_PATTERN = /\A\s*(\^+|\^{}) /.freeze
 
         # @param annotated_source [String] string passed to the matchers
         #
@@ -261,6 +271,7 @@ module RuboCop
             offenses.map do |offense|
               indent     = ' ' * offense.column
               carets     = '^' * offense.column_length
+              carets     = '^{}' if offense.column_length.zero?
 
               [offense.line, "#{indent}#{carets} #{offense.message}\n"]
             end

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '0.87.0'
+    STRING = '0.87.1'
 
     MSG = '%<version>s (using Parser %<parser_version>s, '\
           'rubocop-ast %<rubocop_ast_version>s, ' \

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.87.0
+  version: 0.87.1
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2020-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -500,6 +500,7 @@ files:
 - lib/rubocop/cop/mixin/trailing_comma.rb
 - lib/rubocop/cop/mixin/uncommunicative_name.rb
 - lib/rubocop/cop/mixin/unused_argument.rb
+- lib/rubocop/cop/mixin/visibility_help.rb
 - lib/rubocop/cop/naming/accessor_method_name.rb
 - lib/rubocop/cop/naming/ascii_identifiers.rb
 - lib/rubocop/cop/naming/binary_operator_parameter_name.rb