rubocop 0.86.0 → 0.87.1

data/lib/rubocop/rake_task.rb

@@ -8,14 +8,11 @@ module RuboCop
   #
   # require 'rubocop/rake_task'
   # RuboCop::RakeTask.new
-  class RakeTask < Rake::TaskLib
-    attr_accessor :name
-    attr_accessor :verbose
-    attr_accessor :fail_on_error
-    attr_accessor :patterns
-    attr_accessor :formatters
-    attr_accessor :requires
-    attr_accessor :options
+  #
+  # Use global Rake namespace here to avoid namespace issues with custom
+  # rubocop-rake tasks
+  class RakeTask < ::Rake::TaskLib
+    attr_accessor :name, :verbose, :fail_on_error, :patterns, :formatters, :requires, :options
 
     def initialize(name = :rubocop, *args, &task_block)
       setup_ivars(name)
@@ -69,7 +66,7 @@ module RuboCop
         task(:auto_correct, *args) do |_, task_args|
           RakeFileUtils.verbose(verbose) do
             yield(*[self, task_args].slice(0, task_block.arity)) if block_given?
-            options = full_options.unshift('--auto-correct')
+            options = full_options.unshift('--auto-correct-all')
             options.delete('--parallel')
             run_cli(verbose, options)
           end

data/lib/rubocop/rspec/cop_helper.rb

@@ -43,14 +43,14 @@ module CopHelper
     processed_source = parse_source(source, file)
     _investigate(cop, processed_source)
 
-    corrector =
-      RuboCop::Cop::Corrector.new(processed_source.buffer, cop.corrections)
-    corrector.rewrite
+    @last_corrector.rewrite
   end
 
   def _investigate(cop, processed_source)
     team = RuboCop::Cop::Team.new([cop], nil, raise_error: true)
-    team.inspect_file(processed_source)
+    report = team.investigate(processed_source)
+    @last_corrector = report.correctors.first || RuboCop::Cop::Corrector.new(processed_source)
+    report.offenses
   end
 end
 

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|
@@ -100,7 +110,7 @@ module RuboCop
       end
 
       # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-      def expect_offense(source, file = nil, **replacements)
+      def expect_offense(source, file = nil, severity: nil, **replacements)
         source = format_offense(source, **replacements)
         RuboCop::Formatter::DisabledConfigFormatter
           .config_to_allow_offenses = {}
@@ -118,11 +128,12 @@ module RuboCop
 
         raise 'Error parsing example code' unless @processed_source.valid_syntax?
 
-        _investigate(cop, @processed_source)
+        offenses = _investigate(cop, @processed_source)
         actual_annotations =
-          expected_annotations.with_offense_annotations(cop.offenses)
+          expected_annotations.with_offense_annotations(offenses)
 
         expect(actual_annotations.to_s).to eq(expected_annotations.to_s)
+        expect(offenses.map(&:severity).uniq).to eq([severity]) if severity
       end
 
       def expect_correction(correction, loop: true)
@@ -132,12 +143,10 @@ module RuboCop
         new_source = loop do
           iteration += 1
 
-          corrector =
-            RuboCop::Cop::Corrector.new(@processed_source.buffer, cop.corrections)
-          corrected_source = corrector.rewrite
+          corrected_source = @last_corrector.rewrite
 
           break corrected_source unless loop
-          break corrected_source if cop.corrections.empty?
+          break corrected_source if @last_corrector.empty?
           break corrected_source if corrected_source == @processed_source.buffer.source
 
           if iteration > RuboCop::Runner::MAX_ITERATIONS
@@ -145,9 +154,6 @@ module RuboCop
           end
 
           # Prepare for next loop
-          cop.instance_variable_set(:@corrections, [])
-          # Cache invalidation. This is bad!
-          cop.instance_variable_set(:@token_table, nil)
           @processed_source = parse_source(corrected_source,
                                            @processed_source.path)
           _investigate(cop, @processed_source)
@@ -160,30 +166,28 @@ module RuboCop
       def expect_no_corrections
         raise '`expect_no_corrections` must follow `expect_offense`' unless @processed_source
 
-        return if cop.corrections.empty?
+        return if @last_corrector.empty?
 
         # In order to print a nice diff, e.g. what source got corrected to,
         # we need to run the actual corrections
 
-        corrector =
-          RuboCop::Cop::Corrector.new(@processed_source.buffer, cop.corrections)
-        new_source = corrector.rewrite
+        new_source = @last_corrector.rewrite
 
         expect(new_source).to eq(@processed_source.buffer.source)
       end
 
       def expect_no_offenses(source, file = nil)
-        inspect_source(source, file)
+        offenses = inspect_source(source, file)
 
         expected_annotations = AnnotatedSource.parse(source)
         actual_annotations =
-          expected_annotations.with_offense_annotations(cop.offenses)
+          expected_annotations.with_offense_annotations(offenses)
         expect(actual_annotations.to_s).to eq(source)
       end
 
       # 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
         #
