rubocop 0.91.0 → 1.0.0

data/lib/rubocop/runner.rb

@@ -16,7 +16,11 @@ module RuboCop
         root_cause = offenses_by_iteration[loop_start..-1]
                      .map { |x| x.map(&:cop_name).uniq.join(', ') }
                      .join(' -> ')
-        super "Infinite loop detected in #{path} and caused by #{root_cause}"
+
+        message = 'Infinite loop detected'
+        message += " in #{path}" if path
+        message += " and caused by #{root_cause}" if root_cause
+        super message
       end
     end
 
@@ -320,8 +324,8 @@ module RuboCop
     end
 
     def mobilized_cop_classes(config)
-      @mobilized_cop_classes ||= {}
-      @mobilized_cop_classes[config.object_id] ||= begin
+      @mobilized_cop_classes ||= {}.compare_by_identity
+      @mobilized_cop_classes[config] ||= begin
         cop_classes = Cop::Registry.all
 
         OptionsValidator.new(@options).validate_cop_options
@@ -395,8 +399,8 @@ module RuboCop
     # otherwise dormant team that can be used for config- and option-
     # level caching in ResultCache.
     def standby_team(config)
-      @team_by_config ||= {}
-      @team_by_config[config.object_id] ||=
+      @team_by_config ||= {}.compare_by_identity
+      @team_by_config[config] ||=
         Cop::Team.mobilize(mobilized_cop_classes(config), config, @options)
     end
   end

data/lib/rubocop/target_finder.rb

@@ -5,6 +5,8 @@ module RuboCop
   # and picking ruby files.
   # @api private
   class TargetFinder
+    HIDDEN_PATH_SUBSTRING = "#{File::SEPARATOR}."
+
     def initialize(config_store, options = {})
       @config_store = config_store
       @options = options
