rubocop 0.25.0 → 0.26.0

data/lib/rubocop/formatter/formatter_set.rb

@@ -13,6 +13,7 @@ module RuboCop
         'fuubar'   => FuubarStyleFormatter,
         'emacs'    => EmacsStyleFormatter,
         'json'     => JSONFormatter,
+        'html'     => HTMLFormatter,
         'files'    => FileListFormatter,
         'offenses' => OffenseCountFormatter,
         'disabled' => DisabledLinesFormatter

data/lib/rubocop/formatter/fuubar_style_formatter.rb

@@ -49,7 +49,7 @@ module RuboCop
         return if offenses.empty?
 
         offenses << @severest_offense if @severest_offense
-        @severest_offense = offenses.max_by { |offense| offense.severity }
+        @severest_offense = offenses.max_by(&:severity)
       end
 
       def with_color

data/lib/rubocop/formatter/html_formatter.rb

@@ -0,0 +1,90 @@
+# encoding: utf-8
+
+require 'erb'
+require 'pathname'
+
+module RuboCop
+  module Formatter
+    # This formatter saves the output as a html file.
+    class HTMLFormatter < BaseFormatter
+      include PathUtil
+
+      attr_reader :output_hash
+
+      def initialize(output)
+        super
+        @output_hash = {
+          metadata: metadata_hash,
+          files:    [],
+          summary:  { offense_count: 0 }
+        }
+      end
+
+      def started(target_files)
+        output_hash[:summary][:target_file_count] = target_files.count
+      end
+
+      def file_finished(file, offenses)
+        output_hash[:files] << hash_for_file(file, offenses)
+        output_hash[:summary][:offense_count] += offenses.count
+      end
+
+      def finished(inspected_files)
+        output_hash[:summary][:inspected_file_count] = inspected_files.count
+        template = File.read(File
+          .expand_path('../../../../assets/output.html.erb', __FILE__))
+        erb = ERB.new(template)
+        html_content = erb.result(binding)
+        output.write html_content
+      end
+
+      def metadata_hash
+        {
+          rubocop_version: RuboCop::Version::STRING,
+          ruby_engine:     RUBY_ENGINE,
+          ruby_version:    RUBY_VERSION,
+          ruby_patchlevel: RUBY_PATCHLEVEL.to_s,
+          ruby_platform:   RUBY_PLATFORM
+        }
+      end
+
+      def hash_for_file(file, offenses)
+        {
+          path:     relative_path(file),
+          offenses: offenses.map { |o| hash_for_offense(o) }
+        }
+      end
+
+      def hash_for_offense(offense)
+        {
+          severity: offense.severity.name,
+          message:  offense.message,
+          cop_name: offense.cop_name,
+          corrected: offense.corrected?,
+          location: hash_for_location(offense)
+        }
+      end
+
+      # TODO: Consider better solution for Offense#real_column.
+      def hash_for_location(offense)
+        {
+          line:   offense.line,
+          column: offense.real_column,
+          length: offense.location.length,
+          source_line: offense.location.source_line,
+          highlight: highlight_line(offense.location)
+        }
+      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/progress_formatter.rb

@@ -44,7 +44,7 @@ module RuboCop
         mark = if offenses.empty?
                  green('.')
                else
-                 highest_offense = offenses.max_by { |o| o.severity }
+                 highest_offense = offenses.max_by(&:severity)
                  colored_severity_code(highest_offense)
                end
 

data/lib/rubocop/options.rb

@@ -24,6 +24,7 @@ module RuboCop
                          '  [fu]ubar',
                          '  [e]macs',
                          '  [j]son',
+                         '  [h]tml',
                          '  [fi]les',
                          '  [o]ffenses',
                          '  custom formatter class name'],

data/lib/rubocop/processed_source.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'astrolabe/builder'
+
 module RuboCop
   # ProcessedSource contains objects which are generated by Parser
   # and other information such as disabled lines for cops.
