rubocop 0.14.0 → 0.14.1

data/spec/rubocop/config_spec.rb

@@ -2,8 +2,6 @@
 
 require 'spec_helper'
 
-DEFAULT_CONFIG = Rubocop::Config.load_file('config/default.yml')
-
 describe Rubocop::Config do
   include FileHelper
 
@@ -11,268 +9,6 @@ describe Rubocop::Config do
   let(:hash) { {} }
   let(:loaded_path) { 'example/.rubocop.yml' }
 
-  describe '.configuration_file_for', :isolated_environment do
-    subject(:configuration_file_for) do
-      described_class.configuration_file_for(dir_path)
-    end
-
-    context 'when no config file exists in ancestor directories' do
-      let(:dir_path) { 'dir' }
-      before { create_file('dir/example.rb', '') }
-
-      context 'but a config file exists in home directory' do
-        before { create_file('~/.rubocop.yml', '') }
-
-        it 'returns the path to the file in home directory' do
-          expect(configuration_file_for).to end_with('home/.rubocop.yml')
-        end
-      end
-
-      context 'and no config file exists in home directory' do
-        it 'falls back to the provided default file' do
-          expect(configuration_file_for).to end_with('config/default.yml')
-        end
-      end
-    end
-
-    context 'when a config file exists in the parent directory' do
-      let(:dir_path) { 'dir' }
-
-      before do
-        create_file('dir/example.rb', '')
-        create_file('.rubocop.yml', '')
-      end
-
-      it 'returns the path to that configuration file' do
-        expect(configuration_file_for).to end_with('work/.rubocop.yml')
-      end
-    end
-
-    context 'when multiple config files exist in ancestor directories' do
-      let(:dir_path) { 'dir' }
-
-      before do
-        create_file('dir/example.rb', '')
-        create_file('dir/.rubocop.yml', '')
-        create_file('.rubocop.yml', '')
-      end
-
-      it 'prefers closer config file' do
-        expect(configuration_file_for).to end_with('dir/.rubocop.yml')
-      end
-    end
-  end
-
-  describe '.configuration_from_file', :isolated_environment do
-    subject(:configuration_from_file) do
-      described_class.configuration_from_file(file_path)
-    end
-
-    context 'with any config file' do
-      let(:file_path) { '.rubocop.yml' }
-
-      before do
-        create_file(file_path, ['Encoding:',
-                                '  Enabled: false'])
-      end
-      it 'returns a configuration inheriting from default.yml' do
-        config = DEFAULT_CONFIG['Encoding'].dup
-        config['Enabled'] = false
-        expect(configuration_from_file)
-          .to eql(DEFAULT_CONFIG.merge('Encoding' => config))
-      end
-    end
-
-    context 'when multiple config files exist in ancestor directories' do
-      let(:file_path) { 'dir/.rubocop.yml' }
-
-      before do
-        create_file('.rubocop.yml',
-                    ['AllCops:',
-                     '  Excludes:',
-                     '    - vendor/**',
-                    ])
-
-        create_file(file_path,
-                    ['AllCops:',
-                     '  Excludes: []',
-                    ])
-      end
-
-      it 'gets AllCops/Excludes from the highest directory level' do
-        excludes = configuration_from_file['AllCops']['Excludes']
-        expect(excludes).to eq([File.expand_path('vendor/**')])
-      end
-    end
-
-    context 'when a file inherits from a parent file' do
-      let(:file_path) { 'dir/.rubocop.yml' }
-
-      before do
-        create_file('.rubocop.yml',
-                    ['AllCops:',
-                     '  Excludes:',
-                     '    - vendor/**',
-                     '    - !ruby/regexp /[A-Z]/',
-                    ])
-
-        create_file(file_path, ['inherit_from: ../.rubocop.yml'])
-      end
-
-      it 'gets an absolute AllCops/Excludes' do
-        excludes = configuration_from_file['AllCops']['Excludes']
-        expect(excludes).to eq([File.expand_path('vendor/**'), /[A-Z]/])
-      end
-    end
-
-    context 'when a file inherits from a sibling file' do
-      let(:file_path) { 'dir/.rubocop.yml' }
-
-      before do
-        create_file('src/.rubocop.yml',
-                    ['AllCops:',
-                     '  Excludes:',
-                     '    - vendor/**',
-                    ])
-
-        create_file(file_path, ['inherit_from: ../src/.rubocop.yml'])
-      end
-
-      it 'gets an absolute AllCops/Exclude' do
-        excludes = configuration_from_file['AllCops']['Excludes']
-        expect(excludes).to eq([File.expand_path('src/vendor/**')])
-      end
-    end
-
-    context 'when a file inherits from a parent and grandparent file' do
-      let(:file_path) { 'dir/subdir/.rubocop.yml' }
-
-      before do
-        create_file('dir/subdir/example.rb', '')
-
-        create_file('.rubocop.yml',
-                    ['LineLength:',
-                     '  Enabled: false',
-                     '  Max: 77'])
-
-        create_file('dir/.rubocop.yml',
-                    ['inherit_from: ../.rubocop.yml',
-                     '',
-                     'MethodLength:',
-                     '  Enabled: true',
-                     '  CountComments: false',
-                     '  Max: 10'
-                    ])
-
-        create_file(file_path,
-                    ['inherit_from: ../.rubocop.yml',
-                     '',
-                     'LineLength:',
-                     '  Enabled: true',
-                     '',
-                     '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
-                          })
-        expect(configuration_from_file).to eq(config)
-      end
-    end
-
-    context 'when a file inherits from two configurations' do
-      let(:file_path) { '.rubocop.yml' }
-
-      before do
-        create_file('example.rb', '')
-
-        create_file('normal.yml',
-                    ['MethodLength:',
-                     '  Enabled: false',
-                     '  CountComments: true',
-                     '  Max: 79'])
-
-        create_file('special.yml',
-                    ['MethodLength:',
-                     '  Enabled: false',
-                     '  Max: 200'])
-
-        create_file(file_path,
-                    ['inherit_from:',
-                     '  - normal.yml',
-                     '  - special.yml',
-                     '',
-                     'MethodLength:',
-                     '  Enabled: true'
-                    ])
-      end
-
-      it 'returns values from the last one when possible' 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)
-          .to be_superset(expected.to_set)
-      end
-    end
-  end
-
-  describe '.load_file', :isolated_environment do
-    subject(:load_file) do
-      described_class.load_file(configuration_path)
-    end
-
-    let(:configuration_path) { '.rubocop.yml' }
-
-    it 'returns a configuration loaded from the passed path' do
-      create_file(configuration_path, [
-        'Encoding:',
-        '  Enabled: true',
-      ])
-      configuration = load_file
-      expect(configuration['Encoding']).to eq({
-        'Enabled' => true
-      })
-    end
-  end
-
-  describe '.merge' do
-    subject(:merge) { described_class.merge(base, derived) }
-
-    let(:base) do
-      {
-        'AllCops' => {
-          'Includes' => ['**/*.gemspec', '**/Rakefile'],
-          'Excludes' => []
-        }
-      }
-    end
-    let(:derived) do
-      { 'AllCops' => { 'Excludes' => ['example.rb', 'exclude_*'] } }
-    end
-
-    it 'returns a recursive merge of its two arguments' do
-      expect(merge).to eq('AllCops' => {
-                            'Includes' => ['**/*.gemspec', '**/Rakefile'],
-                            'Excludes' => ['example.rb', 'exclude_*']
-                          })
-    end
-  end
-
   describe '#validate', :isolated_environment do
     # TODO: Because Config.load_file now outputs the validation warning,
     #       it is inserting text into the rspec test output here.
