rubocop 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5013f1930869ad961d7fe1cf2cd8bad7a36a15bc37f6cf42e1663fbdb61f2cc2
-  data.tar.gz: 1ac4e658406f0f6e22a068f28fab225a8e9f53c59a79f89f0e52157cdc076efc
+  metadata.gz: 4238df3546a63ce2c279ced4bba228a61c137b083a3fad76b45365954555f690
+  data.tar.gz: bf3bd7a2409203b911212906d013aec7219f1a21825352bc92e0b897faafbd66
 SHA512:
-  metadata.gz: 555adab63cf768a150f37d2ca84e08f2322e84182528949e09bd5eda4c79348e4c41dc17d23737785ea044a78f54f99d99d512047446d7437efdeaf306147f32
-  data.tar.gz: 3fe186c044fd8733f4edef4055c036106d739e485dbfdcdbffe7882961175695edb79aafe27c1b11a8bbe9791f0754f26e7bd7534571dd09955bd5caf6aa6afe
+  metadata.gz: a87bd4426855a7278963b8c3e4373b7c995994b5685318aad04bc2b0832c0db44e705d50d4ea21d81eb47074137fde56665f8317121caae8a81e208e044ce4a7
+  data.tar.gz: 3bb4cb7794129ac95c70876bc009a4ed07425a7a346acaf77279c4e0fc8b1c20f31e82e9590e1d880fa011ddddc08c93bb3851f6f815718b9de8ff7a0dd78c6f

data/config/default.yml

@@ -1176,7 +1176,7 @@ Layout/SpaceBeforeBlockBraces:
   SupportedStylesForEmptyBraces:
     - space
     - no_space
-  VersionChanged: '0.52.1'
+  VersionChanged: '0.52'
 
 Layout/SpaceBeforeComma:
   Description: 'No spaces before commas.'
@@ -1401,7 +1401,10 @@ Lint/ConstantDefinitionInBlock:
   Enabled: true
   VersionAdded: '0.91'
   VersionChanged: '1.3'
-  AllowedMethods: []
+  # `enums` for Typed Enums via T::Enum in Sorbet.
+  # https://sorbet.org/docs/tenum
+  AllowedMethods:
+    - enums
 
 Lint/ConstantResolution:
   Description: 'Check that constants are fully qualified with `::`.'
@@ -1862,7 +1865,7 @@ Lint/RescueException:
   StyleGuide: '#no-blind-rescues'
   Enabled: true
   VersionAdded: '0.9'
-  VersionChanged: '0.27.1'
+  VersionChanged: '0.27'
 
 Lint/RescueType:
   Description: 'Avoid rescuing from non constants that could result in a `TypeError`.'
@@ -3917,7 +3920,7 @@ Style/PercentLiteralDelimiters:
     '%r': '{}'
     '%w': '[]'
     '%W': '[]'
-  VersionChanged: '0.48.1'
+  VersionChanged: '0.48'
 
 Style/PercentQLiterals:
   Description: 'Checks if uses of %Q/%q match the configured preference.'
@@ -4324,7 +4327,7 @@ Style/StringMethods:
   Description: 'Checks if configured preferred methods are used over non-preferred.'
   Enabled: false
   VersionAdded: '0.34'
-  VersionChanged: '0.34.2'
+  VersionChanged: '0.34'
   # Mapping from undesired method to desired_method
   # e.g. to use `to_sym` over `intern`:
   #

data/lib/rubocop/config_loader.rb

@@ -255,10 +255,18 @@ module RuboCop
               "Configuration file not found: #{absolute_path}"
       end
 
-      raise 'SafeYAML is unmaintained, no longer needed and should be removed' if defined?(SafeYAML)
+      def yaml_safe_load(yaml_code, filename)
+        yaml_safe_load!(yaml_code, filename)
+      rescue ::StandardError
+        if defined?(::SafeYAML)
+          raise 'SafeYAML is unmaintained, no longer needed and should be removed'
+        end
+
+        raise
+      end
 
       if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0')
-        def yaml_safe_load(yaml_code, filename)
+        def yaml_safe_load!(yaml_code, filename)
           YAML.safe_load(yaml_code,
                          permitted_classes: [Regexp, Symbol],
                          permitted_symbols: [],
@@ -266,7 +274,7 @@ module RuboCop
                          filename: filename)
         end
       else # Ruby < 2.6
-        def yaml_safe_load(yaml_code, filename)
+        def yaml_safe_load!(yaml_code, filename)
           YAML.safe_load(yaml_code, [Regexp, Symbol], [], true, filename)
         end
       end