@@ -14,6 +16,11 @@ module RuboCop
     end
 
     def initialize(source, path = nil)
+      # In Ruby 2, source code encoding defaults to UTF-8. We follow the same
+      # principle regardless of which Ruby version we're running under.
+      # Encoding comments will override this setting.
+      source.force_encoding(Encoding::UTF_8)
+
       @raw_source = source
       @path = path
       @diagnostics = []
@@ -66,7 +73,9 @@ module RuboCop
     end
 
     def create_parser
-      Parser::CurrentRuby.new.tap do |parser|
+      builder = Astrolabe::Builder.new
+
+      Parser::CurrentRuby.new(builder).tap do |parser|
         # On JRuby and Rubinius, there's a risk that we hang in tokenize() if we
         # don't set the all errors as fatal flag. The problem is caused by a bug
         # in Racc that is discussed in issue #93 of the whitequark/parser

data/lib/rubocop/string_util.rb

@@ -0,0 +1,153 @@
+# encoding: utf-8
+
+module RuboCop
+  # This module provides approximate string matching methods.
+  module StringUtil
+    module_function
+
+    def similarity(string_a, string_b)
+      JaroWinkler.distance(string_a.to_s, string_b.to_s)
+    end
+
+    # This class computes Jaro distance, which is a measure of similarity
+    # between two strings.
+    class Jaro
+      attr_reader :shorter, :longer
+
+      def self.distance(*args)
+        new(*args).distance
+      end
+
+      def initialize(a, b)
+        if a.size < b.size
+          @shorter, @longer = a, b
+        else
+          @shorter, @longer = b, a
+        end
+      end
+
+      def distance
+        @distance ||= compute_distance
+      end
+
+      private
+
+      def compute_distance
+        common_chars_a, common_chars_b = find_common_characters
+        matched_count = common_chars_a.size
+
+        return 0.0 if matched_count.zero?
+
+        transposition_count =
+          count_transpositions(common_chars_a, common_chars_b)
+
+        sum = (matched_count / shorter.size.to_f) +
+              (matched_count / longer.size.to_f) +
+              ((matched_count - transposition_count / 2) / matched_count.to_f)
+
+        sum / 3.0
+      end
+
+      def find_common_characters
+        common_chars_of_shorter = Array.new(shorter.size)
+        common_chars_of_longer = Array.new(longer.size)
+
+        # In Ruby 1.9 String#chars returns Enumerator rather than Array.
+        longer_chars = longer.each_char.to_a
+
+        shorter.each_char.with_index do |shorter_char, shorter_index|
+          matching_index_range(shorter_index).each do |longer_index|
+            longer_char = longer_chars[longer_index]
+
+            next unless shorter_char == longer_char
+
+            common_chars_of_shorter[shorter_index] = shorter_char
+            common_chars_of_longer[longer_index] = longer_char
+
+            # Mark the matching character as already used
+            longer_chars[longer_index] = nil
+
+            break
+          end
+        end
+
+        [common_chars_of_shorter, common_chars_of_longer].map(&:compact)
+      end
+
+      def count_transpositions(common_chars_a, common_chars_b)
+        common_chars_a.size.times.count do |index|
+          common_chars_a[index] != common_chars_b[index]
+        end
+      end
+
+      def matching_index_range(origin)
+        min = origin - matching_window
+        min = 0 if min < 0
+
+        max = origin + matching_window
+
+        min..max
+      end
+
+      def matching_window
+        @matching_window ||= (longer.size / 2).to_i - 1
+      end
+    end
+
+    # This class computes Jaro-Winkler distance, which adds prefix-matching
+    # bonus to Jaro distance.
+    class JaroWinkler < Jaro
+      # Add the prefix bonus only when the Jaro distance is above this value.
+      # In other words, if the Jaro distance is less than this value,
+      # JaroWinkler.distance returns the raw Jaro distance.
+      DEFAULT_BOOST_THRESHOLD = 0.7
+
+      # How much the prefix bonus is weighted.
+      # This should not exceed 0.25.
+      DEFAULT_SCALING_FACTOR = 0.1
+
+      # Cutoff the common prefix length to this value if it's longer than this.
+      MAX_COMMON_PREFIX_LENGTH = 4
+
+      attr_reader :boost_threshold, :scaling_factor
+
+      def initialize(a, b, boost_threshold = nil, scaling_factor = nil)
+        super(a, b)
+        @boost_threshold = boost_threshold || DEFAULT_BOOST_THRESHOLD
+        @scaling_factor = scaling_factor || DEFAULT_SCALING_FACTOR
+      end
+
+      private
+
+      def compute_distance
+        jaro_distance = super
+
+        if jaro_distance >= boost_threshold
+          bonus = limited_common_prefix_length.to_f * scaling_factor.to_f *
+                  (1.0 - jaro_distance)
+          jaro_distance + bonus
+        else
+          jaro_distance
+        end
+      end
+
+      def limited_common_prefix_length
+        length = common_prefix_length
+
+        if length > MAX_COMMON_PREFIX_LENGTH
+          MAX_COMMON_PREFIX_LENGTH
+        else
+          length
+        end
+      end
+
+      def common_prefix_length
+        shorter.size.times do |index|
+          return index unless shorter[index] == longer[index]
+        end
+
+        shorter.size
+      end
+    end
+  end
+end

