rubocop 0.37.0 → 0.37.1

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

@@ -16,11 +16,8 @@ module RuboCop
         MSG = 'Missing frozen string literal comment.'.freeze
         SHEBANG = '#!'.freeze
 
-        def_node_matcher :frozen_strings, '{(send {dstr str} :<< ...)
-                                            (send {dstr str} :freeze)}'
-
         def investigate(processed_source)
-          return unless style == :always
+          return if style == :when_needed && target_ruby_version < 2.3
           return if processed_source.buffer.source.empty?
 
           return if frozen_string_literal_comment_exists?(processed_source)
@@ -28,14 +25,6 @@ module RuboCop
           offense(processed_source)
         end
 
-        def on_send(node)
-          return unless style == :when_needed
-          return if target_ruby_version < 2.3
-          return if frozen_string_literal_comment_exists?(processed_source)
-
-          frozen_strings(node) { offense(processed_source) }
-        end
-
         def autocorrect(_node)
           lambda do |corrector|
             last_special_comment = last_special_comment(processed_source)

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

@@ -82,7 +82,9 @@ module RuboCop
         end
 
         def elsif?(node)
-          node.children.last.if_type?
+          return false unless node.parent && node.parent.if_type?
+          _condition, _if_branch, else_branch = *node.parent
+          else_branch.equal?(node)
         end
 
         def check_trailing_if(node)

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

@@ -17,7 +17,7 @@ module RuboCop
           return if first_token.pos.column == 0
 
           with_space = range_with_surrounding_space(first_token.pos, :left,
-                                                    nil, !:with_newline)
+                                                    !:with_newline)
           # If the file starts with a byte order mark (BOM), the column can be
           # non-zero, but then we find out here if there's no space to the left
           # of the first token.

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

@@ -39,7 +39,7 @@ module RuboCop
         def autocorrect(operator_range)
           # Include any trailing whitespace so we don't create a syntax error.
           operator_range = range_with_surrounding_space(operator_range,
-                                                        :right, nil,
+                                                        :right,
                                                         !:with_newline)
           ->(corrector) { corrector.replace(operator_range, '\\') }
         end

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

@@ -53,8 +53,7 @@ module RuboCop
           _block_start, args, last_expression = node.children
 
           unless args.children.empty?
-            line = args.loc.end.nil? ? args.loc.line : args.loc.end.line
-            if do_loc.line != line
+            if do_loc.line != args.loc.last_line
               add_offense_for_expression(node, args, ARG_MSG)
             end
           end
@@ -77,9 +76,8 @@ module RuboCop
         def autocorrect(node)
           lambda do |corrector|
             _method, args, block_body = *node
-            unless args.children.empty? ||
-                   args.loc.end.line == node.loc.begin.line
-              autocorrect_arguments(corrector, node, args, block_body)
+            unless args.children.empty? || args.loc.last_line == node.loc.line
+              autocorrect_arguments(corrector, node, args)
               expr_before_body = args.source_range.end
             end
 
@@ -92,12 +90,10 @@ module RuboCop
           end
         end
 
-        def autocorrect_arguments(corrector, node, args, block_body)
-          end_pos = if block_body
-                      block_body.source_range.begin_pos
-                    else
-                      node.loc.end.begin.begin_pos - 1
-                    end
+        def autocorrect_arguments(corrector, node, args)
+          end_pos =
+            range_with_surrounding_space(args.source_range, :right, false)
+            .end_pos
           range = Parser::Source::Range.new(args.source_range.source_buffer,
                                             node.loc.begin.end.begin_pos,
                                             end_pos)
@@ -118,7 +114,13 @@ module RuboCop
         end
 
         def block_arg_string(args)
-          args.children.map(&:source).join(', ')
+          args.children.map do |arg|
+            if arg.mlhs_type?
+              "(#{block_arg_string(arg)})"
+            else
+              arg.source
+            end
+          end.join(', ')
         end
       end
     end

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

@@ -19,7 +19,7 @@ module RuboCop
         private
 
         def correction(node)
