rubocop 0.48.0 → 0.48.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83278e7b0db6182dca6c9c459ec501d77879da8f
-  data.tar.gz: f704ff6c92918ac9d981d2bc99a9cb5e8c93ae36
+  metadata.gz: b4aa95a4490b838949fa15403588cced4899c86b
+  data.tar.gz: e6715d302d3b009057392f4875453c5a9dd5bb29
 SHA512:
-  metadata.gz: 6cfa68a81c85d90199e4c334b0c067956d0a44004651622c65ff62902bd1624d06f051dab10213bce4c0f00dd7cf13db8345e938cef0444f9762bb4d33222dcb
-  data.tar.gz: f573cc40d97449a1b51925594c1b034ca047a1ee5cf3693851008fb4e1d5be21bae3d450296b11dfe904ec99324e6318d3e8e33271001854e3b1f161f134d94b
+  metadata.gz: 0411e00f1c0b571dd45414ed595a6a0c5da0119bc2b1deeef053c21ba95dd6d2ebe84e91c426f5ab4b3471c9c5ed1d481cf6adfcff1c581cff9247f445c877aa
+  data.tar.gz: 901d75ba9adee9d27c26323d24bd44eeedac3112d11beb1081d1f385dd77989945a7011653b8b1595bda34c92a4faa56daa8688c434eaca6b8a52fe9c615a2b9

data/README.md

@@ -50,7 +50,7 @@ haven't reached version 1.0 yet). To prevent an unwanted RuboCop update you
 might want to use a conservative version locking in your `Gemfile`:
 
 ```rb
-gem 'rubocop', '~> 0.48.0', require: false
+gem 'rubocop', '~> 0.48.1', require: false
 ```
 
 ## Quickstart

data/config/default.yml

@@ -902,6 +902,7 @@ Style/NonNilCheck:
 
 Style/NumericLiterals:
   MinDigits: 5
+  Strict: false
 
 Style/NumericLiteralPrefix:
   EnforcedOctalStyle: zero_with_o
@@ -938,7 +939,11 @@ Style/PercentLiteralDelimiters:
   # an individual key
   PreferredDelimiters:
     default: ()
+    '%i': '[]'
+    '%I': '[]'
     '%r': '{}'
+    '%w': '[]'
+    '%W': '[]'
 
 Style/PercentQLiterals:
   EnforcedStyle: lower_case_q

data/config/enabled.yml

@@ -360,6 +360,7 @@ Style/IfWithSemicolon:
 
 Style/IndentationConsistency:
   Description: 'Keep indentation straight.'
+  StyleGuide: '#spaces-indentation'
   Enabled: true
 
 Style/IndentationWidth:
@@ -566,7 +567,7 @@ Style/NestedTernaryOperator:
   Enabled: true
 
 Style/EmptyLineAfterMagicComment:
-  Description: 'Add a newline after magic comments to separate them from code.'
+  Description: 'Add an empty line after magic comments to separate them from code.'
   StyleGuide: '#separate-magic-comments-from-code'
   Enabled: true
 

data/lib/rubocop/ast/builder.rb

@@ -26,9 +26,9 @@ module RuboCop
         PairNode         => [:pair],
         ResbodyNode      => [:resbody],
         SendNode         => [:send],
-        UntilNode        => %i(until until_post),
+        UntilNode        => %i[until until_post],
         WhenNode         => [:when],
-        WhileNode        => %i(while while_post)
+        WhileNode        => %i[while while_post]
       }.freeze
 
       # Generates {Node} from the given information.

data/lib/rubocop/ast/node.rb

@@ -21,28 +21,28 @@ module RuboCop
     class Node < Parser::AST::Node # rubocop:disable Metrics/ClassLength
       include RuboCop::AST::Sexp
 
-      COMPARISON_OPERATORS = %i(! == === != <= >= > < <=>).freeze
+      COMPARISON_OPERATORS = %i[! == === != <= >= > < <=>].freeze
 
-      TRUTHY_LITERALS = %i(str dstr xstr int float sym dsym array
+      TRUTHY_LITERALS = %i[str dstr xstr int float sym dsym array
                            hash regexp true irange erange complex
-                           rational regopt).freeze
-      FALSEY_LITERALS = %i(false nil).freeze
+                           rational regopt].freeze
+      FALSEY_LITERALS = %i[false nil].freeze
       LITERALS = (TRUTHY_LITERALS + FALSEY_LITERALS).freeze
-      COMPOSITE_LITERALS = %i(dstr xstr dsym array hash irange
-                              erange regexp).freeze
+      COMPOSITE_LITERALS = %i[dstr xstr dsym array hash irange
+                              erange regexp].freeze
       BASIC_LITERALS = (LITERALS - COMPOSITE_LITERALS).freeze