data/lib/rubocop/target_finder.rb

@@ -42,7 +42,7 @@ module RuboCop
     end
 
     # Finds all Ruby source files under the current or other supplied
-    # directory.  A Ruby source file is defined as a file with the `.rb`
+    # directory. A Ruby source file is defined as a file with the `.rb`
     # extension or a file with no extension that has a ruby shebang line
     # as its first line.
     # It is possible to specify includes and excludes using the config file,

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '0.25.0'
+    STRING = '0.26.0'
 
     MSG = '%s (using Parser %s, running on %s %s %s)'
 

data/relnotes/v0.26.0.md

@@ -0,0 +1,89 @@
+Nothing particularly exciting this time around.  The new release comes
+with lots of bug fixes, more auto-corrections and several new cops.
+
+Note that the `Style/Encoding` cop is now disabled by default. See
+[#1304](https://github.com/bbatsov/rubocop/issues/1304) for the
+rationale behind this change.
+
+Below is the list of all the gory details. Enjoy!
+
+### New features
+
+* New formatter `HTMLFormatter` generates a html file with a list of files with offences in them. ([@SkuliOskarsson][])
+* New cop `SpaceInsideRangeLiteral` checks for spaces around `..` and `...` in range literals. ([@bbatsov][])
+* New cop `InfiniteLoop` checks for places where `Kernel#loop` should have been used. ([@bbatsov][])
+* New cop `SymbolProc` checks for places where a symbol can be used as proc instead of a block. ([@bbatsov][])
+* `UselessAssignment` cop now suggests a variable name for possible typos if there's a variable-ish identifier similar to the unused variable name in the same scope. ([@yujinakayama][])
+* `PredicateName` cop now has separate configurations for prefices that denote predicate method names and predicate prefices that should be removed. ([@bbatsov][])
+* [#1272](https://github.com/bbatsov/rubocop/issues/1272): `Tab` cop does auto-correction. ([@yous][])
+* [#1274](https://github.com/bbatsov/rubocop/issues/1274): `MultilineIfThen` cop does auto-correction. ([@bbatsov][])
+* [#1279](https://github.com/bbatsov/rubocop/issues/1279): `DotPosition` cop does auto-correction. ([@yous][])
+* [#1277](https://github.com/bbatsov/rubocop/issues/1277): `SpaceBeforeFirstArg` cop does auto-correction. ([@yous][])
+* [#1310](https://github.com/bbatsov/rubocop/issues/1310): Handle `module_function` in `Style/AccessModifierIndentation` and `Style/EmptyLinesAroundAccessModifier`. ([@bbatsov][])
+
+### Changes
+
+* [#1289](https://github.com/bbatsov/rubocop/issues/1289): Use utf-8 as default encoding for inspected files. ([@jonas054][])
+* [#1304](https://github.com/bbatsov/rubocop/issues/1304): `Style/Encoding` is no longer a no-op on Ruby 2.x. It's also disabled by default, as projects not supporting 1.9 don't need to run it. ([@bbatsov][])
+
+### Bugs fixed
+
+* [#1263](https://github.com/bbatsov/rubocop/issues/1263): Do not report `%W` literals with special escaped characters in `UnneededCapitalW`. ([@jonas054][])
+* [#1286](https://github.com/bbatsov/rubocop/issues/1286): Fix a false positive in `VariableName`. ([@bbatsov][])
+* [#1211](https://github.com/bbatsov/rubocop/issues/1211): Fix false negative in `UselessAssignment` when there's a reference for the variable in an exclusive branch. ([@yujinakayama][])
+* [#1307](https://github.com/bbatsov/rubocop/issues/1307): Fix auto-correction of `RedundantBegin` cop deletes new line. ([@yous][])
+* [#1283](https://github.com/bbatsov/rubocop/issues/1283): Fix auto-correction of indented expressions in `PercentLiteralDelimiters`. ([@jonas054][])
+* [#1315](https://github.com/bbatsov/rubocop/pull/1315): `BracesAroundHashParameters` auto-correction removes whitespace around content inside braces. ([@jspanjers][])
+* [#1313](https://github.com/bbatsov/rubocop/issues/1313): Fix a false positive in `AndOr` when enforced style is `conditionals`. ([@bbatsov][])
+* Handle post-conditional `while` and `until` in `AndOr` when enforced style is `conditionals`. ([@yujinakayama][])
+* [#1319](https://github.com/bbatsov/rubocop/issues/1319): Fix a false positive in `FormatString`. ([@bbatsov][])
+* [#1287](https://github.com/bbatsov/rubocop/issues/1287): Allow missing blank line for EmptyLinesAroundAccessModifier if next line closes a block. ([@sch1zo][])
+
+[@bbatsov]: https://github.com/bbatsov
+[@jonas054]: https://github.com/jonas054
+[@yujinakayama]: https://github.com/yujinakayama
+[@dblock]: https://github.com/dblock
+[@nevir]: https://github.com/nevir
+[@daviddavis]: https://github.com/daviddavis
+[@sds]: https://github.com/sds
+[@fancyremarker]: https://github.com/fancyremarker
+[@sinisterchipmunk]: https://github.com/sinisterchipmunk
+[@vonTronje]: https://github.com/vonTronje
+[@agrimm]: https://github.com/agrimm
+[@pmenglund]: https://github.com/pmenglund
+[@chulkilee]: https://github.com/chulkilee
+[@codez]: https://github.com/codez
+[@emou]: https://github.com/emou
+[@skanev]: http://github.com/skanev
+[@claco]: http://github.com/claco
+[@rifraf]: http://github.com/rifraf
+[@scottmatthewman]: https://github.com/scottmatthewman
+[@ma2gedev]: http://github.com/ma2gedev
+[@jeremyolliver]: https://github.com/jeremyolliver
+[@hannestyden]: https://github.com/hannestyden
+[@geniou]: https://github.com/geniou
+[@jkogara]: https://github.com/jkogara
+[@tmorris-fiksu]: https://github.com/tmorris-fiksu
+[@mockdeep]: https://github.com/mockdeep
+[@hiroponz]: https://github.com/hiroponz
+[@tamird]: https://github.com/tamird
+[@fshowalter]: https://github.com/fshowalter
+[@cschramm]: https://github.com/cschramm
+[@bquorning]: https://github.com/bquorning
+[@bcobb]: https://github.com/bcobb
+[@irrationalfab]: https://github.com/irrationalfab
+[@tommeier]: https://github.com/tommeier
+[@sfeldon]: https://github.com/sfeldon
+[@biinari]: https://github.com/biinari
+[@barunio]: https://github.com/barunio
+[@molawson]: https://github.com/molawson
+[@wndhydrnt]: https://github.com/wndhydrnt
+[@ggilder]: https://github.com/ggilder
+[@salbertson]: https://github.com/salbertson
+[@camilleldn]: https://github.com/camilleldn
+[@mcls]: https://github.com/mcls
+[@yous]: https://github.com/yous
+[@vrthra]: https://github.com/vrthra
+[@SkuliOskarsson]: https://github.com/SkuliOskarsson
+[@jspanjers]: https://github.com/jspanjers
+[@sch1zo]: https://github.com/sch1zo

data/rubocop.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('rainbow', '>= 1.99.1', '< 3.0')
   s.add_runtime_dependency('parser', '>= 2.2.0.pre.4', '< 3.0')
   s.add_runtime_dependency('powerpack', '~> 0.0.6')
+  s.add_runtime_dependency('astrolabe', '~> 1.3')
   s.add_runtime_dependency('ruby-progressbar', '~> 1.4')
   s.add_development_dependency('rake', '~> 10.1')
   s.add_development_dependency('rspec', '~> 3.0')

data/spec/rubocop/cli_spec.rb

@@ -103,7 +103,8 @@ describe RuboCop::CLI, :isolated_environment do
                   '      }',
                   '    ]',
                   '  end',
-                  'end'].join("\n") + "\n")
+                  'end',
+                  ''].join("\n"))
       end
 
       it 'can change block comments and indent them' do
@@ -132,7 +133,8 @@ describe RuboCop::CLI, :isolated_environment do
                   '      do_something',
                   '    end',
                   '  end',
-                  'end'].join("\n") + "\n")
+                  'end',
+                  ''].join("\n"))
       end
 
       it 'can correct two problems with blocks' do
@@ -146,7 +148,8 @@ describe RuboCop::CLI, :isolated_environment do
           .to eq(['# encoding: utf-8',
                   '(1..10).each do |i|',
                   '  puts i',
-                  'end'].join("\n") + "\n")
+                  'end',
+                  ''].join("\n"))
       end
 
       it 'can handle spaces when removing braces' do
@@ -188,7 +191,8 @@ describe RuboCop::CLI, :isolated_environment do
         expect(IO.read('example.rb')).to eq(['class Test',
                                              '  def f',
                                              '  end',
-                                             'end'].join("\n") + "\n")
+                                             'end',
+                                             ''].join("\n"))
       end
 
       # A case where WordArray's correction can be clobbered by
@@ -205,7 +209,8 @@ describe RuboCop::CLI, :isolated_environment do
                                              '  private',
                                              '',
                                              '  A = %w(git path)',
-                                             'end'].join("\n") + "\n")
+                                             'end',
+                                             ''].join("\n"))
         e = abs('example.rb')
         expect($stdout.string)
           .to eq(["#{e}:2:1: C: Missing top-level class documentation " \
@@ -248,7 +253,8 @@ describe RuboCop::CLI, :isolated_environment do
                                    'end end'])
         expect(cli.run(['--auto-correct'])).to eq(1)
         expect(IO.read('example.rb')).to eq(['module A module B',
-                                             'end end'].join("\n") + "\n")
+                                             'end end',
+                                             ''].join("\n"))
       end
 
       it 'can correct single line methods' do
