rubocop 0.22.0 → 0.23.0

data/spec/rubocop/comment_config_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::CommentConfig do
+describe RuboCop::CommentConfig do
   subject(:comment_config) { described_class.new(parse_source(source)) }
 
   describe '#cop_enabled_at_line?' do
@@ -10,33 +10,34 @@ describe Rubocop::CommentConfig do
       [
         '# encoding: utf-8',
         '',
-        '# rubocop:disable MethodLength',
+        '# rubocop:disable Style/MethodLength',
         'def some_method',
         "  puts 'foo'",
         'end',
-        '# rubocop:enable MethodLength',
+        '# rubocop:enable Style/MethodLength',
         '',
         '# rubocop:disable all',
         'some_method',
         '# rubocop:enable all',
         '',
         "code = 'This is evil.'",
-        'eval(code) # rubocop:disable Eval',
+        'eval(code) # rubocop:disable Lint/Eval',
         "puts 'This is not evil.'",
         '',
         'def some_method',
-        "  puts 'Disabling indented single line' # rubocop:disable LineLength",
+        "  puts 'Disabling indented single line' # rubocop:disable " \
+        'Style/LineLength',
         'end',
         '',
         'string = <<END',
-        'This is a string not a real comment # rubocop:disable Loop',
+        'This is a string not a real comment # rubocop:disable Style/Loop',
         'END',
         '',
-        'foo # rubocop:disable MethodCallParentheses',
+        'foo # rubocop:disable Style/MethodCallParentheses',
         '',
-        '# rubocop:enable Void',
+        '# rubocop:enable Style/Void',
         '',
-        '# rubocop:disable For',
+        '# rubocop:disable Style/For',
         'foo'
       ]
     end
@@ -49,33 +50,34 @@ describe Rubocop::CommentConfig do
     end
 
     it 'supports disabling multiple lines with a pair of directive' do
-      method_length_disabled_lines = disabled_lines_of_cop('MethodLength')
+      method_length_disabled_lines =
+        disabled_lines_of_cop('Style/MethodLength')
       expected_part = (3..6).to_a
       expect(method_length_disabled_lines & expected_part)
         .to eq(expected_part)
     end
 
     it 'supports disabling all lines after a directive' do
-      for_disabled_lines = disabled_lines_of_cop('For')
+      for_disabled_lines = disabled_lines_of_cop('Style/For')
       expected_part = (29..source.size).to_a
       expect(for_disabled_lines & expected_part)
         .to eq(expected_part)
     end
 
     it 'just ignores unpaired enabling directives' do
-      void_disabled_lines = disabled_lines_of_cop('Void')
+      void_disabled_lines = disabled_lines_of_cop('Lint/Void')
       expected_part = (27..source.size).to_a
       expect(void_disabled_lines & expected_part).to be_empty
     end
 
     it 'supports disabling single line with a direcive at end of line' do
-      eval_disabled_lines = disabled_lines_of_cop('Eval')
+      eval_disabled_lines = disabled_lines_of_cop('Lint/Eval')
       expect(eval_disabled_lines).to include(14)
       expect(eval_disabled_lines).not_to include(15)
     end
 
     it 'handles indented single line' do
-      line_length_disabled_lines = disabled_lines_of_cop('LineLength')
+      line_length_disabled_lines = disabled_lines_of_cop('Style/LineLength')
       expect(line_length_disabled_lines).to include(18)
       expect(line_length_disabled_lines).not_to include(19)
     end
@@ -89,7 +91,7 @@ describe Rubocop::CommentConfig do
     it 'supports disabling all cops with keyword all' do
       expected_part = (9..10).to_a
 
-      Rubocop::Cop::Cop.all.each do |cop|
+      RuboCop::Cop::Cop.all.each do |cop|
         disabled_lines = disabled_lines_of_cop(cop)
         expect(disabled_lines & expected_part).to eq(expected_part)
       end

data/spec/rubocop/config_loader_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::ConfigLoader do
+describe RuboCop::ConfigLoader do
   include FileHelper
 
   let(:default_config) { described_class.default_configuration }
@@ -68,14 +68,14 @@ describe Rubocop::ConfigLoader do
       let(:file_path) { '.rubocop.yml' }
 
       before do
