rubocop 0.22.0 → 0.23.0

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # Access modifiers should be surrounded by blank lines.

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cops checks redundant empty lines around the bodies of classes,

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop checks for the use of a method, the result of which

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop checks whether the source file has a utf-8 encoding comment or

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop checks for END blocks.

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop checks for Windows-style line endings in the source code.
@@ -9,8 +9,9 @@ module Rubocop
 
         def investigate(processed_source)
           buffer = processed_source.buffer
-          original_source = IO.read(buffer.name,
-                                    encoding: buffer.source.encoding)
+          original_source = IO.read(buffer.name, encoding: 'ascii-8bit')
+          change_encoding(original_source)
+
           original_source.lines.each_with_index do |line, index|
             next unless line =~ /\r$/
 
@@ -24,6 +25,14 @@ module Rubocop
             break
           end
         end
+
+        private
+
+        def change_encoding(string)
+          recognized_encoding =
+            Parser::Source::Buffer.recognize_encoding(string)
+          string.force_encoding(recognized_encoding) if recognized_encoding
+        end
       end
     end
   end

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop checks for places where Fixnum#even? or Fixnum#odd?

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop makes sure that Ruby source files have snake_case names.

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop looks for uses of flip flop operator

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop looks for uses of the *for* keyword, or *each* method. The

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop enforces the use of a single string formatting utility.

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cops looks for uses of global variables.

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # Use a guard clause instead of wrapping the code inside a conditional

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop checks hash literal syntax.

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # Checks for if and unless statements that would fit on one line

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # Checks for uses of semicolon in if statements.

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cops checks the indentation of the first element in an array
@@ -14,26 +14,49 @@ module Rubocop
         include AutocorrectAlignment
 
         def on_array(node)
-          first_pair = node.children.first
-          return if first_pair.nil?
-
           left_bracket = node.loc.begin
           return if left_bracket.nil?
 
-          return if first_pair.loc.expression.line == left_bracket.line
+          first_pair = node.children.first
+          check_first_pair(first_pair, left_bracket)
+          check_right_bracket(node, first_pair, left_bracket)
+        end
+
+        def check_first_pair(first_pair, left_bracket)
+          return if first_pair.nil?
+          expr = first_pair.loc.expression
+          return if expr.line == left_bracket.line
 
-          column = first_pair.loc.expression.column
           base_column = left_bracket.source_line =~ /\S/
           expected_column = base_column + IndentationWidth::CORRECT_INDENTATION
-          @column_delta = expected_column - column
+          @column_delta = expected_column - expr.column
+          return if @column_delta == 0
 
-          add_offense(first_pair, :expression) if @column_delta != 0
+          msg = format('Use %d spaces for indentation in an array, relative ' \
+                       'to the start of the line where the left bracket is.',
+                       IndentationWidth::CORRECT_INDENTATION)
+          add_offense(first_pair, :expression, msg)
         end
 
-        def message(_)
-          format('Use %d spaces for indentation in an array, relative to ' \
-                 'the start of the line where the left bracket is.',
-                 IndentationWidth::CORRECT_INDENTATION)
+        def check_right_bracket(node, first_pair, left_bracket)
+          right_bracket = node.loc.end
+          column = right_bracket.column
+          return if right_bracket.source_line[0...column] =~ /\S/
+
+          if first_pair && first_pair.loc.expression.line == left_bracket.line
+            base_column = left_bracket.column
+            expected_indentation = 'the left bracket'
+          else
+            base_column = left_bracket.source_line =~ /\S/
+            expected_indentation =
+              'the start of the line where the left bracket is'
+          end
+          @column_delta = base_column - column
+          return if @column_delta == 0
+
+          add_offense(right_bracket, right_bracket,
+                      'Indent the right bracket the same as ' +
+                      expected_indentation + '.')
         end
       end
     end

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cops checks the indentation of the first key in a hash literal
@@ -46,23 +46,42 @@ module Rubocop
           return if ignored_node?(hash_node)
 
           first_pair = hash_node.children.first
-          return if first_pair.nil?
+          if first_pair
+            left_brace = hash_node.loc.begin
+            return if first_pair.loc.expression.line == left_brace.line
 
