rubocop 0.79.0 → 0.80.0

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

@@ -11,8 +11,8 @@ module RuboCop
       #
       # Configuration option: MinSize
       # If set, arrays with fewer elements than this value will not trigger the
-      # cop. For example, a `MinSize of `3` will not enforce a style on an array
-      # of 2 or fewer elements.
+      # cop. For example, a `MinSize` of `3` will not enforce a style on an
+      # array of 2 or fewer elements.
       #
       # @example EnforcedStyle: percent (default)
       #   # good

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

@@ -162,7 +162,7 @@ module RuboCop
         # `RedundantParentheses` cop is enabled, it will cause an infinite loop
         # as they compete to add and remove the parentheses respectively.
         def infinite_loop?
-          require_parentheses? &&
+          (require_parentheses? || require_parentheses_when_complex?) &&
             redundant_parentheses_enabled?
         end
 

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

@@ -68,28 +68,6 @@ module RuboCop
         def self.autocorrect_incompatible_with
           [Layout::HeredocArgumentClosingParenthesis]
         end
-
-        private
-
-        def avoid_autocorrect?(args)
-          args.last.hash_type? && args.last.braces? &&
-            braces_will_be_removed?(args)
-        end
-
-        # Returns true if running with --auto-correct would remove the braces
-        # of the last argument.
-        def braces_will_be_removed?(args)
-          brace_config = config.for_cop('Style/BracesAroundHashParameters')
-          return false unless brace_config.fetch('Enabled')
-          return false if brace_config['AutoCorrect'] == false
-
-          brace_style = brace_config['EnforcedStyle']
-          return true if brace_style == 'no_braces'
-
-          return false unless brace_style == 'context_dependent'
-
-          args.one? || !args[-2].hash_type?
-        end
       end
     end
   end

data/lib/rubocop/cop/variable_force.rb

@@ -190,7 +190,10 @@ module RuboCop
       end
 
       def regexp_captured_names(node)
-        regexp_string = node.children[0].children[0] || ''
+        regexp_string = node.children.select(&:str_type?).map do |child|
+          child.children.first
+        end.join || ''
+
         regexp = Regexp.new(regexp_string)
 
         regexp.named_captures.keys

data/lib/rubocop/formatter/formatter_set.rb

@@ -17,6 +17,7 @@ module RuboCop
         '[fu]ubar'      => FuubarStyleFormatter,
         '[h]tml'        => HTMLFormatter,
         '[j]son'        => JSONFormatter,
+        '[ju]nit'       => JUnitFormatter,
         '[o]ffenses'    => OffenseCountFormatter,
         '[pa]cman'      => PacmanFormatter,
         '[p]rogress'    => ProgressFormatter,

data/lib/rubocop/formatter/junit_formatter.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require 'rexml/document'
+
+#
+# This code is based on https://github.com/mikian/rubocop-junit-formatter.
+#
+# Copyright (c) 2015 Mikko Kokkonen
+#
+# MIT License
+#
+# https://github.com/mikian/rubocop-junit-formatter/blob/master/LICENSE.txt
+#
+module RuboCop
+  module Formatter
+    # This formatter formats the report data in JUnit format.
+    class JUnitFormatter < BaseFormatter
+      def initialize(output, options = {})
+        super
+
+        @document = REXML::Document.new.tap do |document|
+          document << REXML::XMLDecl.new
+        end
+        testsuites = REXML::Element.new('testsuites', @document)
+        testsuite = REXML::Element.new('testsuite', testsuites)
+        @testsuite = testsuite.tap do |element|
+          element.add_attributes('name' => 'rubocop')
+        end
+      end
+
+      def file_finished(file, offenses)
+        offenses.group_by(&:cop_name).each do |cop_name, grouped_offenses|
+          REXML::Element.new('testcase', @testsuite).tap do |testcase|
+            testcase.attributes['classname'] = file.gsub(
+              /\.rb\Z/, ''
+            ).gsub("#{Dir.pwd}/", '').tr('/', '.')
+            testcase.attributes['name'] = cop_name
+
+            add_failure_to(testcase, grouped_offenses, cop_name)
+          end
+        end
+      end
+
+      def finished(_inspected_files)
+        @document.write(output, 2)
+      end
+
+      private
+
+      def add_failure_to(testcase, offenses, cop_name)
+        # One failure per offense. Zero failures is a passing test case,
+        # for most surefire/nUnit parsers.
+        offenses.each do |offense|
+          REXML::Element.new('failure', testcase).tap do |failure|
+            failure.attributes['type'] = cop_name
+            failure.attributes['message'] = offense.message
+            failure.add_text(offense.location.to_s)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/node_pattern.rb