@@ -291,8 +297,8 @@ describe RuboCop::CLI, :isolated_environment do
         expect(IO.read('example.rb'))
           .to eq(['# encoding: utf-8',
                   'fail NotImplementedError,',
-                  "     'Method should be overridden in child classes'"]
-                   .join("\n") + "\n")
+                  "     'Method should be overridden in child classes'",
+                  ''].join("\n"))
         expect($stdout.string)
           .to eq(['Inspecting 1 file',
                   'C',
@@ -331,7 +337,8 @@ describe RuboCop::CLI, :isolated_environment do
                   'class Klass',
                   '  def f',
                   '  end',
-                  'end'].join("\n") + "\n")
+                  'end',
+                  ''].join("\n"))
         expect($stderr.string).to eq('')
         expect($stdout.string)
           .to eq(['Inspecting 1 file',
@@ -361,7 +368,8 @@ describe RuboCop::CLI, :isolated_environment do
           .to eq(['# encoding: utf-8',
                   'def primes(limit)',
                   '  1.upto(limit).select { |i| is_prime[i] }',
-                  'end'].join("\n") + "\n")
+                  'end',
+                  ''].join("\n"))
         expect($stdout.string)
           .to eq(['Inspecting 1 file',
                   'C',
@@ -462,7 +470,8 @@ describe RuboCop::CLI, :isolated_environment do
                      '',
                      ''])
         expect(cli.run(%w(--auto-correct --format emacs))).to eq(1)
