rubocop 0.85.0 → 0.88.0

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|
@@ -13,19 +12,22 @@ RSpec.shared_context 'isolated environment', :isolated_environment do
       # get mismatched pathnames when loading config files later on.
       tmpdir = File.realpath(tmpdir)
 
+      virtual_home = File.expand_path(File.join(tmpdir, 'home'))
+      Dir.mkdir(virtual_home)
+      ENV['HOME'] = virtual_home
+      ENV.delete('XDG_CONFIG_HOME')
+
+      base_dir = example.metadata[:project_inside_home] ? virtual_home : tmpdir
+      root = example.metadata[:root]
+      working_dir = root ? File.join(base_dir, 'work', root) : File.join(base_dir, 'work')
+
       # Make upwards search for .rubocop.yml files stop at this directory.
-      RuboCop::FileFinder.root_level = tmpdir
+      RuboCop::FileFinder.root_level = working_dir
 
       begin
-        virtual_home = File.expand_path(File.join(tmpdir, 'home'))
-        Dir.mkdir(virtual_home)
-        ENV['HOME'] = virtual_home
-        ENV.delete('XDG_CONFIG_HOME')
+        FileUtils.mkdir_p(working_dir)
 
-        working_dir = File.join(tmpdir, 'work')
-        Dir.mkdir(working_dir)
-
-        RuboCop::PathUtil.chdir(working_dir) do
+        Dir.chdir(working_dir) do
           example.run
         end
       ensure
@@ -45,11 +47,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 +97,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

@@ -118,9 +118,9 @@ module RuboCop
 
     def file_offenses(file)
       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)
+        source, offenses = do_inspection_loop(file)
+        offenses = add_redundant_disables(file, offenses.compact.sort, source)
+        offenses.sort.reject(&:disabled?).freeze
       end
     end
 
@@ -151,16 +151,29 @@ 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)
+          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 +193,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,
@@ -214,7 +211,7 @@ module RuboCop
       @cached_run ||=
         (@options[:cache] == 'true' ||
          @options[:cache] != 'false' &&
-         @config_store.for_dir(Dir.pwd).for_all_cops['UseCache']) &&
+         @config_store.for_pwd.for_all_cops['UseCache']) &&
         # When running --auto-gen-config, there's some processing done in the
         # cops related to calculating the Max parameters for Metrics cops. We
         # need to do that processing and cannot use caching.
@@ -233,7 +230,8 @@ module RuboCop
       cache.save(offenses)
     end
 
-    def do_inspection_loop(file, processed_source)
+    def do_inspection_loop(file)
+      processed_source = get_processed_source(file)
       offenses = []
 
       # When running with --auto-correct, we need to inspect the file (which
@@ -293,13 +291,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_finder.rb

@@ -132,14 +132,14 @@ module RuboCop
     end
 
     def all_cops_include
-      @config_store.for('.').for_all_cops['Include'].map(&:to_s)
+      @config_store.for_pwd.for_all_cops['Include'].map(&:to_s)
     end
 
     def ruby_executable?(file)
       return false unless File.extname(file).empty? && File.exist?(file)
 
       first_line = File.open(file, &:readline)