@@ -267,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/rspec/shared_contexts.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'tmpdir'
-require 'fileutils'
 
 RSpec.shared_context 'isolated environment', :isolated_environment do
   around do |example|
@@ -45,11 +44,11 @@ RSpec.shared_context 'config', :config do # rubocop:disable Metrics/BlockLength
   let(:source) { 'code = {some: :ruby}' }
 
   let(:cop_class) do
-    if described_class.is_a?(Class) && described_class < RuboCop::Cop::Cop
-      described_class
-    else
-      RuboCop::Cop::Cop
+    unless described_class.is_a?(Class) && described_class < RuboCop::Cop::Base
+      raise 'Specify which cop class to use (e.g `let(:cop_class) { RuboCop::Cop::Base }`, ' \
+            'or RuboCop::Cop::Cop for legacy)'
     end
+    described_class
   end
 
   let(:cop_config) { {} }
@@ -95,8 +94,9 @@ RSpec.shared_context 'config', :config do # rubocop:disable Metrics/BlockLength
   end
 
   let(:cop) do
-    cop_class.new(config, cop_options)
-             .tap { |cop| cop.processed_source = processed_source }
+    cop_class.new(config, cop_options).tap do |cop|
+      cop.send :begin_investigation, processed_source
+    end
   end
 end
 

data/lib/rubocop/runner.rb

@@ -120,7 +120,8 @@ module RuboCop
       file_offense_cache(file) do
         source = get_processed_source(file)
         source, offenses = do_inspection_loop(file, source)
-        add_redundant_disables(file, offenses.compact.sort, source)
+        offenses = add_redundant_disables(file, offenses.compact.sort, source)
+        offenses.sort.reject(&:disabled?).freeze
       end
     end
 
@@ -151,16 +152,30 @@ module RuboCop
     end
 
     def add_redundant_disables(file, offenses, source)
-      if check_for_redundant_disables?(source)
-        redundant_cop_disable_directive(file) do |cop|
-          cop.check(offenses, source.disabled_line_ranges, source.comments)
-          offenses += cop.offenses
-          offenses += autocorrect_redundant_disables(file, source, cop,
-                                                     offenses)
+      team_for_redundant_disables(file, offenses, source) do |team|
+        new_offenses, redundant_updated = inspect_file(source, team)
+        offenses += new_offenses
+        if redundant_updated
+          # Do one extra inspection loop if any redundant disables were
+          # removed. This is done in order to find rubocop:enable directives that
+          # have now become useless.
+          _source, new_offenses = do_inspection_loop(file,
+                                                     get_processed_source(file))
+          offenses |= new_offenses
         end
       end
+      offenses
+    end
 
-      offenses.sort.reject(&:disabled?).freeze
+    def team_for_redundant_disables(file, offenses, source)
+      return unless check_for_redundant_disables?(source)
+
+      config = @config_store.for_file(file)
+      team = Cop::Team.mobilize([Cop::Lint::RedundantCopDisableDirective], config, @options)
+      return if team.cops.empty?
+
+      team.cops.first.offenses_to_check = offenses
+      yield team
     end
 
     def check_for_redundant_disables?(source)
@@ -180,22 +195,6 @@ module RuboCop
       @options[:except] || @options[:only]
     end
 