-        expect(IO.read('example.rb')).to eq("# encoding: utf-8\n")
+        expect(IO.read('example.rb')).to eq(['# encoding: utf-8',
+                                             ''].join("\n"))
         expect($stdout.string)
           .to eq(["#{abs('example.rb')}:2:1: C: [Corrected] 3 trailing " \
                   'blank lines detected.',
@@ -609,8 +618,9 @@ describe RuboCop::CLI, :isolated_environment do
         expect { cli.run(['--auto-gen-config', 'example1.rb']) }
           .to exit_with_code(1)
         expect($stderr.string)
-          .to eq('--auto-gen-config can not be combined with any other ' \
-                 "arguments.\n")
+          .to eq(['--auto-gen-config can not be combined with any other ' \
+                  'arguments.',
+                  ''].join("\n"))
         expect($stdout.string).to eq('')
       end
 
@@ -667,6 +677,7 @@ describe RuboCop::CLI, :isolated_environment do
            '  Enabled: false',
            '',
            '# Offense count: 1',
+           '# Cop supports --auto-correct.',
            'Style/Tab:',
            '  Enabled: false',
            '',
@@ -713,6 +724,7 @@ describe RuboCop::CLI, :isolated_environment do
            '  Enabled: false',
            '',
            '# Offense count: 1',
+           '# Cop supports --auto-correct.',
            'Style/Tab:',
            '  Enabled: false']
         actual = IO.read('.rubocop_todo.yml').split($RS)
@@ -1041,7 +1053,7 @@ describe RuboCop::CLI, :isolated_environment do
           lines = stdout.lines
           lines.slice_before(/Type /).each do |slice|
             types = cops.types.map(&:to_s).map(&:capitalize)
-            current = types.delete(slice.shift[/Type '(?<c>[^'']+)'/, 'c'])
+            current = types.delete(slice.shift[/Type '(?<c>[^']+)'/, 'c'])
             # all cops in their type listing
             cops.with_type(current).each do |cop|
               expect(slice.any? { |l| l.include? cop.cop_name }).to be_truthy
@@ -1063,11 +1075,15 @@ describe RuboCop::CLI, :isolated_environment do
         let(:cop_list) { ['Style/Tab'] }
 
         it 'prints that cop and nothing else' do
-          expect(stdout).to eq(['Style/Tab:',
-                                '  Description: No hard tabs.',
-                                '  Enabled: true',
-                                '',
-                                ''].join("\n"))
+          expect(stdout).to eq(
+            ['# Supports --auto-correct',
+             'Style/Tab:',
+             '  Description: No hard tabs.',
+             '  StyleGuide: ' \
+             'https://github.com/bbatsov/ruby-style-guide#spaces-indentation',
+             '  Enabled: true',
+             '',
+             ''].join("\n"))
         end
 
         include_examples :prints_config
@@ -1082,11 +1098,15 @@ describe RuboCop::CLI, :isolated_environment do
         let(:cop_list) { ['Style/Tab,Lint/X123'] }
 
         it 'skips the unknown cop' do
-          expect(stdout).to eq(['Style/Tab:',
-                                '  Description: No hard tabs.',
-                                '  Enabled: true',
-                                '',
-                                ''].join("\n"))
+          expect(stdout).to eq(
+            ['# Supports --auto-correct',
+             'Style/Tab:',
+             '  Description: No hard tabs.',
+             '  StyleGuide: ' \
+             'https://github.com/bbatsov/ruby-style-guide#spaces-indentation',
+             '  Enabled: true',
+             '',
+             ''].join("\n"))
         end
       end
     end
@@ -1297,7 +1317,8 @@ describe RuboCop::CLI, :isolated_environment do
                                       ''].join("\n"))
 
         expect(File.read('emacs_output.txt'))
