rubocop 0.19.1 → 0.20.0

data/lib/rubocop/formatter/json_formatter.rb

@@ -7,6 +7,8 @@ module Rubocop
   module Formatter
     # This formatter formats the report data in JSON format.
     class JSONFormatter < BaseFormatter
+      include PathUtil
+
       attr_reader :output_hash
 
       def initialize(output)
@@ -51,7 +53,7 @@ module Rubocop
 
       def hash_for_offense(offense)
         {
-          severity: offense.severity,
+          severity: offense.severity.name,
           message:  offense.message,
           cop_name: offense.cop_name,
           corrected: offense.corrected?,
@@ -67,12 +69,6 @@ module Rubocop
           length: offense.location.length
         }
       end
-
-      private
-
-      def relative_path(path)
-        Pathname.new(path).relative_path_from(Pathname.getwd).to_s
-      end
     end
   end
 end

data/lib/rubocop/formatter/progress_formatter.rb

@@ -44,9 +44,7 @@ module Rubocop
         mark = if offenses.empty?
                  green('.')
                else
-                 highest_offense = offenses.max do |a, b|
-                   a.severity_level <=> b.severity_level
-                 end
+                 highest_offense = offenses.max_by { |o| o.severity }
                  colored_severity_code(highest_offense)
                end
 

data/lib/rubocop/formatter/simple_text_formatter.rb

@@ -85,13 +85,17 @@ module Rubocop
       end
 
       def colored_severity_code(offense)
-        color = COLOR_FOR_SEVERITY[offense.severity]
-        colorize(offense.severity_code, color)
+        color = COLOR_FOR_SEVERITY[offense.severity.name]
+        colorize(offense.severity.code, color)
+      end
+
+      def annotate_message(msg)
+        msg.gsub(/`(.*?)`/, Rainbow('\1').yellow)
       end
 
       def message(offense)
         message = offense.corrected? ? green('[Corrected] ') : ''
-        message << offense.message
+        message << annotate_message(offense.message)
       end
 
       def pluralize(number, thing, options = {})

data/lib/rubocop/options.rb

@@ -23,14 +23,14 @@ module Rubocop
           validate_only_option
         end
 
-        option(opts, '-c', '--config FILE', 'Specify configuration file.')
-
+        add_configuration_options(opts, args)
         add_formatting_options(opts, args)
 
         option(opts, '-r', '--require FILE', 'Require Ruby file.') do |f|
           require f
         end
 
+        add_severity_option(opts)
         add_flags_with_optional_args(opts)
         add_boolean_flags(opts)
       end.parse!(args)
@@ -44,12 +44,30 @@ module Rubocop
 
     private
 
+    def add_configuration_options(opts, args)
+      option(opts, '-c', '--config FILE', 'Specify configuration file.')
+
+      option(opts, '--auto-gen-config',
+             'Generate a configuration file acting as a', 'TODO list.') do
+        validate_auto_gen_config_option(args)
+        @options[:formatters] = [[DEFAULT_FORMATTER],
+                                 [Formatter::DisabledConfigFormatter,
+                                  ConfigLoader::AUTO_GENERATED_FILE]]
+      end
+
+      option(opts, '--force-exclusion',
+             'Force excluding files specified in the',
+             'configuration `Exclude` even if they are',
+             'explicitly passed as arguments.')
+    end
+
     FORMAT_HELP = ['Choose an output formatter. This option',
                    'can be specified multiple times to enable',
                    'multiple formatters at the same time.',
                    '  [p]rogress (default)',
                    '  [s]imple',
                    '  [c]lang',
+                   '  [d]isabled cops via inline comments',
                    '  [fu]ubar',
                    '  [e]macs',
                    '  [j]son',
@@ -58,14 +76,6 @@ module Rubocop
                    '  custom formatter class name']
 
     def add_formatting_options(opts, args)
-      option(opts, '--auto-gen-config',
-             'Generate a configuration file acting as a', 'TODO list.') do
-        validate_auto_gen_config_option(args)
-        @options[:formatters] = [[DEFAULT_FORMATTER],
-                                 [Formatter::DisabledConfigFormatter,
-                                  ConfigLoader::AUTO_GENERATED_FILE]]
-      end
-
       option(opts, '-f', '--format FORMATTER', *FORMAT_HELP) do |key|
         @options[:formatters] ||= []
         @options[:formatters] << [key]
@@ -81,6 +91,15 @@ module Rubocop
       end
     end
 