-      MUTABLE_LITERALS = %i(str dstr xstr array hash).freeze
+      MUTABLE_LITERALS = %i[str dstr xstr array hash].freeze
       IMMUTABLE_LITERALS = (LITERALS - MUTABLE_LITERALS).freeze
 
-      VARIABLES = %i(ivar gvar cvar lvar).freeze
-      REFERENCES = %i(nth_ref back_ref).freeze
-      KEYWORDS = %i(alias and break case class def defs defined?
+      VARIABLES = %i[ivar gvar cvar lvar].freeze
+      REFERENCES = %i[nth_ref back_ref].freeze
+      KEYWORDS = %i[alias and break case class def defs defined?
                     kwbegin do else ensure for if module next
                     not or postexe redo rescue retry return self
                     super zsuper then undef until when while
-                    yield).freeze
-      OPERATOR_KEYWORDS = %i(and or).freeze
-      SPECIAL_KEYWORDS = %w(__FILE__ __LINE__ __ENCODING__).freeze
+                    yield].freeze
+      OPERATOR_KEYWORDS = %i[and or].freeze
+      SPECIAL_KEYWORDS = %w[__FILE__ __LINE__ __ENCODING__].freeze
 
       # def_matcher can be used to define a pattern-matching method on Node
       class << self
@@ -361,7 +361,7 @@ module RuboCop
         IMMUTABLE_LITERALS.include?(type)
       end
 
-      %i(literal basic_literal).each do |kind|
+      %i[literal basic_literal].each do |kind|
         recursive_kind = :"recursive_#{kind}?"
         kind_filter = :"#{kind}?"
         define_method(recursive_kind) do

data/lib/rubocop/ast/node/send_node.rb

@@ -6,8 +6,6 @@ module RuboCop
     # node when the builder constructs the AST, making its methods available
     # to all `send` nodes within RuboCop.
     class SendNode < Node
-      MACRO_PARENT_NODES = %i(class module).freeze
-
       # The receiving node of the method invocation.
       #
       # @return [Node, nil] the receiver of the invoked method or `nil`
@@ -38,7 +36,7 @@ module RuboCop
       #
       # @return [Boolean] whether the method is a macro method
       def macro?
-        !receiver && MACRO_PARENT_NODES.include?(parent && parent.type)
+        !receiver && macro_scope?
       end
 
       # Checks whether the method name matches the argument and has an
@@ -185,6 +183,13 @@ module RuboCop
       def node_parts
         [*self]
       end
+
+      private
+
+      def_matcher :macro_scope?, <<-PATTERN
+        {^({class module} ...)
+         ^^({class module} ... (begin ...))}
+      PATTERN
     end
   end
 end

data/lib/rubocop/ast/traversal.rb

@@ -13,21 +13,21 @@ module RuboCop
         nil
       end
 
-      NO_CHILD_NODES    = %i(true false nil int float complex
+      NO_CHILD_NODES    = %i[true false nil int float complex
                              rational str sym regopt self lvar
                              ivar cvar gvar nth_ref back_ref cbase
                              arg restarg blockarg shadowarg
-                             kwrestarg zsuper lambda redo retry).freeze
-      ONE_CHILD_NODE    = %i(splat kwsplat block_pass not break next
+                             kwrestarg zsuper lambda redo retry].freeze
+      ONE_CHILD_NODE    = %i[splat kwsplat block_pass not break next
                              preexe postexe match_current_line defined?
-                             arg_expr).freeze
-      MANY_CHILD_NODES  = %i(dstr dsym xstr regexp array hash pair
+                             arg_expr].freeze
+      MANY_CHILD_NODES  = %i[dstr dsym xstr regexp array hash pair
                              irange erange mlhs masgn or_asgn and_asgn
                              undef alias args super yield or and
                              while_post until_post iflipflop eflipflop
-                             match_with_lvasgn begin kwbegin return).freeze
-      SECOND_CHILD_ONLY = %i(lvasgn ivasgn cvasgn gvasgn optarg kwarg
-                             kwoptarg).freeze
+                             match_with_lvasgn begin kwbegin return].freeze
+      SECOND_CHILD_ONLY = %i[lvasgn ivasgn cvasgn gvasgn optarg kwarg
+                             kwoptarg].freeze
 
       NO_CHILD_NODES.each do |type|
         module_eval("def on_#{type}(node); end")

data/lib/rubocop/config.rb

@@ -13,8 +13,8 @@ module RuboCop
   class Config
     include PathUtil
 
-    COMMON_PARAMS = %w(Exclude Include Severity
-                       AutoCorrect StyleGuide Details).freeze
+    COMMON_PARAMS = %w[Exclude Include Severity
+                       AutoCorrect StyleGuide Details].freeze
     # 2.1 is the oldest officially supported Ruby version.
     DEFAULT_RUBY_VERSION = 2.1
     KNOWN_RUBIES = [1.9, 2.0, 2.1, 2.2, 2.3, 2.4].freeze
