rubocop 0.61.1 → 0.62.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f3af102582affbb1b9735d2af44ac0dccb270ab
-  data.tar.gz: cca031307df0c706e0b1f65254659dfc7ee04686
+  metadata.gz: dd76265ab6d79dd4e54127c4969d0af755732cfc
+  data.tar.gz: 12ff96a7380e7a32ea291237754f66d0450605f7
 SHA512:
-  metadata.gz: f38a3804680b872219520c3e651c6bd863b5adadacb1729d6e251e76288192981b12f5d257f91ed704bcf53985b3770cdf0a309d1c008e3d26074fdba1447361
-  data.tar.gz: 82f6ab2d61dd493269f3550ed0ba36672c3912b72073d12ea5d1f1ba0825a3fd3b40af339dd6b8cb7dbd5a093dae10b9bd60db058535f8ef1b730ae8a15fae11
+  metadata.gz: 91eb27b2b5c06d550cf06d83782b53e0ff05245ec079a01ec9158e06fc00ab61324c5d6b24db0bbdc68992bdce4d051375f9e9f5224e9401c3b2f20fa6023c1f
+  data.tar.gz: c7a1c9f7f0e3d50f95c9b7e0a488cfdb31842b93e2f427ee14921429d4f64cae9ab9d0659b9775c60e5a19341615f29a4c5949451c7a4b563d7b9ca0d8994212

data/README.md

