rubocop 0.27.1 → 0.28.0

data/lib/rubocop/cop/util.rb

@@ -181,7 +181,7 @@ module RuboCop
         node
       end
 
-      # Range#size is not avaialable prior to Ruby 2.0.
+      # Range#size is not available prior to Ruby 2.0.
       def numeric_range_size(range)
         size = range.end - range.begin
         size += 1 unless range.exclude_end?

data/lib/rubocop/cop/variable_force.rb

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     # This force provides a way to track local variables and scopes of Ruby.
-    # Cops intertact with this force need to override some of the hook methods.
+    # Cops interact with this force need to override some of the hook methods.
     #
     #     def before_entering_scope(scope, variable_table)
     #     end
@@ -31,7 +31,7 @@ module RuboCop
       ARGUMENT_DECLARATION_TYPES = [
         :arg, :optarg, :restarg,
         :kwarg, :kwoptarg, :kwrestarg,
-        :blockarg, # This doen't mean block argument, it's block-pass (&block).
+        :blockarg, # This doesn't mean block argument, it's block-pass (&block).
         :shadowarg # This means block local variable (obj.each { |arg; this| }).
       ].freeze
 
@@ -290,7 +290,7 @@ module RuboCop
 
         referenced_variable_names_in_loop.each do |name|
           variable = variable_table.find_variable(name)
-          # Non related references which are catched in the above scan
+          # Non related references which are caught in the above scan
           # would be skipped here.
           next unless variable
           variable.assignments.each do |assignment|

data/lib/rubocop/cop/variable_force/scope.rb

@@ -33,10 +33,10 @@ module RuboCop
         end
 
         def name
+          # TODO: Add an else clause
           case @node.type
           when :def  then @node.children[0]
           when :defs then @node.children[1]
-          else nil # TODO
           end
         end
 

data/lib/rubocop/cop/variable_force/variable.rb

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     class VariableForce
-      # A Variable represents existance of a local variable.
+      # A Variable represents existence of a local variable.
       # This holds a variable declaration node,
       # and some states of the variable.
       class Variable

data/lib/rubocop/formatter/html_formatter.rb

@@ -57,7 +57,7 @@ module RuboCop
         end
       end
 
-      # This class privides helper methods used in the ERB template.
+      # This class provides helper methods used in the ERB template.
       class ERBContext
         include PathUtil, TextUtil
 

data/lib/rubocop/options.rb