@@ -178,7 +178,7 @@ module RuboCop
     end
 
     def deprecation_check
-      %w(Exclude Include).each do |key|
+      %w[Exclude Include].each do |key|
         plural = "#{key}s"
         next unless for_all_cops[plural]
 

data/lib/rubocop/config_loader.rb

@@ -83,7 +83,7 @@ module RuboCop
 
       def base_configs(path, inherit_from)
         configs = Array(inherit_from).compact.map do |f|
-          if f =~ /\A#{URI::Parser.new.make_regexp(%w(http https))}\z/
+          if f =~ /\A#{URI::Parser.new.make_regexp(%w[http https])}\z/
             f = RemoteConfig.new(f, File.dirname(path)).file
           else
             f = File.expand_path(f, File.dirname(path))
@@ -187,7 +187,7 @@ module RuboCop
         if YAML.respond_to?(:safe_load) # Ruby 2.1+
           if defined?(SafeYAML) && SafeYAML.respond_to?(:load)
             SafeYAML.load(yaml_code, filename,
-                          whitelisted_tags: %w(!ruby/regexp))
+                          whitelisted_tags: %w[!ruby/regexp])
           else
             YAML.safe_load(yaml_code, [Regexp, Symbol], [], false, filename)
           end

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

@@ -16,37 +16,50 @@ module RuboCop
       #   # good
       #   # With parentheses, there's no ambiguity.
       #   some_method(a) { |val| puts val }
+      #
+      #   # good
+      #   # Operator methods require no disambiguation
+      #   foo == bar { |b| b.baz }
+      #
+      #   # good
+      #   # Lambda arguments require no disambiguation
+      #   foo = ->(bar) { bar.baz }
       class AmbiguousBlockAssociation < Cop
         MSG = 'Parenthesize the param `%s` to make sure that the block will be'\
               ' associated with the `%s` method call.'.freeze
 
         def on_send(node)
-          return if node.parenthesized? || node.assignment? || node.method?(:[])
+          return if node.parenthesized? || allowed_method?(node)
+          return if lambda_argument?(node.first_argument)
 
-          return unless method_with_block?(node.first_argument)
-          first_param = node.first_argument.children.first
-          return unless method_as_param?(first_param)
+          return unless method_with_block?(node.last_argument)
+          last_param = node.last_argument.children.first
+          return unless method_as_param?(last_param)
 
-          add_offense(node, :expression, message(first_param, node.method_name))
+          add_offense(node, :expression, message(node.last_argument))
         end
 
         private
 
-        def method_with_block?(param)
-          return false unless param
+        def allowed_method?(node)
+          node.assignment? || node.operator_method? || node.method?(:[])
+        end
 
-          param.block_type?
+        def method_with_block?(param)
+          param && param.block_type?
         end
 
         def method_as_param?(param)
-          return false unless param
-
-          param.send_type? && !param.arguments?
+          param && param.send_type? && !param.arguments?
         end
 
-        def message(param, method_name)
-          format(MSG, param.children[1], method_name)
+        def message(param)
+          format(MSG, param.source, param.children.first.source)
         end
+
+        def_node_matcher :lambda_argument?, <<-PATTERN
+          (block (send _ :lambda) ...)
+        PATTERN
       end
     end
   end

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

@@ -29,7 +29,7 @@ module RuboCop
         SHOVEL = '<<'.freeze
         PERCENT = '%'.freeze
         PERCENT_PERCENT = '%%'.freeze
-        STRING_TYPES = %i(str dstr).freeze
+        STRING_TYPES = %i[str dstr].freeze
         NAMED_INTERPOLATION = /%(?:<\w+>|\{\w+\})/
 
         def on_send(node)

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

@@ -37,7 +37,7 @@ module RuboCop
           runtime_error: 'RuntimeError',
           standard_error: 'StandardError'
         }.freeze
-        ILLEGAL_CLASSES = %w(
+        ILLEGAL_CLASSES = %w[
           Exception
           SystemStackError
           NoMemoryError
@@ -49,7 +49,7 @@ module RuboCop
           Interrupt
           SignalException
           SystemExit
-        ).freeze
+        ].freeze
 
         def on_class(node)
           _class, base_class, _body = *node

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

@@ -108,7 +108,7 @@ module RuboCop
         def handle_node(node)
           if node.literal?
             add_offense(node, :expression)
-          elsif %i(send and or begin).include?(node.type)
+          elsif %i[send and or begin].include?(node.type)
             check_node(node)
           end
         end

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

@@ -18,7 +18,7 @@ module RuboCop
       #   "result is 10"
       class LiteralInInterpolation < Cop
         MSG = 'Literal interpolation detected.'.freeze