-    def autocorrect_redundant_disables(file, source, cop, offenses)
-      cop.processed_source = source
-
-      team = Cop::Team.mobilize(RuboCop::Cop::Registry.new, nil, @options)
-      team.autocorrect(source.buffer, [cop])
-
-      return [] unless team.updated_source_file?
-
-      # Do one extra inspection loop if any redundant disables were
-      # removed. This is done in order to find rubocop:enable directives that
-      # have now become useless.
-      _source, new_offenses = do_inspection_loop(file,
-                                                 get_processed_source(file))
-      new_offenses - offenses
-    end
-
     def file_started(file)
       puts "Scanning #{file}" if @options[:debug]
       formatter_set.file_started(file,
@@ -293,13 +292,16 @@ module RuboCop
       @processed_sources << checksum
     end
 
-    def inspect_file(processed_source)
-      config = @config_store.for_file(processed_source.path)
-      team = Cop::Team.mobilize(mobilized_cop_classes(config), config, @options)
-      offenses = team.inspect_file(processed_source)
+    def inspect_file(processed_source, team = mobilize_team(processed_source))
+      report = team.investigate(processed_source)
       @errors.concat(team.errors)
       @warnings.concat(team.warnings)
-      [offenses, team.updated_source_file?]
+      [report.offenses, team.updated_source_file?]
+    end
+
+    def mobilize_team(processed_source)
+      config = @config_store.for_file(processed_source.path)
+      Cop::Team.mobilize(mobilized_cop_classes(config), config, @options)
     end
 
     def mobilized_cop_classes(config)

data/lib/rubocop/target_ruby.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # The kind of Ruby that code inspected by RuboCop is written in.
   class TargetRuby
-    KNOWN_RUBIES = [2.4, 2.5, 2.6, 2.7].freeze
+    KNOWN_RUBIES = [2.4, 2.5, 2.6, 2.7, 2.8].freeze
     DEFAULT_VERSION = KNOWN_RUBIES.first
 
     OBSOLETE_RUBIES = {

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '0.86.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.86.0
+  version: 0.87.1
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-22 00:00:00.000000000 Z
+date: 2020-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.0.1
+        version: 2.7.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.0.1
+        version: 2.7.1.1
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +94,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.1.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -104,7 +104,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.1.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -202,6 +202,7 @@ files:
 - lib/rubocop/config_validator.rb
 - lib/rubocop/cop/autocorrect_logic.rb
 - lib/rubocop/cop/badge.rb
+- lib/rubocop/cop/base.rb
 - lib/rubocop/cop/bundler/duplicated_gem.rb
 - lib/rubocop/cop/bundler/gem_comment.rb
 - lib/rubocop/cop/bundler/insecure_protocol_source.rb
@@ -331,6 +332,8 @@ files:
 - lib/rubocop/cop/layout/space_inside_string_interpolation.rb
 - lib/rubocop/cop/layout/trailing_empty_lines.rb
 - lib/rubocop/cop/layout/trailing_whitespace.rb
+- lib/rubocop/cop/legacy/corrections_proxy.rb
+- lib/rubocop/cop/legacy/corrector.rb
 - lib/rubocop/cop/lint/ambiguous_block_association.rb
 - lib/rubocop/cop/lint/ambiguous_operator.rb
 - lib/rubocop/cop/lint/ambiguous_regexp_literal.rb
@@ -428,15 +431,17 @@ files:
 - lib/rubocop/cop/metrics/parameter_lists.rb
 - lib/rubocop/cop/metrics/perceived_complexity.rb
 - lib/rubocop/cop/metrics/utils/abc_size_calculator.rb
+- lib/rubocop/cop/metrics/utils/code_length_calculator.rb
 - lib/rubocop/cop/metrics/utils/iterating_block.rb
 - lib/rubocop/cop/migration/department_name.rb
 - lib/rubocop/cop/mixin/alignment.rb
+- lib/rubocop/cop/mixin/allowed_methods.rb
 - lib/rubocop/cop/mixin/annotation_comment.rb
 - lib/rubocop/cop/mixin/array_min_size.rb
 - lib/rubocop/cop/mixin/array_syntax.rb
+- lib/rubocop/cop/mixin/auto_corrector.rb
 - lib/rubocop/cop/mixin/check_assignment.rb
 - lib/rubocop/cop/mixin/check_line_breakable.rb
-- lib/rubocop/cop/mixin/classish_length.rb
 - lib/rubocop/cop/mixin/code_length.rb
 - lib/rubocop/cop/mixin/configurable_enforced_style.rb
 - lib/rubocop/cop/mixin/configurable_formatting.rb
@@ -495,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
@@ -520,6 +526,7 @@ files:
 - lib/rubocop/cop/security/yaml_load.rb
 - lib/rubocop/cop/severity.rb
 - lib/rubocop/cop/style/access_modifier_declarations.rb
+- lib/rubocop/cop/style/accessor_grouping.rb
 - lib/rubocop/cop/style/alias.rb
 - lib/rubocop/cop/style/and_or.rb
 - lib/rubocop/cop/style/array_join.rb
@@ -528,6 +535,7 @@ files:
 - lib/rubocop/cop/style/auto_resource_cleanup.rb
 - lib/rubocop/cop/style/bare_percent_literals.rb
 - lib/rubocop/cop/style/begin_block.rb
+- lib/rubocop/cop/style/bisected_attr_accessor.rb
 - lib/rubocop/cop/style/block_comments.rb
 - lib/rubocop/cop/style/block_delimiters.rb
 - lib/rubocop/cop/style/case_equality.rb
@@ -639,6 +647,7 @@ files:
 - lib/rubocop/cop/style/proc.rb
 - lib/rubocop/cop/style/raise_args.rb
 - lib/rubocop/cop/style/random_with_offset.rb
+- lib/rubocop/cop/style/redundant_assignment.rb
 - lib/rubocop/cop/style/redundant_begin.rb
 - lib/rubocop/cop/style/redundant_capital_w.rb
 - lib/rubocop/cop/style/redundant_condition.rb

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

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-module RuboCop
-  module Cop
-    # Common functionality for checking length of classes and modules.
-    module ClassishLength
-      include CodeLength
-
-      private
-
-      def code_length(node)
-        body_line_numbers = line_range(node).to_a[1...-1]
-
-        target_line_numbers = body_line_numbers -
-                              line_numbers_of_inner_nodes(node, :module, :class)
-
-        target_line_numbers.reduce(0) do |length, line_number|
-          source_line = processed_source[line_number]
-          next length if irrelevant_line(source_line)
-
-          length + 1
-        end
-      end
-
-      def line_numbers_of_inner_nodes(node, *types)
-        line_numbers = Set.new
-
-        node.each_descendant(*types) do |inner_node|
-          line_range = line_range(inner_node)
-          line_numbers.merge(line_range)
-        end
-
-        line_numbers.to_a
-      end
-    end
-  end
-end