@@ -281,7 +17,7 @@ describe Rubocop::Config do
     after(:each) { $stdout = STDOUT }
 
     subject(:configuration) do
-      described_class.load_file(configuration_path)
+      Rubocop::ConfigLoader.load_file(configuration_path)
     end
 
     let(:configuration_path) { '.rubocop.yml' }
@@ -424,47 +160,4 @@ describe Rubocop::Config do
       end
     end
   end
-
-  describe 'configuration for SymbolArray', :isolated_environment do
-    let(:config) do
-      config_path = described_class.configuration_file_for('.')
-      described_class.configuration_from_file(config_path)
-    end
-
-    context 'when no config file exists for the target file' do
-      it 'is disabled' do
-        expect(config.cop_enabled?('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:',
-          '  Max: 79'
-        ])
-        expect(config.cop_enabled?('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:',
-          '  Enabled: true'
-        ])
-        expect(config.cop_enabled?('SymbolArray')).to be_true
-      end
-    end
-  end
-
-  describe 'configuration for SymbolName' do
-    describe 'AllowCamelCase' do
-      it 'is enabled by default' do
-        default_config = described_class.default_configuration
-        symbol_name_config = default_config.for_cop('SymbolName')
-        expect(symbol_name_config['AllowCamelCase']).to be_true
-      end
-    end
-  end
 end

data/spec/rubocop/config_store_spec.rb

@@ -6,7 +6,7 @@ describe Rubocop::ConfigStore do
   subject(:config_store) { described_class.new }
 
   before do
-    Rubocop::Config.stub(:configuration_file_for) do |arg|
+    Rubocop::ConfigLoader.stub(:configuration_file_for) do |arg|
       # File tree:
       # file1
       # dir/.rubocop.yml
@@ -14,9 +14,9 @@ describe Rubocop::ConfigStore do
       # dir/subdir/file3
       (arg =~ /dir/ ? 'dir' : '.') + '/.rubocop.yml'
     end