+    def add_severity_option(opts)
+      opts.on('--fail-level SEVERITY',
+              Rubocop::Cop::Severity::NAMES,
+              Rubocop::Cop::Severity::CODE_TABLE,
+              'Minimum severity for exit with error code.') do |severity|
+                @options[:fail_level] = severity
+              end
+    end
+
     def add_flags_with_optional_args(opts)
       option(opts, '--show-cops [cop1,cop2,...]',
              'Shows the given cops, or all cops by',

data/lib/rubocop/path_util.rb

@@ -6,7 +6,8 @@ module Rubocop
     module_function
 
     def relative_path(path, base_dir = Dir.pwd)
-      Pathname.new(path).relative_path_from(Pathname.new(base_dir)).to_s
+      path_name = Pathname.new(File.expand_path(path))
+      path_name.relative_path_from(Pathname.new(base_dir)).to_s
     end
 
     def match_path?(pattern, path)

data/lib/rubocop/processed_source.rb

@@ -17,6 +17,10 @@ module Rubocop
       @comment_config = CommentConfig.new(self)
     end
 
+    def disabled_line_ranges
+      comment_config.cop_disabled_line_ranges
+    end
+
     def lines
       if @lines
         @lines
@@ -43,6 +47,10 @@ module Rubocop
       @diagnostics.none? { |d| [:error, :fatal].include?(d.level) }
     end
 
+    def file_path
+      @buffer.name
+    end
+
     private
 
     def init_lines

data/lib/rubocop/target_finder.rb

@@ -4,9 +4,17 @@ module Rubocop
   # This class finds target files to inspect by scanning the directory tree
   # and picking ruby files.
   class TargetFinder
-    def initialize(config_store, debug = false)
+    def initialize(config_store, options = {})
       @config_store = config_store
-      @debug = debug
+      @options = { force_exclusion: false, debug: false }.merge(options)
+    end
+
+    def force_exclusion?
+      @options[:force_exclusion]
+    end
+
+    def debug?
+      @options[:debug]
     end
 
     # Generate a list of target files by expanding globbing patterns
@@ -19,13 +27,11 @@ module Rubocop
       files = []
 
       args.uniq.each do |arg|
-        if File.directory?(arg)
-          files += target_files_in_dir(arg.chomp(File::SEPARATOR))
-        elsif arg.include?('*')
-          files += Dir[arg]
-        else
-          files << arg
-        end
+        files += if File.directory?(arg)
+                   target_files_in_dir(arg.chomp(File::SEPARATOR))
+                 else
+                   process_explicit_path(arg)
+                 end
       end
 
       files.map { |f| File.expand_path(f) }.uniq
@@ -46,7 +52,7 @@ module Rubocop
         base_dir.gsub!(File::ALT_SEPARATOR, File::SEPARATOR)
       end
       files = Dir["#{base_dir}/**/*"].select { |path| FileTest.file?(path) }
-      base_dir_config = @config_store.for("#{base_dir}/foobar.rb")
+      base_dir_config = @config_store.for(base_dir)
 
       target_files = files.select do |file|
         next false if base_dir_config.file_to_exclude?(file)
@@ -55,7 +61,7 @@ module Rubocop
         @config_store.for(file).file_to_include?(file)
       end
 
-      target_files.uniq
+      target_files
     end
 
     def ruby_executable?(file)
@@ -63,8 +69,23 @@ module Rubocop
       first_line = File.open(file) { |f| f.readline }
       first_line =~ /#!.*ruby/
     rescue EOFError, ArgumentError => e
-      warn "Unprocessable file #{file}: #{e.class}, #{e.message}" if @debug
+      warn "Unprocessable file #{file}: #{e.class}, #{e.message}" if debug?
       false
     end
+
+    def process_explicit_path(path)
+      files = if path.include?('*')
+                Dir[path]
+              else
+                [path]
+              end
+
+      return files unless force_exclusion?
+
+      files.reject do |file|
+        config = @config_store.for(file)
+        config.file_to_exclude?(file)
+      end
+    end
   end
 end

data/lib/rubocop/version.rb

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

data/relnotes/v0.20.0.md

@@ -0,0 +1,69 @@
+There aren't many exciting new features this time around - our focus in 0.20 has been fixing most of the problems we
+introduced in 0.19. Apart from that we've added a few new cops and implemented auto-correct for a bunch of the existing cops.
+You'll also notice that the messages produced by most formatters a bit more colorful (and hopefully more readable as well).
+
+You should also note that `AllCops/Includes` and `AllCops/Excludes` have been renamed, so you'll have to update your config files
+accordingly.
+
+Below is the list of all the gory details. Enjoy!
+
+### New features
+
+* New cop `GuardClause` checks for conditionals that can be replaced by guard clauses. ([@bbatsov][])
+* New cop `EmptyInterpolation` checks for empty interpolation in double-quoted strings. ([@bbatsov][])
+* [#899](https://github.com/bbatsov/rubocop/issues/899): Make `LineEndConcatenation` cop `<<` aware. ([@mockdeep][])
+* [#896](https://github.com/bbatsov/rubocop/issues/896): New option `--fail-level` changes minimum severity for exit with error code. ([@hiroponz][])
+* [#893](https://github.com/bbatsov/rubocop/issues/893): New option `--force-exclusion` forces excluding files specified in the configuration `Exclude` even if they are explicitly passed as arguments. ([@yujinakayama][])
+* `VariableInterpolation` cop does auto-correction. ([@bbatsov][])
+* `Not` cop does auto-correction. ([@bbatsov][])
+* `ClassMethods` cop does auto-correction. ([@bbatsov][])
+* `StringConversionInInterpolation` cop does auto-correction. ([@bbatsov][])
+* `NilComparison` cop does auto-correction. ([@bbatsov][])
+* `NonNilComparison` cop does auto-correction. ([@bbatsov][])
+* `NegatedIf` cop does auto-correction. ([@bbatsov][])
+* `NegatedWhile` cop does auto-correction. ([@bbatsov][])
+* New lint cop `SpaceBeforeFirstArg` checks for space between the method name and the first argument in method calls without parentheses. ([@jonas054][])
+* New style cop `SingleSpaceBeforeFirstArg` checks that no more than one space is used between the method name and the first argument in method calls without parentheses. ([@jonas054][])
+* New formatter `disabled_lines` displays cops and line ranges disabled by inline comments. ([@fshowalter][])
+* New cop `UselessAccessModifiers` checks for access modifiers that have no effect. ([@fshowalter][])
+
+### Changes
+
+* [#913](https://github.com/bbatsov/rubocop/issues/913): `FileName` accepts multiple extensions. ([@tamird][])
+* `AllCops/Excludes` and `AllCops/Includes` were renamed to `AllCops/Exclude` and `AllCops/Include` for consistency with standard cop params. ([@bbatsov][])
+* Extract `NonNilCheck` cop from `NilComparison`. ([@bbatsov][])
+* Renamed `FavorJoin` to `ArrayJoin`. ([@bbatsov][])
+* Renamed `FavorUnlessOverNegatedIf` to `NegatedIf`. ([@bbatsov][])
+* Renamed `FavorUntilOverNegatedWhile`to `NegatedWhile`. ([@bbatsov][])
+* Renamed `HashMethods` to `DeprecatedHashMethods`. ([@bbatsov][])
+* Renamed `ReadAttribute` to `ReadWriteAttribute` and extended it to check for uses of `write_attribute`. ([@bbatsov][])
+* Add experimental support for Ruby 2.2 (development version) by falling back to Ruby 2.1 parser. ([@yujinakayama][])
+
+### Bugs fixed
+
+* [#926](https://github.com/bbatsov/rubocop/issues/926): Fixed `BlockNesting` not auto-generating correctly. ([@tmorris-fiksu][])
+* [#904](https://github.com/bbatsov/rubocop/issues/904): Fixed a NPE in `LiteralInInterpolation`. ([@bbatsov][])
+* [#904](https://github.com/bbatsov/rubocop/issues/904): Fixed a NPE in `StringConversionInInterpolation`. ([@bbatsov][])
+* [#892](https://github.com/bbatsov/rubocop/issues/892): Make sure `Include` and `Exclude` paths in a `.rubocop.yml` are interpreted as relative to the directory of that file. ([@jonas054][])
+* [#906](https://github.com/bbatsov/rubocop/issues/906): Fixed a false positive in `LiteralInInterpolation`. ([@bbatsov][])
+* [#909](https://github.com/bbatsov/rubocop/issues/909): Handle properly multiple `rescue` clauses in `SignalException`. ([@bbatsov][])
+* [#876](https://github.com/bbatsov/rubocop/issues/876): Do a deep merge of hashes when overriding default configuration in a `.rubocop.yml` file. ([@jonas054][])
+* [#912](https://github.com/bbatsov/rubocop/issues/912): Fix a false positive in `LineEndConcatenation` for `%` string literals. ([@bbatsov][])
+* [#912](https://github.com/bbatsov/rubocop/issues/912): Handle top-level constant resolution in `DeprecatedClassMethods` (e.g. `::File.exists?`). ([@bbatsov][])
+* [#914](https://github.com/bbatsov/rubocop/issues/914): Fixed rdoc error during gem installation. ([@bbatsov][])
+* The `--only` option now enables the given cop in case it is disabled in configuration. ([@jonas054][])
+* Fix path resolution so that the default exclusion of `vendor` directories works. ([@jonas054][])
+* [#908](https://github.com/bbatsov/rubocop/issues/908): Fixed hanging while auto correct for `SpaceAfterComma` and `SpaceInsideBrackets`. ([@hiroponz][])
+* [#919](https://github.com/bbatsov/rubocop/issues/919): Don't avoid auto-correction in `HashSyntax` when there is missing space around operator. ([@jonas054][])
+* Fixed handling of floats in `NumericLiterals`. ([@bbatsov][])
+* [#927](https://github.com/bbatsov/rubocop/issues/927): Let `--auto-gen-config` overwrite an existing `rubocop-todo.yml` file instead of asking the user to remove it. ([@jonas054][])
+* [#936](https://github.com/bbatsov/rubocop/issues/936): Allow `_other` as well as `other` in `OpMethod`. ([@bbatsov][])
+
+[@bbatsov]: https://github.com/bbatsov
+[@jonas054]: https://github.com/jonas054
+[@yujinakayama]: https://github.com/yujinakayama
+[@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

data/rubocop-todo.yml

@@ -8,7 +8,7 @@
 # Offense count: 6
 # Configuration parameters: CountComments.
 ClassLength:
-  Max: 130
+  Max: 146
 
 # Offense count: 16
 CyclomaticComplexity:
@@ -17,4 +17,4 @@ CyclomaticComplexity:
 # Offense count: 105
 # Configuration parameters: CountComments.
 MethodLength:
-  Max: 20
+  Max: 22

data/spec/rubocop/cli_spec.rb

@@ -110,12 +110,15 @@ describe Rubocop::CLI, :isolated_environment do
           .to eq(["#{e}:2:1: C: Missing top-level class documentation " \
                   'comment.',
                   "#{e}:3:1: C: [Corrected] Indent access modifiers like " \
-                  'private.',
-                  "#{e}:3:1: C: Keep a blank line before and after private.",
+                  '`private`.',
+                  "#{e}:3:1: C: Keep a blank line before and after `private`.",
+                  "#{e}:3:1: W: Useless `private` access modifier.",
                   # An offense that moves around during auto-correction will
                   # appear to be duplicated:
-                  "#{e}:3:3: C: Keep a blank line before and after private.",
-                  "#{e}:4:7: C: [Corrected] Use %w or %W for array of words.",
+                  "#{e}:3:3: C: Keep a blank line before and after `private`.",
+                  "#{e}:3:3: W: Useless `private` access modifier.",
+                  "#{e}:4:7: C: [Corrected] Use `%w` or `%W` " \
+                  'for array of words.',
                   "#{e}:4:8: C: [Corrected] Prefer single-quoted strings " \
                   "when you don't need string interpolation or special " \
                   'symbols.',
@@ -185,8 +188,8 @@ describe Rubocop::CLI, :isolated_environment do
                   '',
                   'Offenses:',
                   '',
-                  'example.rb:2:1: C: [Corrected] Use `fail` instead of ' \
-                  '`raise` to signal exceptions.',
+                  'example.rb:2:1: C: [Corrected] Use fail instead of ' \
+                  'raise to signal exceptions.',
                   'raise NotImplementedError,',
                   '^^^^^',
                   'example.rb:3:7: C: [Corrected] Align the parameters of a ' \
@@ -273,7 +276,6 @@ describe Rubocop::CLI, :isolated_environment do
                     ['# encoding: utf-8',
                      '{ :b=>1 }'])
         expect(cli.run(%w(-D --auto-correct --format emacs))).to eq(1)
-        expect($stderr.string).to eq('')
         expect(IO.read('example.rb')).to eq(['# encoding: utf-8',
                                              '{ b: 1 }',
                                              ''].join("\n"))
@@ -286,6 +288,21 @@ describe Rubocop::CLI, :isolated_environment do
                   ''].join("\n"))
       end
 
+      it 'can correct HashSyntax when --only is used' do
+        create_file('example.rb',
+                    ['# encoding: utf-8',
+                     '{ :b=>1 }'])
+        expect(cli.run(%w(--auto-correct -f emacs --only HashSyntax))).to eq(1)
+        expect($stderr.string).to eq('')
+        expect(IO.read('example.rb')).to eq(['# encoding: utf-8',
+                                             '{ b: 1 }',
+                                             ''].join("\n"))
+        expect($stdout.string)
+          .to eq(["#{abs('example.rb')}:2:3: C: [Corrected] Use the new " \
+                  "Ruby 1.9 hash syntax.",
+                  ''].join("\n"))
+      end
+
       it 'can correct TrailingBlankLines and TrailingWhitespace offenses' do
         create_file('example.rb',
                     ['# encoding: utf-8',
@@ -357,29 +374,51 @@ describe Rubocop::CLI, :isolated_environment do
                                              'some_method(a,)',
                                              ''].join("\n"))
       end
+
+      it 'should not hang SpaceAfterPunctuation and SpaceInsideBrackets' do
+        create_file('example.rb',
+                    ['# encoding: utf-8',
+                     'puts [1, ]'])
+        Timeout.timeout(10) do
+          expect(cli.run(%w(--auto-correct))).to eq(1)
+        end
+        expect($stderr.string).to eq('')
+        expect(IO.read('example.rb')).to eq(['# encoding: utf-8',
+                                             'puts [1,]',
+                                             ''].join("\n"))
+      end
     end
 
     describe '--auto-gen-config' do
-      it 'exits with error if asked to re-generate a todo list that is in ' \
-        'use' do
+      it 'overwrites an existing todo file' do
         create_file('example1.rb', ['# encoding: utf-8',
                                     'x= 0 ',
                                     '#' * 85,
                                     'y ',
                                     'puts x'])
-        todo_contents = ['# This configuration was generated with `rubocop' \
-                         ' --auto-gen-config`',
-                         '',
-                         'LineLength:',
-                         '  Enabled: false']
-        create_file('rubocop-todo.yml', todo_contents)
-        expect(IO.read('rubocop-todo.yml'))
-          .to eq(todo_contents.join("\n") + "\n")
+        create_file('rubocop-todo.yml', ['LineLength:',
+                                         '  Enabled: false'])
         create_file('.rubocop.yml', ['inherit_from: rubocop-todo.yml'])
-        expect { cli.run(['--auto-gen-config']) }.to exit_with_code(1)
-        expect($stderr.string).to eq('Remove rubocop-todo.yml from the ' \
-                                     'current configuration before ' \
-                                     "generating it again.\n")
+        expect(cli.run(['--auto-gen-config'])).to eq(1)
+        expect(IO.readlines('rubocop-todo.yml')[7..-1].map(&:chomp))
+          .to eq(['# Offense count: 1',
+                  'LineLength:',
+                  '  Max: 85',
+                  '',
+                  '# Offense count: 1',
+                  '# Cop supports --auto-correct.',
+                  'SpaceAroundOperators:',
+                  '  Enabled: false',
+                  '',
+                  '# Offense count: 2',
+                  '# Cop supports --auto-correct.',
+                  'TrailingWhitespace:',
+                  '  Enabled: false'])
+
+        # Create new CLI instance to avoid using cached configuration.
+        new_cli = described_class.new
+
+        expect(new_cli.run(['example1.rb'])).to eq(0)
       end
 
       it 'exits with error if file arguments are given' do
@@ -410,7 +449,7 @@ describe Rubocop::CLI, :isolated_environment do
         expect($stderr.string).to eq('')
         expect($stdout.string)
           .to include(['Created rubocop-todo.yml.',
-                       'Run rubocop with --config rubocop-todo.yml, or',
+                       'Run `rubocop --config rubocop-todo.yml`, or',
                        'add inherit_from: rubocop-todo.yml in a ' \
                        '.rubocop.yml file.',
                        ''].join("\n"))
@@ -508,13 +547,34 @@ describe Rubocop::CLI, :isolated_environment do
                         'example.rb'])).to eq(1)
         expect($stdout.string)
           .to eq(['== example.rb ==',
-                  'C:  1:  1: Favor modifier if usage when you ' \
-                  'have a single-line body. Another good alternative is ' \
+                  'C:  1:  1: Favor modifier if usage when ' \
+                  'having a single-line body. Another good alternative is ' \
                   'the usage of control flow &&/||.',
                   '',
                   '1 file inspected, 1 offense detected',
                   ''].join("\n"))
       end
+
+      it 'enables the given cop' do
+        create_file('example.rb', ['x = 0 ',
+                                   # Disabling comments still apply.
+                                   '# rubocop:disable TrailingWhitespace',
+                                   'y = 1  '])
+
+        create_file('.rubocop.yml', ['TrailingWhitespace:',
+                                     '  Enabled: false'])
+
+        expect(cli.run(['--format', 'simple',
+                        '--only', 'TrailingWhitespace',
+                        'example.rb'])).to eq(1)
+        expect($stderr.string).to eq('')
+        expect($stdout.string)
+          .to eq(['== example.rb ==',
+                  'C:  1:  6: Trailing whitespace detected.',
+                  '',
+                  '1 file inspected, 1 offense detected',
+                  ''].join("\n"))
+      end
     end
 
     describe '--lint' do
@@ -759,7 +819,7 @@ describe Rubocop::CLI, :isolated_environment do
                       'def badName',
                       '    ^^^^^^^',
                       'example3.rb:3:3: C: Favor modifier if usage ' \
-                      'when you have a single-line body. Another good ' \
+                      'when having a single-line body. Another good ' \
                       'alternative is the usage of control flow &&/||.',
                       '  if something',
                       '  ^^',
@@ -888,6 +948,42 @@ describe Rubocop::CLI, :isolated_environment do
           .to eq("#{abs(target_file)}:2:80: C: Line is too long. [90/79]\n")
       end
     end
+
+    describe '--fail-level option' do
+      let(:target_file) { 'example.rb' }
+
+      before do
+        create_file(target_file, ['# encoding: utf-8',
+                                  '#' * 90])
+      end
+
+      it 'should be failed when option is less than the severity level' do
+        expect(cli.run(['--fail-level', 'convention', target_file])).to eq(1)
+      end
+
+      it 'should be success when option is greater than the severity level' do
+        expect(cli.run(['--fail-level', 'warning', target_file])).to eq(0)
+      end
+    end
+
+    describe '--force-exclusion' do
+      let(:target_file) { 'example.rb' }
+
+      before do
+        create_file(target_file, ['# encoding: utf-8',
+                                  '#' * 90])
+
+        create_file('.rubocop.yml', ['AllCops:',
+                                     '  Exclude:',
+                                     "    - #{target_file}"])
+
+      end
+
+      it 'excludes files specified in the configuration Exclude ' \
+         'even if they are explicitly passed as arguments' do
+        expect(cli.run(['--force-exclusion', target_file])).to eq(0)
+      end
+    end
   end
 
   describe '#wants_to_quit?' do
@@ -1090,57 +1186,100 @@ describe Rubocop::CLI, :isolated_environment do
       .to eq(['', '1 file inspected, no offenses detected', ''].join("\n"))
   end
 
-  describe 'enabling/disabling rails cops' do
-    it 'by default does not run rails cops' do
-      create_file('app/models/example1.rb', ['# encoding: utf-8',
-                                             'read_attribute(:test)'])
-      expect(cli.run(['--format', 'simple', 'app/models/example1.rb']))
-        .to eq(0)
-    end
+  describe 'rails cops' do
+    describe 'enabling/disabling' do
+      it 'by default does not run rails cops' do
+        create_file('app/models/example1.rb', ['# encoding: utf-8',
+                                               'read_attribute(:test)'])
+        expect(cli.run(['--format', 'simple', 'app/models/example1.rb']))
+          .to eq(0)
+      end
 
-    it 'with -R given runs rails cops' do
-      create_file('app/models/example1.rb', ['# encoding: utf-8',
-                                             'read_attribute(:test)'])
-      expect(cli.run(['--format', 'simple', '-R', 'app/models/example1.rb']))
-        .to eq(1)
-      expect($stdout.string).to include('Prefer self[:attribute]')
-    end
+      it 'with -R given runs rails cops' do
+        create_file('app/models/example1.rb', ['# encoding: utf-8',
+                                               'read_attribute(:test)'])
+        expect(cli.run(['--format', 'simple', '-R', 'app/models/example1.rb']))
+          .to eq(1)
+        expect($stdout.string).to include('Prefer self[:attr]')
+      end
 
-    it 'with configation option true in one dir runs rails cops there' do
-      create_file('dir1/app/models/example1.rb', ['# encoding: utf-8',
-                                                  'read_attribute(:test)'])
-      create_file('dir1/.rubocop.yml', ['AllCops:',
-                                        '  RunRailsCops: true',
-                                        '',
-                                        'ReadAttribute:',
-                                        '  Include:',
-                                        '    - dir1/app/models/*.rb'])
-      create_file('dir2/app/models/example2.rb', ['# encoding: utf-8',
-                                                  'read_attribute(:test)'])
-      create_file('dir2/.rubocop.yml', ['AllCops:',
-                                        '  RunRailsCops: false',
-                                        '',
-                                        'ReadAttribute:',
-                                        '  Include:',
-                                        '    - dir2/app/models/*.rb'])
-      expect(cli.run(%w(--format simple dir1 dir2))).to eq(1)
-      expect($stdout.string)
-        .to eq(['== dir1/app/models/example1.rb ==',
-                'C:  2:  1: Prefer self[:attribute] over read_attribute' \
-                '(:attribute).',
-                '',
-                '2 files inspected, 1 offense detected',
-                ''].join("\n"))
+      it 'with configation option true in one dir runs rails cops there' do
+        source = ['# encoding: utf-8',
+                  'read_attribute(:test)']
+        create_file('dir1/app/models/example1.rb', source)
+        create_file('dir1/.rubocop.yml', ['AllCops:',
+                                          '  RunRailsCops: true',
+                                          '',
+                                          'ReadAttribute:',
+                                          '  Include:',
+                                          '    - app/models/*.rb'])
+        create_file('dir2/app/models/example2.rb', source)
+        create_file('dir2/.rubocop.yml', ['AllCops:',
+                                          '  RunRailsCops: false',
+                                          '',
+                                          'ReadAttribute:',
+                                          '  Include:',
+                                          '    - app/models/*.rb'])
+        expect(cli.run(%w(--format simple dir1 dir2))).to eq(1)
+        expect($stdout.string)
+          .to eq(['== dir1/app/models/example1.rb ==',
+                  'C:  2:  1: Prefer self[:attr] over read_attribute' \
+                  '(:attr).',
+                  '',
+                  '2 files inspected, 1 offense detected',
+                  ''].join("\n"))
+      end
+
+      it 'with configation option false but -R given runs rails cops' do
+        create_file('app/models/example1.rb', ['# encoding: utf-8',
+                                               'read_attribute(:test)'])
+        create_file('.rubocop.yml', ['AllCops:',
+                                     '  RunRailsCops: false'])
+        expect(cli.run(['--format', 'simple', '-R', 'app/models/example1.rb']))
+          .to eq(1)
+        expect($stdout.string).to include('Prefer self[:attr]')
+      end
     end
 
-    it 'with configation option false but -R given runs rails cops' do
-      create_file('app/models/example1.rb', ['# encoding: utf-8',
-                                             'read_attribute(:test)'])
-      create_file('.rubocop.yml', ['AllCops:',
-                                   '  RunRailsCops: false'])
-      expect(cli.run(['--format', 'simple', '-R', 'app/models/example1.rb']))
-        .to eq(1)
-      expect($stdout.string).to include('Prefer self[:attribute]')
+    describe 'including/excluding' do
+      it 'includes some directories by default' do
+        source = ['# encoding: utf-8',
+                  'read_attribute(:test)',
+                  "default_scope order: 'position'"]
+        # Several rails cops include app/models by default.
+        create_file('dir1/app/models/example1.rb', source)
+        create_file('dir1/app/models/example2.rb', source)
+        # No rails cops include app/views by default.
+        create_file('dir1/app/views/example3.rb', source)
+        # The .rubocop.yml file inherits from default.yml where the Include
+        # config parameter is set for the rails cops. The paths are interpreted
+        # as relative to dir1 because .rubocop.yml is placed there.
+        create_file('dir1/.rubocop.yml', ['AllCops:',
+                                          '  RunRailsCops: true',
+                                          '',
+                                          'ReadWriteAttribute:',
+                                          '  Exclude:',
+                                          '    - example2.rb',
+                                          '',
+                                          'DefaultScope:',
+                                          '  Exclude:',
+                                          '    - "**/example2.rb"'])
+        # No .rubocop.yml file in dir2 means that the paths from default.yml
+        # are interpreted as relative to the current directory, so they don't
+        # match.
+        create_file('dir2/app/models/example4.rb', source)
+
+        expect(cli.run(%w(--format simple dir1 dir2))).to eq(1)
+        expect($stdout.string)
+          .to eq(['== dir1/app/models/example1.rb ==',
+                  'C:  2:  1: Prefer self[:attr] over read_attribute' \
+                  '(:attr).',
+                  'C:  3: 15: default_scope expects a block as its sole' \
+                  ' argument.',
+                  '',
+                  '4 files inspected, 2 offenses detected',
+                  ''].join("\n"))
+      end
     end
   end
 
@@ -1180,7 +1319,7 @@ describe Rubocop::CLI, :isolated_environment do
                              'puts x'
                             ])
       create_file('.rubocop.yml', ['AllCops:',
-                                   '  Includes:',
+                                   '  Include:',
                                    '    - example',
                                    '    - !ruby/regexp /regexp$/'
                                   ])
@@ -1205,7 +1344,7 @@ describe Rubocop::CLI, :isolated_environment do
                                       'puts x'
                                      ])
       create_file('.rubocop.yml', ['AllCops:',
-                                   '  Excludes:',
+                                   '  Exclude:',
                                    '    - example.rb',
                                    '    - !ruby/regexp /regexp.rb$/',
                                    '    - "exclude_*"'
@@ -1226,7 +1365,7 @@ describe Rubocop::CLI, :isolated_environment do
       end
 
       create_file('example/.rubocop.yml', ['AllCops:',
-                                           '  Excludes:',
+                                           '  Exclude:',
                                            '    - ignored/**'])
       expect(File).not_to receive(:open).with(%r{/ignored/})
       allow(File).to receive(:open).and_call_original
@@ -1277,23 +1416,48 @@ describe Rubocop::CLI, :isolated_environment do
       expect($stdout.string).to include('unexpected token $end')
     end
 
-    it 'can be configured to override a parameter that is a hash' do
+    it 'can be configured to merge a parameter that is a hash' do
       create_file('example1.rb',
                   ['# encoding: utf-8',
-                   'arr.find_all { |e| e > 0 }.collect { |e| -e }'])
-      # We only care about select over find_all. All other preferred methods
-      # appearing in the default config are gone when we override
-      # PreferredMethods. We get no report about collect.
+                   'puts %w(a b c)',
+                   'puts %q|hi|'])
+      # We want to change the preferred delimiters for word arrays. The other
+      # settings from default.yml are unchanged.
+      create_file('rubocop.yml',
+                  ['PercentLiteralDelimiters:',
+                   '  PreferredDelimiters:',
+                   "    '%w': '[]'",
+                   "    '%W': '[]'"])
+      cli.run(['--format', 'simple', '-c', 'rubocop.yml', 'example1.rb'])
+      expect($stdout.string)
+        .to eq(['== example1.rb ==',
+                'C:  2:  6: %w-literals should be delimited by [ and ]',
+                'C:  3:  6: %q-literals should be delimited by ( and )',
+                '',
+                '1 file inspected, 2 offenses detected',
+                ''].join("\n"))
+    end
+
+    it 'can be configured to override a parameter that is a hash in a ' \
+       'special case' do
+      create_file('example1.rb',
+                  ['# encoding: utf-8',
+                   'arr.select { |e| e > 0 }.collect { |e| -e }',
+                   '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
+      # config (e.g., map over collect) are kept.
       create_file('rubocop.yml',
                   ['CollectionMethods:',
                    '  PreferredMethods:',
-                   '    find_all: select'])
+                   '    select: find_all'])
       cli.run(['--format', 'simple', '-c', 'rubocop.yml', 'example1.rb'])
       expect($stdout.string)
         .to eq(['== example1.rb ==',
-                'C:  2:  5: Prefer select over find_all.',
+                'C:  2:  5: Prefer find_all over select.',
+                'C:  2: 26: Prefer map over collect.',
                 '',
-                '1 file inspected, 1 offense detected',
+                '1 file inspected, 2 offenses detected',
                 ''].join("\n"))
     end
 
@@ -1311,7 +1475,7 @@ describe Rubocop::CLI, :isolated_environment do
                         '-c', 'rubocop.yml', 'example1.rb'])
       expect($stdout.string)
         .to eq(['== example1.rb ==',
-                'C:  1:  1: Favor modifier if usage when you have ' \
+                'C:  1:  1: Favor modifier if usage when having ' \
                 'a single-line body. Another good alternative is the ' \
                 'usage of control flow &&/||.',
                 '',
@@ -1397,7 +1561,7 @@ describe Rubocop::CLI, :isolated_environment do
       end
 
       create_file('example/.rubocop.yml', ['AllCops:',
-                                           '  Excludes:',
+                                           '  Exclude:',
                                            '    - src/**',
                                            '    - etc/**',
                                            '    - tmp/spec/**'])
@@ -1414,7 +1578,7 @@ describe Rubocop::CLI, :isolated_environment do
     it 'can exclude a typical vendor directory' do
       create_file('vendor/bundle/ruby/1.9.1/gems/parser-2.0.0/.rubocop.yml',
                   ['AllCops:',
-                   '  Excludes:',
+                   '  Exclude:',
                    '    - lib/parser/lexer.rb'])
 
       create_file('vendor/bundle/ruby/1.9.1/gems/parser-2.0.0/lib/ex.rb',
@@ -1423,7 +1587,7 @@ describe Rubocop::CLI, :isolated_environment do
 
       create_file('.rubocop.yml',
                   ['AllCops:',
-                   '  Excludes:',
+                   '  Exclude:',
                    '    - vendor/**'])
 
       cli.run(%w(--format simple))
@@ -1432,6 +1596,17 @@ describe Rubocop::CLI, :isolated_environment do
                 ''].join("\n"))
     end
 
+    it 'excludes the vendor directory by default' do
+      create_file('vendor/ex.rb',
+                  ['# encoding: utf-8',
+                   '#' * 90])
+
+      cli.run(%w(--format simple))
+      expect($stdout.string)
+        .to eq(['', '0 files inspected, no offenses detected',
+                ''].join("\n"))
+    end
+
     # Being immune to bad configuration files in excluded directories has
     # become important due to a bug in rubygems
     # (https://github.com/rubygems/rubygems/issues/680) that makes
@@ -1447,7 +1622,7 @@ describe Rubocop::CLI, :isolated_environment do
 
       create_file('.rubocop.yml',
                   ['AllCops:',
-                   '  Excludes:',
+                   '  Exclude:',
                    '    - vendor/**'])
 
       cli.run(%w(--format simple))
@@ -1463,7 +1638,7 @@ describe Rubocop::CLI, :isolated_environment do
     it 'can exclude a vendor directory indirectly' do
       create_file('vendor/bundle/ruby/1.9.1/gems/parser-2.0.0/.rubocop.yml',
                   ['AllCops:',
-                   '  Excludes:',
+                   '  Exclude:',
                    '    - lib/parser/lexer.rb'])
 
       create_file('vendor/bundle/ruby/1.9.1/gems/parser-2.0.0/lib/ex.rb',
@@ -1475,7 +1650,7 @@ describe Rubocop::CLI, :isolated_environment do
 
       create_file('config/default.yml',
                   ['AllCops:',
-                   '  Excludes:',
+                   '  Exclude:',
                    '    - vendor/**'])
 
       cli.run(%w(--format simple))
@@ -1516,13 +1691,13 @@ describe Rubocop::CLI, :isolated_environment do
                 ''].join("\n"))
     end
 
-    it 'works when a configuration file passed by -c specifies Excludes ' \
+    it 'works when a configuration file passed by -c specifies Exclude ' \
        'with regexp' do
       create_file('example/example1.rb', ['# encoding: utf-8',
                                           '#' * 90])
 
       create_file('rubocop.yml', ['AllCops:',
-                                  '  Excludes:',
+                                  '  Exclude:',
                                   '    - !ruby/regexp /example1\.rb$/'])
 
       cli.run(%w(--format simple -c rubocop.yml))
@@ -1531,13 +1706,13 @@ describe Rubocop::CLI, :isolated_environment do
                 ''].join("\n"))
     end
 
-    it 'works when a configuration file passed by -c specifies Excludes ' \
+    it 'works when a configuration file passed by -c specifies Exclude ' \
        'with strings' do
       create_file('example/example1.rb', ['# encoding: utf-8',
                                           '#' * 90])
 
       create_file('rubocop.yml', ['AllCops:',
-                                  '  Excludes:',
+                                  '  Exclude:',
                                   '    - example/**'])
 
       cli.run(%w(--format simple -c rubocop.yml))