rubocop 0.41.2 → 0.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a7d6fcd2f40430ad14bde72540681109b1e9f5b
-  data.tar.gz: af9a00491131661fdd1866f9b6b774c7ed92763c
+  metadata.gz: 4a32da91af2bcd18b8deee4673be9daf3a5783d2
+  data.tar.gz: 8d6c1b8a6624ccdaa5014ac08c18b2483768386c
 SHA512:
-  metadata.gz: 3eb3c0f92e9455c4225a7eb7c571227db0b6cb3563ab746029c3d108d0146ce68762e5a4f8193acc8e0f92172ade66f102a3bcb24488c06cc749ef82826e7e26
-  data.tar.gz: 152966c8fc530fad493837af8e58a5d8128d17b0fbe2514f9b8f14db104b68ef31e3275f8036abd5b41dec4fbdb5184eee44b79e836c305f80ae90df7e9a329d
+  metadata.gz: 0a5deb237bbedb201eabcfc8923d488bd44c11e151371cc467f8ac8678c8f04fb48fddd4d721dd0cc147a01006916bd554a333d755114f9ea665be61beaef557
+  data.tar.gz: 7adc5a8bc59f5fecc727ebe5e60ebdc0c87072636294d91a701263e77ac9a785a471469d1bd0d035d10dd5cefbfd7fcb4d506a5cd9c240b193591200c8af4cbe

data/README.md

