rubocop 0.28.0 → 0.29.0

data/lib/rubocop/version.rb

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

data/relnotes/v0.29.0.md

@@ -0,0 +1,116 @@
+### New features
+
+* [#1430](https://github.com/bbatsov/rubocop/issues/1430): Add `--except` option for disabling cops on the command line. ([@jonas054][])
+* [#1506](https://github.com/bbatsov/rubocop/pull/1506): Add auto-correct from `EvenOdd` cop. ([@blainesch][])
+* [#1507](https://github.com/bbatsov/rubocop/issues/1507): `Debugger` cop now checks for the Capybara debug methods `save_and_open_page` and `save_and_open_screenshot`. ([@rrosenblum][])
+* [#1539](https://github.com/bbatsov/rubocop/pull/1539): Implement autocorrection for Rails/ReadWriteAttribute cop. ([@huerlisi][])
+* [#1324](https://github.com/bbatsov/rubocop/issues/1324): Add `AllCops/DisplayCopNames` configuration option for showing cop names in reports, like `--display-cop-names`. ([@jonas054][])
+* [#1271](https://github.com/bbatsov/rubocop/issues/1271): `Lambda` cop does auto-correction. ([@lumeet][])
+* [#1284](https://github.com/bbatsov/rubocop/issues/1284): Support namespaces, e.g. `Lint`, in the arguments to `--only` and `--except`. ([@jonas054][])
+* [#1276](https://github.com/bbatsov/rubocop/issues/1276): `SelfAssignment` cop does auto-correction. ([@lumeet][])
+* Add autocorrect to `RedundantException`. ([@mattjmcnaughton][])
+* [#1571](https://github.com/bbatsov/rubocop/pull/1571): New cop `StructInheritance` checks for inheritance from Struct.new. ([@mmozuras][])
+* [#1575](https://github.com/bbatsov/rubocop/issues/1575): New cop `DuplicateMethods` points out duplicate method name in class and module. ([@d4rk5eed][])
+* [#1144](https://github.com/bbatsov/rubocop/issues/1144): New cop `FirstParameterIndentation` checks the indentation of the first parameter in a method call. ([@jonas054][])
+* [#1627](https://github.com/bbatsov/rubocop/issues/1627): New cop `SpaceAroundBlockParameters` checks the spacing inside and after block parameters pipes. ([@jonas054][])
+
+### Changes
+
+* [#1492](https://github.com/bbatsov/rubocop/pull/1492): Abort when auto-correct causes an infinite loop. ([@dblock][])
+* Options `-e`/`--emacs` and `-s`/`--silent` are no longer recognized. Using them will now raise an error. ([@bquorning][])
+* [#1565](https://github.com/bbatsov/rubocop/issues/1565): Let `--fail-level A` cause exit with error if all offenses are auto-corrected. ([@jonas054][])
+* [#1309](https://github.com/bbatsov/rubocop/issues/1309): Add argument handling to `MultilineBlockLayout`. ([@lumeet][])
+
+### Bugs fixed
+
+* [#1634](https://github.com/bbatsov/rubocop/pull/1634): Fix `PerlBackrefs` Cop Autocorrections to Not Raise. ([@cshaffer][])
+* [#1553](https://github.com/bbatsov/rubocop/pull/1553): Fix bug where `Style/EmptyLinesAroundAccessModifier` interfered with `Style/EmptyLinesAroundBlockBody` when there is and access modifier at the beginning of a block. ([@volkert][])
+* Handle element assignment in `Lint/AssignmentInCondition`. ([@jonas054][])
+* [#1484](https://github.com/bbatsov/rubocop/issues/1484): Fix `EmptyLinesAroundAccessModifier` incorrectly finding a violation inside method calls with names identical to an access modifier. ([@dblock][])
+* Fix bug concerning `Exclude` properties inherited from a higher directory level. ([@jonas054][])
+* [#1500](https://github.com/bbatsov/rubocop/issues/1500): Fix crashing `--auto-correct --only IndentationWidth`. ([@jonas054][])
+* [#1512](https://github.com/bbatsov/rubocop/issues/1512): Fix false negative for typical string formatting examples. ([@kakutani][], [@jonas054][])
+* [#1504](https://github.com/bbatsov/rubocop/issues/1504): Fail with a meaningful error if the configuration file is malformed. ([@bquorning][])
+* Fix bug where `auto_correct` Rake tasks does not take in the options specified in its parent task. ([@rrosenblum][])
+* [#1054](https://github.com/bbatsov/rubocop/issues/1054): Handle comments within concatenated strings in `LineEndConcatenation`. ([@yujinakayama][], [@jonas054][])
+* [#1527](https://github.com/bbatsov/rubocop/issues/1527): Make autocorrect `BracesAroundHashParameter` leave the correct number of spaces. ([@mattjmcnaughton][])
+* [#1547](https://github.com/bbatsov/rubocop/issues/1547): Don't print `[Corrected]` when auto-correction was avoided in `Style/Semicolon`. ([@jonas054][])
+* [#1573](https://github.com/bbatsov/rubocop/issues/1573): Fix assignment-related auto-correction for `BlockAlignment`. ([@lumeet][])
+* [#1587](https://github.com/bbatsov/rubocop/pull/1587): Exit with exit code 1 if there were errors ("crashing" cops). ([@jonas054][])
+* [#1574](https://github.com/bbatsov/rubocop/issues/1574): Avoid auto-correcting `Hash.new` to `{}` when braces would be interpreted as a block. ([@jonas054][])
+* [#1591](https://github.com/bbatsov/rubocop/issues/1591): Don't check parameters inside `[]` in `MultilineOperationIndentation`. ([@jonas054][])
+* [#1509](https://github.com/bbatsov/rubocop/issues/1509): Ignore class methods in `Rails/Delegate`. ([@bbatsov][])
+* [#1594](https://github.com/bbatsov/rubocop/issues/1594): Fix `@example` warnings in Yard Doc documentation generation. ([@mattjmcnaughton][])
+* [#1598](https://github.com/bbatsov/rubocop/issues/1598): Fix bug in file inclusion when running from another directory. ([@jonas054][])
+* [#1580](https://github.com/bbatsov/rubocop/issues/1580): Don't print `[Corrected]` when auto-correction was avoided in `TrivialAccessors`. ([@lumeet][])
+* [#1612](https://github.com/bbatsov/rubocop/issues/1612): Allow `expand_path` on `inherit_from` in `.rubocop.yml`. ([@mattjmcnaughton][])
+* [#1610](https://github.com/bbatsov/rubocop/issues/1610): Check that class method names actually match the name of the containing class/module in `Style/ClassMethods`. ([@bbatsov][])
+
+[@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
+[@smangelsdorf]: https://github.com/smangelsdorf
+[@mvz]: https://github.com/mvz
+[@jfelchner]: https://github.com/jfelchner
+[@janraasch]: https://github.com/janraasch
+[@jcarbo]: https://github.com/jcarbo
+[@oneamtu]: https://github.com/oneamtu
+[@toy]: https://github.com/toy
+[@Koronen]: https://github.com/Koronen
+[@blainesch]: https://github.com/blainesch
+[@marxarelli]: https://github.com/marxarelli
+[@katieschilling]: https://github.com/katieschilling
+[@kakutani]: https://github.com/kakutani
+[@rrosenblum]: https://github.com/rrosenblum
+[@mattjmcnaughton]: https://github.com/mattjmcnaughton
+[@huerlisi]: https://github.com/huerlisi
+[@volkert]: https://github.com/volkert
+[@lumeet]: https://github.com/lumeet
+[@mmozuras]: https://github.com/mmozuras
+[@d4rk5eed]: https://github.com/d4rk5eed
+[@cshaffer]: https://github.com/cshaffer

data/rubocop.gemspec

@@ -27,12 +27,12 @@ Gem::Specification.new do |s|
   s.summary = 'Automatic Ruby code style checking tool.'
 
   s.add_runtime_dependency('rainbow', '>= 1.99.1', '< 3.0')
-  s.add_runtime_dependency('parser', '>= 2.2.0.pre.7', '< 3.0')
-  s.add_runtime_dependency('powerpack', '~> 0.0.6')
+  s.add_runtime_dependency('parser', '>= 2.2.0.1', '< 3.0')
+  s.add_runtime_dependency('powerpack', '~> 0.1')
   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')
+  s.add_development_dependency('rspec', '~> 3.1.0')
   s.add_development_dependency('yard', '~> 0.8')
   s.add_development_dependency('bundler', '~> 1.3')
   s.add_development_dependency('simplecov', '~> 0.7')

data/spec/rubocop/cli_spec.rb

@@ -47,6 +47,57 @@ describe RuboCop::CLI, :isolated_environment do
         expect(uncorrected).to be_empty # Hence exit code 0.
       end
 
+      it 'corrects only IndentationWidth without crashing' do
+        source = ['foo = if bar',
+                  '  something',
+                  'elsif baz',
+                  '  other_thing',
+                  'else',
+                  '  fail',
+                  'end']
+        create_file('example.rb', source)
+        expect(cli.run(%w(--only IndentationWidth --auto-correct))).to eq(0)
+        corrected = ['foo = if bar',
+                     '        something',
+                     'elsif baz',
+                     '  other_thing',
+                     'else',
+                     '  fail',
+                     'end',
+                     ''].join("\n")
+        expect(IO.read('example.rb')).to eq(corrected)
+      end
+
+      it 'crashes on infinite loop but prints offenses' do
+        create_file('example.rb', '3.times{ something;other_thing;}')
+        # This configuration makes --auto-correct impossible to finish since a
+        # space will be added after each ; but then removed again for the one
+        # that's inside }.
+        create_file('.rubocop.yml', ['SpaceInsideBlockBraces:',
+                                     '  EnforcedStyle: no_space',
+                                     '  SpaceBeforeBlockParameters: false'])
+        cmd = %w(--only SpaceAfterSemicolon,SpaceInsideBlockBraces
+                 --auto-correct --format simple)
+        expect { cli.run(cmd) }.to raise_error(RuboCop::Runner::
+                                               InfiniteCorrectionLoop)
+        expect(IO.read('example.rb'))
+          .to eq("3.times{something; other_thing;}\n")
+
+        expected_output = [
+          '== example.rb ==',
+          'C:  1:  9: [Corrected] Space inside { detected.',
+          'C:  1: 19: [Corrected] Space missing after semicolon.',
+          'C:  1: 31: [Corrected] Space missing after semicolon.',
+          'C:  1: 32: [Corrected] Space inside } detected.',
+          'C:  1: 33: [Corrected] Space inside } detected.',
+          '',
+          # We're interrupted during inspection, hence 0 files inspected.
+          '0 files inspected, 5 offenses detected, 5 offenses corrected',
+          ''
+        ]
+        expect($stdout.string).to eq(expected_output.join("\n"))
+      end
+
       it 'corrects complicated cases conservatively' do
         # Two cops make corrections here; Style/BracesAroundHashParameters, and
         # Style/AlignHash. Because they make minimal corrections relating only
@@ -66,13 +117,11 @@ describe RuboCop::CLI, :isolated_environment do
         expect(cli.run(['-D', '--auto-correct'])).to eq(0)
         corrected =
           ['# encoding: utf-8',
-           'expect(subject[:address]).to eq(',
-           "  street1:     '1 Market',",
-           "  street2:     '#200',",
-           "  city:        'Some Town',",
-           "  state:       'CA',",
-           "  postal_code: '99999-1111'",
-           ')']
+           "expect(subject[:address]).to eq(street1:     '1 Market',",
+           "                                street2:     '#200',",
+           "                                city:        'Some Town',",
+           "                                state:       'CA',",
+           "                                postal_code: '99999-1111')"]
         expect(IO.read('example.rb')).to eq(corrected.join("\n") + "\n")
       end
 
@@ -320,12 +369,12 @@ describe RuboCop::CLI, :isolated_environment do
                                              ''].join("\n"))
         expect($stdout.string).to eq(['',
                                       '10  Style/TrailingWhitespace',
-                                      '5   Style/Semicolon',
+                                      '3   Style/Semicolon',
                                       '3   Style/SingleLineMethods',
                                       '1   Style/DefWithParentheses',
                                       '1   Style/EmptyLineBetweenDefs',
                                       '--',
-                                      '20  Total',
+                                      '18  Total',
                                       '',
                                       ''].join("\n"))
       end
@@ -570,22 +619,26 @@ describe RuboCop::CLI, :isolated_environment do
         create_file('example.rb', ['# encoding: utf-8',
                                    'a = c and b',
                                    'not a && b',
-                                   'func a do b end'])
+                                   'func a do b end',
+                                   "Signal.trap('TERM') { system(cmd); exit }"])
         expect(cli.run(%w(-a -f simple))).to eq(1)
         expect($stderr.string).to eq('')
-        expect(IO.read('example.rb')).to eq(['# encoding: utf-8',
-                                             'a = c and b',
-                                             'not a && b',
-                                             'func a do b end',
-                                             ''].join("\n"))
+        expect(IO.read('example.rb'))
+          .to eq(['# encoding: utf-8',
+                  'a = c and b',
+                  'not a && b',
+                  'func a do b end',
+                  "Signal.trap('TERM') { system(cmd); exit }",
+                  ''].join("\n"))
         expect($stdout.string)
           .to eq(['== example.rb ==',
                   'C:  2:  7: Use && instead of and.',
                   'C:  3:  1: Use ! instead of not.',
                   'C:  4:  8: Prefer {...} over do...end for single-line ' \
                   'blocks.',
+                  'C:  5: 34: Do not use semicolons to terminate expressions.',
                   '',
-                  '1 file inspected, 3 offenses detected',
+                  '1 file inspected, 4 offenses detected',
                   ''].join("\n"))
       end
 
@@ -847,7 +900,8 @@ describe RuboCop::CLI, :isolated_environment do
                                      "\ty",
                                      'end'])
           expect(cli.run(['--only', 'Style/123'])).to eq(1)
-          expect($stderr.string).to include('Unrecognized cop name: Style/123.')
+          expect($stderr.string)
+            .to include('Unrecognized cop or namespace: Style/123.')
         end
 
         it 'accepts cop names from plugins' do
@@ -974,6 +1028,125 @@ describe RuboCop::CLI, :isolated_environment do
           end
         end
       end
+
+      context 'when a namespace is given' do
+        it 'runs all enabled cops in that namespace' do
+          create_file('example.rb', ['if x== 100000000000000 ',
+                                     '  ' + '#' * 100,
+                                     "\ty",
+                                     'end'])
+          expect(cli.run(%w(-f offenses --only Metrics example.rb))).to eq(1)
+          expect($stdout.string).to eq(['',
+                                        '1  Metrics/LineLength',
+                                        '--',
+                                        '1  Total',
+                                        '',
+                                        ''].join("\n"))
+        end
+      end
+
+      context 'when two namespaces are given' do
+        it 'runs all enabled cops in those namespaces' do
+          create_file('example.rb', ['# encoding: utf-8',
+                                     'if x== 100000000000000 ',
+                                     '  # ' + '-' * 98,
+                                     "\ty",
+                                     'end'])
+          create_file('.rubocop.yml', ['Style/SpaceAroundOperators:',
+                                       '  Enabled: false'])
+          expect(cli.run(%w(-f o --only Metrics,Style example.rb))).to eq(1)
+          expect($stdout.string)
+            .to eq(['',
+                    '1  Metrics/LineLength',
+                    '1  Style/CommentIndentation',
+                    '1  Style/IndentationWidth',
+                    '1  Style/NumericLiterals',
+                    '1  Style/Tab',
+                    '1  Style/TrailingWhitespace',
+                    '--',
+                    '6  Total',
+                    '',
+                    ''].join("\n"))
+        end
+      end
+    end
+
+    describe '--except' do
+      context 'when one name is given' do
+        it 'exits with error if the cop name is incorrect' do
+          create_file('example.rb', ['if x== 0 ',
+                                     "\ty",
+                                     'end'])
+          expect(cli.run(['--except', 'Style/123'])).to eq(1)
+          expect($stderr.string)
+            .to include('Unrecognized cop or namespace: Style/123.')
+        end
+      end
+
+      context 'when one cop plus one namespace are given' do
+        it 'runs all cops except the given' do
+          create_file('example.rb', ['if x== 0 ',
+                                     "\ty = 3",
+                                     'end'])
+          expect(cli.run(['--format', 'offenses',
+                          '--except', 'Style/IfUnlessModifier,Lint',
+                          'example.rb'])).to eq(1)
+          expect($stdout.string)
+            .to eq(['',
+                    # Note: No Lint/UselessAssignment offense.
+                    '1  Style/IndentationWidth',
+                    '1  Style/SpaceAroundOperators',
+                    '1  Style/Tab',
+                    '1  Style/TrailingWhitespace',
+                    '--',
+                    '4  Total',
+                    '',
+                    ''].join("\n"))
+        end
+      end
+
+      context 'when one cop is given without namespace' do
+        it 'disables the given cop' do
+          create_file('example.rb', ['if x== 0 ',
+                                     "\ty",
+                                     'end'])
+
+          cli.run(['--format', 'offenses',
+                   '--except', 'IfUnlessModifier',
+                   'example.rb'])
+          with_option = $stdout.string
+          $stdout = StringIO.new
+          cli.run(['--format', 'offenses',
+                   'example.rb'])
+          without_option = $stdout.string
+
+          expect(without_option.split($RS) - with_option.split($RS))
+            .to eq(['1  Style/IfUnlessModifier', '5  Total'])
+        end
+      end
+
+      context 'when several cops are given' do
+        it 'disables the given cops' do
+          create_file('example.rb', ['if x== 100000000000000 ',
+                                     "\ty",
+                                     'end'])
+          expect(cli.run(['--format', 'offenses',
+                          '--except',
+                          'Style/IfUnlessModifier,Style/Tab,' \
+                          'Style/SpaceAroundOperators',
+                          'example.rb'])).to eq(1)
+          expect($stderr.string).to eq('')
+          expect($stdout.string)
+            .to eq(['',
+                    '1  Style/IndentationWidth',
+                    '1  Style/NumericLiterals',
+                    '1  Style/TrailingWhitespace',
+                    '--',
+                    '3  Total',
+                    '',
+                    ''].join("\n"))
+        end
+      end
     end
 
     describe '--lint' do
@@ -1282,6 +1455,16 @@ describe RuboCop::CLI, :isolated_environment do
               .to include('No formatter for "unknown"')
           end
         end
+
+        context 'when ambiguous format name is specified' do
+          it 'aborts with error message' do
+            # Both 'files' and 'fuubar' start with an 'f'.
+            expect { cli.run(['--format', 'f', 'example.rb']) }
+              .to exit_with_code(1)
+            expect($stderr.string)
+              .to include('Cannot determine formatter for "f"')
+          end
+        end
       end
 
       describe 'custom formatter' do
@@ -1372,16 +1555,63 @@ describe RuboCop::CLI, :isolated_environment do
 
       before do
         create_file(target_file, ['# encoding: utf-8',
-                                  '#' * 90])
+                                  'def f',
+                                  ' x',
+                                  'end'])
+      end
+
+      after do
+        expect($stderr.string).to eq('')
+        expect($stdout.string)
+          .to include('1 file inspected, 1 offense detected')
       end
 
       it 'fails when option is less than the severity level' do
+        expect(cli.run(['--fail-level', 'refactor', target_file])).to eq(1)
+        expect(cli.run(['--fail-level', 'autocorrect', target_file])).to eq(1)
+      end
+
+      it 'fails when option is equal to the severity level' do
         expect(cli.run(['--fail-level', 'convention', target_file])).to eq(1)
       end
 
-      it 'succeed when option is greater than the severity level' do
+      it 'succeeds when option is greater than the severity level' do
         expect(cli.run(['--fail-level', 'warning', target_file])).to eq(0)
       end
+
+      context 'with --auto-correct' do
+        after do
+          expect($stdout.string.lines.to_a.last)
+            .to eq('1 file inspected, 1 offense detected, 1 offense corrected' \
+                   "\n")
+        end
+
+        it 'fails when option is autocorrect and all offenses are ' \
+           'autocorrected' do
+          expect(cli.run(['--auto-correct', '--format', 'simple',
+                          '--fail-level', 'autocorrect',
+                          target_file])).to eq(1)
+        end
+
+        it 'fails when option is A and all offenses are autocorrected' do
+          expect(cli.run(['--auto-correct', '--format', 'simple',
+                          '--fail-level', 'A',
+                          target_file])).to eq(1)
+        end
+
+        it 'succeeds when option is not given and all offenses are ' \
+           'autocorrected' do
+          expect(cli.run(['--auto-correct', '--format', 'simple',
+                          target_file])).to eq(0)
+        end
+
+        it 'succeeds when option is refactor and all offenses are ' \
+           'autocorrected' do
+          expect(cli.run(['--auto-correct', '--format', 'simple',
+                          '--fail-level', 'refactor',
+                          target_file])).to eq(0)
+        end
+      end
     end
 
     describe '--force-exclusion' do
@@ -1457,6 +1687,44 @@ describe RuboCop::CLI, :isolated_environment do
     end
   end
 
+  context 'when given a file/directory that is not under the current dir' do
+    shared_examples 'checks Rakefile' do
+      it 'checks a Rakefile but Style/FileName does not report' do
+        create_file('Rakefile', 'x = 1')
+        create_file('other/empty', '')
+        Dir.chdir('other') do
+          expect(cli.run(['--format', 'simple', checked_path])).to eq(1)
+        end
+        expect($stdout.string)
+          .to eq(["== #{abs('Rakefile')} ==",
+                  'W:  1:  1: Useless assignment to variable - x.',
+                  '',
+                  '1 file inspected, 1 offense detected',
+                  ''].join("\n"))
+      end
+    end
+
+    context 'and the directory is absolute' do
+      let(:checked_path) { abs('..') }
+      include_examples 'checks Rakefile'
+    end
+
+    context 'and the directory is relative' do
+      let(:checked_path) { '..' }
+      include_examples 'checks Rakefile'
+    end
+
+    context 'and the Rakefile path is absolute' do
+      let(:checked_path) { abs('../Rakefile') }
+      include_examples 'checks Rakefile'
+    end
+
+    context 'and the Rakefile path is relative' do
+      let(:checked_path) { '../Rakefile' }
+      include_examples 'checks Rakefile'
+    end
+  end
+
   it 'checks a given correct file and returns 0' do
     create_file('example.rb', ['# encoding: utf-8',
                                'x = 0',
@@ -1607,8 +1875,7 @@ describe RuboCop::CLI, :isolated_environment do
                   ])
       expect(cli.run(['--format', 'emacs', 'example.rb'])).to eq(1)
       expect($stdout.string)
-        .to eq(
-               ["#{abs('example.rb')}:3:81: C: Line is too long. [95/80]",
+        .to eq(["#{abs('example.rb')}:3:81: C: Line is too long. [95/80]",
                 ''].join("\n"))
     end
 
@@ -1622,8 +1889,7 @@ describe RuboCop::CLI, :isolated_environment do
                     ])
         expect(cli.run(['--format', 'emacs', 'example.rb'])).to eq(1)
         expect($stdout.string)
-          .to eq(
-                 ["#{abs('example.rb')}:3:81: C: Line is too long. [95/80]",
+          .to eq(["#{abs('example.rb')}:3:81: C: Line is too long. [95/80]",
                   ''].join("\n"))
       end
     end
@@ -1867,6 +2133,31 @@ describe RuboCop::CLI, :isolated_environment do
                 ''].join("\n"))
     end
 
+    it 'displays cop names if DisplayCopNames is true' do
+      source = ['# encoding: utf-8',
+                'x = 0 ',
+                'puts x']
+      create_file('example1.rb', source)
+
+      # DisplayCopNames: false inherited from config/default.yml
+      create_file('.rubocop.yml', [])
+
+      create_file('dir/example2.rb', source)
+      create_file('dir/.rubocop.yml', ['AllCops:',
+                                       '  DisplayCopNames: true'])
+
+      expect(cli.run(%w(--format simple))).to eq(1)
+      expect($stdout.string)
+        .to eq(['== example1.rb ==',
+                'C:  2:  6: Trailing whitespace detected.',
+                '== dir/example2.rb ==',
+                'C:  2:  6: Style/TrailingWhitespace: Trailing whitespace' \
+                ' detected.',
+                '',
+                '2 files inspected, 2 offenses detected',
+                ''].join("\n"))
+    end
+
     it 'finds included files' do
       create_file('file.rb', 'x=0') # Included by default
       create_file('example', 'x=0')
@@ -2175,8 +2466,7 @@ describe RuboCop::CLI, :isolated_environment do
                                                '  Max: 100'
                                               ])
       expect(cli.run(%w(--format simple example))).to eq(1)
-      expect($stdout.string).to eq(
-                                   ['== example/lib/example1.rb ==',
+      expect($stdout.string).to eq(['== example/lib/example1.rb ==',
                                     'C:  2: 81: Line is too long. [90/80]',
                                     '',
                                     '2 files inspected, 1 offense detected',
@@ -2421,5 +2711,19 @@ describe RuboCop::CLI, :isolated_environment do
                   ''].join("\n"))
       end
     end
+
+    context 'when a file inherits from a higher level' do
+      before do
+        create_file('.rubocop.yml', ['Metrics/LineLength:',
+                                     '  Exclude:',
+                                     '    - dir/example.rb'])
+        create_file('dir/.rubocop.yml', 'inherit_from: ../.rubocop.yml')
+        create_file('dir/example.rb', '#' * 90)
+      end
+
+      it 'inherits relative excludes correctly' do
+        expect(cli.run([])).to eq(0)
+      end
+    end
   end
 end