rubocop 0.37.2 → 0.38.0

data/lib/rubocop/cop/team.rb

@@ -12,6 +12,11 @@ module RuboCop
         Style::SpaceBeforeBlockBraces => [Style::SymbolProc]
       }.freeze
 
+      DEFAULT_OPTIONS = {
+        auto_correct: false,
+        debug: false
+      }.freeze
+
       attr_reader :errors, :warnings, :updated_source_file
 
       alias updated_source_file? updated_source_file
@@ -19,7 +24,7 @@ module RuboCop
       def initialize(cop_classes, config, options = nil)
         @cop_classes = cop_classes
         @config = config
-        @options = options || { auto_correct: false, debug: false }
+        @options = options || DEFAULT_OPTIONS
         @errors = []
         @warnings = []
 

data/lib/rubocop/cop/util.rb

@@ -46,6 +46,10 @@ module RuboCop
         OPERATOR_METHODS.include?(symbol)
       end
 
+      def ternary_op?(node)
+        node.loc.respond_to?(:question)
+      end
+
       def strip_quotes(str)
         if str[0] == '"' || str[0] == "'"
           str[0] = ''
@@ -84,6 +88,10 @@ module RuboCop
           node.loc.end.is?(')'.freeze)
       end
 
+      def parenthesized_call?(send)
+        send.loc.begin && send.loc.begin.is?('(')
+      end
+
       def on_node(syms, sexp, excludes = [], &block)
         return to_enum(:on_node, syms, sexp, excludes) unless block_given?
 
@@ -104,12 +112,11 @@ module RuboCop
           column_index = column
         end
 
-        preceding_line_numbers = (1...line_number)
-
-        line_begin_pos = preceding_line_numbers.reduce(0) do |pos, line|
-          pos + source_buffer.source_line(line).length + 1
-        end
-
+        line_begin_pos = if line_number == 0
+                           0
+                         else
+                           source_buffer.line_range(line_number).begin_pos
+                         end
         begin_pos = line_begin_pos + column_index
         end_pos = begin_pos + length
 

data/lib/rubocop/formatter/clang_style_formatter.rb

@@ -7,29 +7,33 @@ module RuboCop
     # The precise location of the problem is shown together with the
     # relevant source code.
     class ClangStyleFormatter < SimpleTextFormatter
+      ELLIPSES = Rainbow('...').yellow.freeze
+
       def report_file(file, offenses)
         offenses.each do |o|
           output.printf("%s:%d:%d: %s: %s\n",
                         cyan(smart_path(file)), o.line, o.real_column,
                         colored_severity_code(o), message(o))
 
-          source_line = o.location.source_line
-          next if source_line.blank?
+          # rubocop:disable Lint/HandleExceptions
+          begin
+            location = o.location
+            source_line = location.source_line
+            next if source_line.blank?
 
-          output.puts(source_line)
-          output.puts(highlight_line(o.location))
+            if location.first_line == location.last_line
+              output.puts(source_line)
+            else
+              output.puts("#{source_line} #{ELLIPSES}")
+            end
+            output.puts("#{' ' * o.highlighted_area.begin_pos}" \
+                        "#{'^' * o.highlighted_area.size}")
+          rescue IndexError
+            # range is not on a valid line; perhaps the source file is empty
+          end
+          # rubocop:enable Lint/HandleExceptions
         end
       end
-
-      def highlight_line(location)
-        column_length = if location.begin.line == location.end.line
-                          location.column_range.count
-                        else
-                          location.source_line.length - location.column
-                        end
-
-        ' ' * location.column + '^' * column_length
-      end
     end
   end
 end

data/lib/rubocop/formatter/html_formatter.rb

@@ -11,6 +11,7 @@ module RuboCop
   module Formatter
     # This formatter saves the output as a html file.
     class HTMLFormatter < BaseFormatter
+      ELLIPSES = '<span class="extra-code">...</span>'.freeze
       TEMPLATE_PATH =
         File.expand_path('../../../../assets/output.html.erb', __FILE__)
 
@@ -95,19 +96,17 @@ module RuboCop
         def highlighted_source_line(offense)
           location = offense.location
 
-          column_range = if location.begin.line == location.end.line
-                           location.column_range
-                         else
-                           location.column...location.source_line.length
-                         end
+          source_line = if location.first_line == location.last_line
+                          location.source_line
+                        else
+                          "#{location.source_line} #{ELLIPSES}"
+                        end
 
-          source_line = location.source_line
-
-          escape(source_line[0...column_range.begin]) +
+          escape(source_line[0...offense.highlighted_area.begin_pos]) +
             "<span class=\"highlight #{offense.severity}\">" +
-            escape(source_line[column_range]) +
+            escape(offense.highlighted_area.source) +
             '</span>' +