-          .to eq("#{abs(target_file)}:2:81: C: Line is too long. [90/80]\n")
+          .to eq(["#{abs(target_file)}:2:81: C: Line is too long. [90/80]",
+                  ''].join("\n"))
       end
     end
 
@@ -1398,7 +1419,9 @@ describe RuboCop::CLI, :isolated_environment do
                                'puts x'])
     expect(cli.run(['--format', 'simple', 'example.rb'])).to eq(0)
     expect($stdout.string)
-      .to eq("\n1 file inspected, no offenses detected\n")
+      .to eq(['',
+              '1 file inspected, no offenses detected',
+              ''].join("\n"))
   end
 
   it 'checks a given file with faults and returns 1' do
@@ -1509,8 +1532,9 @@ describe RuboCop::CLI, :isolated_environment do
                    'end'])
       expect(cli.run(['--format', 'emacs', 'example.rb'])).to eq(1)
       expect($stderr.string)
-        .to eq("#{abs('example.rb')}: Style/LineLength has the wrong " \
-               "namespace - should be Metrics\n")
+        .to eq(["#{abs('example.rb')}: Style/LineLength has the wrong " \
+                'namespace - should be Metrics',
+                ''].join("\n"))
       # 3 cops were disabled, then 2 were enabled again, so we
       # should get 2 offenses reported.
       expect($stdout.string)