@@ -78,6 +78,8 @@ module RuboCop
   #                         # matching process starts
   #     '^^send'            # each ^ ascends one level in the AST
   #                         # so this matches against the grandparent node
+  #     '`send'             # descends any number of level in the AST
+  #                         # so this matches against any descendant node
   #     '#method'           # we call this a 'funcall'; it calls a method in the
   #                         # context where a pattern-matching method is defined
   #                         # if that returns a truthy value, the match succeeds
@@ -112,7 +114,7 @@ module RuboCop
       SYMBOL       = %r{:(?:[\w+@*/?!<>=~|%^-]+|\[\]=?)}.freeze
       IDENTIFIER   = /[a-zA-Z_][a-zA-Z0-9_-]*/.freeze
       META         = Regexp.union(
-        %w"( ) { } [ ] $< < > $... $ ! ^ ... + * ?"
+        %w"( ) { } [ ] $< < > $... $ ! ^ ` ... + * ?"
       ).freeze
       NUMBER       = /-?\d+(?:\.\d+)?/.freeze
       STRING       = /".+?"/.freeze
@@ -188,7 +190,7 @@ module RuboCop
 
         @temps    = 0  # avoid name clashes between temp variables
         @captures = 0  # number of captures seen
-        @unify    = {} # named wildcard -> temp variable number
+        @unify    = {} # named wildcard -> temp variable
         @params   = 0  # highest % (param) number seen
         run(node_var)
       end
@@ -223,6 +225,7 @@ module RuboCop
         when '!'       then compile_negation
         when '$'       then compile_capture
         when '^'       then compile_ascend
+        when '`'       then compile_descend
         when WILDCARD  then compile_wildcard(token[1..-1])
         when FUNCALL   then compile_funcall(token)
         when LITERAL   then compile_literal(token)
@@ -466,12 +469,67 @@ module RuboCop
         end
       end
 
+      def access_unify(name)
+        var = @unify[name]
+
+        if var == :forbidden_unification
+          fail_due_to "Wildcard #{name} was first seen in a subset of a" \
+                      " union and can't be used outside that union"
+        end
+        var
+      end
+
+      def forbid_unification(*names)
+        names.each do |name|
+          @unify[name] = :forbidden_unification
+        end
+      end
+
+      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+      def unify_in_union(enum)
+        # We need to reset @unify before each branch is processed.
+        # Moreover we need to keep track of newly encountered wildcards.
+        # Var `new_unify_intersection` will hold those that are encountered
+        # in all branches; these are not a problem.
+        # Var `partial_unify` will hold those encountered in only a subset
+        # of the branches; these can't be used outside of the union.
+
+        return to_enum __method__, enum unless block_given?
+
+        new_unify_intersection = nil
+        partial_unify = []
+        unify_before = @unify.dup
+
+        result = enum.each do |e|
+          @unify = unify_before.dup if new_unify_intersection
+          yield e
+          new_unify = @unify.keys - unify_before.keys
+          if new_unify_intersection.nil?
+            # First iteration
+            new_unify_intersection = new_unify
+          else
+            union = new_unify_intersection | new_unify
+            new_unify_intersection &= new_unify
+            partial_unify |= union - new_unify_intersection
+          end
+        end
+
+        # At this point, all members of `new_unify_intersection` can be used
+        # for unification outside of the union, but partial_unify may not
+
+        forbid_unification(*partial_unify)
+
+        result
+      end
+      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
+
       def compile_union
         # we need to ensure that each branch of the {} contains the same
         # number of captures (since only one branch of the {} can actually
         # match, the same variables are used to hold the captures for each
         # branch)
         enum = tokens_until('}', 'union')
