rubocop 0.9.1 → 0.10.0

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

@@ -29,6 +29,8 @@ module Rubocop
         STR_NODE = s(:send, s(:const, nil, :String), :new)
 
         def on_send(node)
+          return if part_of_ignored_node?(node)
+
           case node
           when ARRAY_NODE
             add_offence(:convention,
@@ -45,7 +47,7 @@ module Rubocop
           end
         end
 
-        # TODO Check block contents as well
+        # TODO: Check block contents as well.
         alias_method :on_block, :ignore_node
       end
     end

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

@@ -10,14 +10,15 @@ module Rubocop
       class Encoding < Cop
         MSG = 'Missing utf-8 encoding comment.'
 
-        def inspect(source_buffer, source, tokens, ast, comments)
+        def investigate(processed_source)
           unless RUBY_VERSION >= '2.0.0'
-            expected_line = 0
-            expected_line += 1 if source[expected_line] =~ /^#!/
-            unless source[expected_line] =~ /#.*coding: (UTF|utf)-8/
+            line_number = 0
+            line_number += 1 if processed_source[line_number] =~ /^#!/
+            line = processed_source[line_number]
+            unless line =~ /#.*coding\s?: (UTF|utf)-8/
               add_offence(:convention,
-                          source_range(source_buffer,
-                                       source[0...expected_line],
+                          source_range(processed_source.buffer,
+                                       processed_source[0...line_number],
                                        0, 1),
                           MSG)
             end

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

@@ -9,8 +9,6 @@ module Rubocop
 
         def on_postexe(node)
           add_offence(:convention, node.loc.keyword, MSG)
-
-          super
         end
       end
     end

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

@@ -7,11 +7,12 @@ module Rubocop
       class EndOfLine < Cop
         MSG = 'Carriage return character detected.'
 
-        def inspect(source_buffer, source, tokens, ast, comments)
-          source.each_with_index do |line, index|
+        def investigate(processed_source)
+          processed_source.lines.each_with_index do |line, index|
             if line =~ /\r$/
               add_offence(:convention,
-                          source_range(source_buffer, source[0...index],
+                          source_range(processed_source.buffer,
+                                       processed_source[0...index],
                                        line.length - 1, 1),
                           MSG)
             end

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

@@ -20,8 +20,6 @@ module Rubocop
                         node.loc.selector,
                         MSG)
           end
-
-          super
         end
       end
     end

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

@@ -5,7 +5,7 @@ module Rubocop
     module Style
       # Common functionality for modifier cops.
       module FavorModifier
-        # TODO extremely ugly solution that needs lots of polish
+        # TODO: Extremely ugly solution that needs lots of polish.
         def check(sexp, comments)
           case sexp.loc.keyword.source
           when 'if'     then cond, body, _else = *sexp
@@ -61,16 +61,16 @@ module Rubocop
             'Another good alternative is the usage of control flow &&/||.'
         end
 
-        def inspect(source_buffer, source, tokens, ast, comments)
-          return unless ast
-          on_node(:if, ast) do |node|
+        def investigate(processed_source)
+          return unless processed_source.ast
+          on_node(:if, processed_source.ast) do |node|
             # discard ternary ops, if/else and modifier if/unless nodes
             return if ternary_op?(node)
             return if modifier_if?(node)
             return if elsif?(node)
             return if if_else?(node)
 
-            if check(node, comments)
+            if check(node, processed_source.comments)
               add_offence(:convention, node.loc.expression, error_message)
             end
           end
@@ -101,13 +101,13 @@ module Rubocop
         MSG =
           'Favor modifier while/until usage when you have a single-line body.'
 
-        def inspect(source_buffer, source, tokens, ast, comments)
-          return unless ast
-          on_node([:while, :until], ast) do |node|
+        def investigate(processed_source)
+          return unless processed_source.ast
+          on_node([:while, :until], processed_source.ast) do |node|
             # discard modifier while/until
             next unless node.loc.end
 
-            if check(node, comments)
+            if check(node, processed_source.comments)
               add_offence(:convention, node.loc.expression, MSG)
             end
           end

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

@@ -19,8 +19,6 @@ module Rubocop
                arg_nodes[0].type == :array)
             add_offence(:convention, node.loc.selector, MSG)
           end
-
-          super
         end
       end
     end

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

@@ -28,7 +28,6 @@ module Rubocop
 
         def on_if(node)
           check(node)
-          super
         end
 
         def error_message
@@ -42,7 +41,6 @@ module Rubocop
 
         def on_while(node)
           check(node)
-          super
         end
 
         def error_message

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

@@ -24,8 +24,6 @@ module Rubocop
               end
             end
           end
-
-          super
         end
 
         private

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

@@ -7,12 +7,10 @@ module Rubocop
       module IfThenElse
         def on_if(node)
           check(node)
-          super
         end
 
         def on_unless(node)
           check(node)
-          super
         end
 
         def check(node)

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

@@ -29,8 +29,6 @@ module Rubocop
               add_offence(:convention, block_method.loc.expression, MULTI_MSG)
             end
           end
-
-          super
         end
 
         private

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

@@ -10,8 +10,8 @@ module Rubocop
       class LeadingCommentSpace < Cop
         MSG = 'Missing space after #.'
 
-        def inspect(source_buffer, source, tokens, ast, comments)
-          comments.each do |comment|
+        def investigate(processed_source)
+          processed_source.comments.each do |comment|
             if comment.text =~ /^#+[^#\s:+-]/
               unless comment.text.start_with?('#!') && comment.loc.line == 1
                 add_offence(:convention, comment.loc, MSG)

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

@@ -10,11 +10,12 @@ module Rubocop
       class LineContinuation < Cop
         MSG = 'Avoid the use of the line continuation character(\).'
 
-        def inspect(source_buffer, source, tokens, ast, comments)
-          source.each_with_index do |line, index|
+        def investigate(processed_source)
+          processed_source.lines.each_with_index do |line, index|
             if line =~ /.*\\\z/
               add_offence(:convention,
-                          source_range(source_buffer, source[0...index],
+                          source_range(processed_source.buffer,
+                                       processed_source[0...index],
                                        line.length - 1, 1),
                           MSG)
             end

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

@@ -8,13 +8,14 @@ module Rubocop
       class LineLength < Cop
         MSG = 'Line is too long. [%d/%d]'
 
-        def inspect(source_buffer, source, tokens, ast, comments)
-          source.each_with_index do |line, index|
+        def investigate(processed_source)
+          processed_source.lines.each_with_index do |line, index|
             max = LineLength.max
             if line.length > max
               message = sprintf(MSG, line.length, max)
               add_offence(:convention,
-                          source_range(source_buffer, source[0...index], max,
+                          source_range(processed_source.buffer,
+                                       processed_source[0...index], max,
                                        line.length - max),
                           message)
             end

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

@@ -16,9 +16,10 @@ module Rubocop
           + - * / % ** ~ +@ -@ [] []= ` ! != !~
         ).map(&:to_sym)
 
-        def inspect(source_buffer, source, tokens, node, comments)
-          return unless node
-          on_node([:def, :defs, :lvasgn, :ivasgn, :send], node) do |n|
+        def investigate(processed_source)
+          ast = processed_source.ast
+          return unless ast
+          on_node([:def, :defs, :lvasgn, :ivasgn, :send], ast) do |n|
             name = case n.type
                    when :def
                      name_of_instance_method(n)

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

@@ -13,8 +13,6 @@ module Rubocop
           if args.empty? && node.loc.begin
             add_offence(:convention, node.loc.begin, MSG)
           end
-
-          super
         end
       end
     end

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

@@ -11,14 +11,10 @@ module Rubocop
 
         def on_def(node)
           check(node)
-
-          super
         end
 
         def on_defs(node)
           check(node)
-
-          super
         end
 
         def max_length

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

@@ -15,8 +15,6 @@ module Rubocop
               node.loc.selector.is?('not')
             add_offence(:convention, node.loc.selector, MSG)
           end
-
-          super
         end
       end
     end

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

@@ -20,8 +20,6 @@ module Rubocop
             add_offence(:convention, args.children[0].loc.expression,
                         sprintf(MSG, name))
           end
-
-          super
         end
       end
     end

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

@@ -15,8 +15,6 @@ module Rubocop
             add_offence(:convention, node.loc.expression,
                         sprintf(MSG, max_params))
           end
-
-          super
         end
 
         private

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

@@ -6,25 +6,20 @@ module Rubocop
       # This cop checks for the presence of superfluous parentheses around the
       # condition of if/while/until.
       class ParenthesesAroundCondition < Cop
+        ASGN_NODES = [:lvasgn, :ivasgn, :cvasgn, :gvasgn, :casgn]
         MSG = "Don't use parentheses around the condition of an " +
           'if/unless/while/until'
 
         def on_if(node)
           process_control_op(node)
-
-          super
         end
 
         def on_while(node)
           process_control_op(node)
-
-          super
         end
 
         def on_until(node)
           process_control_op(node)
-
-          super
         end
 
         private
@@ -33,9 +28,20 @@ module Rubocop
           cond, _body = *node
 
           if cond.type == :begin
+            # allow safe assignment
+            return if safe_assignment?(cond) && safe_assignment_allowed?
+
             add_offence(:convention, cond.loc.expression, MSG)
           end
         end
+
+        def safe_assignment?(node)
+          node.children.size == 1 && ASGN_NODES.include?(node.children[0].type)
+        end
+
+        def safe_assignment_allowed?
+          ParenthesesAroundCondition.config['AllowSafeAssignment']
+        end
       end
     end
   end

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

@@ -21,8 +21,6 @@ module Rubocop
           if block_method == TARGET
             add_offence(:convention, block_method.loc.expression, MSG)
           end
-
-          super
         end
       end
     end

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

@@ -25,8 +25,6 @@ module Rubocop
           unless args_node == ARGS_NODE
             add_offence(:convention, node.loc.expression, MSG)
           end
-
-          super
         end
       end
     end

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

@@ -0,0 +1,45 @@
+# encoding: utf-8
+
+module Rubocop
+  module Cop
+    module Style
+      # This cop checks for redundant `begin` blocks.
+      #
+      # Currently it checks for code like this:
+      #
+      # @example
+      #
+      # def test
+      #   begin
+      #     ala
+      #     bala
+      #   rescue StandardError => e
+      #     something
+      #   end
+      # end
+      class RedundantBegin < Cop
+        MSG = 'Redundant `begin` block detected.'
+
+        def on_def(node)
+          _method_name, _args, body = *node
+
+          check(body)
+        end
+
+        def on_defs(node)
+          _scope, _method_name, _args, body = *node
+
+          check(body)
+        end
+
+        private
+
+        def check(node)
+          return unless node && node.type == :kwbegin
+
+          add_offence(:convention, node.loc.begin, MSG)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,59 @@
+# encoding: utf-8
+
+module Rubocop
+  module Cop
+    module Style
+      # This cop checks for redundant `return` expressions.
+      #
+      # Currently it checks for code like this:
+      #
+      # @example
+      #
+      # def test
+      #   return something
+      # end
+      #
+      # def test
+      #   one
+      #   two
+      #   three
+      #   return something
+      # end
+      #
+      # It should be extended to handle methods whose body is if/else
+      # or a case expression with a default branch.
+      class RedundantReturn < Cop
+        MSG = 'Redundant `return` detected.'
+
+        def on_def(node)
+          _method_name, _args, body = *node
+
+          check(body)
+        end
+
+        def on_defs(node)
+          _scope, _method_name, _args, body = *node
+
+          check(body)
+        end
+
+        private
+
+        def check(node)
+          return unless node
+
+          if node.type == :return
+            add_offence(:convention, node.loc.keyword, MSG)
+          elsif node.type == :begin
+            expressions = *node
+            last_expr = expressions.last
+
+            if last_expr && last_expr.type == :return
+              add_offence(:convention, last_expr.loc.keyword, MSG)
+            end
+          end
+        end
+      end
+    end
+  end
+end