-          new_source = node.source.sub(/not\s+/, '!')
+          new_source = node.source.sub(/not\s*/, '!')
           ->(corrector) { corrector.replace(node.source_range, new_source) }
         end
       end

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

@@ -13,7 +13,7 @@ module RuboCop
           return unless processed_source.ast
           @processed_source = processed_source
 
-          check_for_line_terminator
+          check_for_line_terminator_or_opener
         end
 
         def on_begin(node)
@@ -33,26 +33,33 @@ module RuboCop
             # if the first semicolon on the line is a separator of
             # expressions. It's just a guess.
             column = @processed_source[line - 1].index(';')
-            convention_on(line, column, !:last_on_line)
+            convention_on(line, column, false)
           end
         end
 
         private
 
-        def check_for_line_terminator
+        def check_for_line_terminator_or_opener
           tokens_for_lines = @processed_source.tokens.group_by do |token|
             token.pos.line
           end
 
           tokens_for_lines.each do |line, tokens|
-            next unless tokens.last.type == :tSEMI
-            convention_on(line, tokens.last.pos.column, :last_on_line)
+            if tokens.last.type == :tSEMI
+              convention_on(line, tokens.last.pos.column, true)
+            end
+
+            if tokens.first.type == :tSEMI
+              convention_on(line, tokens.first.pos.column, true)
+            end
           end
         end
 
-        def convention_on(line, column, last_on_line)
+        def convention_on(line, column, autocorrect)
           range = source_range(@processed_source.buffer, line, column)
-          add_offense(last_on_line ? range : nil, range)
+          # Don't attempt to autocorrect if semicolon is separating statements
+          # on the same line
+          add_offense(autocorrect ? range : nil, range)
         end
 
         def autocorrect(range)

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

@@ -30,7 +30,8 @@ module RuboCop
         MSG_AFTER = 'Space after keyword `%s` is missing.'.freeze
 
         DO = 'do'.freeze
-        ACCEPT_LEFT_PAREN = %w(break next not return super yield).freeze
+        ACCEPT_LEFT_PAREN =
+          %w(break next not return super yield defined?).freeze
 
         def on_and(node)
           check(node, [:operator].freeze) if node.keyword?
@@ -100,6 +101,10 @@ module RuboCop
           check(node, [:keyword].freeze)
         end
 
+        def on_zsuper(node)
+          check(node, [:keyword].freeze)
+        end
+
         def on_until(node)
           check(node, [:begin, :end, :keyword].freeze)
         end
@@ -116,6 +121,10 @@ module RuboCop
           check(node, [:keyword].freeze)
         end
 
+        def on_defined?(node)
+          check(node, [:keyword].freeze)
+        end
+
         private
 
         def check(node, locations, begin_keyword = DO)
@@ -167,10 +176,10 @@ module RuboCop
         def space_after_missing?(range)
           pos = range.end_pos
           char = range.source_buffer.source[pos]
-          return false unless range.source_buffer.source[pos]
+          return false unless char
           return false if accept_left_parenthesis?(range) && char == '('.freeze
 