-        COMPOSITE = %i(array hash pair irange erange).freeze
+        COMPOSITE = %i[array hash pair irange erange].freeze
 
         def on_dstr(node)
           node.each_child_node(:begin) do |begin_node|

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

@@ -36,6 +36,24 @@ module RuboCop
       #       end
       #     end
       #   end
+      #
+      #   def foo
+      #     self.module_exec do
+      #       def bar
+      #       end
+      #     end
+      #   end
+      #
+      # @example
+      #
+      #   # good
+      #
+      #   def foo
+      #     class << self
+      #       def bar
+      #       end
+      #     end
+      #   end
       class NestedMethodDefinition < Cop
         include OnMethodDef
         extend RuboCop::NodePattern::Macros
@@ -57,7 +75,7 @@ module RuboCop
               subject, = *child
               next if subject.lvar_type?
               yield child
-            elsif !ignored_child?(child)
+            elsif !scoping_method_call?(child)
               find_nested_defs(child, &block)
             end
           end
@@ -65,14 +83,19 @@ module RuboCop
 
         private
 
-        def ignored_child?(child)
-          eval_call?(child) || class_or_module_or_struct_new_call?(child)
+        def scoping_method_call?(child)
+          eval_call?(child) || exec_call?(child) || child.sclass_type? ||
+            class_or_module_or_struct_new_call?(child)
         end
 
         def_node_matcher :eval_call?, <<-PATTERN
           (block (send _ {:instance_eval :class_eval :module_eval} ...) ...)
         PATTERN
 
+        def_node_matcher :exec_call?, <<-PATTERN
+          (block (send _ {:instance_exec :class_exec :module_exec} ...) ...)
+        PATTERN
+
         def_node_matcher :class_or_module_or_struct_new_call?, <<-PATTERN
           (block (send (const nil {:Class :Module :Struct}) :new ...) ...)
         PATTERN

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

@@ -57,7 +57,7 @@ module RuboCop
         PERCENT_I = '%i'.freeze
         PERCENT_CAPITAL_I = '%I'.freeze
         ARRAY_NEW_PATTERN = '$(send (const nil :Array) :new ...)'.freeze
-        ASSIGNMENT_TYPES = %i(lvasgn ivasgn cvasgn gvasgn).freeze
+        ASSIGNMENT_TYPES = %i[lvasgn ivasgn cvasgn gvasgn].freeze
 
         def_node_matcher :literal_expansion?, <<-PATTERN
           (splat {$({str dstr int float array} ...) (block #{ARRAY_NEW_PATTERN} ...) #{ARRAY_NEW_PATTERN}} ...)

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

@@ -26,8 +26,8 @@ module RuboCop
       class UnreachableCode < Cop
         MSG = 'Unreachable code detected.'.freeze
 
-        NODE_TYPES = %i(return next break retry redo).freeze
-        FLOW_COMMANDS = %i(throw raise fail).freeze
+        NODE_TYPES = %i[return next break retry redo].freeze
+        FLOW_COMMANDS = %i[throw raise fail].freeze
 
         def on_begin(node)
           expressions = *node

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

@@ -12,7 +12,7 @@ module RuboCop
       #   x.top >= x.top
       class UselessComparison < Cop
         MSG = 'Comparison of something with itself detected.'.freeze
-        OPS = %w(== === != < > <= >= <=>).freeze
+        OPS = %w[== === != < > <= >= <=>].freeze
 
         def_node_matcher :useless_comparison?,
                          "(send $_match {:#{OPS.join(' :')}} $_match)"

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

@@ -28,7 +28,7 @@ module RuboCop
         include OnMethodDef
 
         MSG = 'Useless setter call to local variable `%s`.'.freeze
-        ASSIGNMENT_TYPES = %i(lvasgn ivasgn cvasgn gvasgn).freeze
+        ASSIGNMENT_TYPES = %i[lvasgn ivasgn cvasgn gvasgn].freeze
 
         private
 

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

@@ -48,7 +48,7 @@ module RuboCop
         SELF_MSG = '`self` used in void context.'.freeze
         DEFINED_MSG = '`%s` used in void context.'.freeze
 
-        OPS = %w(* / % + - == === != < > <= >= <=>).freeze
+        OPS = %w[* / % + - == === != < > <= >= <=>].freeze
 
         def on_begin(node)
           check_begin(node)

data/lib/rubocop/cop/metrics/abc_size.rb

@@ -11,7 +11,7 @@ module RuboCop
 
         MSG = 'Assignment Branch Condition size for %s is too high. ' \
               '[%.4g/%.4g]'.freeze
-        BRANCH_NODES = %i(send csend).freeze
+        BRANCH_NODES = %i[send csend].freeze
         CONDITION_NODES = CyclomaticComplexity::COUNTED_NODES.freeze
 
         private