-          left_brace = hash_node.loc.begin
-          return if first_pair.loc.expression.line == left_brace.line
-
-          if separator_style?(first_pair)
-            check_based_on_longest_key(hash_node.children, left_brace,
-                                       left_parenthesis)
-          else
-            check_first_pair(first_pair, left_brace, left_parenthesis, 0)
+            if separator_style?(first_pair)
+              check_based_on_longest_key(hash_node.children, left_brace,
+                                         left_parenthesis)
+            else
+              check_first_pair(first_pair, left_brace, left_parenthesis, 0)
+            end
           end
+
+          check_right_brace(hash_node.loc.end, left_brace, left_parenthesis)
+        end
+
+        def check_right_brace(right_brace, left_brace, left_parenthesis)
+          return if right_brace.source_line[0...right_brace.column] =~ /\S/
+
+          expected_column = base_column(left_brace, left_parenthesis)
+          @column_delta = expected_column - right_brace.column
+          return if @column_delta == 0
+
+          msg = if style == :special_inside_parentheses && left_parenthesis
+                  'Indent the right brace the same as the first position ' \
+                  'after the preceding left parenthesis.'
+                else
+                  'Indent the right brace the same as the start of the line ' \
+                  'where the left brace is.'
+                end
+          add_offense(right_brace, right_brace, msg)
         end
 
         def separator_style?(first_pair)
           separator = first_pair.loc.operator
           key = "Enforced#{separator.is?(':') ? 'Colon' : 'HashRocket'}Style"
-          config.for_cop('AlignHash')[key] == 'separator'
+          config.for_cop('Style/AlignHash')[key] == 'separator'
         end
 
         def check_based_on_longest_key(pairs, left_brace, left_parenthesis)
@@ -75,8 +94,9 @@ module Rubocop
 
         def check_first_pair(first_pair, left_brace, left_parenthesis, offset)
           column = first_pair.loc.expression.column
-          @column_delta =
-            expected_column(left_brace, left_parenthesis, offset) - column
+          expected_column = base_column(left_brace, left_parenthesis) +
+            IndentationWidth::CORRECT_INDENTATION + offset
+          @column_delta = expected_column - column
 
           if @column_delta == 0
             correct_style_detected
@@ -93,16 +113,12 @@ module Rubocop
           end
         end
 
-        # Returns the expected, or correct indentation.
-        def expected_column(left_brace, left_parenthesis, offset)
-          base_column =
-            if left_parenthesis && style == :special_inside_parentheses
-              left_parenthesis.column + 1
-            else
-              left_brace.source_line =~ /\S/
-            end
-
-          base_column + IndentationWidth::CORRECT_INDENTATION + offset
+        def base_column(left_brace, left_parenthesis)
+          if left_parenthesis && style == :special_inside_parentheses
+            left_parenthesis.column + 1
+          else
+            left_brace.source_line =~ /\S/
+          end
         end
 
         # Returns the description of what the correct indentation is based on.

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cops checks for inconsistent indentation.

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cops checks for indentation that doesn't use two spaces.
@@ -118,7 +118,7 @@ module Rubocop
           rhs = first_part_of_call_chain(rhs)
           return unless rhs
 
-          end_config = config.for_cop('EndAlignment')
+          end_config = config.for_cop('Lint/EndAlignment')
           style = end_config['Enabled'] ? end_config['AlignWith'] : 'keyword'
           base = style == 'variable' ? node : rhs
 

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

@@ -0,0 +1,19 @@
+# encoding: utf-8
+
+module RuboCop
+  module Cop
+    module Style
+      # This cop checks for inline comments.
+      class InlineComment < Cop
+        MSG = 'Avoid inline comments.'
+
+        def investigate(processed_source)
+          processed_source.comments.each do |comment|
+            next unless comment.inline?
+            add_offense(comment, :expression)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop checks for uses of the pre 1.9 lambda syntax for one-line

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop checks for use of the lambda.(args) syntax.

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop checks whether comments have a leading space

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop checks for string literal concatenation at

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop checks the length of lines in the source code.

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop checks for unwanted parentheses in parameterless method calls.
@@ -18,7 +18,7 @@ module Rubocop
 
         def autocorrect(node)
           # Bail out if the call is going to be auto-corrected by EmptyLiteral.
-          if config.for_cop('EmptyLiteral')['Enabled'] &&
+          if config.for_cop('Style/EmptyLiteral')['Enabled'] &&
               [EmptyLiteral::HASH_NODE,
                EmptyLiteral::ARRAY_NODE,
                EmptyLiteral::STR_NODE].include?(node)

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop checks for methods called on a do...end block. The point of