+        enum = unify_in_union(enum)
         terms = insure_same_captures(enum, 'branch of {}')
                 .map { compile_expr }
 
@@ -496,6 +554,19 @@ module RuboCop
         with_context("#{CUR_NODE} && #{compile_expr}", "#{CUR_NODE}.parent")
       end
 
+      def compile_descend
+        with_temp_variables do |descendant|
+          pattern = with_context(compile_expr, descendant,
+                                 use_temp_node: false)
+          [
+            "RuboCop::NodePattern.descend(#{CUR_ELEMENT}).",
+            "any? do |#{descendant}|",
+            "  #{pattern}",
+            'end'
+          ].join("\n")
+        end
+      end
+
       def compile_wildcard(name)
         if name.empty?
           'true'
@@ -503,12 +574,12 @@ module RuboCop
           # we have already seen a wildcard with this name before
           # so the value it matched the first time will already be stored
           # in a temp. check if this value matches the one stored in the temp
-          "#{CUR_ELEMENT} == temp#{@unify[name]}"
+          "#{CUR_ELEMENT} == #{access_unify(name)}"
         else
-          n = @unify[name] = next_temp_value
-          # double assign to temp#{n} to avoid "assigned but unused variable"
-          "(temp#{n} = #{CUR_ELEMENT}; " \
-          "temp#{n} = temp#{n}; true)"
+          n = @unify[name] = "unify_#{name.gsub('-', '__')}"
+          # double assign to avoid "assigned but unused variable"
+          "(#{n} = #{CUR_ELEMENT}; " \
+          "#{n} = #{n}; true)"
         end
       end
 
@@ -560,9 +631,8 @@ module RuboCop
       def compile_arg(token)
         case token
         when WILDCARD  then
-          name   = token[1..-1]
-          number = @unify[name] || fail_due_to('invalid in arglist: ' + token)
-          "temp#{number}"
+          name = token[1..-1]
+          access_unify(name) || fail_due_to('invalid in arglist: ' + token)
         when LITERAL   then token
         when PARAM     then get_param(token[1..-1])
         when CLOSING   then fail_due_to("#{token} in invalid position")
@@ -796,6 +866,22 @@ module RuboCop
     def to_s
       "#<#{self.class} #{pattern}>"
     end
+
+    # Yields its argument and any descendants, depth-first.
+    #
+    def self.descend(element, &block)
+      return to_enum(__method__, element) unless block_given?
+
+      yield element
+
+      if element.is_a?(::RuboCop::AST::Node)
+        element.children.each do |child|
+          descend(child, &block)
+        end
+      end
+
+      nil
+    end
   end
 end
 # rubocop:enable Metrics/ClassLength, Metrics/CyclomaticComplexity

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '0.79.0'
+    STRING = '0.80.0'
 
     MSG = '%<version>s (using Parser %<parser_version>s, running on ' \
           '%<ruby_engine>s %<ruby_version>s %<ruby_platform>s)'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.79.0
+  version: 0.80.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-06 00:00:00.000000000 Z
+date: 2020-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jaro_winkler
@@ -74,6 +74,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -461,6 +475,7 @@ files:
 - lib/rubocop/cop/mixin/first_element_line_break.rb
 - lib/rubocop/cop/mixin/frozen_string_literal.rb
 - lib/rubocop/cop/mixin/hash_alignment_styles.rb
+- lib/rubocop/cop/mixin/hash_transform_method.rb
 - lib/rubocop/cop/mixin/heredoc.rb
 - lib/rubocop/cop/mixin/ignored_methods.rb
 - lib/rubocop/cop/mixin/ignored_pattern.rb