@@ -51,7 +51,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.41.2', require: false
+gem 'rubocop', '~> 0.42.0', require: false
 ```
 
 ## Quickstart
@@ -71,12 +71,11 @@ You can read a ton more about RuboCop in its [official manual](http://rubocop.re
 
 RuboCop supports the following Ruby implementations:
 
-* MRI 1.9.3
 * MRI 2.0
 * MRI 2.1
 * MRI 2.2
 * MRI 2.3
-* JRuby in 1.9 mode
+* JRuby 9.0+
 * Rubinius 2.0+
 
 ## Team

data/config/default.yml

@@ -643,6 +643,12 @@ Style/NonNilCheck:
   # offenses for `!x.nil?` and does no changes that might change behavior.
   IncludeSemanticChanges: false
 
+Style/NumericPredicate:
+  EnforcedStyle: predicate
+  SupportedStyles:
+    - predicate
+    - comparison
+
 Style/MethodDefParentheses:
   EnforcedStyle: require_parentheses
   SupportedStyles:
@@ -952,6 +958,13 @@ Style/SymbolProc:
     - respond_to
     - define_method
 
+Style/TernaryParentheses:
+  EnforcedStyle: require_no_parentheses
+  SupportedStyles:
+    - require_parentheses
+    - require_no_parentheses
+  AllowSafeAssignment: true
+
 Style/TrailingBlankLines:
   EnforcedStyle: final_newline
   SupportedStyles:

data/config/disabled.yml

@@ -5,6 +5,11 @@
 Rails:
   Enabled: false
 
+Rails/SaveBang:
+  Description: 'Identifies possible cases where Active Record save! or related should be used.'
+  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#save-bang'
+  Enabled: false
+
 Style/AutoResourceCleanup:
   Description: 'Suggests the usage of an auto resource cleanup version of a method (if available).'
   Enabled: false

data/config/enabled.yml

@@ -417,6 +417,11 @@ Style/MethodName:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#snake-case-symbols-methods-vars'
   Enabled: true
 
+Style/MethodMissing:
+  Description: 'Avoid using `method_missing`.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-method-missing'
+  Enabled: true
+
 Style/ModuleFunction:
   Description: 'Checks for usage of `extend self` in modules.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#module-function'
@@ -547,6 +552,12 @@ Style/NumericLiteralPrefix:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#numeric-literal-prefixes'
   Enabled: true
 
+Style/NumericPredicate:
+  Description: >-
+                 Checks for the use of predicate- or comparison methods for
+                 numeric comparisons.
+  Enabled: true
+
 Style/OneLineConditional:
   Description: >-
                  Favor the ternary operator(?:) over
@@ -832,6 +843,10 @@ Style/Tab:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-indentation'
   Enabled: true
 
+Style/TernaryParentheses:
+  Description: 'Checks for use of parentheses around ternary conditions.'
+  Enabled: true
+
 Style/TrailingBlankLines:
   Description: 'Checks trailing blank lines and final newline.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#newline-eof'
@@ -1206,6 +1221,7 @@ Lint/UnreachableCode:
 Lint/UselessAccessModifier:
   Description: 'Checks for useless access modifiers.'
   Enabled: true
+  ContextCreatingMethods: []
 
 Lint/UselessArraySplat:
   Description: 'Checks for useless array splats.'
@@ -1400,14 +1416,17 @@ Rails/Exit:
 
 Rails/FindBy:
   Description: 'Prefer find_by over where.first.'
+  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#find_by'
   Enabled: true
 
 Rails/FindEach:
   Description: 'Prefer all.find_each over all.find.'
+  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#find-each'
   Enabled: true
 
 Rails/HasAndBelongsToMany:
   Description: 'Prefer has_many :through to has_and_belongs_to_many.'
+  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#has-many-through'
   Enabled: true
 
 Rails/Output:
@@ -1426,6 +1445,7 @@ Rails/ReadWriteAttribute:
   Description: >-
                  Checks for read_attribute(:attr) and
                  write_attribute(:attr, val).
+  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#read-attribute'
   Enabled: true
 
 Rails/RequestReferer:

data/lib/rubocop.rb

@@ -268,6 +268,7 @@ require 'rubocop/cop/style/method_call_parentheses'
 require 'rubocop/cop/style/method_called_on_do_end_block'
 require 'rubocop/cop/style/method_def_parentheses'
 require 'rubocop/cop/style/method_name'
+require 'rubocop/cop/style/method_missing'
 require 'rubocop/cop/style/missing_else'
 require 'rubocop/cop/style/module_function'
 require 'rubocop/cop/style/multiline_array_brace_layout'
@@ -293,6 +294,7 @@ require 'rubocop/cop/style/non_nil_check'
 require 'rubocop/cop/style/not'
 require 'rubocop/cop/style/numeric_literals'
 require 'rubocop/cop/style/numeric_literal_prefix'
+require 'rubocop/cop/style/numeric_predicate'
 require 'rubocop/cop/style/one_line_conditional'
 require 'rubocop/cop/style/op_method'
 require 'rubocop/cop/style/option_hash'
@@ -352,6 +354,7 @@ require 'rubocop/cop/style/symbol_array'
 require 'rubocop/cop/style/symbol_literal'
 require 'rubocop/cop/style/symbol_proc'
 require 'rubocop/cop/style/tab'
+require 'rubocop/cop/style/ternary_parentheses'
 require 'rubocop/cop/style/trailing_blank_lines'
 require 'rubocop/cop/style/trailing_comma_in_arguments'
 require 'rubocop/cop/style/trailing_comma_in_literal'
@@ -382,6 +385,7 @@ require 'rubocop/cop/rails/output'
 require 'rubocop/cop/rails/pluralization_grammar'
 require 'rubocop/cop/rails/read_write_attribute'
 require 'rubocop/cop/rails/request_referer'
+require 'rubocop/cop/rails/save_bang'
 require 'rubocop/cop/rails/scope_args'
 require 'rubocop/cop/rails/time_zone'
 require 'rubocop/cop/rails/uniq_before_pluck'

data/lib/rubocop/ast_node.rb

@@ -113,7 +113,8 @@ module RuboCop
       Node.new(type || @type, children || @children, properties)
     end
 
-    # Returns the index of the receiver node in its siblings.
+    # Returns the index of the receiver node in its siblings. (Sibling index
+    # uses zero based numbering.)
     #
     # @return [Integer] the index of the receiver node in its siblings
     def sibling_index
@@ -564,12 +565,12 @@ module RuboCop
     def case_if_value_used?
       # (case <condition> <when...>)
       # (if <condition> <truebranch> <falsebranch>)
-      sibling_index == 0 ? true : parent.value_used?
+      sibling_index.zero? ? true : parent.value_used?
     end
 
     def while_until_value_used?
       # (while <condition> <body>) -> always evaluates to `nil`
-      sibling_index == 0
+      sibling_index.zero?
     end
 
     def parent_module_name_part(node)

data/lib/rubocop/config.rb

@@ -18,7 +18,7 @@ module RuboCop
                        AutoCorrect StyleGuide Details).freeze
     # 2.0 is the oldest officially supported Ruby version.
     DEFAULT_RUBY_VERSION = 2.0
-    KNOWN_RUBIES = [1.9, 2.0, 2.1, 2.2, 2.3].freeze
+    KNOWN_RUBIES = [1.9, 2.0, 2.1, 2.2, 2.3, 2.4].freeze
     OBSOLETE_COPS = {
       'Style/TrailingComma' =>
         'The `Style/TrailingComma` cop no longer exists. Please use ' \

data/lib/rubocop/config_loader.rb

@@ -140,13 +140,8 @@ module RuboCop
 
       def load_yaml_configuration(absolute_path)
         yaml_code = IO.read(absolute_path, encoding: 'UTF-8')
-        # At one time, there was a problem with the psych YAML engine under
-        # Ruby 1.9.3. YAML.load_file would crash when reading empty .yml files
-        # or files that only contained comments and blank lines. This problem
-        # is not possible to reproduce now, but we want to avoid it in case
-        # it's still there. So we only load the YAML code if we find some real
-        # code in there.
-        hash = yaml_code =~ /^[A-Z]/i ? yaml_safe_load(yaml_code) : {}
+        hash = yaml_safe_load(yaml_code) || {}
+
         puts "configuration from #{absolute_path}" if debug?
 
         unless hash.is_a?(Hash)

data/lib/rubocop/cop/cop.rb

@@ -217,17 +217,17 @@ module RuboCop
 
       def style_guide_url
         url = cop_config['StyleGuide']
-        (url.nil? || url.empty?) ? nil : url
+        url.nil? || url.empty? ? nil : url
       end
 
       def reference_url
         url = cop_config['Reference']
-        (url.nil? || url.empty?) ? nil : url
+        url.nil? || url.empty? ? nil : url
       end
 
       def details
         details = cop_config && cop_config['Details']
-        (details.nil? || details.empty?) ? nil : details
+        details.nil? || details.empty? ? nil : details
       end
 
       private

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

@@ -174,24 +174,26 @@ module RuboCop
 
         def autocorrect(node)
           ancestor_node = start_for_block_node(node)
-          source = node.source_range.source_buffer
-
-          lambda do |corrector|
-            starting_position_of_block_end = node.loc.end.begin_pos
-            end_col = node.loc.end.column
-            start_col = compute_start_col(ancestor_node, node)
-
-            if end_col < start_col
-              delta = start_col - end_col
-              corrector.insert_before(node.loc.end, ' ' * delta)
-            elsif end_col > start_col
-              range_start = starting_position_of_block_end + start_col - end_col
-              range = Parser::Source::Range.new(source, range_start,
-                                                starting_position_of_block_end)
-              corrector.remove(range)
-            end
+          start_col = compute_start_col(ancestor_node, node)
+          loc_end = node.loc.end
+          delta = start_col - loc_end.column
+
+          if delta > 0
+            add_space_before(loc_end, delta)
+          elsif delta < 0
+            source = node.source_range.source_buffer
+            remove_space_before(loc_end.begin_pos, -delta, source)
           end
         end
+
+        def add_space_before(loc, delta)
+          ->(corrector) { corrector.insert_before(loc, ' ' * delta) }
+        end
+
+        def remove_space_before(end_pos, delta, source)
+          range = Parser::Source::Range.new(source, end_pos - delta, end_pos)
+          ->(corrector) { corrector.remove(range) }
+        end
       end
     end
   end

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

@@ -91,29 +91,44 @@ module RuboCop
         end
 
         def check_scope(node, cur_vis = :public)
-          node.children.each do |child|
-            if (new_vis = access_modifier(child))
-              @last_access_modifier = child
-              cur_vis = new_vis
-            elsif child.defs_type?
-              if cur_vis != :public
-                _, method_name, = *child
-                @useless[method_name] = [child, cur_vis, @last_access_modifier]
-              end
-            elsif (methods = private_class_method(child))
-              # don't warn about defs nodes which are followed by a call to
-              # `private_class_method :name`
-              # obviously the programmer knows what they are doing
-              methods.select(&:sym_type?).each do |sym|
-                @useless.delete(sym.children[0])
-              end
-            elsif child.kwbegin_type?
-              cur_vis = check_scope(child, cur_vis)
-            end
+          node.children.reduce(cur_vis) do |visibility, child|
+            check_child_scope(child, visibility)
+          end
+        end
+
+        def check_child_scope(node, cur_vis)
+          if (new_vis = access_modifier(node))
+            cur_vis = change_visibility(node, new_vis)
+          elsif node.defs_type?
+            mark_method_as_useless(node, cur_vis) if cur_vis != :public
+          elsif (methods = private_class_method(node))
+            # don't warn about defs nodes which are followed by a call to
+            # `private_class_method :name`
+            # obviously the programmer knows what they are doing
+            revert_method_uselessness(methods)
+          elsif node.kwbegin_type?
+            cur_vis = check_scope(node, cur_vis)
           end
 
           cur_vis
         end
+
+        def change_visibility(node, new_vis)
+          @last_access_modifier = node
+          new_vis
+        end
+
+        def mark_method_as_useless(node, cur_vis)
+          _, method_name, = *node
+          @useless[method_name] = [node, cur_vis, @last_access_modifier]
+        end
+
+        def revert_method_uselessness(methods)
+          methods.each do |sym|
+            next unless sym.sym_type?
+            @useless.delete(sym.children[0])
+          end
+        end
       end
     end
   end

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

@@ -27,11 +27,19 @@ module RuboCop
 
         def on_block(node)
           on_body_of_reduce(node) do |body|
-            void_next = body.each_node(:next).find { |n| n.children.empty? }
+            void_next = body.each_node(:next).find do |n|
+              n.children.empty? && parent_block_node(n) == node
+            end
 
             add_offense(void_next, :expression) if void_next
           end
         end
+
+        private
+
+        def parent_block_node(node)
+          node.each_ancestor.find { |n| n.type == :block }
+        end
       end
     end
   end

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

@@ -66,10 +66,22 @@ module RuboCop
         end
 
         def contains_multiple_levels_of_exceptions?(group)
+          if group.size > 1 && group.include?(Exception)
+            # Treat `Exception` as the highest level exception unless `nil` was
+            # also rescued
+            return !(group.size == 2 && group.include?(NilClass))
+          end
+
           group.any? do |exception|
             higher_exception = false
             group.each_with_index do |_e, i|
-              higher_exception ||= group[i] < exception
+              higher_exception ||= begin
+                                     if group[i].nil? || exception.nil?
+                                       false
+                                     else
+                                       group[i] < exception
+                                     end
+                                   end
             end
 
             higher_exception
@@ -83,7 +95,7 @@ module RuboCop
               begin
                 converted << instance_eval(exception, __FILE__, __LINE__)
               rescue StandardError, ScriptError
-                next
+                converted << nil
               end
             end
           else
@@ -94,7 +106,15 @@ module RuboCop
 
         def sort_rescued_groups(groups)
           groups.sort do |x, y|
-            x <=> y || 0
+            if x.include?(Exception)
+              1
+            elsif y.include?(Exception)
+              -1
+            elsif x.empty? || y.empty?
+              0
+            else
+              x <=> y || 0
+            end
           end
         end
 

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

@@ -42,7 +42,7 @@ module RuboCop
                                                    # Special for a comment that
                                                    # begins the file: remove
                                                    # the newline at the end.
-                                                   original_begin == 0)
+                                                   original_begin.zero?)
             else
               # Is there any cop between this one and the end of the line, which
               # is NOT being removed?

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

@@ -56,6 +56,29 @@ module RuboCop
       #     def self.method3
       #     end
       #   end
+      #
+      # @example
+      #   # Lint/UselessAccessModifier:
+      #   #   ContextCreatingMethods:
+      #   #     - concerning
+      #   require 'active_support/concern'
+      #   class Foo
+      #     concerning :Bar do
+      #       def some_public_method
+      #       end
+      #
+      #       private
+      #
+      #       def some_private_method
+      #       end
+      #     end
+      #
+      #     # this is not redundant because `concerning` created its own context
+      #     private
+      #
+      #     def some_other_private_method
+      #     end
+      #   end
       class UselessAccessModifier < Cop
         MSG = 'Useless `%s` access modifier.'.freeze
 
@@ -68,7 +91,7 @@ module RuboCop
         end
 
         def on_block(node)
-          return unless instance_eval_or_new_call?(node)
+          return unless eval_call?(node)
 
           check_node(node.children[2]) # block body
         end
@@ -153,12 +176,26 @@ module RuboCop
 
         def start_of_new_scope?(child)
           child.module_type? || child.class_type? ||
-            child.sclass_type? || instance_eval_or_new_call?(child)
+            child.sclass_type? || eval_call?(child)
         end
 
-        def instance_eval_or_new_call?(child)
+        def eval_call?(child)
           class_or_instance_eval?(child) ||
-            class_or_module_or_struct_new_call?(child)
+            class_or_module_or_struct_new_call?(child) ||
+            any_context_creating_methods?(child)
+        end
+
+        def any_context_creating_methods?(child)
+          cop_config.fetch('ContextCreatingMethods', []).any? do |m|
+            matcher_name = "#{m}_block?".to_sym
+            unless respond_to?(matcher_name)
+              self.class.def_node_matcher matcher_name, <<-PATTERN
+                (block (send {nil const} {:#{m}} ...) ...)
+              PATTERN
+            end
+
+            send(matcher_name, child)
+          end
         end
       end
     end