-        create_file(file_path, ['Encoding:',
+        create_file(file_path, ['Style/Encoding:',
                                 '  Enabled: false'])
       end
       it 'returns a configuration inheriting from default.yml' do
-        config = default_config['Encoding'].dup
+        config = default_config['Style/Encoding'].dup
         config['Enabled'] = false
         expect(configuration_from_file)
-          .to eql(default_config.merge('Encoding' => config))
+          .to eql(default_config.merge('Style/Encoding' => config))
       end
     end
 
@@ -161,14 +161,14 @@ describe Rubocop::ConfigLoader do
         create_file('dir/subdir/example.rb', '')
 
         create_file('.rubocop.yml',
-                    ['LineLength:',
+                    ['Style/LineLength:',
                      '  Enabled: false',
                      '  Max: 77'])
 
         create_file('dir/.rubocop.yml',
                     ['inherit_from: ../.rubocop.yml',
                      '',
-                     'MethodLength:',
+                     'Style/MethodLength:',
                      '  Enabled: true',
                      '  CountComments: false',
                      '  Max: 10'
@@ -177,29 +177,30 @@ describe Rubocop::ConfigLoader do
         create_file(file_path,
                     ['inherit_from: ../.rubocop.yml',
                      '',
-                     'LineLength:',
+                     'Style/LineLength:',
                      '  Enabled: true',
                      '',
-                     'MethodLength:',
+                     'Style/MethodLength:',
                      '  Max: 5'
                     ])
       end
 
       it 'returns the ancestor configuration plus local overrides' do
-        config = default_config
-                   .merge('LineLength' => {
-                            'Description' =>
-                               default_config['LineLength']['Description'],
-                            'Enabled' => true,
-                            'Max' => 77
-                          },
-                          'MethodLength' => {
-                            'Description' =>
-                               default_config['MethodLength']['Description'],
-                            'Enabled' => true,
-                            'CountComments' => false,
-                            'Max' => 5
-                          })
+        config =
+          default_config
+          .merge('Style/LineLength' => {
+                   'Description' =>
+                   default_config['Style/LineLength']['Description'],
+                   'Enabled' => true,
+                   'Max' => 77
+                 },
+                 'Style/MethodLength' => {
+                   'Description' =>
+                   default_config['Style/MethodLength']['Description'],
+                   'Enabled' => true,
+                   'CountComments' => false,
+                   'Max' => 5
+                 })
         expect(configuration_from_file).to eq(config)
       end
     end
@@ -211,13 +212,13 @@ describe Rubocop::ConfigLoader do
         create_file('example.rb', '')
 
         create_file('normal.yml',
-                    ['MethodLength:',
+                    ['Style/MethodLength:',
                      '  Enabled: false',
                      '  CountComments: true',
                      '  Max: 80'])
 
         create_file('special.yml',
-                    ['MethodLength:',
+                    ['Style/MethodLength:',
                      '  Enabled: false',
                      '  Max: 200'])
 
@@ -226,7 +227,7 @@ describe Rubocop::ConfigLoader do
                      '  - normal.yml',
                      '  - special.yml',
                      '',
-                     'MethodLength:',
+                     'Style/MethodLength:',
                      '  Enabled: true'
                     ])
       end
@@ -235,7 +236,7 @@ describe Rubocop::ConfigLoader do
         expected = { 'Enabled' => true,        # overridden in .rubocop.yml
                      'CountComments' => true,  # only defined in normal.yml
                      'Max' => 200 }            # special.yml takes precedence
-        expect(configuration_from_file['MethodLength'].to_set)
+        expect(configuration_from_file['Style/MethodLength'].to_set)
           .to be_superset(expected.to_set)
       end
     end
@@ -250,11 +251,11 @@ describe Rubocop::ConfigLoader do
 
     it 'returns a configuration loaded from the passed path' do
       create_file(configuration_path, [
-        'Encoding:',
+        'Style/Encoding:',
         '  Enabled: true'
       ])
       configuration = load_file
-      expect(configuration['Encoding']).to eq(
+      expect(configuration['Style/Encoding']).to eq(
         'Enabled' => true
       )
     end
@@ -291,27 +292,27 @@ describe Rubocop::ConfigLoader do
 
     context 'when no config file exists for the target file' do
       it 'is disabled' do
-        expect(config.cop_enabled?('SymbolArray')).to be_false
+        expect(config.cop_enabled?('Style/SymbolArray')).to be_false
       end
     end
 
     context 'when a config file which does not mention SymbolArray exists' do
       it 'is disabled' do
         create_file('.rubocop.yml', [
-          'LineLength:',
+          'Style/LineLength:',
           '  Max: 80'
         ])
-        expect(config.cop_enabled?('SymbolArray')).to be_false
+        expect(config.cop_enabled?('Style/SymbolArray')).to be_false
       end
     end
 
     context 'when a config file which explicitly enables SymbolArray exists' do
       it 'is enabled' do
         create_file('.rubocop.yml', [
-          'SymbolArray:',
+          'Style/SymbolArray:',
           '  Enabled: true'
         ])
-        expect(config.cop_enabled?('SymbolArray')).to be_true
+        expect(config.cop_enabled?('Style/SymbolArray')).to be_true
       end
     end
   end
@@ -320,9 +321,25 @@ describe Rubocop::ConfigLoader do
     describe 'AllowSafeAssignment' do
       it 'is enabled by default' do
         default_config = described_class.default_configuration
-        symbol_name_config = default_config.for_cop('AssignmentInCondition')
+        symbol_name_config =
+          default_config.for_cop('Lint/AssignmentInCondition')
         expect(symbol_name_config['AllowSafeAssignment']).to be_true
       end
     end
   end
+
+  describe 'when a requirement is defined', :isolated_environment do
+    let(:required_file_path) { './required_file.rb' }
+
+    before do
+      create_file('.rubocop.yml', ['require:', "  - #{required_file_path}"])
+      create_file(required_file_path, ['class MyClass', 'end'])
+    end
+
+    it 'requires the passed path' do
+      config_path = described_class.configuration_file_for('.')
+      described_class.configuration_from_file(config_path)
+      expect(defined?(MyClass)).to be_true
+    end
+  end
 end

data/spec/rubocop/config_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Config do
+describe RuboCop::Config do
   include FileHelper
 
   subject(:configuration) { described_class.new(hash, loaded_path) }
@@ -17,7 +17,7 @@ describe Rubocop::Config do
     after(:each) { $stderr = STDERR }
 
     subject(:configuration) do
-      Rubocop::ConfigLoader.load_file(configuration_path)
+      RuboCop::ConfigLoader.load_file(configuration_path)
     end
 
     let(:configuration_path) { '.rubocop.yml' }
@@ -41,7 +41,7 @@ describe Rubocop::Config do
     context 'when the configuration includes any unrecognized parameter' do
       before do
         create_file(configuration_path, [
-          'LineLength:',
+          'Style/LineLength:',
           '  Enabled: true',
           '  Min: 10'
         ])
@@ -50,7 +50,7 @@ describe Rubocop::Config do
       it 'raises validation error' do
         expect { configuration.validate }
           .to raise_error(described_class::ValidationError,
-                          /^unrecognized parameter LineLength:Min/)
+                          /^unrecognized parameter Style\/LineLength:Min/)
       end
     end
 
@@ -59,7 +59,7 @@ describe Rubocop::Config do
       # configuration, but are nonetheless allowed for any cop.
       before do
         create_file(configuration_path, [
-          'LineLength:',
+          'Style/LineLength:',
           '  Exclude:',
           '    - lib/file.rb',
           '  Include:',

data/spec/rubocop/config_store_spec.rb

@@ -2,11 +2,11 @@
 
 require 'spec_helper'
 
-describe Rubocop::ConfigStore do
+describe RuboCop::ConfigStore do
   subject(:config_store) { described_class.new }
 
   before do
-    allow(Rubocop::ConfigLoader).to receive(:configuration_file_for) do |arg|
+    allow(RuboCop::ConfigLoader).to receive(:configuration_file_for) do |arg|
       # File tree:
       # file1
       # dir/.rubocop.yml
@@ -14,11 +14,11 @@ describe Rubocop::ConfigStore do
       # dir/subdir/file3
       (arg =~ /dir/ ? 'dir' : '.') + '/.rubocop.yml'
     end
-    allow(Rubocop::ConfigLoader)
+    allow(RuboCop::ConfigLoader)
       .to receive(:configuration_from_file) { |arg| arg }
-    allow(Rubocop::ConfigLoader)
-      .to receive(:load_file) { |arg| Rubocop::Config.new(arg) }
-    allow(Rubocop::ConfigLoader)
+    allow(RuboCop::ConfigLoader)
+      .to receive(:load_file) { |arg| RuboCop::Config.new(arg) }
+    allow(RuboCop::ConfigLoader)
       .to receive(:merge_with_default) { |config| "merged #{config}" }
   end
 
@@ -30,12 +30,12 @@ describe Rubocop::ConfigStore do
 
     context 'when no config specified in command line' do
       it 'gets config path and config from cache if available' do
-        expect(Rubocop::ConfigLoader).to receive(:configuration_file_for).once
+        expect(RuboCop::ConfigLoader).to receive(:configuration_file_for).once
           .with('dir')
-        expect(Rubocop::ConfigLoader).to receive(:configuration_file_for).once
+        expect(RuboCop::ConfigLoader).to receive(:configuration_file_for).once
           .with('dir/subdir')
         # The stub returns the same config path for dir and dir/subdir.
-        expect(Rubocop::ConfigLoader).to receive(:configuration_from_file).once
+        expect(RuboCop::ConfigLoader).to receive(:configuration_from_file).once
           .with('dir/.rubocop.yml')
 
         config_store.for('dir/file2')
@@ -44,8 +44,8 @@ describe Rubocop::ConfigStore do
       end
 
       it 'searches for config path if not available in cache' do
-        expect(Rubocop::ConfigLoader).to receive(:configuration_file_for).once
-        expect(Rubocop::ConfigLoader).to receive(:configuration_from_file).once
+        expect(RuboCop::ConfigLoader).to receive(:configuration_file_for).once
+        expect(RuboCop::ConfigLoader).to receive(:configuration_from_file).once
         config_store.for('file1')
       end
     end

data/spec/rubocop/cop/commissioner_spec.rb

@@ -1,12 +1,12 @@
 # encoding: utf-8
-# rubocop:disable LineLength
+# rubocop:disable Style/LineLength
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Commissioner do
+describe RuboCop::Cop::Commissioner do
   describe '#investigate' do
-    let(:cop) { double(Rubocop::Cop, offenses: []).as_null_object }
-    let(:force) { double(Rubocop::Cop::Force).as_null_object }
+    let(:cop) { double(RuboCop::Cop, offenses: []).as_null_object }
+    let(:force) { double(RuboCop::Cop::Force).as_null_object }
 
     it 'returns all offenses found by the cops' do
       allow(cop).to receive(:offenses).and_return([1])

data/spec/rubocop/cop/cop_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Cop do
+describe RuboCop::Cop::Cop do
   subject(:cop) { described_class.new }
   let(:location) do
     source_buffer = Parser::Source::Buffer.new('test', 1)
@@ -14,6 +14,29 @@ describe Rubocop::Cop::Cop do
     expect(cop.offenses).to be_empty
   end
 
+  describe '.qualified_cop_name' do
+    it 'adds namespace if the cop name is found in exactly one namespace' do
+      expect(described_class.qualified_cop_name('LineLength', '--only'))
+        .to eq('Style/LineLength')
+    end
+
+    it 'returns the given cop name if it is not found in any namespace' do
+      expect(described_class.qualified_cop_name('UnknownCop', '--only'))
+        .to eq('UnknownCop')
+    end
+
+    it 'returns the given cop name if it already has a namespace' do
+      expect(described_class.qualified_cop_name('Style/LineLength', '--only'))
+        .to eq('Style/LineLength')
+    end
+
+    it 'raises an error if the cop name is in more than one namespace' do
+      pending 'Example needs a cop with same name in two namespaces'
+      expect { described_class.qualified_cop_name('ExampleCop', '--only') }
+        .to raise_error(RuboCop::Cop::AmbiguousCopName)
+    end
+  end
+
   it 'keeps track of offenses' do
     cop.add_offense(nil, location, 'message')
 
@@ -46,32 +69,32 @@ describe Rubocop::Cop::Cop do
   end
 
   it 'registers offense with its name' do
-    cop = Rubocop::Cop::Style::For.new
+    cop = RuboCop::Cop::Style::For.new
     cop.add_offense(nil, location, 'message')
-    expect(cop.offenses.first.cop_name).to eq('For')
+    expect(cop.offenses.first.cop_name).to eq('Style/For')
   end
 
   context 'with no submodule' do
     subject(:cop) { described_class }
-    it('has right name') { expect(cop.cop_name).to eq('Cop') }
+    it('has right name') { expect(cop.cop_name).to eq('Cop/Cop') }
     it('has right type') { expect(cop.cop_type).to eq(:cop) }
   end
 
   context 'with style cops' do
-    subject(:cop) { Rubocop::Cop::Style::For }
-    it('has right name') { expect(cop.cop_name).to eq('For') }
+    subject(:cop) { RuboCop::Cop::Style::For }
+    it('has right name') { expect(cop.cop_name).to eq('Style/For') }
     it('has right type') { expect(cop.cop_type).to eq(:style) }
   end
 
   context 'with lint cops' do
-    subject(:cop) { Rubocop::Cop::Lint::Loop }
-    it('has right name') { expect(cop.cop_name).to eq('Loop') }
+    subject(:cop) { RuboCop::Cop::Lint::Loop }
+    it('has right name') { expect(cop.cop_name).to eq('Lint/Loop') }
     it('has right type') { expect(cop.cop_type).to eq(:lint) }
   end
 
   context 'with rails cops' do
-    subject(:cop) { Rubocop::Cop::Rails::Validation }
-    it('has right name') { expect(cop.cop_name).to eq('Validation') }
+    subject(:cop) { RuboCop::Cop::Rails::Validation }
+    it('has right name') { expect(cop.cop_name).to eq('Rails/Validation') }
     it('has right type') { expect(cop.cop_type).to eq(:rails) }
   end