rubocop 0.62.0 → 0.63.0

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

@@ -53,8 +53,13 @@ module RuboCop
 
         MSG = 'Missing method documentation comment.'.freeze
 
+        def_node_matcher :module_function_node?, <<-PATTERN
+          (send nil? :module_function ...)
+        PATTERN
+
         def on_def(node)
-          check(node)
+          parent = node.parent
+          module_function_node?(parent) ? check(parent) : check(node)
         end
         alias on_defs on_def
 

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

@@ -3,10 +3,10 @@
 module RuboCop
   module Cop
     module Style
-      # This cop is designed to help upgrade to Ruby 3.0. It will add the
+      # This cop is designed to help upgrade to after Ruby 3.0. It will add the
       # comment `# frozen_string_literal: true` to the top of files to
       # enable frozen string literals. Frozen string literals may be default
-      # in Ruby 3.0. The comment will be added below a shebang and encoding
+      # after Ruby 3.0. The comment will be added below a shebang and encoding
       # comment. The frozen string literal comment is only valid in Ruby 2.3+.
       #
       # @example EnforcedStyle: when_needed (default)

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

@@ -245,7 +245,8 @@ module RuboCop
         def call_in_logical_operators?(node)
           node.parent &&
             (logical_operator?(node.parent) ||
-             node.parent.descendants.any?(&method(:logical_operator?)))
+             node.parent.send_type? &&
+             node.parent.arguments.any?(&method(:logical_operator?)))
         end
 
         def call_in_optional_arguments?(node)
@@ -267,7 +268,9 @@ module RuboCop
         end
 
         def call_as_argument_or_chain?(node)
-          node.parent && (node.parent.send_type? || node.parent.csend_type?)
+          node.parent &&
+            (node.parent.send_type? && !assigned_before?(node.parent, node) ||
+             node.parent.csend_type?)
         end
 
         def hash_literal_in_arguments?(node)
@@ -314,6 +317,11 @@ module RuboCop
         def regexp_slash_literal?(node)
           node.regexp_type? && node.loc.begin.source == '/'
         end
+
+        def assigned_before?(node, target)
+          node.assignment? &&
+            node.loc.operator.begin < target.loc.begin
+        end
       end
     end
   end

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

@@ -150,8 +150,9 @@ module RuboCop
           cop_config['AllowInnerSlashes']
         end
 
-        def node_body(node)
-          node.each_child_node(:str).map(&:source).join
+        def node_body(node, include_begin_nodes: false)
+          types = include_begin_nodes ? %i[str begin] : %i[str]
+          node.each_child_node(*types).map(&:source).join
         end
 
         def slash_literal?(node)
@@ -186,7 +187,7 @@ module RuboCop
         end
 
         def inner_slash_indices(node)
-          text    = node_body(node)
+          text    = node_body(node, include_begin_nodes: true)
           pattern = inner_slash_before_correction(node)
           index   = -1
           indices = []

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

@@ -101,6 +101,7 @@ module RuboCop
 
           checked_variable, receiver, method_chain, method = extract_parts(node)
           return unless receiver == checked_variable
+          return if use_var_only_in_unless_modifier?(node, checked_variable)
           # method is already a method call so this is actually checking for a
           # chain greater than 2
           return if chain_size(method_chain, method) > 1
@@ -109,6 +110,10 @@ module RuboCop
           add_offense(node)
         end
 
+        def use_var_only_in_unless_modifier?(node, variable)
+          node.if_type? && node.unless? && !method_called?(variable)
+        end
+
         def autocorrect(node)
           _check, body, = node.node_parts
           _checked_variable, matching_receiver, = extract_parts(node)
@@ -209,13 +214,17 @@ module RuboCop
         end
 
         def negated?(send_node)
-          if send_node.parent && send_node.parent.send_type?
+          if method_called?(send_node)
             negated?(send_node.parent)
           else
             send_node.send_type? && send_node.method?(:!)
           end
         end
 
+        def method_called?(send_node)
+          send_node.parent && send_node.parent.send_type?
+        end
+
         def begin_range(node, method_call)
           range_between(node.loc.expression.begin_pos,
                         method_call.loc.expression.begin_pos)

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

@@ -154,14 +154,12 @@ module RuboCop
         end
 
         def unparenthesized_method_call?(child)
-          argument = method_call_argument(child)
-
-          argument && !argument.parenthesized?
+          method_name(child) =~ /^[a-z]/i && !child.parenthesized?
         end
 
-        def_node_matcher :method_call_argument, <<-PATTERN
-          {(:defined? $(send nil? _) ...)
-           (send {_ nil?} _ $(send nil? _) ...)}
+        def_node_matcher :method_name, <<-PATTERN
+          {($:defined? (send nil? _) ...)
+           (send {_ nil?} $_ _ ...)}
         PATTERN
 
         def correct_parenthesized(condition)

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

@@ -3,11 +3,11 @@
 module RuboCop
   module Cop
     module Style
-      # This cop checks for Yoda conditions, i.e. comparison operations where
-      # readability is reduced because the operands are not ordered the same
-      # way as they would be ordered in spoken English.
+      # This cop can either enforce or forbid Yoda conditions,
+      # i.e. comparison operations where the order of expression is reversed.
+      # eg. `5 == x`
       #
-      # @example EnforcedStyle: all_comparison_operators (default)
+      # @example EnforcedStyle: forbid_for_all_comparison_operators (default)
       #   # bad
       #   99 == foo
       #   "bar" != foo
@@ -20,7 +20,7 @@ module RuboCop
       #   foo <= 42
       #   bar > 10
       #
-      # @example EnforcedStyle: equality_operators_only
+      # @example EnforcedStyle: forbid_for_equality_operators_only
       #   # bad
       #   99 == foo
       #   "bar" != foo
@@ -28,6 +28,28 @@ module RuboCop
       #   # good
       #   99 >= foo
       #   3 < a && a < 5
+      #
+      # @example EnforcedStyle: require_for_all_comparison_operators
+      #   # bad
+      #   foo == 99
+      #   foo == "bar"
+      #   foo <= 42
+      #   bar > 10
+      #
+      #   # good
+      #   99 == foo
+      #   "bar" != foo
+      #   42 >= foo
+      #   10 < bar
+      #
+      # @example EnforcedStyle: require_for_equality_operators_only
+      #   # bad
+      #   99 >= foo
+      #   3 < a && a < 5
+      #
+      #   # good
+      #   99 == foo
+      #   "bar" != foo
       class YodaCondition < Cop
         include ConfigurableEnforcedStyle
         include RangeHelp
@@ -46,9 +68,10 @@ module RuboCop
         NONCOMMUTATIVE_OPERATORS = %i[===].freeze
 
         def on_send(node)
-          return unless yoda_condition?(node)
+          return unless yoda_compatible_condition?(node)
+          return if equality_only? && non_equality_operator?(node)
 
-          add_offense(node)
+          valid_yoda?(node) || add_offense(node)
         end
 
         def autocorrect(node)
@@ -59,17 +82,33 @@ module RuboCop
 
         private
 
-        def yoda_condition?(node)
-          return false unless node.comparison_method?
+        def enforce_yoda?
+          style == :require_for_all_comparison_operators ||
+            style == :require_for_equality_operators_only
+        end
 
-          lhs, operator, rhs = *node
-          if check_equality_only?
-            return false if non_equality_operator?(operator)
-          end
+        def equality_only?
+          style == :forbid_for_equality_operators_only ||
+            style == :require_for_equality_operators_only
+        end
 
-          return false if noncommutative_operator?(operator)
+        def yoda_compatible_condition?(node)
+          node.comparison_method? &&
+            !noncommutative_operator?(node)
+        end
 
-          lhs.literal? && !rhs.literal?
+        def both_literals?(node)
+          lhs, _operator, rhs = *node
+          lhs.literal? && rhs.literal?
+        end
+
+        def valid_yoda?(node)
+          lhs, _operator, rhs = *node
+
+          return true if lhs.literal? && rhs.literal? ||
+                         !lhs.literal? && !rhs.literal?
+
+          enforce_yoda? ? lhs.literal? : rhs.literal?
         end
 
         def message(node)
@@ -91,15 +130,13 @@ module RuboCop
           REVERSE_COMPARISON.fetch(operator.to_s, operator)
         end
 
-        def check_equality_only?
-          style == :equality_operators_only
-        end
-
-        def non_equality_operator?(operator)
+        def non_equality_operator?(node)
+          _, operator, = *node
           !EQUALITY_OPERATORS.include?(operator)
         end
 
-        def noncommutative_operator?(operator)
+        def noncommutative_operator?(node)
+          _, operator, = *node
           NONCOMMUTATIVE_OPERATORS.include?(operator)
         end
       end

data/lib/rubocop/options.rb

@@ -9,6 +9,10 @@ module RuboCop
 
   # This class handles command line options.
   class Options
+    E_STDIN_NO_PATH = '-s/--stdin requires exactly one path, relative to the ' \
+      'root of the project. RuboCop will use this path to determine which ' \
+      'cops are enabled (via eg. Include/Exclude), and so that certain cops ' \
+      'like Naming/FileName can be checked.'.freeze
     EXITING_OPTIONS = %i[version verbose_version show_cops].freeze
     DEFAULT_MAXIMUM_EXCLUSION_ITEMS = 15
 
@@ -24,11 +28,9 @@ module RuboCop
       @validator.validate_compatibility
 
       if @options[:stdin]
-        # The parser has put the file name given after --stdin into
-        # @options[:stdin]. The args array should be empty.
-        if args.any?
-          raise OptionArgumentError, '-s/--stdin requires exactly one path.'
-        end
+        # The parser will put the file name given after --stdin into
+        # @options[:stdin]. If it did, then the args array should be empty.
+        raise OptionArgumentError, E_STDIN_NO_PATH if args.any?
 
         # We want the STDIN contents in @options[:stdin] and the file name in
         # args to simplify the rest of the processing.
@@ -157,6 +159,7 @@ module RuboCop
       option(opts, '-S', '--display-style-guide')
       option(opts, '-R', '--rails')
       option(opts, '-a', '--auto-correct')
+      option(opts, '--ignore-disable-comments')
 
       option(opts, '--safe')
 
@@ -373,6 +376,8 @@ module RuboCop
       force_exclusion: ['Force excluding files specified in the',
                         'configuration `Exclude` even if they are',
                         'explicitly passed as arguments.'],
+      ignore_disable_comments: ['Run cops even when they are disabled locally',
+                                'with a comment.'],
       ignore_parent_exclusion: ['Prevent from inheriting AllCops/Exclude from',
                                 'parent folders.'],
       force_default_config: ['Use default configuration even if configuration',

data/lib/rubocop/target_finder.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'set'
-require 'open3'
 
 module RuboCop
   # This class finds target files to inspect by scanning the directory tree
@@ -60,13 +59,10 @@ 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, git_files, hidden_files, base_dir_config)
+        to_inspect?(file, hidden_files, base_dir_config)
       end
 
       # Most recently modified file first.
@@ -75,6 +71,13 @@ 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
@@ -97,31 +100,6 @@ 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.62.0'.freeze
+    STRING = '0.63.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.62.0
+  version: 0.63.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-01 00:00:00.000000000 Z
+date: 2019-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jaro_winkler
@@ -202,6 +202,7 @@ files:
 - lib/rubocop/ast/node/mixin/predicate_operator_node.rb
 - lib/rubocop/ast/node/or_node.rb
 - lib/rubocop/ast/node/pair_node.rb
+- lib/rubocop/ast/node/range_node.rb
 - lib/rubocop/ast/node/regexp_node.rb
 - lib/rubocop/ast/node/resbody_node.rb
 - lib/rubocop/ast/node/send_node.rb
@@ -350,6 +351,7 @@ files:
 - lib/rubocop/cop/lint/circular_argument_reference.rb
 - lib/rubocop/cop/lint/debugger.rb
 - lib/rubocop/cop/lint/deprecated_class_methods.rb
+- lib/rubocop/cop/lint/disjunctive_assignment_in_constructor.rb
 - lib/rubocop/cop/lint/duplicate_case_condition.rb
 - lib/rubocop/cop/lint/duplicate_methods.rb
 - lib/rubocop/cop/lint/duplicated_key.rb
@@ -362,6 +364,7 @@ files:
 - lib/rubocop/cop/lint/end_in_method.rb
 - lib/rubocop/cop/lint/ensure_return.rb
 - lib/rubocop/cop/lint/erb_new_arguments.rb
+- lib/rubocop/cop/lint/flip_flop.rb
 - lib/rubocop/cop/lint/float_out_of_range.rb
 - lib/rubocop/cop/lint/format_parameter_mismatch.rb
 - lib/rubocop/cop/lint/handle_exceptions.rb
@@ -539,6 +542,7 @@ files:
 - lib/rubocop/cop/rails/application_job.rb
 - lib/rubocop/cop/rails/application_record.rb
 - lib/rubocop/cop/rails/assert_not.rb
+- lib/rubocop/cop/rails/belongs_to.rb
 - lib/rubocop/cop/rails/blank.rb
 - lib/rubocop/cop/rails/bulk_change_table.rb
 - lib/rubocop/cop/rails/create_table_with_timestamps.rb
@@ -556,6 +560,7 @@ files:
 - lib/rubocop/cop/rails/has_many_or_has_one_dependent.rb
 - lib/rubocop/cop/rails/http_positional_arguments.rb
 - lib/rubocop/cop/rails/http_status.rb
+- lib/rubocop/cop/rails/ignored_skip_action_filter_option.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
@@ -631,7 +636,6 @@ files:
 - lib/rubocop/cop/style/eval_with_location.rb
 - lib/rubocop/cop/style/even_odd.rb
 - lib/rubocop/cop/style/expand_path_arguments.rb
-- lib/rubocop/cop/style/flip_flop.rb
 - lib/rubocop/cop/style/for.rb
 - lib/rubocop/cop/style/format_string.rb
 - lib/rubocop/cop/style/format_string_token.rb