-    Rubocop::Config.stub(:configuration_from_file) { |arg| arg }
-    Rubocop::Config.stub(:load_file) { |arg| "#{arg} loaded" }
-    Rubocop::Config.stub(:merge_with_default) do |config, file|
+    Rubocop::ConfigLoader.stub(:configuration_from_file) { |arg| arg }
+    Rubocop::ConfigLoader.stub(:load_file) { |arg| "#{arg} loaded" }
+    Rubocop::ConfigLoader.stub(:merge_with_default) do |config, file|
       "merged #{config}"
     end
   end
@@ -29,12 +29,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
-        Rubocop::Config.should_receive(:configuration_file_for).once
+        Rubocop::ConfigLoader.should_receive(:configuration_file_for).once
           .with('dir')
-        Rubocop::Config.should_receive(:configuration_file_for).once
+        Rubocop::ConfigLoader.should_receive(:configuration_file_for).once
           .with('dir/subdir')
         # The stub returns the same config path for dir and dir/subdir.
-        Rubocop::Config.should_receive(:configuration_from_file).once
+        Rubocop::ConfigLoader.should_receive(:configuration_from_file).once
           .with('dir/.rubocop.yml')
 
         config_store.for('dir/file2')
@@ -43,8 +43,8 @@ describe Rubocop::ConfigStore do
       end
 
       it 'searches for config path if not available in cache' do
-        Rubocop::Config.should_receive(:configuration_file_for).once
-        Rubocop::Config.should_receive(:configuration_from_file).once
+        Rubocop::ConfigLoader.should_receive(:configuration_file_for).once
+        Rubocop::ConfigLoader.should_receive(:configuration_from_file).once
         config_store.for('file1')
       end
     end

data/spec/rubocop/cop/lint/shadowing_outer_local_variable_spec.rb

@@ -180,7 +180,7 @@ describe Rubocop::Cop::Lint::ShadowingOuterLocalVariable do
       ]
     end
 
-    include_examples 'accepts'
+    include_examples 'accepts' unless RUBY_VERSION < '2.0'
     include_examples 'mimics MRI 2.0'
   end
 

data/spec/rubocop/cop/lint/useless_assignment_spec.rb

@@ -1439,7 +1439,7 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    include_examples 'accepts'
+    include_examples 'accepts' unless RUBY_VERSION < '2.0'
     include_examples 'mimics MRI 2.0'
   end
 
@@ -1452,7 +1452,7 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    include_examples 'accepts'
+    include_examples 'accepts' unless RUBY_VERSION < '2.0'
     include_examples 'mimics MRI 2.0'
   end
 
@@ -1464,7 +1464,7 @@ describe Rubocop::Cop::Lint::UselessAssignment do
       ]
     end
 
-    include_examples 'accepts'
+    include_examples 'accepts' unless RUBY_VERSION < '2.0'
     include_examples 'mimics MRI 2.0'
   end
 

data/spec/rubocop/cop/style/align_hash_spec.rb

@@ -3,6 +3,19 @@
 require 'spec_helper'
 
 describe Rubocop::Cop::Style::AlignHash, :config do
+  shared_examples 'not on separate lines' do
+    it 'accepts single line hash' do
+      inspect_source(cop, 'func(a: 0, bb: 1)')
+      expect(cop.offences).to be_empty
+    end
+
+    it 'accepts several pairs per line' do
+      inspect_source(cop, ['func(a: 1, bb: 2,',
+                           '     ccc: 3, dddd: 4)'])
+      expect(cop.offences).to be_empty
+    end
+  end
+
   subject(:cop) { described_class.new(config) }
   let(:cop_config) do
     {
@@ -88,16 +101,7 @@ describe Rubocop::Cop::Style::AlignHash, :config do
     end
   end
 
-  it 'accepts single line hash' do
-    inspect_source(cop, 'hash = { a: 0, b: 1 }')
-    expect(cop.offences).to be_empty
-  end
-
-  it 'accepts several pairs per line' do
-    inspect_source(cop, ['hash = { a: 0, b: 1,',
-                         '         c: 2, d: 3 }'])
-    expect(cop.offences).to be_empty
-  end
+  include_examples 'not on separate lines'
 
   context 'with table alignment configuration' do
     let(:cop_config) do
@@ -107,16 +111,7 @@ describe Rubocop::Cop::Style::AlignHash, :config do
       }
     end
 
-    it 'accepts single line hash' do
-      inspect_source(cop, 'func(a: 0, bb: 1)')
-      expect(cop.offences).to be_empty
-    end
-
-    it 'accepts several pairs per line' do
-      inspect_source(cop, ['func(a:   1, bb:   2',
-                           '     ccc: 3, dddd: 4)'])
-      expect(cop.offences).to be_empty
-    end
+    include_examples 'not on separate lines'
 
     it 'accepts aligned hash keys' do
       inspect_source(cop, ['hash1 = {',
@@ -235,6 +230,8 @@ describe Rubocop::Cop::Style::AlignHash, :config do
       expect(cop.offences).to have(1).item
     end
 
+    include_examples 'not on separate lines'
+
     it 'auto-corrects alignment' do
       new_source = autocorrect_source(cop, ['hash1 = { a: 0,',
                                             '     bb:    1,',