-      !(first_line =~ /#!.*(#{ruby_interpreters(file).join('|')})/).nil?
+      /#!.*(#{ruby_interpreters(file).join('|')})/.match?(first_line)
     rescue EOFError, ArgumentError => e
       warn("Unprocessable file #{file}: #{e.class}, #{e.message}") if debug?
 
@@ -160,7 +160,7 @@ module RuboCop
     end
 
     def configured_include?(file)
-      @config_store.for('.').file_to_include?(file)
+      @config_store.for_pwd.file_to_include?(file)
     end
 
     def included_file?(file)

data/lib/rubocop/target_ruby.rb

@@ -3,11 +3,11 @@
 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 = {
-      1.9 => '0.50', 2.0 => '0.50', 2.1 => '0.58', 2.2 => '0.69', 2.3 => '0.81'
+      1.9 => '0.41', 2.0 => '0.50', 2.1 => '0.57', 2.2 => '0.68', 2.3 => '0.81'
     }.freeze
     private_constant :KNOWN_RUBIES, :OBSOLETE_RUBIES
 

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '0.85.0'
+    STRING = '0.88.0'
 
     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.85.0
+  version: 0.88.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-01 00:00:00.000000000 Z
+date: 2020-07-13 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,14 +94,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -157,8 +163,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 description: |2
-      Automatic Ruby code style checking tool.
-      Aims to enforce the community-driven Ruby Style Guide.
+      RuboCop is a Ruby code style checking and code formatting tool.
+      It aims to enforce the community-driven Ruby Style Guide.
 email: rubocop@googlegroups.com
 executables:
 - rubocop
@@ -172,6 +178,7 @@ files:
 - assets/logo.png
 - assets/output.html.erb
 - bin/console
+- bin/rubocop-profile
 - bin/setup
 - config/default.yml
 - exe/rubocop
@@ -196,6 +203,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
@@ -325,6 +333,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
@@ -332,11 +342,13 @@ files:
 - lib/rubocop/cop/lint/big_decimal_new.rb
 - lib/rubocop/cop/lint/boolean_symbol.rb
 - lib/rubocop/cop/lint/circular_argument_reference.rb
+- lib/rubocop/cop/lint/constant_resolution.rb
 - lib/rubocop/cop/lint/debugger.rb
 - lib/rubocop/cop/lint/deprecated_class_methods.rb
 - lib/rubocop/cop/lint/deprecated_open_ssl_constant.rb
 - lib/rubocop/cop/lint/disjunctive_assignment_in_constructor.rb
 - lib/rubocop/cop/lint/duplicate_case_condition.rb
+- lib/rubocop/cop/lint/duplicate_elsif_condition.rb
 - lib/rubocop/cop/lint/duplicate_hash_key.rb
 - lib/rubocop/cop/lint/duplicate_methods.rb
 - lib/rubocop/cop/lint/each_with_object_argument.rb
@@ -421,14 +433,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
@@ -487,6 +502,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
@@ -512,17 +528,21 @@ 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_coercion.rb
 - lib/rubocop/cop/style/array_join.rb
 - lib/rubocop/cop/style/ascii_comments.rb
 - lib/rubocop/cop/style/attr.rb
 - 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
+- lib/rubocop/cop/style/case_like_if.rb
 - lib/rubocop/cop/style/character_literal.rb
 - lib/rubocop/cop/style/class_and_module_children.rb
 - lib/rubocop/cop/style/class_check.rb
@@ -566,7 +586,9 @@ files:
 - lib/rubocop/cop/style/frozen_string_literal_comment.rb
 - lib/rubocop/cop/style/global_vars.rb
 - lib/rubocop/cop/style/guard_clause.rb
+- lib/rubocop/cop/style/hash_as_last_array_item.rb
 - lib/rubocop/cop/style/hash_each_methods.rb
+- lib/rubocop/cop/style/hash_like_case.rb
 - lib/rubocop/cop/style/hash_syntax.rb
 - lib/rubocop/cop/style/hash_transform_keys.rb
 - lib/rubocop/cop/style/hash_transform_values.rb
@@ -631,11 +653,14 @@ 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
 - lib/rubocop/cop/style/redundant_conditional.rb
 - lib/rubocop/cop/style/redundant_exception.rb
+- lib/rubocop/cop/style/redundant_fetch_block.rb
+- lib/rubocop/cop/style/redundant_file_extension_in_require.rb
 - lib/rubocop/cop/style/redundant_freeze.rb
 - lib/rubocop/cop/style/redundant_interpolation.rb
 - lib/rubocop/cop/style/redundant_parentheses.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