data/lib/rubocop/cop/generator.rb

@@ -17,7 +17,6 @@ module RuboCop
       SOURCE_TEMPLATE = <<-RUBY.gsub(/^ {8}/, '')
         # frozen_string_literal: true
 
-        # TODO: when finished, run `rake generate_cops_documentation` to update the docs
         module RuboCop
           module Cop
             module %<department>s
@@ -134,7 +133,7 @@ module RuboCop
       end
 
       def inject_config(config_file_path: 'config/default.yml',
-                        version_added: bump_minor_version)
+                        version_added: '<<next>>')
         injector =
           ConfigurationInjector.new(configuration_file_path: config_file_path,
                                     badge: badge,
@@ -213,12 +212,6 @@ module RuboCop
           .gsub(/([A-Z])([A-Z][^A-Z\d]+)/, '\1_\2')
           .downcase
       end
-
-      def bump_minor_version
-        versions = RuboCop::Version::STRING.split('.')
-
-        "#{versions[0]}.#{versions[1].succ}"
-      end
     end
   end
 end

data/lib/rubocop/cop/generator/configuration_injector.rb

@@ -14,7 +14,7 @@ module RuboCop
             VersionAdded: '%<version_added>s'
         YAML
 
-        def initialize(configuration_file_path:, badge:, version_added:)
+        def initialize(configuration_file_path:, badge:, version_added: '<<next>>')
           @configuration_file_path = configuration_file_path
           @badge = badge
           @version_added = version_added

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

@@ -147,6 +147,10 @@ module RuboCop
         MSG = '`%<category>s` is supposed to appear before ' \
               '`%<previous>s`.'
 
+        def_node_matcher :dynamic_constant?, <<~PATTERN
+          (casgn nil? _ (send ...))
+        PATTERN
+
         # Validates code style on class declaration.
         # Add offense when find a node out of expected order.
         def on_class(class_node)
@@ -168,11 +172,10 @@ module RuboCop
 
         # Autocorrect by swapping between two nodes autocorrecting them
         def autocorrect(corrector, node)
-          node_classification = classify(node)
           previous = node.left_siblings.find do |sibling|
-            classification = classify(sibling)
-            !ignore?(classification) && node_classification != classification
+            !ignore_for_autocorrect?(node, sibling)
           end
+          return unless previous
 
           current_range = source_range_with_comment(node)
           previous_range = source_range_with_comment(previous)
@@ -241,6 +244,15 @@ module RuboCop
             expected_order.index(classification).nil?
         end
 
+        def ignore_for_autocorrect?(node, sibling)
+          classification = classify(node)
+          sibling_class = classify(sibling)
+
+          ignore?(sibling_class) ||
+            classification == sibling_class ||
+            dynamic_constant?(node)
+        end
+
         def humanize_node(node)
           if node.def_type?
             return :initializer if node.method?(:initialize)

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

@@ -50,8 +50,11 @@ module RuboCop
       #     end
       #   end
       #
-      # @example AllowedMethods: ['enums']
+      # @example AllowedMethods: ['enums'] (default)
       #   # good
+      #
+      #   # `enums` for Typed Enums via `T::Enum` in Sorbet.
+      #   # https://sorbet.org/docs/tenum
       #   class TestEnum < T::Enum
       #     enums do
       #       Foo = new("foo")

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

@@ -8,23 +8,14 @@ module RuboCop
       #
       # @example
       #   # bad
-      #   def method(x, y = 1)
-      #     return to_enum(__method__, x) # `y` is missing
+      #   def foo(x, y = 1)
+      #     return to_enum(__callee__, x) # `y` is missing
       #   end
       #
       #   # good
-      #   def method(x, y = 1)
-      #     return to_enum(__method__, x, y)
-      #   end
-      #
-      #   # bad
-      #   def method(required:)
-      #     return to_enum(:method, required: something) # `required` has incorrect value
-      #   end
-      #
-      #   # good
-      #   def method(required:)
-      #     return to_enum(:method, required: required)
+      #   def foo(x, y = 1)
+      #     return to_enum(__callee__, x, y)
+      #     # alternatives to `__callee__` are `__method__` and `:foo`
       #   end
       #
       class ToEnumArguments < Base
@@ -37,7 +28,7 @@ module RuboCop
         PATTERN
 
         def_node_matcher :method_name?, <<~PATTERN
-          {(send nil? :__method__) (sym %1)}
+          {(send nil? {:__method__ :__callee__}) (sym %1)}
         PATTERN
 
         def_node_matcher :passing_keyword_arg?, <<~PATTERN

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

@@ -8,9 +8,9 @@ module RuboCop
       include ConfigurableFormatting
 
       FORMATS = {
-        snake_case:  /(?:\D|_\d+)$/,
-        normalcase:  /(?:\D|[^_\d]\d+)$/,
-        non_integer: /\D$/
+        snake_case:  /(?:\D|_\d+|\A\d+)\z/,
+        normalcase:  /(?:\D|[^_\d]\d+|\A\d+)\z/,
+        non_integer: /(\D|\A\d+)\z/
       }.freeze
     end
   end

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

@@ -68,6 +68,12 @@ module RuboCop
       #       end
       #     EOT
       #   )
+      #
+      #   # bad - interpolated string without comment
+      #   class_eval("def #{unsafe_method}!(*params); end")
+      #
+      #   # good - with inline comment or replace it with block comment using heredoc
+      #   class_eval("def #{unsafe_method}!(*params); end # def capitalize!(*params); end")
       class DocumentDynamicEvalDefinition < Base
         BLOCK_COMMENT_REGEXP = /^\s*#(?!{)/.freeze
         COMMENT_REGEXP = /\s*#(?!{).*/.freeze
@@ -79,7 +85,8 @@ module RuboCop
           arg_node = node.first_argument
 
           return unless arg_node&.dstr_type? && interpolated?(arg_node)
-          return if inline_comment_docs?(arg_node) || comment_block_docs?(arg_node)
+          return if inline_comment_docs?(arg_node) ||
+                    arg_node.heredoc? && comment_block_docs?(arg_node)
 
           add_offense(node.loc.selector)
         end

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

@@ -35,6 +35,8 @@ module RuboCop
 
         NEGATED_EQUALITY_METHODS = %i[!= !~].freeze
 
+        def_node_matcher :double_negation?, '(send (send _ :!) :!)'
+
         def self.autocorrect_incompatible_with
           [Style::InverseMethods, Style::Not]
         end
@@ -47,7 +49,7 @@ module RuboCop
           return unless if_else?(node)
 
           condition = node.condition
-          return unless negated_condition?(condition)
+          return if double_negation?(condition) || !negated_condition?(condition)
 
           type = node.ternary? ? 'ternary' : 'if-else'
           add_offense(node, message: format(MSG, type: type)) do |corrector|

data/lib/rubocop/target_finder.rb

@@ -94,7 +94,7 @@ module RuboCop
     end
 
     def wanted_dir_patterns(base_dir, exclude_pattern, flags)
-      dirs = Dir.glob(File.join(base_dir, '*/'), flags)
+      dirs = Dir.glob(File.join(base_dir.gsub('/**/', '/\**/'), '*/'), flags)
                 .reject do |dir|
                   dir.end_with?('/./', '/../') || File.fnmatch?(exclude_pattern, dir, flags)
                 end

data/lib/rubocop/target_ruby.rb

@@ -123,6 +123,10 @@ module RuboCop
         (send _ :required_ruby_version= $_)
       PATTERN
 
+      def_node_matcher :gem_requirement?, <<~PATTERN
+        (send (const(const _ :Gem):Requirement) :new $str)
+      PATTERN
+
       def name
         "`required_ruby_version` parameter (in #{gemspec_filename})"
       end
@@ -136,10 +140,9 @@ module RuboCop
         version = version_from_gemspec_file(file)
         return if version.nil?
 
-        if version.array_type?
-          versions = version.children.map { |v| version_from_str(v.str_content) }
-          return versions.compact.min
-        end
+        requirement = version.children.last
+        return version_from_array(version) if version.array_type?
+        return version_from_array(requirement) if gem_requirement? version
 
         version_from_str(version.str_content)
       end
@@ -161,6 +164,11 @@ module RuboCop
         required_ruby_version(processed_source.ast).first
       end
 
+      def version_from_array(array)
+        versions = array.children.map { |v| version_from_str(v.is_a?(String) ? v : v.str_content) }
+        versions.compact.min
+      end
+
       def version_from_str(str)
         str.match(/^(?:>=|<=)?\s*(?<version>\d+(?:\.\d+)*)/) do |md|
           md[:version].to_f

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '1.3.0'
+    STRING = '1.3.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: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-12 00:00:00.000000000 Z
+date: 2020-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel