rubocop 0.62.0 → 0.63.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd76265ab6d79dd4e54127c4969d0af755732cfc
-  data.tar.gz: 12ff96a7380e7a32ea291237754f66d0450605f7
+  metadata.gz: 7aaecd68a4876e64c43f009e849b228a26805bfe
+  data.tar.gz: 68a8b80a3f44980737704d596a595548bc6cb086
 SHA512:
-  metadata.gz: 91eb27b2b5c06d550cf06d83782b53e0ff05245ec079a01ec9158e06fc00ab61324c5d6b24db0bbdc68992bdce4d051375f9e9f5224e9401c3b2f20fa6023c1f
-  data.tar.gz: c7a1c9f7f0e3d50f95c9b7e0a488cfdb31842b93e2f427ee14921429d4f64cae9ab9d0659b9775c60e5a19341615f29a4c5949451c7a4b563d7b9ca0d8994212
+  metadata.gz: e2f5aacc075c83cc70ff025a59f4ed5201de381be89da00c93ed23fceb2a43d09960a653407ee6a040a68e9f6f199bed50342fdb413c84d3b22ee8ff0f840f08
+  data.tar.gz: c9883abe7b2d4221e7af6a36f3d9aeeeca51de1a36d558c2a55a6a5b33cad9948a53bd9eeda38e4565f56b1aed85b7e98c4d2a8e2d939cb53984ad9eaec63088

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012-18 Bozhidar Batsov
+Copyright (c) 2012-19 Bozhidar Batsov
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -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.62.0', require: false
+gem 'rubocop', '~> 0.63.0', require: false
 ```
 
 ## Quickstart
@@ -217,5 +217,5 @@ RuboCop's changelog is available [here](CHANGELOG.md).
 
 ## Copyright
 
-Copyright (c) 2012-2018 Bozhidar Batsov. See [LICENSE.txt](LICENSE.txt) for
+Copyright (c) 2012-2019 Bozhidar Batsov. See [LICENSE.txt](LICENSE.txt) for
 further details.

data/config/default.yml

@@ -1191,6 +1191,12 @@ Lint/DeprecatedClassMethods:
   Enabled: true
   VersionAdded: '0.19'
 
+Lint/DisjunctiveAssignmentInConstructor:
+  Description: 'In constructor, plain assignment is preferred over disjunctive.'
+  Enabled: true
+  Safe: false
+  VersionAdded: '0.62'
+
 Lint/DuplicateCaseCondition:
   Description: 'Do not repeat values in case conditionals.'
   Enabled: true
@@ -1255,6 +1261,12 @@ Lint/ErbNewArguments:
   Enabled: true
   VersionAdded: '0.56'
 
+Lint/FlipFlop:
+  Description: 'Checks for flip-flops'
+  StyleGuide: '#no-flip-flops'
+  Enabled: true
+  VersionAdded: '0.16'
+
 Lint/FloatOutOfRange:
   Description: >-
                  Catches floating-point literals too large or small for Ruby to
@@ -2074,6 +2086,7 @@ Performance/RangeInclude:
   Reference: 'https://github.com/JuanitoFatas/fast-ruby#cover-vs-include-code'
   Enabled: true
   VersionAdded: '0.36'
+  Safe: false
 
 Performance/RedundantBlockCall:
   Description: 'Use `yield` instead of `block.call`.'
@@ -2228,6 +2241,13 @@ Rails/AssertNot:
   Include:
     - '**/test/**/*'
 
+Rails/BelongsTo:
+  Description: >-
+                  Use `optional: true` instead of `required: false` for
+                  `belongs_to` relations'
+  Enabled: true
+  VersionAdded: '0.62'
+
 Rails/Blank:
   Description: 'Enforces use of `blank?`.'
   Enabled: true
@@ -2384,6 +2404,14 @@ Rails/HttpStatus:
     - numeric
     - symbolic
 
+Rails/IgnoredSkipActionFilterOption:
+  Description: 'Checks that `if` and `only` (or `except`) are not used together as options of `skip_*` action filter.'
+  Reference: 'https://api.rubyonrails.org/classes/AbstractController/Callbacks/ClassMethods.html#method-i-_normalize_callback_options'
+  Enabled: true
+  VersionAdded: '0.63'
+  Include:
+    - app/controllers/**/*.rb
+
 Rails/InverseOf:
   Description: 'Checks for associations where the inverse cannot be determined automatically.'
   Enabled: true
@@ -3128,12 +3156,6 @@ Style/ExpandPathArguments:
   Enabled: true
   VersionAdded: '0.53'
 
-Style/FlipFlop:
-  Description: 'Checks for flip flops'
-  StyleGuide: '#no-flip-flops'
-  Enabled: true
-  VersionAdded: '0.16'
-
 Style/For:
   Description: 'Checks use of for or each in multiline loops.'
   StyleGuide: '#no-for-loops'
@@ -3174,7 +3196,7 @@ Style/FormatStringToken:
 Style/FrozenStringLiteralComment:
   Description: >-
                  Add the frozen_string_literal comment to the top of files
-                 to help transition from Ruby 2.3.0 to Ruby 3.0.
+                 to help transition to frozen string literals by default.
   Enabled: true
   VersionAdded: '0.36'
   VersionChanged: '0.47'
@@ -4292,17 +4314,21 @@ Style/WordArray:
   WordRegex: !ruby/regexp '/\A[\p{Word}\n\t]+\z/'
 
 Style/YodaCondition:
-  Description: 'Do not use literals as the first operand of a comparison.'
+  Description: 'Forbid or enforce yoda conditions.'
   Reference: 'https://en.wikipedia.org/wiki/Yoda_conditions'
   Enabled: true
-  EnforcedStyle: all_comparison_operators
+  EnforcedStyle: forbid_for_all_comparison_operators
   SupportedStyles:
     # check all comparison operators
-    - all_comparison_operators
+    - forbid_for_all_comparison_operators
     # check only equality operators: `!=` and `==`
-    - equality_operators_only
+    - forbid_for_equality_operators_only
+    # enforce yoda for all comparison operators
+    - require_for_all_comparison_operators
+    # enforce yoda only for equality operators: `!=` and `==`
+    - require_for_equality_operators_only
   VersionAdded: '0.49'
-  VersionChanged: '0.50'
+  VersionChanged: '0.63'
 
 Style/ZeroLengthPredicate:
   Description: 'Use #empty? when testing for objects of length 0.'

data/lib/rubocop.rb

@@ -48,6 +48,7 @@ require_relative 'rubocop/ast/node/if_node'
 require_relative 'rubocop/ast/node/keyword_splat_node'
 require_relative 'rubocop/ast/node/or_node'
 require_relative 'rubocop/ast/node/pair_node'
+require_relative 'rubocop/ast/node/range_node'
 require_relative 'rubocop/ast/node/regexp_node'
 require_relative 'rubocop/ast/node/resbody_node'
 require_relative 'rubocop/ast/node/send_node'
@@ -265,6 +266,7 @@ require_relative 'rubocop/cop/lint/boolean_symbol'
 require_relative 'rubocop/cop/lint/circular_argument_reference'
 require_relative 'rubocop/cop/lint/debugger'
 require_relative 'rubocop/cop/lint/deprecated_class_methods'
+require_relative 'rubocop/cop/lint/disjunctive_assignment_in_constructor'
 require_relative 'rubocop/cop/lint/duplicate_case_condition'
 require_relative 'rubocop/cop/lint/duplicate_methods'
 require_relative 'rubocop/cop/lint/duplicated_key'
@@ -277,6 +279,7 @@ require_relative 'rubocop/cop/lint/empty_when'
 require_relative 'rubocop/cop/lint/end_in_method'
 require_relative 'rubocop/cop/lint/ensure_return'
 require_relative 'rubocop/cop/lint/erb_new_arguments'
+require_relative 'rubocop/cop/lint/flip_flop'
 require_relative 'rubocop/cop/lint/float_out_of_range'
 require_relative 'rubocop/cop/lint/format_parameter_mismatch'
 require_relative 'rubocop/cop/lint/handle_exceptions'
@@ -436,7 +439,6 @@ require_relative 'rubocop/cop/style/end_block'
 require_relative 'rubocop/cop/style/eval_with_location'
 require_relative 'rubocop/cop/style/even_odd'
 require_relative 'rubocop/cop/style/expand_path_arguments'
-require_relative 'rubocop/cop/style/flip_flop'
 require_relative 'rubocop/cop/style/for'
 require_relative 'rubocop/cop/style/format_string'
 require_relative 'rubocop/cop/style/format_string_token'
@@ -560,6 +562,7 @@ require_relative 'rubocop/cop/rails/active_support_aliases'
 require_relative 'rubocop/cop/rails/application_job'
 require_relative 'rubocop/cop/rails/application_record'
 require_relative 'rubocop/cop/rails/assert_not'
+require_relative 'rubocop/cop/rails/belongs_to'
 require_relative 'rubocop/cop/rails/blank'
 require_relative 'rubocop/cop/rails/bulk_change_table'
 require_relative 'rubocop/cop/rails/create_table_with_timestamps'
@@ -577,6 +580,7 @@ require_relative 'rubocop/cop/rails/has_and_belongs_to_many'
 require_relative 'rubocop/cop/rails/has_many_or_has_one_dependent'
 require_relative 'rubocop/cop/rails/http_positional_arguments'
 require_relative 'rubocop/cop/rails/http_status'
+require_relative 'rubocop/cop/rails/ignored_skip_action_filter_option'
 require_relative 'rubocop/cop/rails/inverse_of'
 require_relative 'rubocop/cop/rails/lexically_scoped_action_filter'
 require_relative 'rubocop/cop/rails/link_to_blank'

data/lib/rubocop/ast/builder.rb

@@ -27,6 +27,8 @@ module RuboCop
         for: ForNode,
         hash: HashNode,
         if: IfNode,
+        irange: RangeNode,
+        erange: RangeNode,
         kwsplat: KeywordSplatNode,
         or: OrNode,
         pair: PairNode,

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

@@ -141,6 +141,35 @@ module RuboCop
 
         [condition, true_branch, false_branch]
       end
+
+      # Returns an array of all the branches in the conditional statement.
+      #
+      # @return [Array<Node>] an array of branch nodes
+      def branches
+        branches = [if_branch]
+
+        return branches unless else_branch
+
+        other_branches = if elsif_conditional?
+                           else_branch.branches
+                         else
+                           [else_branch]
+                         end
+        branches.concat(other_branches)
+      end
+
+      # Calls the given block for each branch node in the conditional statement.
+      # If no block is given, an `Enumerator` is returned.
+      #
+      # @return [self] if a block is given
+      # @return [Enumerator] if no block is given
+      def each_branch
+        return branches.to_enum(__method__) unless block_given?
+
+        branches.each do |branch|
+          yield branch
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module AST
+    # A node extension for `irange` and `erange` nodes. This will be used in
+    # place of a plain node when the builder constructs the AST, making its
+    # methods available to all `irange` and `erange` nodes within RuboCop.
+    class RangeNode < Node
+    end
+  end
+end

data/lib/rubocop/ast/traversal.rb

@@ -23,7 +23,7 @@ module RuboCop
                              preexe postexe match_current_line defined?
                              arg_expr].freeze
       MANY_CHILD_NODES  = %i[dstr dsym xstr regexp array hash pair
-                             irange erange mlhs masgn or_asgn and_asgn
+                             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
@@ -176,6 +176,8 @@ module RuboCop
       alias on_ensure  on_case
       alias on_for     on_case
       alias on_when    on_case
+      alias on_irange  on_case
+      alias on_erange  on_case
     end
   end
 end

data/lib/rubocop/config.rb

@@ -26,6 +26,8 @@ module RuboCop
     RUBY_VERSION_FILENAME = '.ruby-version'.freeze
     DEFAULT_RAILS_VERSION = 5.0
     OBSOLETE_COPS = {
+      'Style/FlipFlop' =>
+        'The `Style/FlipFlop` cop has been moved to `Lint/FlipFlop`.',
       'Style/TrailingComma' =>
         'The `Style/TrailingComma` cop no longer exists. Please use ' \
         '`Style/TrailingCommaInArguments`, ' \

data/lib/rubocop/cop/cop.rb

@@ -218,7 +218,7 @@ module RuboCop
       end
 
       def enabled_line?(line_number)
-        return true unless @processed_source
+        return true if @options[:ignore_disable_comments] || !@processed_source
 
         @processed_source.comment_config.cop_enabled_at_line?(self, line_number)
       end

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

@@ -33,10 +33,11 @@ module RuboCop
       #
       #   # bad
       #   h = { a: { b: 2 } }
+      #   foo = { { a: 1 } => { b: { c: 2 } } }
       #
       #   # good
       #   h = { a: { b: 2 }}
-      #
+      #   foo = {{ a: 1 } => { b: { c: 2 }}}
       #
       # @example EnforcedStyleForEmptyBraces: no_space (default)
       #   # The `no_space` EnforcedStyleForEmptyBraces style enforces that

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

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Lint
+      # This cop checks constructors for disjunctive assignments that should
+      # be plain assignments.
+      #
+      # So far, this cop is only concerned with disjunctive assignment of
+      # instance variables.
+      #
+      # In ruby, an instance variable is nil until a value is assigned, so the
+      # disjunction is unnecessary. A plain assignment has the same effect.
+      #
+      # @example
+      #   # bad
+      #   def initialize
+      #     @x ||= 1
+      #   end
+      #
+      #   # good
+      #   def initialize
+      #     @x = 1
+      #   end
+      class DisjunctiveAssignmentInConstructor < Cop
+        MSG = 'Unnecessary disjunctive assignment. Use plain assignment.'.freeze
+
+        def on_def(node)
+          check(node)
+        end
+
+        private
+
+        def check(node)
+          return unless node.method_name == :initialize
+
+          check_body(node)
+        end
+
+        # @param [DefNode] node a constructor definition
+        def check_body(node)
+          body = node.body
+          case body.type
+          when :begin
+            check_body_lines(body.child_nodes)
+          else
+            check_body_lines([body])
+          end
+        end
+
+        # @param [Array] lines the logical lines of the constructor
+        def check_body_lines(lines)
+          lines.each do |line|
+            case line.type
+            when :or_asgn
+              check_disjunctive_assignment(line)
+            else
+              # Once we encounter something other than a disjunctive
+              # assignment, we cease our investigation, because we can't be
+              # certain that any future disjunctive assignments are offensive.
+              # You're off the case, detective!
+              break
+            end
+          end
+        end
+
+        # Add an offense if the LHS of the given disjunctive assignment is
+        # an instance variable.
+        #
+        # For now, we only care about assignments to instance variables.
+        #
+        # @param [Node] node a disjunctive assignment
+        def check_disjunctive_assignment(node)
+          lhs = node.child_nodes.first
+          add_offense(node, location: :operator) if lhs.ivasgn_type?
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/{style → lint}/flip_flop.rb

@@ -2,8 +2,9 @@
 
 module RuboCop
   module Cop
-    module Style
-      # This cop looks for uses of flip flop operator
+    module Lint
+      # This cop looks for uses of flip-flop operator.
+      # flip-flop operator is deprecated since Ruby 2.6.0.
       #
       # @example
       #   # bad
@@ -16,7 +17,7 @@ module RuboCop
       #     puts x if (x >= 5) && (x <= 10)
       #   end
       class FlipFlop < Cop
-        MSG = 'Avoid the use of flip flop operators.'.freeze
+        MSG = 'Avoid the use of flip-flop operators.'.freeze
 
         def on_iflipflop(node)
           add_offense(node)

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

@@ -53,11 +53,7 @@ module RuboCop
           return if rescue_modifier?(node)
 
           _body, *rescues, _else = *node
-          rescued_groups = rescues.each_with_object([]) do |group, exceptions|
-            rescue_group, = *group
-
-            exceptions << evaluate_exceptions(rescue_group)
-          end
+          rescued_groups = rescued_groups_for(rescues)
 
           rescue_group_rescues_multiple_levels = rescued_groups.any? do |group|
             contains_multiple_levels_of_exceptions?(group)
@@ -72,17 +68,16 @@ module RuboCop
         private
 
         def offense_range(rescues)
-          first_rescue = rescues.first
-          last_rescue = rescues.last
-          last_exceptions, = *last_rescue
-          # last_rescue clause may not specify exception class
-          end_pos = if last_exceptions
-                      last_exceptions.loc.expression.end_pos
-                    else
-                      last_rescue.loc.keyword.end_pos
-                    end
-
-          range_between(first_rescue.loc.expression.begin_pos, end_pos)
+          shadowing_rescue = find_shadowing_rescue(rescues)
+          expression = shadowing_rescue.loc.expression
+          range_between(expression.begin_pos, expression.end_pos)
+        end
+
+        def rescued_groups_for(rescues)
+          rescues.map do |group|
+            rescue_group, = *group
+            evaluate_exceptions(rescue_group)
+          end
         end
 
         def contains_multiple_levels_of_exceptions?(group)
@@ -153,6 +148,17 @@ module RuboCop
             klass.source
           end.compact
         end
+
+        def find_shadowing_rescue(rescues)
+          rescued_groups = rescued_groups_for(rescues)
+          rescued_groups.zip(rescues).each do |group, res|
+            return res if contains_multiple_levels_of_exceptions?(group)
+          end
+
+          rescued_groups.each_cons(2).with_index do |group_pair, i|
+            return rescues[i] unless sorted?(group_pair)
+          end
+        end
       end
     end
   end