@@ -1,7 +1,7 @@
 [![Gem Version](https://badge.fury.io/rb/rubocop.svg)](https://badge.fury.io/rb/rubocop)
 [![CircleCI Status](https://circleci.com/gh/rubocop-hq/rubocop/tree/master.svg?style=svg)](https://circleci.com/gh/rubocop-hq/rubocop/tree/master)
 [![AppVeyor Status](https://ci.appveyor.com/api/projects/status/sj3ye7n5690d0nvg?svg=true)](https://ci.appveyor.com/project/bbatsov/rubocop)
-[![Coverage Status](https://img.shields.io/codeclimate/coverage/github/bbatsov/rubocop.svg)](https://codeclimate.com/github/bbatsov/rubocop)
+[![Coverage Status](https://api.codeclimate.com/v1/badges/ad6e76460499c8c99697/test_coverage)](https://codeclimate.com/github/bbatsov/rubocop)
 [![Code Climate](https://codeclimate.com/github/bbatsov/rubocop/badges/gpa.svg)](https://codeclimate.com/github/bbatsov/rubocop)
 [![Inline docs](https://inch-ci.org/github/bbatsov/rubocop.svg)](https://inch-ci.org/github/bbatsov/rubocop)
 [![SemVer](https://api.dependabot.com/badges/compatibility_score?dependency-name=rubocop&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=rubocop&package-manager=bundler&version-scheme=semver)
@@ -53,7 +53,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.61.1', require: false
+gem 'rubocop', '~> 0.62.0', require: false
 ```
 
 ## Quickstart

data/config/default.yml

@@ -2399,6 +2399,12 @@ Rails/LexicallyScopedActionFilter:
   Include:
     - app/controllers/**/*.rb
 
+Rails/LinkToBlank:
+  Description: 'Checks that `link_to` with a `target: "_blank"` have a `rel: "noopener"` option passed to them.'
+  Reference: https://mathiasbynens.github.io/rel-noopener/
+  Enabled: true
+  VersionAdded: '0.62'
+
 Rails/NotNullColumn:
   Description: 'Do not add a NOT NULL column without a default value'
   Enabled: true

data/lib/rubocop.rb

@@ -564,9 +564,9 @@ require_relative 'rubocop/cop/rails/blank'
 require_relative 'rubocop/cop/rails/bulk_change_table'
 require_relative 'rubocop/cop/rails/create_table_with_timestamps'
 require_relative 'rubocop/cop/rails/date'
-require_relative 'rubocop/cop/rails/dynamic_find_by'
 require_relative 'rubocop/cop/rails/delegate'
 require_relative 'rubocop/cop/rails/delegate_allow_blank'
+require_relative 'rubocop/cop/rails/dynamic_find_by'
 require_relative 'rubocop/cop/rails/enum_uniqueness'
 require_relative 'rubocop/cop/rails/environment_comparison'
 require_relative 'rubocop/cop/rails/exit'
@@ -579,18 +579,19 @@ require_relative 'rubocop/cop/rails/http_positional_arguments'
 require_relative 'rubocop/cop/rails/http_status'
 require_relative 'rubocop/cop/rails/inverse_of'
 require_relative 'rubocop/cop/rails/lexically_scoped_action_filter'
+require_relative 'rubocop/cop/rails/link_to_blank'
 require_relative 'rubocop/cop/rails/not_null_column'
-require_relative 'rubocop/cop/rails/output_safety'
 require_relative 'rubocop/cop/rails/output'
+require_relative 'rubocop/cop/rails/output_safety'
 require_relative 'rubocop/cop/rails/pluralization_grammar'
 require_relative 'rubocop/cop/rails/presence'
 require_relative 'rubocop/cop/rails/present'
 require_relative 'rubocop/cop/rails/read_write_attribute'
 require_relative 'rubocop/cop/rails/redundant_receiver_in_with_options'
 require_relative 'rubocop/cop/rails/refute_methods'
+require_relative 'rubocop/cop/rails/relative_date_constant'
 require_relative 'rubocop/cop/rails/request_referer'
 require_relative 'rubocop/cop/rails/reversible_migration'
-require_relative 'rubocop/cop/rails/relative_date_constant'
 require_relative 'rubocop/cop/rails/safe_navigation'
 require_relative 'rubocop/cop/rails/save_bang'
 require_relative 'rubocop/cop/rails/scope_args'

data/lib/rubocop/cli.rb

@@ -7,9 +7,14 @@ module RuboCop
   class CLI
     include Formatter::TextUtil
 
-    SKIPPED_PHASE_1 = 'Phase 1 of 2: run Metrics/LineLength cop (skipped ' \
-                      'because the default Metrics/LineLength:Max is ' \
-                      'overridden)'.freeze
+    PHASE_1 = 'Phase 1 of 2: run Metrics/LineLength cop'.freeze
+    PHASE_2 = 'Phase 2 of 2: run all cops'.freeze
+
+    PHASE_1_OVERRIDDEN = '(skipped because the default Metrics/LineLength:Max' \
+                         ' is overridden)'.freeze
+    PHASE_1_DISABLED   = '(skipped because Metrics/LineLength is ' \
+                         'disabled)'.freeze
+
     STATUS_SUCCESS     = 0
     STATUS_OFFENSES    = 1
     STATUS_ERROR       = 2
@@ -64,28 +69,47 @@ module RuboCop
     def execute_runners(paths)
       if @options[:auto_gen_config]
         reset_config_and_auto_gen_file
-        line_length_contents =
-          if max_line_length(@config_store.for(Dir.pwd)) ==
-             max_line_length(ConfigLoader.default_configuration)
-            run_line_length_cop_auto_gen_config(paths)
-          else
-            puts Rainbow(SKIPPED_PHASE_1).yellow
-            ''
-          end
+        line_length_contents = maybe_run_line_length_cop(paths)
         run_all_cops_auto_gen_config(line_length_contents, paths)
       else
         execute_runner(paths)
       end
     end
 
+    def maybe_run_line_length_cop(paths)
+      if !line_length_enabled?(@config_store.for(Dir.pwd))
+        puts Rainbow("#{PHASE_1} #{PHASE_1_DISABLED}").yellow
+        ''
+      elsif !same_max_line_length?(
+        @config_store.for(Dir.pwd), ConfigLoader.default_configuration
+      )
+        puts Rainbow("#{PHASE_1} #{PHASE_1_OVERRIDDEN}").yellow
+        ''
+      else
+        run_line_length_cop_auto_gen_config(paths)
+      end
+    end
+
+    def line_length_enabled?(config)
+      line_length_cop(config)['Enabled']
+    end
+
+    def same_max_line_length?(config1, config2)
+      max_line_length(config1) == max_line_length(config2)
+    end
+
     def max_line_length(config)
-      config.for_cop('Metrics/LineLength')['Max']
+      line_length_cop(config)['Max']
+    end
+
+    def line_length_cop(config)
+      config.for_cop('Metrics/LineLength')
     end
 
     # Do an initial run with only Metrics/LineLength so that cops that depend
     # on Metrics/LineLength:Max get the correct value for that parameter.
     def run_line_length_cop_auto_gen_config(paths)
-      puts Rainbow('Phase 1 of 2: run Metrics/LineLength cop').yellow
+      puts Rainbow(PHASE_1).yellow
       @options[:only] = ['Metrics/LineLength']
       execute_runner(paths)
       @options.delete(:only)
@@ -98,7 +122,7 @@ module RuboCop
     end
 
     def run_all_cops_auto_gen_config(line_length_contents, paths)
-      puts Rainbow('Phase 2 of 2: run all cops').yellow
+      puts Rainbow(PHASE_2).yellow
       result = execute_runner(paths)
       # This run was made with the current maximum length allowed, so append
       # the saved setting for LineLength.

data/lib/rubocop/config.rb

@@ -16,6 +16,9 @@ module RuboCop
 
     COMMON_PARAMS = %w[Exclude Include Severity inherit_mode
                        AutoCorrect StyleGuide Details].freeze
+    INTERNAL_PARAMS = %w[Description StyleGuide VersionAdded
+                         VersionChanged Reference Safe SafeAutoCorrect].freeze
+
     # 2.2 is the oldest officially supported Ruby version.
     DEFAULT_RUBY_VERSION = 2.2
     KNOWN_RUBIES = [2.2, 2.3, 2.4, 2.5, 2.6].freeze
@@ -509,12 +512,17 @@ module RuboCop
     def validate_parameter_names(valid_cop_names)
       valid_cop_names.each do |name|
         validate_section_presence(name)
+        default_config = ConfigLoader.default_configuration[name]
+
         self[name].each_key do |param|
-          next if COMMON_PARAMS.include?(param) ||
-                  ConfigLoader.default_configuration[name].key?(param)
+          next if COMMON_PARAMS.include?(param) || default_config.key?(param)
+
+          message =
+            "Warning: #{name} does not support #{param} parameter.\n\n" \
+            "Supported parameters are:\n\n" \
+            "  - #{(default_config.keys - INTERNAL_PARAMS).join("\n  - ")}\n"
 
-          warn Rainbow("Warning: unrecognized parameter #{name}:#{param} " \
-                       "found in #{smart_loaded_path}").yellow
+          warn Rainbow(message).yellow.to_s
         end
       end
     end

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

@@ -34,6 +34,7 @@ module RuboCop
       class AccessModifierIndentation < Cop
         include Alignment
         include ConfigurableEnforcedStyle
+        include RangeHelp
 
         MSG = '%<style>s access modifiers like `%<node>s`.'.freeze
 
@@ -53,8 +54,6 @@ module RuboCop
         end
 
         def on_block(node)
-          return unless node.class_constructor?
-
           check_body(node.body, node)
         end
 
@@ -69,14 +68,13 @@ module RuboCop
           return unless body.begin_type?
 
           modifiers = body.each_child_node(:send).select(&:access_modifier?)
-          class_column = node.source_range.column
+          end_range = node.loc.end
 
-          modifiers.each { |modifier| check_modifier(modifier, class_column) }
+          modifiers.each { |modifier| check_modifier(modifier, end_range) }
         end
 
-        def check_modifier(send_node, class_start_col)
-          access_modifier_start_col = send_node.source_range.column
-          offset = access_modifier_start_col - class_start_col
+        def check_modifier(send_node, end_range)
+          offset = column_offset_between(send_node.source_range, end_range)
 
           @column_delta = expected_indent_offset - offset
           if @column_delta.zero?

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

@@ -118,7 +118,7 @@ module RuboCop
         def check_alignment(base_range, else_range)
           return unless begins_its_line?(else_range)
 
-          @column_delta = effective_column(base_range) - else_range.column
+          @column_delta = column_offset_between(base_range, else_range)
           return if @column_delta.zero?
 
           message = format(

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

@@ -29,20 +29,33 @@ module RuboCop
         MSG_BEFORE_AND_AFTER = 'Keep a blank line before and after ' \
                                '`%<modifier>s`.'.freeze
 
+        def initialize(config = nil, options = nil)
+          super
+
+          @block_line = nil
+        end
+
         def on_class(node)
           _name, superclass, _body = *node
 
-          @class_or_module_def = superclass || node.source_range
+          @class_or_module_def_first_line = if superclass
+                                              superclass.first_line
+                                            else
+                                              node.source_range.first_line
+                                            end
+          @class_or_module_def_last_line = node.source_range.last_line
         end
 
         def on_module(node)
-          @class_or_module_def = node.source_range
+          @class_or_module_def_first_line = node.source_range.first_line
+          @class_or_module_def_last_line = node.source_range.last_line
         end
 
         def on_sclass(node)
           self_node, _body = *node
 
-          @class_or_module_def = self_node.source_range
+          @class_or_module_def_first_line = self_node.source_range.first_line
+          @class_or_module_def_last_line = self_node.source_range.last_line
         end
 
         def on_block(node)
@@ -100,9 +113,9 @@ module RuboCop
         end
 
         def class_def?(line)
-          return false unless @class_or_module_def
+          return false unless @class_or_module_def_first_line
 
-          line == @class_or_module_def.first_line + 1
+          line == @class_or_module_def_first_line + 1
         end
 
         def block_start?(line)
@@ -112,9 +125,9 @@ module RuboCop
         end
 
         def body_end?(line)
-          return false unless @class_or_module_def
+          return false unless @class_or_module_def_last_line
 
-          line == @class_or_module_def.last_line - 1
+          line == @class_or_module_def_last_line - 1
         end
 
         def message(node)

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

@@ -234,7 +234,7 @@ module RuboCop
         def check_indentation(base_loc, body_node, style = 'normal')
           return unless indentation_to_check?(base_loc, body_node)
 
-          indentation = body_node.loc.column - effective_column(base_loc)
+          indentation = column_offset_between(body_node.loc, base_loc)
           @column_delta = configured_indentation_width - indentation
           return if @column_delta.zero?
 

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

@@ -119,7 +119,7 @@ module RuboCop
                                   ancestor_node.kwbegin_type?
 
           assignment_node = assignment_node(ancestor_node)
-          return assignment_node unless assignment_node.nil?
+          return assignment_node if same_line?(ancestor_node, assignment_node)
 
           access_modifier_node = access_modifier_node(ancestor_node)
           return access_modifier_node unless access_modifier_node.nil?

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

@@ -33,10 +33,15 @@ module RuboCop
       #
       #   # bad
       #   array = [ a, [ b, c ] ]
+      #   array = [
+      #     [ a ],
+      #     [ b, c ]
+      #   ]
       #
       #   # good
       #   array = [ a, [ b, c ]]
-      #
+      #   array = [[ a ],
+      #     [ b, c ]]
       #
       # @example EnforcedStyleForEmptyBrackets: no_space (default)
       #   # The `no_space` EnforcedStyleForEmptyBrackets style enforces that

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

@@ -5,8 +5,7 @@ module RuboCop
     # Functions for checking the alignment of the `end` keyword.
     module EndKeywordAlignment
       include ConfigurableEnforcedStyle
-
-      BYTE_ORDER_MARK = 0xfeff # The Unicode codepoint
+      include RangeHelp
 
       MSG = '`end` at %<end_line>d, %<end_col>d is not aligned with ' \
             '`%<source>s` at %<align_line>d, %<align_col>d.'.freeze
@@ -36,7 +35,7 @@ module RuboCop
       def matching_ranges(end_loc, align_ranges)
         align_ranges.select do |_, range|
           range.line == end_loc.line ||
-            effective_column(range) == end_loc.column
+            column_offset_between(range, end_loc).zero?
         end
       end
 
@@ -66,19 +65,6 @@ module RuboCop
       def line_break_before_keyword?(whole_expression, rhs)
         rhs.first_line > whole_expression.line
       end
-
-      # Returns the column attribute of the range, except if the range is on
-      # the first line and there's a byte order mark at the beginning of that
-      # line, in which case 1 is subtracted from the column value. This gives
-      # the column as it appears when viewing the file in an editor.
-      def effective_column(range)
-        if range.line == 1 &&
-           @processed_source.raw_source.codepoints.first == BYTE_ORDER_MARK
-          range.column - 1
-        else
-          range.column
-        end
-      end
     end
   end
 end

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

@@ -6,6 +6,8 @@ module RuboCop
     module RangeHelp
       private
 
+      BYTE_ORDER_MARK = 0xfeff # The Unicode codepoint
+
       def source_range(source_buffer, line_number, column, length = 1)
         if column.is_a?(Range)
           column_index = column.begin
@@ -72,8 +74,25 @@ module RuboCop
           .intersect(buffer.source_range)
       end
 
+      def column_offset_between(base_range, range)
+        effective_column(base_range) - effective_column(range)
+      end
+
       ## Helpers for above range methods. Do not use inside Cops.
 
+      # Returns the column attribute of the range, except if the range is on
+      # the first line and there's a byte order mark at the beginning of that
+      # line, in which case 1 is subtracted from the column value. This gives
+      # the column as it appears when viewing the file in an editor.
+      def effective_column(range)
+        if range.line == 1 &&
+           @processed_source.raw_source.codepoints.first == BYTE_ORDER_MARK
+          range.column - 1
+        else
+          range.column
+        end
+      end
+
       def directions(side)
         if side == :both
           [true, true]

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

@@ -63,7 +63,7 @@ module RuboCop
         when :comma
           multiline?(node) && no_elements_on_same_line?(node)
         when :consistent_comma
-          multiline?(node)
+          multiline?(node) && !method_name_and_arguments_on_same_line?(node)
         else
           false
         end
@@ -77,7 +77,7 @@ module RuboCop
       end
 
       def heredoc?(source_after_last_item)
-        source_after_last_item =~ /\w/
+        source_after_last_item !~ /^\s*#/ && source_after_last_item =~ /\w/
       end
 
       # Returns true if the node has round/square/curly brackets.
@@ -92,6 +92,12 @@ module RuboCop
         node.multiline? && !allowed_multiline_argument?(node)
       end
 
+      def method_name_and_arguments_on_same_line?(node)
+        node.send_type? &&
+          node.loc.selector.line == node.arguments.last.last_line &&
+          node.last_line == node.arguments.last.last_line
+      end
+
       # A single argument with the closing bracket on the same line as the end
       # of the argument is not considered multiline, even if the argument
       # itself might span multiple lines.

data/lib/rubocop/cop/rails/blank.rb

@@ -43,6 +43,11 @@ module RuboCop
       #   if foo.blank?
       #     something
       #   end
+      #
+      #   # good
+      #   def blank?
+      #     !present?
+      #   end
       class Blank < Cop
         MSG_NIL_OR_EMPTY = 'Use `%<prefer>s` instead of `%<current>s`.'.freeze
         MSG_NOT_PRESENT = 'Use `%<prefer>s` instead of `%<current>s`.'.freeze
@@ -70,6 +75,8 @@ module RuboCop
 
         def_node_matcher :not_present?, '(send (send $_ :present?) :!)'
 
+        def_node_matcher :defining_blank?, '(def :blank? (args) ...)'
+
         def_node_matcher :unless_present?, <<-PATTERN
           (:if $(send $_ :present?) {nil? (...)} ...)
         PATTERN
@@ -78,6 +85,9 @@ module RuboCop
           return unless cop_config['NotPresent']
 
           not_present?(node) do |receiver|
+            # accepts !present? if its in the body of a `blank?` method
+            next if defining_blank?(node.parent)
+
             add_offense(node,
                         message: format(MSG_NOT_PRESENT,
                                         prefer: replacement(receiver),

data/lib/rubocop/cop/rails/date.rb

@@ -26,7 +26,6 @@ module RuboCop
       #   Date.yesterday
       #   Date.today
       #   date.to_time
-      #   date.to_time_in_current_zone
       #
       #   # good
       #   Time.zone.today
@@ -42,7 +41,7 @@ module RuboCop
       #   Time.zone.today - 1.day
       #   Date.current
       #   Date.yesterday
-      #   date.to_time_in_current_zone
+      #   date.in_time_zone
       #
       class Date < Cop
         include ConfigurableEnforcedStyle
@@ -55,6 +54,13 @@ module RuboCop
 
         BAD_DAYS = %i[today current yesterday tomorrow].freeze
 
+        DEPRECATED_METHODS = [
+          { deprecated: 'to_time_in_current_zone', relevant: 'in_time_zone' }
+        ].freeze
+
+        DEPRECATED_MSG = '`%<deprecated>s` is deprecated. ' \
+                         'Use `%<relevant>s` instead.'.freeze
+
         def on_const(node)
           mod, klass = *node.children
           # we should only check core Date class (`Date` or `::Date`)
@@ -68,12 +74,25 @@ module RuboCop
 
           return if safe_chain?(node) || safe_to_time?(node)
 
+          check_deprecated_methods(node)
+
           add_offense(node, location: :selector,
                             message: format(MSG_SEND, method: node.method_name))
         end
 
         private
 
+        def check_deprecated_methods(node)
+          DEPRECATED_METHODS.each do |relevant:, deprecated:|
+            next unless node.method_name == deprecated.to_sym
+
+            add_offense(node, location: :selector,
+                              message: format(DEPRECATED_MSG,
+                                              deprecated: deprecated,
+                                              relevant: relevant))
+          end
+        end
+
         def check_date_node(node)
           chain = extract_method_chain(node)
 
@@ -124,7 +143,7 @@ module RuboCop
         end
 
         def bad_methods
-          style == :strict ? %i[to_time to_time_in_current_zone] : [:to_time]
+          %i[to_time to_time_in_current_zone]
         end
 
         def good_methods

data/lib/rubocop/cop/rails/link_to_blank.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Rails
+      # This cop checks for calls to `link_to` that contain a
+      # `target: '_blank'` but no `rel: 'noopener'`. This can be a security
+      # risk as the loaded page will have control over the previous page
+      # and could change its location for phishing purposes.
+      #
+      # @example
+      #   # bad
+      #   link_to 'Click here', url, target: '_blank'
+      #
+      #   # good
+      #   link_to 'Click here', url, target: '_blank', rel: 'noopener'
+      class LinkToBlank < Cop
+        MSG = 'Specify a `:rel` option containing noopener.'.freeze
+
+        def_node_matcher :blank_target?, <<-PATTERN
+          (pair {(sym :target) (str "target")} (str "_blank"))
+        PATTERN
+
+        def_node_matcher :includes_noopener?, <<-PATTERN
+          (pair {(sym :rel) (str "rel")} (str #contains_noopener?))
+        PATTERN
+
+        def on_send(node)
+          return unless node.method?(:link_to)
+
+          option_nodes = node.each_child_node(:hash)
+
+          option_nodes.map(&:children).each do |options|
+            blank = options.find { |o| blank_target?(o) }
+            if blank && options.none? { |o| includes_noopener?(o) }
+              add_offense(blank)
+            end
+          end
+        end
+
+        private
+
+        def contains_noopener?(str)
+          return false unless str
+
+          str.split(' ').include?('noopener')
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/rails/output_safety.rb

@@ -66,6 +66,8 @@ module RuboCop
         MSG = 'Tagging a string as html safe may be a security risk.'.freeze
 
         def on_send(node)
+          return if non_interpolated_string?(node)
+
           return unless looks_like_rails_html_safe?(node) ||
                         looks_like_rails_raw?(node) ||
                         looks_like_rails_safe_concat?(node)
@@ -76,6 +78,10 @@ module RuboCop
 
         private
 
+        def non_interpolated_string?(node)
+          node.receiver && node.receiver.str_type? && !node.receiver.dstr_type?
+        end
+
         def looks_like_rails_html_safe?(node)
           node.receiver && node.method?(:html_safe) && !node.arguments?
         end

data/lib/rubocop/cop/rails/validation.rb

@@ -80,12 +80,20 @@ module RuboCop
 
           if options
             corrector.replace(options.loc.expression,
-                              "#{validate_type}: { #{options.source} }")
+                              "#{validate_type}: #{braced_options(options)}")
           else
             corrector.insert_after(node.loc.expression,
                                    ", #{validate_type}: true")
           end
         end
+
+        def braced_options(options)
+          if options.braces?
+            options.source
+          else
+            "{ #{options.source} }"
+          end
+        end
       end
     end
   end

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

@@ -87,7 +87,7 @@ module RuboCop
         end
 
         def ruby19_no_mixed_keys_check(pairs)
-          if force_hash_rockets?
+          if force_hash_rockets?(pairs)
             check(pairs, ':', MSG_HASH_ROCKETS)
           elsif sym_indices?(pairs)
             check(pairs, '=>', MSG_19)
@@ -106,7 +106,7 @@ module RuboCop
 
         def autocorrect(node)
           lambda do |corrector|
-            if style == :hash_rockets || force_hash_rockets?
+            if style == :hash_rockets || force_hash_rockets?(node.parent.pairs)
               autocorrect_hash_rockets(corrector, node)
             elsif style == :ruby19_no_mixed_keys || style == :no_mixed_keys
               autocorrect_no_mixed_keys(corrector, node)
@@ -204,11 +204,9 @@ module RuboCop
           end
         end
 
-        def force_hash_rockets?(pairs = [])
-          @force_hash_rockets ||= begin
-            cop_config['UseHashRocketsWithSymbolValues'] &&
-              pairs.map(&:value).any?(&:sym_type?)
-          end
+        def force_hash_rockets?(pairs)
+          cop_config['UseHashRocketsWithSymbolValues'] &&
+            pairs.map(&:value).any?(&:sym_type?)
         end
       end
     end

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

@@ -21,7 +21,7 @@ module RuboCop
       #     to `true` allows the presence of parentheses in multi-line method
       #     calls.
       #
-      # @example EnforcedStyle: require_parentheses
+      # @example EnforcedStyle: require_parentheses (default)
       #
       #
       #   # bad
@@ -156,7 +156,7 @@ module RuboCop
           return if node.implicit_call?
           return if super_call_without_arguments?(node)
           return if camel_case_method_call_without_arguments?(node)
-          return if eligible_for_parentheses_presence?(node)
+          return if legitimate_call_with_parentheses?(node)
 
           add_offense(node, location: node.loc.begin.join(node.loc.end))
         end
@@ -225,10 +225,11 @@ module RuboCop
           node.camel_case_method? && node.arguments.none?
         end
 
-        def eligible_for_parentheses_presence?(node)
+        def legitimate_call_with_parentheses?(node)
           call_in_literals?(node) ||
             call_with_ambiguous_arguments?(node) ||
             call_in_logical_operators?(node) ||
+            call_in_optional_arguments?(node) ||
             allowed_multiline_call_with_parentheses?(node) ||
             allowed_chained_call_with_parentheses?(node)
         end
@@ -237,6 +238,7 @@ module RuboCop
           node.parent &&
             (node.parent.pair_type? ||
              node.parent.array_type? ||
+             splat?(node.parent) ||
              ternary_if?(node.parent))
         end
 
@@ -246,21 +248,26 @@ module RuboCop
              node.parent.descendants.any?(&method(:logical_operator?)))
         end
 
+        def call_in_optional_arguments?(node)
+          node.parent && node.parent.optarg_type?
+        end
+
         def call_with_ambiguous_arguments?(node)
           call_with_braced_block?(node) ||
-            call_as_argument?(node) ||
+            call_as_argument_or_chain?(node) ||
             hash_literal_in_arguments?(node) ||
             node.descendants.any? do |n|
-              splat?(n) || ternary_if?(n) || logical_operator?(n)
+              ambigious_literal?(n) || logical_operator?(n) ||
+                call_with_braced_block?(n)
             end
         end
 
         def call_with_braced_block?(node)
-          node.block_node && node.block_node.braces?
+          node.send_type? && node.block_node && node.block_node.braces?
         end
 
-        def call_as_argument?(node)
-          node.parent && node.parent.send_type?
+        def call_as_argument_or_chain?(node)
+          node.parent && (node.parent.send_type? || node.parent.csend_type?)
         end
 
         def hash_literal_in_arguments?(node)
@@ -275,7 +282,7 @@ module RuboCop
         end
 
         def allowed_chained_call_with_parentheses?(node)
-          return unless cop_config['AllowParenthesesInChaining']
+          return false unless cop_config['AllowParenthesesInChaining']
 
           previous = node.descendants.first
           return false unless previous && previous.send_type?
@@ -284,6 +291,10 @@ module RuboCop
             allowed_chained_call_with_parentheses?(previous)
         end
 
+        def ambigious_literal?(node)
+          splat?(node) || ternary_if?(node) || regexp_slash_literal?(node)
+        end
+
         def splat?(node)
           node.splat_type? || node.kwsplat_type? || node.block_pass_type?
         end
@@ -299,6 +310,10 @@ module RuboCop
         def hash_literal?(node)
           node.hash_type? && node.braces?
         end
+
+        def regexp_slash_literal?(node)
+          node.regexp_type? && node.loc.begin.source == '/'
+        end
       end
     end
   end

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

@@ -21,6 +21,18 @@ module RuboCop
       #     # ...
       #   end
       #
+      # In case there are private methods, the cop won't be activated.
+      # Otherwise, it forces to change the flow of the default code.
+      #
+      # @example EnforcedStyle: module_function (default)
+      #   # good
+      #   module Test
+      #     extend self
+      #     # ...
+      #     private
+      #     # ...
+      #   end
+      #
       # @example EnforcedStyle: extend_self
       #   # bad
       #   module Test
@@ -46,6 +58,7 @@ module RuboCop
 
         def_node_matcher :module_function_node?, '(send nil? :module_function)'
         def_node_matcher :extend_self_node?, '(send nil? :extend self)'
+        def_node_matcher :private_directive?, '(send nil? :private ...)'
 
         def on_module(node)
           _name, body = *node
@@ -71,8 +84,10 @@ module RuboCop
         def each_wrong_style(nodes)
           case style
           when :module_function
+            private_directive = nodes.any? { |node| private_directive?(node) }
+
             nodes.each do |node|
-              yield node if extend_self_node?(node)
+              yield node if extend_self_node?(node) && !private_directive
             end
           when :extend_self
             nodes.each do |node|

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

@@ -79,7 +79,7 @@ module RuboCop
 
         def preferred_delimiters_for(type)
           PreferredDelimiters
-            .new(type, @config, @preferred_delimiters)
+            .new(type, @config, nil)
             .delimiters
         end
 

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

@@ -10,6 +10,9 @@ module RuboCop
       #   method(1, 2,)
       #
       #   # good
+      #   method(1, 2)
+      #
+      #   # good
       #   method(
       #     1, 2,
       #     3,
@@ -26,6 +29,9 @@ module RuboCop
       #   method(1, 2,)
       #
       #   # good
+      #   method(1, 2)
+      #
+      #   # good
       #   method(
       #     1,
       #     2,
@@ -36,6 +42,9 @@ module RuboCop
       #   method(1, 2,)
       #
       #   # good
+      #   method(1, 2)
+      #
+      #   # good
       #   method(
       #     1,
       #     2

data/lib/rubocop/formatter/disabled_config_formatter.rb

@@ -38,7 +38,7 @@ module RuboCop
       def file_finished(file, offenses)
         offenses.each do |o|
           @cops_with_offenses[o.cop_name] += 1
-          @files_with_offenses[o.cop_name] ||= []
+          @files_with_offenses[o.cop_name] ||= Set.new
           @files_with_offenses[o.cop_name] << file
         end
       end
@@ -85,7 +85,7 @@ module RuboCop
       def output_cop(cop_name, offense_count)
         output.puts
         cfg = self.class.config_to_allow_offenses[cop_name] || {}
-        set_max(cfg, offense_count)
+        set_max(cfg, cop_name)
 
         # To avoid malformed YAML when potentially reading the config in
         # #excludes, we use an output buffer and append it to the actual output
@@ -96,13 +96,14 @@ module RuboCop
         output.puts(output_buffer.string)
       end
 
-      def set_max(cfg, offense_count)
+      def set_max(cfg, cop_name)
         return unless cfg[:exclude_limit]
 
         # In case auto_gen_only_exclude is set, only modify the maximum if the
         # files are not excluded one by one.
-        if !@options[:auto_gen_only_exclude] || offense_count > @exclude_limit
-          cfg.merge! cfg[:exclude_limit]
+        if !@options[:auto_gen_only_exclude] ||
+           @files_with_offenses[cop_name].size > @exclude_limit
+          cfg.merge!(cfg[:exclude_limit])
         end
 
         # Remove already used exclude_limit.
@@ -171,7 +172,7 @@ module RuboCop
       def output_offending_files(output_buffer, cfg, cop_name)
         return unless cfg.empty?
 
-        offending_files = @files_with_offenses[cop_name].uniq.sort
+        offending_files = @files_with_offenses[cop_name].sort
         if offending_files.count > @exclude_limit
           output_buffer.puts '  Enabled: false'
         else
@@ -184,8 +185,8 @@ module RuboCop
         parent = Pathname.new(Dir.pwd)
 
         output_buffer.puts '  Exclude:'
-        excludes(offending_files, cop_name, parent).each do |file|
-          output_exclude_path(output_buffer, file, parent)
+        excludes(offending_files, cop_name, parent).each do |exclude_path|
+          output_exclude_path(output_buffer, exclude_path, parent)
         end
       end
 
@@ -201,12 +202,17 @@ module RuboCop
         ((cfg['Exclude'] || []) + offending_files).uniq
       end
 
-      def output_exclude_path(output_buffer, file, parent)
-        file_path = Pathname.new(file)
+      def output_exclude_path(output_buffer, exclude_path, parent)
+        # exclude_path is either relative path, an absolute path, or a regexp.
+        file_path = Pathname.new(exclude_path)
         relative = file_path.relative_path_from(parent)
         output_buffer.puts "    - '#{relative}'"
       rescue ArgumentError
+        file = exclude_path
         output_buffer.puts "    - '#{file}'"
+      rescue TypeError
+        regexp = exclude_path
+        output_buffer.puts "    - !ruby/regexp /#{regexp.source}/"
       end
     end
   end

data/lib/rubocop/target_finder.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'set'
+require 'open3'
 
 module RuboCop
   # This class finds target files to inspect by scanning the directory tree
@@ -59,10 +60,13 @@ module RuboCop
       end
       all_files = find_files(base_dir, File::FNM_DOTMATCH)
       hidden_files = Set.new(all_files - find_files(base_dir, 0))
+
+      git_files = ls_git_files(base_dir)
+
       base_dir_config = @config_store.for(base_dir)
 
       target_files = all_files.select do |file|
-        to_inspect?(file, hidden_files, base_dir_config)
+        to_inspect?(file, git_files, hidden_files, base_dir_config)
       end
 
       # Most recently modified file first.
@@ -71,13 +75,6 @@ module RuboCop
       target_files
     end
 
-    def to_inspect?(file, hidden_files, base_dir_config)
-      return false if base_dir_config.file_to_exclude?(file)
-      return true if !hidden_files.include?(file) && ruby_file?(file)
-
-      base_dir_config.file_to_include?(file)
-    end
-
     # Search for files recursively starting at the given base directory using
     # the given flags that determine how the match is made. Excluded files will
     # be removed later by the caller, but as an optimization find_files removes
@@ -100,6 +97,31 @@ module RuboCop
       Dir.glob(pattern, flags).select { |path| FileTest.file?(path) }
     end
 
+    private
+
+    def ls_git_files(base_dir)
+      return if `sh -c 'command -v git'`.empty?
+
+      output, _error, status = Open3.capture3(
+        'git', 'ls-files', '-z', base_dir,
+        '--exclude-standard', '--others', '--cached', '--modified'
+      )
+
+      return unless status.success?
+
+      output.split("\0").map { |git_file| "#{base_dir}/#{git_file}" }
+    end
+
+    def to_inspect?(file, git_files, hidden_files, base_dir_config)
+      return false if base_dir_config.file_to_exclude?(file)
+
+      if !hidden_files.include?(file) && ruby_file?(file)
+        return git_files.nil? || git_files.include?(file)
+      end
+
+      base_dir_config.file_to_include?(file)
+    end
+
     def toplevel_dirs(base_dir, flags)
       Dir.glob(File.join(base_dir, '*'), flags).select do |dir|
         File.directory?(dir) && !dir.end_with?('/.', '/..')

data/lib/rubocop/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.61.1
+  version: 0.62.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-06 00:00:00.000000000 Z
+date: 2019-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jaro_winkler
@@ -126,16 +126,22 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -552,6 +558,7 @@ files:
 - lib/rubocop/cop/rails/http_status.rb
 - lib/rubocop/cop/rails/inverse_of.rb
 - lib/rubocop/cop/rails/lexically_scoped_action_filter.rb
+- lib/rubocop/cop/rails/link_to_blank.rb
 - lib/rubocop/cop/rails/not_null_column.rb
 - lib/rubocop/cop/rails/output.rb
 - lib/rubocop/cop/rails/output_safety.rb