-            escape(source_line[column_range.end..-1])
+            escape(source_line[offense.highlighted_area.end_pos..-1])
         end
 
         def escape(s)

data/lib/rubocop/rake_task.rb

@@ -21,7 +21,7 @@ module RuboCop
     def initialize(*args, &task_block)
       setup_ivars(args)
 
-      desc 'Run RuboCop' unless ::Rake.application.last_comment
+      desc 'Run RuboCop' unless ::Rake.application.last_description
 
       task(name, *args) do |_, task_args|
         RakeFileUtils.send(:verbose, verbose) do
@@ -52,9 +52,9 @@ module RuboCop
 
     def full_options
       [].tap do |result|
-        result.concat(formatters.flat_map { |f| ['--format', f] })
-        result.concat(requires.flat_map { |r| ['--require', r] })
-        result.concat(options)
+        result.concat(formatters.map { |f| ['--format', f] }.flatten)
+        result.concat(requires.map { |r| ['--require', r] }.flatten)
+        result.concat(options.flatten)
         result.concat(patterns)
       end
     end

data/lib/rubocop/remote_config.rb

@@ -2,14 +2,16 @@
 # frozen_string_literal: true
 
 require 'net/http'
+require 'time'
 
 module RuboCop
   # Common methods and behaviors for dealing with remote config files.
   class RemoteConfig
     CACHE_LIFETIME = 24 * 60 * 60
 
-    def initialize(url)
+    def initialize(url, base_dir)
       @uri = URI.parse(url)
+      @base_dir = base_dir
     end
 
     def file
@@ -36,7 +38,7 @@ module RuboCop
     private
 
     def cache_path
-      ".rubocop-#{cache_name_from_uri}"
+      File.expand_path(".rubocop-#{cache_name_from_uri}", @base_dir)
     end
 
     def cache_path_exists?

data/lib/rubocop/result_cache.rb

@@ -33,14 +33,20 @@ module RuboCop
           puts "Removing the #{remove_count} oldest files from #{cache_root}"
         end
         sorted = files.sort_by { |path| File.mtime(path) }
-        begin
-          File.delete(*sorted[0, remove_count])
-          dirs.each { |dir| Dir.rmdir(dir) if Dir["#{dir}/*"].empty? }
-        rescue Errno::ENOENT
-          # This can happen if parallel RuboCop invocations try to remove the
-          # same files. No problem.
-          puts $ERROR_INFO if verbose
-        end
+        remove_files(sorted, dirs, remove_count, verbose)
+      end
+    end
+
+    class << self
+      private
+
+      def remove_files(files, dirs, remove_count, verbose)
+        File.delete(*files[0, remove_count])
+        dirs.each { |dir| Dir.rmdir(dir) if Dir["#{dir}/*"].empty? }
+      rescue Errno::ENOENT
+        # This can happen if parallel RuboCop invocations try to remove the
+        # same files. No problem.
+        puts $ERROR_INFO if verbose
       end
     end
 

data/lib/rubocop/runner.rb

@@ -151,6 +151,11 @@ module RuboCop
       # infinite loop.
       @processed_sources = []
 
+      # It is also possible for a cop to keep adding indefinitely to a file,
+      # making it bigger and bigger. If the inspection loop runs for an
+      # excessively high number of iterations, this is likely happening.
+      @iterations = 0
+
       # When running with --auto-correct, we need to inspect the file (which
       # includes writing a corrected version of it) until no more corrections
       # are made. This is because automatic corrections can introduce new
@@ -158,6 +163,10 @@ module RuboCop
       loop do
         check_for_infinite_loop(processed_source, offenses)
 
+        if (@iterations += 1) > 200
+          raise InfiniteCorrectionLoop.new(processed_source.path, offenses)
+        end
+
         # The offenses that couldn't be corrected will be found again so we
         # only keep the corrected ones in order to avoid duplicate reporting.
         offenses.select!(&:corrected?)

data/lib/rubocop/version.rb

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

data/spec/support/cop_helper.rb