@@ -536,7 +551,6 @@ files:
 - lib/rubocop/cop/style/begin_block.rb
 - lib/rubocop/cop/style/block_comments.rb
 - lib/rubocop/cop/style/block_delimiters.rb
-- lib/rubocop/cop/style/braces_around_hash_parameters.rb
 - lib/rubocop/cop/style/case_equality.rb
 - lib/rubocop/cop/style/character_literal.rb
 - lib/rubocop/cop/style/class_and_module_children.rb
@@ -579,7 +593,10 @@ 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_each_methods.rb
 - lib/rubocop/cop/style/hash_syntax.rb
+- lib/rubocop/cop/style/hash_transform_keys.rb
+- lib/rubocop/cop/style/hash_transform_values.rb
 - lib/rubocop/cop/style/identical_conditional_branches.rb
 - lib/rubocop/cop/style/if_inside_else.rb
 - lib/rubocop/cop/style/if_unless_modifier.rb
@@ -723,6 +740,7 @@ files:
 - lib/rubocop/formatter/fuubar_style_formatter.rb
 - lib/rubocop/formatter/html_formatter.rb
 - lib/rubocop/formatter/json_formatter.rb
+- lib/rubocop/formatter/junit_formatter.rb
 - lib/rubocop/formatter/offense_count_formatter.rb
 - lib/rubocop/formatter/pacman_formatter.rb
 - lib/rubocop/formatter/progress_formatter.rb

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