@@ -1890,7 +1914,7 @@ describe RuboCop::CLI, :isolated_environment do
        'special case' do
       create_file('example1.rb',
                   ['# encoding: utf-8',
-                   'arr.select { |e| e > 0 }.collect { |e| -e }',
+                   'arr.select { |e| e > 0 }.collect { |e| e * 2 }',
                    'a2.find_all { |e| e > 0 }'])
       # We prefer find_all over select. This setting overrides the default
       # select over find_all. Other preferred methods appearing in the default
@@ -2193,9 +2217,10 @@ describe RuboCop::CLI, :isolated_environment do
 
       cli.run(%w(--format simple -c rubocop.yml))
       expect($stderr.string)
-        .to eq("Warning: Invalid severity 'superbad'. " \
-               'Valid severities are refactor, convention, ' \
-               "warning, error, fatal.\n")
+        .to eq(["Warning: Invalid severity 'superbad'. " \
+                'Valid severities are refactor, convention, ' \
+                'warning, error, fatal.',
+                ''].join("\n"))
     end
 
     context 'when a file inherits from the old auto generated file' do
@@ -2212,8 +2237,9 @@ describe RuboCop::CLI, :isolated_environment do
         expect { cli.run(%w(-c .rubocop.yml --auto-gen-config)) }
           .to exit_with_code(1)
         expect($stderr.string)
-          .to eq('Attention: rubocop-todo.yml has been renamed to ' \
-                 ".rubocop_todo.yml\n")
+          .to eq(['Attention: rubocop-todo.yml has been renamed to ' \
+                  '.rubocop_todo.yml',
+                  ''].join("\n"))
       end
     end
   end