@@ -7,6 +7,8 @@ module RuboCop
   module OptionsHelp
     TEXT = {
       only:              'Run only the given cop(s).',
+      only_guide_cops:  ['Run only cops for rules that link to a',
+                         'style guide.'],
       require:           'Require Ruby file.',
       config:            'Specify configuration file.',
       auto_gen_config:  ['Generate a configuration file acting as a',
@@ -76,12 +78,7 @@ module RuboCop
       OptionParser.new do |opts|
         opts.banner = 'Usage: rubocop [options] [file1, file2, ...]'
 
-        option(opts, '--only [COP1,COP2,...]') do |list|
-          @options[:only] = list.split(',').map do |c|
-            Cop::Cop.qualified_cop_name(c, '--only option')
-          end
-        end
-
+        add_only_options(opts)
         add_configuration_options(opts, args)
         add_formatting_options(opts)
 
@@ -98,6 +95,16 @@ module RuboCop
       fail ArgumentError, "Incompatible cli options: #{incompat.inspect}"
     end
 
+    def add_only_options(opts)
+      option(opts, '--only [COP1,COP2,...]') do |list|
+        @options[:only] = list.split(',').map do |c|
+          Cop::Cop.qualified_cop_name(c, '--only option')
+        end
+      end
+
+      option(opts, '--only-guide-cops')
+    end
+
     def add_configuration_options(opts, args)
       option(opts, '-c', '--config FILE')
 

data/lib/rubocop/rake_task.rb

@@ -75,7 +75,6 @@ module RuboCop
 
     def setup_subtasks(name)
       namespace name do
-
         desc 'Auto-correct RuboCop offenses'
 
         task :auto_correct do

data/lib/rubocop/runner.rb

@@ -106,17 +106,26 @@ module RuboCop
             @options[:only].include?(c.cop_name) || @options[:lint] && c.lint?
           end
         else
-          # filter out Rails cops unless requested
-          cop_classes.reject!(&:rails?) unless run_rails_cops?(config)
-
-          # select only lint cops when --lint is passed
-          cop_classes.select!(&:lint?) if @options[:lint]
+          filter_cop_classes(cop_classes, config)
         end
 
         cop_classes
       end
     end
 
+    def filter_cop_classes(cop_classes, config)
+      # use only cops that link to a style guide if requested
+      if style_guide_cops_only?(config)
+        cop_classes.select! { |cop| config.for_cop(cop)['StyleGuide'] }
+      end
+
+      # filter out Rails cops unless requested
+      cop_classes.reject!(&:rails?) unless run_rails_cops?(config)
+
+      # select only lint cops when --lint is passed
+      cop_classes.select!(&:lint?) if @options[:lint]
+    end
+
     def validate_only_option
       @options[:only].each do |cop_to_run|
         next unless Cop::Cop.all.none? { |c| c.cop_name == cop_to_run }
@@ -128,6 +137,10 @@ module RuboCop
       @options[:rails] || config['AllCops']['RunRailsCops']
     end
 
+    def style_guide_cops_only?(config)
+      @options[:only_guide_cops] || config['AllCops']['StyleGuideCopsOnly']
+    end
+
     def formatter_set
       @formatter_set ||= begin
         set = Formatter::FormatterSet.new
@@ -144,7 +157,7 @@ module RuboCop
     end
 
     def considered_failure?(offense)
-      offense.severity >= minimum_severity_to_fail
+      !offense.corrected? && offense.severity >= minimum_severity_to_fail
     end
 
     def minimum_severity_to_fail

data/lib/rubocop/target_finder.rb

@@ -80,8 +80,39 @@ module RuboCop
       base_dir_config.file_to_include?(file)
     end
 
+    # Search for files recursively starting at the given base directory using
+    # the given flags that determine how the match is made. Excluded files will
+    # be removed later by the caller, but as an optimization find_files removes
+    # the top level directories that are excluded in configuration in the
+    # normal way (dir/**/*).
     def find_files(base_dir, flags)
-      Dir.glob("#{base_dir}/**/*", flags).select { |path| FileTest.file?(path) }
+      wanted_toplevel_dirs = toplevel_dirs(base_dir, flags) -
+                             excluded_dirs(base_dir)
+
+      pattern = if wanted_toplevel_dirs.empty?
+                  # We need this special case to avoid creating the pattern
+                  # /**/* which searches the entire file system.
+                  "#{base_dir}/**/*"
+                else
+                  # Search the non-excluded top directories, but also add files
+                  # on the top level, which would otherwise not be found.
+                  "{#{base_dir}/*,{#{wanted_toplevel_dirs.join(',')}}/**/*}"
+                end
+      Dir.glob(pattern, flags).select { |path| FileTest.file?(path) }
+    end
+
+    def toplevel_dirs(base_dir, flags)
+      Dir.glob(File.join(base_dir, '*'), flags).select do |dir|
+        File.directory?(dir) && !(dir.end_with?('/.') || dir.end_with?('/..'))
+      end
+    end
+
+    def excluded_dirs(base_dir)
+      all_cops_config = @config_store.for(base_dir)['AllCops']
+      dir_tree_excludes = all_cops_config['Exclude'].select do |pattern|
+        pattern.is_a?(String) && pattern.end_with?('/**/*')
+      end
+      dir_tree_excludes.map { |pattern| pattern.sub(%r{/\*\*/\*$}, '') }
     end
 
     def ruby_executable?(file)

data/lib/rubocop/version.rb

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

data/relnotes/v0.28.0.md

@@ -0,0 +1,90 @@
+### New features
+
+* New cop `ExtraSpacing` points out unnecessary spacing in files. ([@blainesch][])
+* New cop `EmptyLinesAroundBlockBody` provides same functionality as the EmptyLinesAround(Class|Method|Module)Body but for blocks. ([@jcarbo][])
+* New cop `Style/EmptyElse` checks for empty `else`-clauses. ([@Koronen][])
+* [#1454](https://github.com/bbatsov/rubocop/issues/1454): New `--only-guide-cops` and `AllCops/StyleGuideCopsOnly` options that will only enforce cops that link to a style guide. ([@marxarelli][])
+
+### Changes
+
+* [#801](https://github.com/bbatsov/rubocop/issues/801): New style `context_dependent` for `Style/BracesAroundHashParameters` looks at preceding parameter to determine if braces should be used for final parameter. ([@jonas054][])
+* [#1427](https://github.com/bbatsov/rubocop/issues/1427): Excluding directories on the top level is now done earlier, so that these file trees are not searched, thus saving time when inspecting projects with many excluded files. ([@jonas054][])
+* [#1325](https://github.com/bbatsov/rubocop/issues/1325): When running with `--auto-correct`, only offenses *that can not be corrected* will result in a non-zero exit code. ([@jonas054][])
+* [#1445](https://github.com/bbatsov/rubocop/issues/1445): Allow sprockets directive comments (starting with `#=`) in `Style/LeadingCommentSpace`. ([@bbatsov][])
+
+### Bugs fixed
+
+* Fix `%W[]` auto corrected to `%w(]`. ([@toy][])
+* Fix Style/ElseAlignment Cop to find the right parent on def/rescue/else/ensure/end. ([@oneamtu][])
+* [#1181](https://github.com/bbatsov/rubocop/issues/1181): *(fix again)* `Style/StringLiterals` cop stays away from strings inside interpolated expressions. ([@jonas054][])
+* [#1441](https://github.com/bbatsov/rubocop/issues/1441): Correct the logic used by `Style/Blocks` and other cops to determine if an auto-correction would alter the meaning of the code. ([@jonas054][])
+* [#1449](https://github.com/bbatsov/rubocop/issues/1449): Handle the case in `MultilineOperationIndentation` where instances of both correct style and unrecognized (plain wrong) style are detected during an `--auto-gen-config` run. ([@jonas054][])
+* [#1456](https://github.com/bbatsov/rubocop/pull/1456): Fix autocorrect in `SymbolProc` when there are multiple offenses on the same line. ([@jcarbo][])
+* [#1459](https://github.com/bbatsov/rubocop/issues/1459): Handle parenthesis around the condition in `--auto-correct` for `NegatedWhile`. ([@jonas054][])
+* [#1465](https://github.com/bbatsov/rubocop/issues/1465): Fix autocorrect of code like `#$1` in `PerlBackrefs`. ([@bbatsov][])
+* Fix autocorrect of code like `#$:` in `SpecialGlobalVars`. ([@bbatsov][])
+* [#1466](https://github.com/bbatsov/rubocop/issues/1466): Allow leading underscore for unused parameters in `SingleLineBlockParams`. ([@jonas054][])
+* [#1470](https://github.com/bbatsov/rubocop/issues/1470): Handle `elsif` + `else` in `ElseAlignment`. ([@jonas054][])
+* [#1474](https://github.com/bbatsov/rubocop/issues/1474): Multiline string with both `<<` and `\` caught by `Style/LineEndConcatenation` cop. ([@katieschilling][])
+* [#1485](https://github.com/bbatsov/rubocop/issues/1485): Ignore procs in `SymbolProc`. ([@bbatsov][])
+* [#1473](https://github.com/bbatsov/rubocop/issues/1473): `Style/MultilineOperationIndentation` doesn't recognize assignment to array/hash element. ([@jonas054][])
+
+[@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

data/spec/project_spec.rb

@@ -96,6 +96,7 @@ describe 'RuboCop Project' do
         let(:bodies) do
           entries.map do |entry|
             entry
+              .gsub(/`[^`]+`/, '``')
               .sub(/^\*\s*(?:\[.+?\):\s*)?/, '')
               .sub(/\s*\([^\)]+\)$/, '')
           end

data/spec/rubocop/cli_spec.rb

@@ -35,12 +35,16 @@ describe RuboCop::CLI, :isolated_environment do
     end
 
     describe '--auto-correct' do
-      it 'corrects SymbolProc and SpaceBeforeBlockBraces offences' do
+      it 'corrects SymbolProc and SpaceBeforeBlockBraces offenses' do
         source = ['foo.map{ |a| a.nil? }']
         create_file('example.rb', source)
-        expect(cli.run(['-D', '--auto-correct'])).to eq(1)
+        expect(cli.run(['-D', '--auto-correct'])).to eq(0)
         corrected = "foo.map(&:nil?)\n"
         expect(IO.read('example.rb')).to eq(corrected)
+        uncorrected = $stdout.string.split($RS).select do |line|
+          line.include?('example.rb:') && !line.include?('[Corrected]')
+        end
+        expect(uncorrected).to be_empty # Hence exit code 0.
       end
 
       it 'corrects complicated cases conservatively' do
@@ -48,7 +52,7 @@ describe RuboCop::CLI, :isolated_environment do
         # Style/AlignHash. Because they make minimal corrections relating only
         # to their specific areas, and stay away from cleaning up extra
         # whitespace in the process, the combined changes don't interfere with
-        # eachother and the result is semantically the same as the starting
+        # each other and the result is semantically the same as the starting
         # point.
         source = ['# encoding: utf-8',
                   'expect(subject[:address]).to eq({',
@@ -59,7 +63,7 @@ describe RuboCop::CLI, :isolated_environment do
                   "  postal_code: '99999-1111'",
                   '})']
         create_file('example.rb', source)
-        expect(cli.run(['-D', '--auto-correct'])).to eq(1)
+        expect(cli.run(['-D', '--auto-correct'])).to eq(0)
         corrected =
           ['# encoding: utf-8',
            'expect(subject[:address]).to eq(',
@@ -180,7 +184,7 @@ describe RuboCop::CLI, :isolated_environment do
                                    '(1..10).each{ |i|',
                                    '  puts i',
                                    '}'])
-        expect(cli.run(['--auto-correct'])).to eq(1)
+        expect(cli.run(['--auto-correct'])).to eq(0)
         expect(IO.read('example.rb'))
           .to eq(['# encoding: utf-8',
                   '(1..10).each do |i|',
@@ -193,7 +197,7 @@ describe RuboCop::CLI, :isolated_environment do
         create_file('example.rb',
                     ['# encoding: utf-8',
                      "assert_post_status_code 400, 's', {:type => 'bad'}"])
-        expect(cli.run(%w(--auto-correct --format emacs))).to eq(1)
+        expect(cli.run(%w(--auto-correct --format emacs))).to eq(0)
         expect(IO.read('example.rb'))
           .to eq(['# encoding: utf-8',
                   "assert_post_status_code 400, 's', type: 'bad'",
@@ -292,13 +296,17 @@ describe RuboCop::CLI, :isolated_environment do
         expect(IO.read('example.rb')).to eq(['module A module B',
                                              'end end',
                                              ''].join("\n"))
+        uncorrected = $stdout.string.split($RS).select do |line|
+          line.include?('example.rb:') && !line.include?('[Corrected]')
+        end
+        expect(uncorrected).not_to be_empty # Hence exit code 1.
       end
 
       it 'can correct single line methods' do
         create_file('example.rb', ['# encoding: utf-8',
                                    'def func1; do_something end # comment',
                                    'def func2() do_1; do_2; end'])
-        expect(cli.run(%w(--auto-correct --format offenses))).to eq(1)
+        expect(cli.run(%w(--auto-correct --format offenses))).to eq(0)
         expect(IO.read('example.rb')).to eq(['# encoding: utf-8',
                                              '# comment',
                                              'def func1',
@@ -330,7 +338,7 @@ describe RuboCop::CLI, :isolated_environment do
                     ['# encoding: utf-8',
                      'raise NotImplementedError,',
                      "      'Method should be overridden in child classes'"])
-        expect(cli.run(['--auto-correct'])).to eq(1)
+        expect(cli.run(['--auto-correct'])).to eq(0)
         expect(IO.read('example.rb'))
           .to eq(['# encoding: utf-8',
                   'fail NotImplementedError,',
@@ -367,7 +375,7 @@ describe RuboCop::CLI, :isolated_environment do
                      '  def f',
                      '  end',
                      'end'])
-        expect(cli.run(['--auto-correct'])).to eq(1)
+        expect(cli.run(['--auto-correct'])).to eq(0)
         expect(IO.read('example.rb'))
           .to eq(['# encoding: utf-8',
                   '# Example class.',
@@ -399,7 +407,7 @@ describe RuboCop::CLI, :isolated_environment do
                      'def primes limit',
                      '  1.upto(limit).select { |i| i.even? }',
                      'end'])
-        expect(cli.run(%w(-D --auto-correct))).to eq(1)
+        expect(cli.run(%w(-D --auto-correct))).to eq(0)
         expect($stderr.string).to eq('')
         expect(IO.read('example.rb'))
           .to eq(['# encoding: utf-8',
@@ -433,7 +441,7 @@ describe RuboCop::CLI, :isolated_environment do
                     ['# encoding: utf-8',
                      "f(type: ['offline','offline_payment'],",
                      "  bar_colors: ['958c12','953579','ff5800','0085cc'])"])
-        expect(cli.run(%w(-D --auto-correct --format o))).to eq(1)
+        expect(cli.run(%w(-D --auto-correct --format o))).to eq(0)
         expect($stdout.string)
           .to eq(['',
                   '4  Style/SpaceAfterComma',
@@ -453,7 +461,7 @@ describe RuboCop::CLI, :isolated_environment do
         create_file('example.rb',
                     ['# encoding: utf-8',
                      "I18n.t('description',:property_name => property.name)"])
-        expect(cli.run(%w(-D --auto-correct --format emacs))).to eq(1)
+        expect(cli.run(%w(-D --auto-correct --format emacs))).to eq(0)
         expect($stdout.string)
           .to eq(["#{abs('example.rb')}:2:21: C: [Corrected] " \
                   'Style/SpaceAfterComma: Space missing after comma.',
@@ -470,7 +478,7 @@ describe RuboCop::CLI, :isolated_environment do
         create_file('example.rb',
                     ['# encoding: utf-8',
                      '{ :b=>1 }'])
-        expect(cli.run(%w(-D --auto-correct --format emacs))).to eq(1)
+        expect(cli.run(%w(-D --auto-correct --format emacs))).to eq(0)
         expect(IO.read('example.rb')).to eq(['# encoding: utf-8',
                                              '{ b: 1 }',
                                              ''].join("\n"))
@@ -488,7 +496,7 @@ describe RuboCop::CLI, :isolated_environment do
                     ['# encoding: utf-8',
                      '{ :b=>1 }'])
         expect(cli.run(%w(--auto-correct -f emacs
-                          --only Style/HashSyntax))).to eq(1)
+                          --only Style/HashSyntax))).to eq(0)
         expect($stderr.string).to eq('')
         expect(IO.read('example.rb')).to eq(['# encoding: utf-8',
                                              '{ b: 1 }',
@@ -506,7 +514,7 @@ describe RuboCop::CLI, :isolated_environment do
                      '  ',
                      '',
                      ''])
-        expect(cli.run(%w(--auto-correct --format emacs))).to eq(1)
+        expect(cli.run(%w(--auto-correct --format emacs))).to eq(0)
         expect(IO.read('example.rb')).to eq(['# encoding: utf-8',
                                              ''].join("\n"))
         expect($stdout.string)
@@ -521,7 +529,7 @@ describe RuboCop::CLI, :isolated_environment do
         create_file('example.rb',
                     ['# encoding: utf-8',
                      'Hash.new()'])
-        expect(cli.run(%w(--auto-correct --format emacs))).to eq(1)
+        expect(cli.run(%w(--auto-correct --format emacs))).to eq(0)
         expect($stderr.string).to eq('')
         expect(IO.read('example.rb')).to eq(['# encoding: utf-8',
                                              '{}',
@@ -546,7 +554,7 @@ describe RuboCop::CLI, :isolated_environment do
         create_file('.rubocop.yml',
                     ['Style/AlignHash:',
                      '  EnforcedColonStyle: separator'])
-        expect(cli.run(%w(--auto-correct))).to eq(1)
+        expect(cli.run(%w(--auto-correct))).to eq(0)
         expect(IO.read('example.rb'))
           .to eq(['# encoding: utf-8',
                   'CONVERSION_CORRESPONDENCE = {',
@@ -586,7 +594,7 @@ describe RuboCop::CLI, :isolated_environment do
                     ['# encoding: utf-8',
                      'some_method(a, )'])
         Timeout.timeout(10) do
-          expect(cli.run(%w(--auto-correct))).to eq(1)
+          expect(cli.run(%w(--auto-correct))).to eq(0)
         end
         expect($stderr.string).to eq('')
         expect(IO.read('example.rb')).to eq(['# encoding: utf-8',
@@ -599,7 +607,7 @@ describe RuboCop::CLI, :isolated_environment do
                     ['# encoding: utf-8',
                      'puts [1, ]'])
         Timeout.timeout(10) do
-          expect(cli.run(%w(--auto-correct))).to eq(1)
+          expect(cli.run(%w(--auto-correct))).to eq(0)
         end
         expect($stderr.string).to eq('')
         expect(IO.read('example.rb')).to eq(['# encoding: utf-8',
@@ -1386,7 +1394,6 @@ describe RuboCop::CLI, :isolated_environment do
         create_file('.rubocop.yml', ['AllCops:',
                                      '  Exclude:',
                                      "    - #{target_file}"])
-
       end
 
       it 'excludes files specified in the configuration Exclude ' \
@@ -1640,6 +1647,91 @@ describe RuboCop::CLI, :isolated_environment do
       .to eq(['', '1 file inspected, no offenses detected', ''].join("\n"))
   end
 
+  describe 'style guide only usage' do
+    context 'via the cli option' do
+      describe '--only-guide-cops' do
+        it 'skips cops that have no link to a style guide' do
+          create_file('example.rb', 'fail')
+          create_file('.rubocop.yml', ['Metrics/LineLength:',
+                                       '  Enabled: true',
+                                       '  StyleGuide: ~',
+                                       '  Max: 2'])
+
+          expect(cli.run(['--format', 'simple', '--only-guide-cops',
+                          'example.rb'])).to eq(0)
+        end
+
+        it 'runs cops for rules that link to a style guide' do
+          create_file('example.rb', 'fail')
+          create_file('.rubocop.yml', ['Metrics/LineLength:',
+                                       '  Enabled: true',
+                                       '  StyleGuide: "http://an.example/url"',
+                                       '  Max: 2'])
+
+          expect(cli.run(['--format', 'simple', '--only-guide-cops',
+                          'example.rb'])).to eq(1)
+
+          expect($stdout.string)
+            .to eq(['== example.rb ==',
+                    'C:  1:  3: Line is too long. [4/2]',
+                    '',
+                    '1 file inspected, 1 offense detected',
+                    ''].join("\n"))
+        end
+
+        it 'overrides configuration of AllCops/StyleGuideCopsOnly' do
+          create_file('example.rb', 'fail')
+          create_file('.rubocop.yml', ['AllCops:',
+                                       '  StyleGuideCopsOnly: false',
+                                       'Metrics/LineLength:',
+                                       '  Enabled: true',
+                                       '  StyleGuide: ~',
+                                       '  Max: 2'])
+
+          expect(cli.run(['--format', 'simple', '--only-guide-cops',
+                          'example.rb'])).to eq(0)
+        end
+      end
+    end
+
+    context 'via the config' do
+      before do
+        create_file('example.rb', 'fail')
+        create_file('.rubocop.yml', ['AllCops:',
+                                     "  StyleGuideCopsOnly: #{guide_cops_only}",
+                                     'Metrics/LineLength:',
+                                     '  Enabled: true',
+                                     '  StyleGuide: ~',
+                                     '  Max: 2'])
+      end
+
+      describe 'AllCops/StyleGuideCopsOnly' do
+        context 'when it is true' do
+          let(:guide_cops_only) { 'true' }
+
+          it 'skips cops that have no link to a style guide' do
+            expect(cli.run(['--format', 'simple', 'example.rb'])).to eq(0)
+          end
+        end
+
+        context 'when it is false' do
+          let(:guide_cops_only) { 'false' }
+
+          it 'runs cops for rules regardless of any link to the style guide' do
+            expect(cli.run(['--format', 'simple', 'example.rb'])).to eq(1)
+
+            expect($stdout.string)
+              .to eq(['== example.rb ==',
+                      'C:  1:  3: Line is too long. [4/2]',
+                      '',
+                      '1 file inspected, 1 offense detected',
+                      ''].join("\n"))
+          end
+        end
+      end
+    end
+  end
+
   describe 'rails cops' do
     describe 'enabling/disabling' do
       it 'by default does not run rails cops' do
@@ -1657,7 +1749,7 @@ describe RuboCop::CLI, :isolated_environment do
         expect($stdout.string).to include('Prefer self[:attr]')
       end
 
-      it 'with configation option true in one dir runs rails cops there' do
+      it 'with configuration 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)
@@ -1684,7 +1776,7 @@ describe RuboCop::CLI, :isolated_environment do
                   ''].join("\n"))
       end
 
-      it 'with configation option false but -R given runs rails cops' do
+      it 'with configuration 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:',
@@ -1759,7 +1851,6 @@ describe RuboCop::CLI, :isolated_environment do
         .to eq(['', '4 files inspected, no offenses detected',
                 ''].join("\n"))
     end
-
   end
 
   describe 'configuration from file' do
@@ -1864,7 +1955,7 @@ describe RuboCop::CLI, :isolated_environment do
                 ''].join("\n"))
     end
 
-    it 'matches included/excluded files corectly when . argument is given' do
+    it 'matches included/excluded files correctly when . argument is given' do
       create_file('example.rb', 'x = 0')
       create_file('special.dsl', ['# encoding: utf-8',
                                   'setup { "stuff" }'