-          char !~ /[\s;,#\\\)\}\]]/
+          char !~ /[\s;,#\\\)\}\]\.]/
         end
 
         def accept_left_parenthesis?(range)
@@ -182,7 +191,7 @@ module RuboCop
           return false unless ancestor
           return true if ancestor.and_type? || ancestor.or_type?
           return false unless ancestor.send_type?
-          operator?(ancestor.loc.selector.source.to_sym)
+          operator?(ancestor.method_name)
         end
 
         def autocorrect(range)

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

@@ -40,8 +40,8 @@ module RuboCop
           if node.loc.operator # aref assignment, attribute assignment
             on_special_asgn(node)
           elsif !node.unary_operation? && !called_with_dot?(node)
-            op = node.loc.selector
-            if operator?(op.source.to_sym)
+            op = node.method_name
+            if op != :[] && op != :! && operator?(op)
               _, _, right, = *node
               check_operator(node.loc.selector, right.source_range)
             end

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

@@ -21,41 +21,25 @@ module RuboCop
       class TrailingUnderscoreVariable < Cop
         include SurroundingSpace
 
-        MSG = 'Do not use trailing `_`s in parallel assignment.'.freeze
+        MSG = 'Do not use trailing `_`s in parallel assignment. ' \
+              'Prefer `%s`.'.freeze
         UNDERSCORE = '_'.freeze
 
         def on_masgn(node)
-          left, = *node
-          variables = *left
-          first_offense = find_first_offense(variables)
+          return unless (range = unneeded_range(node))
 
-          return if first_offense.nil?
+          good_code = node.source
+          offset = range.begin_pos - node.source_range.begin_pos
+          good_code[offset, range.size] = ''
 
-          range =
-            Parser::Source::Range.new(node.source_range.source_buffer,
-                                      first_offense.source_range.begin_pos,
-                                      variables.last.source_range.end_pos)
-          add_offense(node, range)
+          add_offense(node, range, format(MSG, good_code))
         end
 
         def autocorrect(node)
-          left, right = *node
-          variables = *left
-          first_offense = find_first_offense(variables)
-
-          end_position =
-            if first_offense.source_range == variables.first.source_range
-              right.source_range.begin_pos
-            else
-              node.loc.operator.begin_pos
-            end
-
-          range =
-            Parser::Source::Range.new(node.source_range.source_buffer,
-                                      first_offense.source_range.begin_pos,
-                                      end_position)
-
-          ->(corrector) { corrector.remove(range) unless range.nil? }
+          lambda do |corrector|
+            range = unneeded_range(node)
+            corrector.remove(range) if range
+          end
         end
 
         private
@@ -88,6 +72,27 @@ module RuboCop
           @allow_named_underscore_variables ||=
             cop_config['AllowNamedUnderscoreVariables']
         end
+
+        def unneeded_range(node)
+          left, right = *node
+          variables = *left
+          first_offense = find_first_offense(variables)
+
+          return unless first_offense
+
+          end_position =
+            if first_offense.source_range == variables.first.source_range
+              right.source_range.begin_pos
+            else
+              node.loc.operator.begin_pos
+            end
+
+          range =
+            Parser::Source::Range.new(node.source_range.source_buffer,
+                                      first_offense.source_range.begin_pos,
+                                      end_position)
+          range_with_surrounding_space(range, :right)
+        end
       end
     end
   end

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

@@ -64,7 +64,7 @@ module RuboCop
         def complex_content?(strings)
           strings.any? do |s|
             string = s.str_content
-            string !~ word_regex || string =~ / /
+            !string.valid_encoding? || string !~ word_regex || string =~ / /
           end
         end
 

data/lib/rubocop/cop/team.rb

@@ -5,6 +5,13 @@ module RuboCop
   module Cop
     # FIXME
     class Team
+      # If these cops try to autocorrect the same file at the same time,
+      # bad things are liable to happen
+      INCOMPATIBLE_COPS = {
+        Style::SymbolProc => [Style::SpaceBeforeBlockBraces],
+        Style::SpaceBeforeBlockBraces => [Style::SymbolProc]
+      }.freeze
+
       attr_reader :errors, :warnings, :updated_source_file
 
       alias updated_source_file? updated_source_file
@@ -90,7 +97,7 @@ module RuboCop
         @updated_source_file = false
         return unless autocorrect?
 
-        new_source = autocorrect_one_cop(buffer, cops)
+        new_source = autocorrect_all_cops(buffer, cops)
 
         return if new_source == buffer.source
 
@@ -104,15 +111,19 @@ module RuboCop
         @updated_source_file = true
       end
 
-      # Does an auto-correction run by correcting for just one cop. The
-      # re-running of auto-corrections will make sure that the full set of
-      # auto-corrections is tried again after this method has finished.
-      def autocorrect_one_cop(buffer, cops)
-        cop_with_corrections = cops.find { |cop| cop.corrections.any? }
+      def autocorrect_all_cops(buffer, cops)
+        corrector = Corrector.new(buffer)
+        skip = Set.new
+
+        cops.each do |cop|
+          next if cop.corrections.empty?
+          next if skip.include?(cop.class)
+          corrector.corrections.concat(cop.corrections)
+          incompatible = INCOMPATIBLE_COPS[cop.class]
+          skip.merge(incompatible) if incompatible
+        end
 
-        if cop_with_corrections
-          corrections = cop_with_corrections.corrections
-          corrector = Corrector.new(buffer, corrections)
+        if !corrector.corrections.empty?
           corrector.rewrite
         else
           buffer.source

data/lib/rubocop/cop/util.rb

@@ -129,8 +129,8 @@ module RuboCop
         end
       end
 
-      def range_with_surrounding_comma(range, side = :both, buffer = nil)
-        buffer ||= @processed_source.buffer
+      def range_with_surrounding_comma(range, side = :both)
+        buffer = @processed_source.buffer
         src = buffer.source
 
         go_left, go_right = directions(side)
@@ -143,9 +143,8 @@ module RuboCop
         Parser::Source::Range.new(buffer, begin_pos, end_pos)
       end
 
-      def range_with_surrounding_space(range, side = :both, buffer = nil,
-                                       with_newline = true)
-        buffer ||= @processed_source.buffer
+      def range_with_surrounding_space(range, side = :both, with_newline = true)
+        buffer = @processed_source.buffer
         src = buffer.source
 
         go_left, go_right = directions(side)

data/lib/rubocop/formatter/formatter_set.rb

@@ -80,9 +80,9 @@ module RuboCop
           key.start_with?(specified_key)
         end
 
-        if matching_keys.empty?
-          raise %(No formatter for "#{specified_key}")
-        elsif matching_keys.size > 1
+        raise %(No formatter for "#{specified_key}") if matching_keys.empty?
+
+        if matching_keys.size > 1
           raise %(Cannot determine formatter for "#{specified_key}")
         end
 

data/lib/rubocop/version.rb

@@ -4,7 +4,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '0.37.0'.freeze
+    STRING = '0.37.1'.freeze
 
     MSG = '%s (using Parser %s, running on %s %s %s)'.freeze
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.37.0
+  version: 0.37.1
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -38,7 +38,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0.2
+        version: 2.3.0.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -48,7 +48,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0.2
+        version: 2.3.0.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -119,13 +119,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- ".yardopts"
-- CHANGELOG.md
-- CONTRIBUTING.md
 - LICENSE.txt
 - README.md
-- assets/logo.png
-- assets/output.html.erb
 - bin/rubocop
 - config/default.yml
 - config/disabled.yml
@@ -507,39 +502,6 @@ files:
 - lib/rubocop/token.rb
 - lib/rubocop/version.rb
 - lib/rubocop/warning.rb
-- logo/rubo-logo-horizontal.png
-- logo/rubo-logo-square.png
-- logo/rubo-logo-symbol.png
-- relnotes/v0.19.0.md
-- relnotes/v0.19.1.md
-- relnotes/v0.20.0.md
-- relnotes/v0.20.1.md
-- relnotes/v0.21.0.md
-- relnotes/v0.22.0.md
-- relnotes/v0.23.0.md
-- relnotes/v0.24.0.md
-- relnotes/v0.24.1.md
-- relnotes/v0.25.0.md
-- relnotes/v0.26.0.md
-- relnotes/v0.26.1.md
-- relnotes/v0.27.0.md
-- relnotes/v0.27.1.md
-- relnotes/v0.28.0.md
-- relnotes/v0.29.0.md
-- relnotes/v0.29.1.md
-- relnotes/v0.30.0.md
-- relnotes/v0.30.1.md
-- relnotes/v0.31.0.md
-- relnotes/v0.32.0.md
-- relnotes/v0.32.1.md
-- relnotes/v0.33.0.md
-- relnotes/v0.34.0.md
-- relnotes/v0.34.1.md
-- relnotes/v0.34.2.md
-- relnotes/v0.35.0.md
-- relnotes/v0.36.0.md
-- relnotes/v0.37.0.md
-- rubocop.gemspec
 homepage: http://github.com/bbatsov/rubocop
 licenses:
 - MIT
@@ -560,7 +522,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Automatic Ruby code style checking tool.