@@ -55,7 +57,8 @@ module RuboCop
       # Support Windows: Backslashes from command-line -> forward slashes
       base_dir = base_dir.gsub(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
       all_files = find_files(base_dir, File::FNM_DOTMATCH)
-      hidden_files = Set.new(all_files - find_files(base_dir, 0))
+      # use file.include? for performance optimization
+      hidden_files = all_files.select { |file| file.include?(HIDDEN_PATH_SUBSTRING) }
       base_dir_config = @config_store.for(base_dir)
 
       target_files = all_files.select do |file|
@@ -78,34 +81,32 @@ module RuboCop
     # the top level directories that are excluded in configuration in the
     # normal way (dir/**/*).
     def find_files(base_dir, flags)
-      wanted_toplevel_dirs = toplevel_dirs(base_dir, flags) -
-                             excluded_dirs(base_dir)
-      wanted_toplevel_dirs.map! { |dir| dir << '/**/*' }
-
-      pattern = if wanted_toplevel_dirs.empty?
-                  # We need this special case to avoid creating the pattern
-                  # /**/* which searches the entire file system.
-                  ["#{base_dir}/**/*"]
-                else
-                  # Search the non-excluded top directories, but also add files
-                  # on the top level, which would otherwise not be found.
-                  wanted_toplevel_dirs.unshift("#{base_dir}/*")
+      # get all wanted directories first to improve speed of finding all files
+      exclude_pattern = combined_exclude_glob_patterns(base_dir)
+      dir_flags = flags | File::FNM_PATHNAME | File::FNM_EXTGLOB
+      patterns = wanted_dir_patterns(base_dir, exclude_pattern, dir_flags)
+      patterns.map! { |dir| File.join(dir, '*') }
+      # We need this special case to avoid creating the pattern
+      # /**/* which searches the entire file system.
+      patterns = [File.join(dir, '**/*')] if patterns.empty?
+
+      Dir.glob(patterns, flags).select { |path| FileTest.file?(path) }
+    end
+
+    def wanted_dir_patterns(base_dir, exclude_pattern, flags)
+      dirs = Dir.glob(File.join(base_dir, '*/'), flags)
+                .reject do |dir|
+                  dir.end_with?('/./', '/../') || File.fnmatch?(exclude_pattern, dir, flags)
                 end
-      Dir.glob(pattern, flags).select { |path| FileTest.file?(path) }
+      dirs.flat_map { |dir| wanted_dir_patterns(dir, exclude_pattern, flags) }
+          .unshift(base_dir)
     end
 
-    def toplevel_dirs(base_dir, flags)
-      Dir.glob(File.join(base_dir, '*'), flags).select do |dir|
-        File.directory?(dir) && !dir.end_with?('/.', '/..')
-      end
-    end
-
-    def excluded_dirs(base_dir)
-      all_cops_config = @config_store.for(base_dir).for_all_cops
-      dir_tree_excludes = all_cops_config['Exclude'].select do |pattern|
-        pattern.is_a?(String) && pattern.end_with?('/**/*')
-      end
-      dir_tree_excludes.map { |pattern| pattern.sub(%r{/\*\*/\*$}, '') }
+    def combined_exclude_glob_patterns(base_dir)
+      exclude = @config_store.for(base_dir).for_all_cops['Exclude']
+      patterns = exclude.select { |pattern| pattern.is_a?(String) && pattern.end_with?('/**/*') }
+                        .map { |pattern| pattern.sub("#{base_dir}/", '') }
+      "#{base_dir}/{#{patterns.join(',')}}"
     end
 
     def ruby_extension?(file)

data/lib/rubocop/target_ruby.rb

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

data/lib/rubocop/version.rb

@@ -3,22 +3,77 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '0.91.0'
+    STRING = '1.0.0'
 
     MSG = '%<version>s (using Parser %<parser_version>s, '\
           'rubocop-ast %<rubocop_ast_version>s, ' \
           'running on %<ruby_engine>s %<ruby_version>s %<ruby_platform>s)'
 
+    CANONICAL_FEATURE_NAMES = { 'Rspec' => 'RSpec' }.freeze
+
     # @api private
-    def self.version(debug: false)
+    def self.version(debug: false, env: nil)
       if debug
-        format(MSG, version: STRING, parser_version: Parser::VERSION,
-                    rubocop_ast_version: RuboCop::AST::Version::STRING,
-                    ruby_engine: RUBY_ENGINE, ruby_version: RUBY_VERSION,
-                    ruby_platform: RUBY_PLATFORM)
+        verbose_version = format(MSG, version: STRING, parser_version: Parser::VERSION,
+                                      rubocop_ast_version: RuboCop::AST::Version::STRING,
+                                      ruby_engine: RUBY_ENGINE, ruby_version: RUBY_VERSION,
+                                      ruby_platform: RUBY_PLATFORM)
+        return verbose_version unless env
+
+        extension_versions = extension_versions(env)
+        return verbose_version if extension_versions.empty?
+
+        <<~VERSIONS
+          #{verbose_version}
+          #{extension_versions.join("\n")}
+        VERSIONS
       else
         STRING
       end
     end
+
+    # @api private
+    def self.extension_versions(env)
+      env.config_store.for_pwd.loaded_features.sort.map do |loaded_feature|
+        next unless (match = loaded_feature.match(/rubocop-(?<feature>.*)/))
+
+        feature = match[:feature]
+        begin
+          require "rubocop/#{feature}/version"
+        rescue LoadError
+          # Not worth mentioning libs that are not installed
+        else
+          next unless (feature_version = feature_version(feature))
+
+          "  - #{loaded_feature} #{feature_version}"
+        end
+      end.compact
+    end
+
+    # Returns feature version in one of two ways:
+    #
+    # * Find by RuboCop core version style (e.g. rubocop-performance, rubocop-rspec)
+    # * Find by `bundle gem` version style (e.g. rubocop-rake)
+    #
+    # @api private
+    def self.feature_version(feature)
+      capitalized_feature = feature.capitalize
+      extension_name = CANONICAL_FEATURE_NAMES.fetch(capitalized_feature, capitalized_feature)
+
+      # Find by RuboCop core version style (e.g. rubocop-performance, rubocop-rspec)
+      RuboCop.const_get(extension_name)::Version::STRING
+    rescue NameError
+      begin
+        # Find by `bundle gem` version style (e.g. rubocop-rake, rubocop-packaging)
+        RuboCop.const_get(extension_name)::VERSION
+      rescue NameError
+        # noop
+      end
+    end
+
+    # @api private
+    def self.document_version
+      STRING.match('\d+\.\d+').to_s
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.91.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-15 00:00:00.000000000 Z
+date: 2020-10-21 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.1.1
+        version: 2.7.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.1.1
+        version: 2.7.1.5
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -66,14 +66,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rexml
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +94,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -199,6 +193,7 @@ files:
 - lib/rubocop/config_loader.rb
 - lib/rubocop/config_loader_resolver.rb
 - lib/rubocop/config_obsoletion.rb
+- lib/rubocop/config_regeneration.rb
 - lib/rubocop/config_store.rb
 - lib/rubocop/config_validator.rb
 - lib/rubocop/cop/autocorrect_logic.rb
@@ -372,6 +367,7 @@ files:
 - lib/rubocop/cop/lint/float_comparison.rb
 - lib/rubocop/cop/lint/float_out_of_range.rb
 - lib/rubocop/cop/lint/format_parameter_mismatch.rb
+- lib/rubocop/cop/lint/hash_compare_by_identity.rb
 - lib/rubocop/cop/lint/heredoc_method_call_position.rb
 - lib/rubocop/cop/lint/identity_comparison.rb
 - lib/rubocop/cop/lint/implicit_string_concatenation.rb
@@ -401,6 +397,7 @@ files:
 - lib/rubocop/cop/lint/redundant_cop_disable_directive.rb
 - lib/rubocop/cop/lint/redundant_cop_enable_directive.rb
 - lib/rubocop/cop/lint/redundant_require_statement.rb
+- lib/rubocop/cop/lint/redundant_safe_navigation.rb
 - lib/rubocop/cop/lint/redundant_splat_expansion.rb
 - lib/rubocop/cop/lint/redundant_string_coercion.rb
 - lib/rubocop/cop/lint/redundant_with_index.rb
@@ -506,7 +503,6 @@ files:
 - lib/rubocop/cop/mixin/preferred_delimiters.rb
 - lib/rubocop/cop/mixin/range_help.rb
 - lib/rubocop/cop/mixin/rational_literal.rb
-- lib/rubocop/cop/mixin/regexp_literal_help.rb
 - lib/rubocop/cop/mixin/rescue_node.rb
 - lib/rubocop/cop/mixin/safe_assignment.rb
 - lib/rubocop/cop/mixin/space_after_punctuation.rb
@@ -564,6 +560,7 @@ files:
 - lib/rubocop/cop/style/character_literal.rb
 - lib/rubocop/cop/style/class_and_module_children.rb
 - lib/rubocop/cop/style/class_check.rb
+- lib/rubocop/cop/style/class_equality_comparison.rb
 - lib/rubocop/cop/style/class_methods.rb
 - lib/rubocop/cop/style/class_methods_definitions.rb
 - lib/rubocop/cop/style/class_vars.rb
@@ -744,7 +741,6 @@ files:
 - lib/rubocop/cop/style/yoda_condition.rb
 - lib/rubocop/cop/style/zero_length_predicate.rb
 - lib/rubocop/cop/team.rb
-- lib/rubocop/cop/tokens_util.rb
 - lib/rubocop/cop/util.rb
 - lib/rubocop/cop/utils/format_string.rb
 - lib/rubocop/cop/variable_force.rb
@@ -757,6 +753,7 @@ files:
 - lib/rubocop/cop/variable_force/variable_table.rb
 - lib/rubocop/cops_documentation_generator.rb
 - lib/rubocop/core_ext/string.rb
+- lib/rubocop/directive_comment.rb
 - lib/rubocop/error.rb
 - lib/rubocop/ext/processed_source.rb
 - lib/rubocop/ext/regexp_node.rb
@@ -808,7 +805,7 @@ metadata:
   homepage_uri: https://rubocop.org/
   changelog_uri: https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/rubocop-hq/rubocop/
-  documentation_uri: https://docs.rubocop.org/
+  documentation_uri: https://docs.rubocop.org/rubocop/1.0/
   bug_tracker_uri: https://github.com/rubocop-hq/rubocop/issues
 post_install_message: 
 rdoc_options: []

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

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-module RuboCop
-  module Cop
-    # Common functionality for handling Regexp literals.
-    module RegexpLiteralHelp
-      private
-
-      def freespace_mode_regexp?(node)
-        regopt = node.children.find(&:regopt_type?)
-
-        regopt.children.include?(:x)
-      end
-
-      def pattern_source(node)
-        freespace_mode = freespace_mode_regexp?(node)
-
-        node.children.reject(&:regopt_type?).map do |child|
-          source_with_comments_and_interpolations_blanked(child, freespace_mode)
-        end.join
-      end
-
-      def source_with_comments_and_interpolations_blanked(child, freespace_mode)
-        source = child.source
-
-        # We don't want to consider the contents of interpolations or free-space mode comments as
-        # part of the pattern source, but need to preserve their width, to allow offsets to
-        # correctly line up with the original source: spaces have no effect, and preserve width.
-        if child.begin_type?
-          replace_match_with_spaces(source, /.*/m) # replace all content
-        elsif freespace_mode
-          replace_match_with_spaces(source, /(?<!\\)#.*/) # replace any comments
-        else
-          source
-        end
-      end
-
-      def replace_match_with_spaces(source, pattern)
-        source.sub(pattern) { ' ' * Regexp.last_match[0].length }
-      end
-    end
-  end
-end

data/lib/rubocop/cop/tokens_util.rb

@@ -1,84 +0,0 @@
-# frozen_string_literal: true
-
-module RuboCop
-  # Common methods and behaviors for dealing with tokens.
-  module TokensUtil
-    module_function
-
-    # rubocop:disable Metrics/AbcSize
-    def tokens(node)
-      @tokens ||= {}
-      return @tokens[node.object_id] if @tokens[node.object_id]
-
-      @tokens[node.object_id] =
-        # The tokens list is always sorted by token position,
-        # except for cases when heredoc is passed as a method argument.
-        # In this case tokens are interleaved by heredoc contents' tokens.
-        # We can try a fast (binary) search, assuming the mentioned cases are rare,
-        # and fallback to linear search if failed.
-        if (tokens = fast_tokens(node))
-          tokens
-        else
-          begin_pos = node.source_range.begin_pos
-          end_pos   = node.source_range.end_pos
-
-          processed_source.tokens.select do |token|
-            token.end_pos <= end_pos && token.begin_pos >= begin_pos
-          end
-        end
-    end
-    # rubocop:enable Metrics/AbcSize
-
-    def index_of_first_token(node)
-      index = fast_index_of_first_token(node)
-      return index if index
-
-      begin_pos = node.source_range.begin_pos
-      processed_source.tokens.index { |token| token.begin_pos == begin_pos }
-    end
-
-    def index_of_last_token(node)
-      index = fast_index_of_last_token(node)
-      return index if index
-
-      end_pos = node.source_range.end_pos
-      processed_source.tokens.index { |token| token.end_pos == end_pos }
-    end
-
-    private
-
-    def fast_index_of_first_token(node)
-      begin_pos = node.source_range.begin_pos
-      tokens = processed_source.tokens
-
-      index = tokens.bsearch_index { |token| token.begin_pos >= begin_pos }
-      index if index && tokens[index].begin_pos == begin_pos
-    end
-
-    def fast_index_of_last_token(node)
-      end_pos = node.source_range.end_pos
-      tokens = processed_source.tokens
-
-      index = tokens.bsearch_index { |token| token.end_pos >= end_pos }
-      index if index && tokens[index].end_pos == end_pos
-    end
-
-    def fast_tokens(node)
-      begin_index = index_of_first_token(node)
-      end_index   = index_of_last_token(node)
-
-      tokens = processed_source.tokens[begin_index..end_index]
-      tokens if sorted_tokens?(tokens)
-    end
-
-    def sorted_tokens?(tokens)
-      prev_begin_pos = -1
-      tokens.each do |token|
-        return false if token.begin_pos < prev_begin_pos
-
-        prev_begin_pos = token.begin_pos
-      end
-      true
-    end
-  end
-end