@@ -0,0 +1,81 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+require 'tempfile'
+
+module CopHelper
+  extend RSpec::SharedContext
+
+  let(:ruby_version) { 2.2 }
+
+  def inspect_source_file(cop, source)
+    Tempfile.open('tmp') { |f| inspect_source(cop, source, f) }
+  end
+
+  def inspect_source(cop, source, file = nil)
+    if source.is_a?(Array) && source.size == 1
+      raise "Don't use an array for a single line of code: #{source}"
+    end
+    RuboCop::Formatter::DisabledConfigFormatter.config_to_allow_offenses = {}
+    RuboCop::Formatter::DisabledConfigFormatter.detected_styles = {}
+    processed_source = parse_source(source, file)
+    raise 'Error parsing example code' unless processed_source.valid_syntax?
+    _investigate(cop, processed_source)
+  end
+
+  def parse_source(source, file = nil)
+    source = source.join($RS) if source.is_a?(Array)
+
+    if file && file.respond_to?(:write)
+      file.write(source)
+      file.rewind
+      file = file.path
+    end
+
+    RuboCop::ProcessedSource.new(source, ruby_version, file)
+  end
+
+  def autocorrect_source_file(cop, source)
+    Tempfile.open('tmp') { |f| autocorrect_source(cop, source, f) }
+  end
+
+  def autocorrect_source(cop, source, file = nil)
+    cop.instance_variable_get(:@options)[:auto_correct] = true
+    processed_source = parse_source(source, file)
+    _investigate(cop, processed_source)
+
+    corrector =
+      RuboCop::Cop::Corrector.new(processed_source.buffer, cop.corrections)
+    corrector.rewrite
+  end
+
+  def _investigate(cop, processed_source)
+    forces = RuboCop::Cop::Force.all.each_with_object([]) do |klass, instances|
+      next unless cop.join_force?(klass)
+      instances << klass.new([cop])
+    end
+
+    commissioner =
+      RuboCop::Cop::Commissioner.new([cop], forces, raise_error: true)
+    commissioner.investigate(processed_source)
+    commissioner
+  end
+end
+
+module RuboCop
+  module Cop
+    class Cop
+      def messages
+        offenses.sort.map(&:message)
+      end
+
+      def highlights
+        offenses.sort.map { |o| o.location.source }
+      end
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include CopHelper
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.37.2
+  version: 0.38.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-11 00:00:00.000000000 Z
+date: 2016-03-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.4
+        version: 2.3.0.6
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -48,7 +48,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0.4
+        version: 2.3.0.6
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -86,14 +86,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -207,7 +213,6 @@ files:
 - lib/rubocop/cop/mixin/array_hash_indentation.rb
 - lib/rubocop/cop/mixin/array_syntax.rb
 - lib/rubocop/cop/mixin/autocorrect_alignment.rb
-- lib/rubocop/cop/mixin/autocorrect_unless_changing_ast.rb
 - lib/rubocop/cop/mixin/check_assignment.rb
 - lib/rubocop/cop/mixin/classish_length.rb
 - lib/rubocop/cop/mixin/code_length.rb
@@ -504,6 +509,7 @@ files:
 - lib/rubocop/token.rb
 - lib/rubocop/version.rb
 - lib/rubocop/warning.rb
+- spec/support/cop_helper.rb
 homepage: http://github.com/bbatsov/rubocop
 licenses:
 - MIT

data/lib/rubocop/cop/mixin/autocorrect_unless_changing_ast.rb

@@ -1,57 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-
-module RuboCop
-  module Cop
-    # This module does auto-correction of nodes that could become grammatically
-    # different after the correction. If the code change would alter the
-    # abstract syntax tree, it is not done.
-    #
-    # However, if the code change merely introduces extraneous "begin" nodes
-    # which do not change the meaning of the code, it is still accepted.
-    #
-    module AutocorrectUnlessChangingAST
-      def autocorrect(node)
-        current_buffer_src = processed_source.buffer.source
-        replaced_range = node.source_range
-        pre = current_buffer_src[0...replaced_range.begin_pos]
-        post = current_buffer_src[replaced_range.end_pos..-1]
-        new_buffer_src = pre + rewrite_node(node) + post
-        new_processed_src = parse(new_buffer_src, processed_source.buffer.name)
-
-        # Make the correction only if it doesn't change the AST for the buffer.
-        return if !new_processed_src.ast ||
-                  (INLINE_BEGIN.process(processed_source.ast) !=
-                   INLINE_BEGIN.process(new_processed_src.ast))
-
-        correction(node)
-      end
-
-      private
-
-      def rewrite_node(node)
-        ps = parse(node.source)
-        c = correction(ps.ast)
-        Corrector.new(ps.buffer, [c]).rewrite
-      end
-
-      # 'begin' nodes with a single child can be removed without changing
-      # the semantics of an AST. Canonicalizing an AST in this way can help
-      # us determine whether it has really changed in a meaningful way, or
-      # not. This means we can auto-correct in cases where we would otherwise
-      # refrain from doing so.
-      #
-      # If any other simplifications can be done to an AST without changing
-      # its meaning, they should be added here (and the class renamed).
-      # This will make autocorrection more powerful across the board.
-      #
-      class InlineBeginNodes < Parser::AST::Processor
-        def on_begin(node)
-          node.children.one? ? process(node.children[0]) : super
-        end
-      end
-
-      INLINE_BEGIN = InlineBeginNodes.new
-    end
-  end
-end