Merge pull request rubocop#2225 from rrosenblum/performance_tweaks_phase_3

bbatsov · bbatsov · commit 78ed79f424d0 · 2015-09-07T08:25:19.000+03:00
Performance tweaks phase 3
diff --git a/lib/rubocop/config.rb b/lib/rubocop/config.rb
@@ -151,11 +151,11 @@ def file_to_exclude?(file)
     end
 
     def patterns_to_include
-      self['AllCops']['Include']
+      @patterns_to_include ||= self['AllCops']['Include']
     end
 
     def patterns_to_exclude
-      self['AllCops']['Exclude']
+      @patterns_to_exclude ||= self['AllCops']['Exclude']
     end
 
     def path_relative_to_config(path)
diff --git a/lib/rubocop/formatter/progress_formatter.rb b/lib/rubocop/formatter/progress_formatter.rb
@@ -8,6 +8,14 @@ module Formatter
     class ProgressFormatter < ClangStyleFormatter
       include TextUtil
 
+      DOT = '.'.freeze
+      GREEN_DOT = Rainbow(DOT).green.freeze
+
+      def initialize(output)
+        super
+        @dot = @output.tty? ? GREEN_DOT : DOT
+      end
+
       def started(target_files)
         super
         @offenses_for_files = {}
@@ -36,14 +44,14 @@ def finished(inspected_files)
           end
         end
 
-        report_summary(inspected_files.count,
+        report_summary(inspected_files.size,
                        @total_offense_count,
                        @total_correction_count)
       end
 
       def report_file_as_mark(offenses)
         mark = if offenses.empty?
-                 green('.')
+                 @dot
                else
                  highest_offense = offenses.max_by(&:severity)
                  colored_severity_code(highest_offense)
diff --git a/lib/rubocop/processed_source.rb b/lib/rubocop/processed_source.rb
@@ -44,7 +44,7 @@ def disabled_line_ranges
     def lines
       @lines ||= begin
         all_lines = raw_source.lines.map(&:chomp)
-        last_token_line = tokens.any? ? tokens.last.pos.line : all_lines.count
+        last_token_line = tokens.any? ? tokens.last.pos.line : all_lines.size
         result = []
         all_lines.each_with_index do |line, ix|
           break if ix >= last_token_line && line == '__END__'