@@ -1,209 +0,0 @@
-# frozen_string_literal: true
-
-module RuboCop
-  module Cop
-    module Style
-      # This cop checks for braces around the last parameter in a method call
-      # if the last parameter is a hash.
-      # It supports `braces`, `no_braces` and `context_dependent` styles.
-      #
-      # @example EnforcedStyle: braces
-      #   # The `braces` style enforces braces around all method
-      #   # parameters that are hashes.
-      #
-      #   # bad
-      #   some_method(x, y, a: 1, b: 2)
-      #
-      #   # good
-      #   some_method(x, y, {a: 1, b: 2})
-      #
-      # @example EnforcedStyle: no_braces (default)
-      #   # The `no_braces` style checks that the last parameter doesn't
-      #   # have braces around it.
-      #
-      #   # bad
-      #   some_method(x, y, {a: 1, b: 2})
-      #
-      #   # good
-      #   some_method(x, y, a: 1, b: 2)
-      #
-      # @example EnforcedStyle: context_dependent
-      #   # The `context_dependent` style checks that the last parameter
-      #   # doesn't have braces around it, but requires braces if the
-      #   # second to last parameter is also a hash literal.
-      #
-      #   # bad
-      #   some_method(x, y, {a: 1, b: 2})
-      #   some_method(x, y, {a: 1, b: 2}, a: 1, b: 2)
-      #
-      #   # good
-      #   some_method(x, y, a: 1, b: 2)
-      #   some_method(x, y, {a: 1, b: 2}, {a: 1, b: 2})
-      class BracesAroundHashParameters < Cop
-        include ConfigurableEnforcedStyle
-        include RangeHelp
-
-        MSG = '%<type>s curly braces around a hash parameter.'
-
-        def on_send(node)
-          return if node.assignment_method? || node.operator_method?
-
-          return unless node.arguments? && node.last_argument.hash_type? &&
-                        !node.last_argument.empty?
-
-          check(node.last_argument, node.arguments)
-        end
-        alias on_csend on_send
-
-        def autocorrect(send_node)
-          hash_node = send_node.last_argument
-
-          lambda do |corrector|
-            if hash_node.braces?
-              remove_braces_with_whitespace(corrector,
-                                            hash_node,
-                                            extra_space(hash_node))
-            else
-              add_braces(corrector, hash_node)
-            end
-          end
-        end
-
-        private
-
-        def check(arg, args)
-          case style
-          when :braces
-            check_braces(arg)
-          when :no_braces
-            check_no_braces(arg)
-          when :context_dependent
-            check_context_dependent(arg, args)
-          end
-        end
-
-        def check_braces(arg)
-          add_arg_offense(arg, :missing) unless arg.braces?
-        end
-
-        def check_no_braces(arg)
-          return unless arg.braces? && !braces_needed_for_semantics?(arg)
-
-          add_arg_offense(arg, :redundant)
-        end
-
-        def check_context_dependent(arg, args)
-          braces_around_second_from_end = args.size > 1 && args[-2].hash_type?
-
-          if arg.braces?
-            unless braces_around_second_from_end ||
-                   braces_needed_for_semantics?(arg)
-              add_arg_offense(arg, :redundant)
-            end
-          elsif braces_around_second_from_end
-            add_arg_offense(arg, :missing)
-          end
-        end
-
-        # Returns true if there's block inside the braces of the given hash arg
-        # and that block uses do..end. The reason for wanting to check this is
-        # that the do..end could bind to a different method invocation if the
-        # hash braces were removed.
-        def braces_needed_for_semantics?(arg)
-          arg.each_pair do |_key, value|
-            return true if value.block_type? && !value.braces?
-          end
-          false
-        end
-
-        def add_arg_offense(arg, type)
-          add_offense(arg.parent, location: arg.source_range,
-                                  message: format(MSG,
-                                                  type: type.to_s.capitalize))
-        end
-
-        def extra_space(hash_node)
-          {
-            newlines: extra_left_space?(hash_node) &&
-              extra_right_space?(hash_node),
-            left: extra_left_space?(hash_node),
-            right: extra_right_space?(hash_node)
-          }
-        end
-
-        def extra_left_space?(hash_node)
-          @extra_left_space ||= begin
-            top_line = hash_node.source_range.source_line
-            top_line.delete(' ') == '{'
-          end
-        end
-
-        def extra_right_space?(hash_node)
-          @extra_right_space ||= begin
-            bottom_line_number = hash_node.source_range.last_line
-            bottom_line = processed_source.lines[bottom_line_number - 1]
-            bottom_line.delete(' ') == '}'
-          end
-        end
-
-        def remove_braces_with_whitespace(corrector, node, space)
-          loc = node.loc
-
-          if node.multiline?
-            remove_braces_with_range(corrector,
-                                     left_whole_line_range(loc.begin),
-                                     right_whole_line_range(loc.end))
-          else
-            remove_braces_with_range(corrector,
-                                     left_brace_and_space(loc.begin, space),
-                                     right_brace_and_space(loc.end, space))
-          end
-        end
-
-        def remove_braces_with_range(corrector, left_range, right_range)
-          corrector.remove(left_range)
-          corrector.remove(right_range)
-        end
-
-        def left_whole_line_range(loc_begin)
-          if range_by_whole_lines(loc_begin).source.strip == '{'
-            range_by_whole_lines(loc_begin, include_final_newline: true)
-          else
-            loc_begin
-          end
-        end
-
-        def right_whole_line_range(loc_end)
-          if range_by_whole_lines(loc_end).source.strip =~ /\A}\s*,?\z/
-            range_by_whole_lines(loc_end, include_final_newline: true)
-          else
-            loc_end
-          end
-        end
-
-        def left_brace_and_space(loc_begin, space)
-          range_with_surrounding_space(range: loc_begin,
-                                       side: :right,
-                                       newlines: space[:newlines],
-                                       whitespace: space[:left])
-        end
-
-        def right_brace_and_space(loc_end, space)
-          brace_and_space =
-            range_with_surrounding_space(
-              range: loc_end,
-              side: :left,
-              newlines: space[:newlines],
-              whitespace: space[:right]
-            )
-          range_with_surrounding_comma(brace_and_space, :left)
-        end
-
-        def add_braces(corrector, node)
-          corrector.insert_before(node.source_range, '{')
-          corrector.insert_after(node.source_range, '}')
-        end
-      end
-    end
-  end
-end