rubocop 0.14.1 → 0.15.0

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

@@ -5,33 +5,31 @@ require 'spec_helper'
 describe Rubocop::Cop::Style::SymbolArray do
   subject(:cop) { described_class.new }
 
-  it 'registers an offence for arrays of symbols', { ruby: 2.0 } do
+  it 'registers an offence for arrays of symbols', ruby: 2.0 do
     inspect_source(cop,
                    ['[:one, :two, :three]'])
     expect(cop.offences.size).to eq(1)
   end
 
-  it 'does not reg an offence for array with non-syms', { ruby: 2.0 } do
+  it 'does not reg an offence for array with non-syms', ruby: 2.0 do
     inspect_source(cop,
                    ['[:one, :two, "three"]'])
     expect(cop.offences).to be_empty
   end
 
-  it 'does not reg an offence for array starting with %i',
-     { ruby: 2.0 } do
+  it 'does not reg an offence for array starting with %i', ruby: 2.0 do
     inspect_source(cop,
                    ['%i(one two three)'])
     expect(cop.offences).to be_empty
   end
 
-  it 'does not reg an offence for array with one element',
-     { ruby: 2.0 } do
+  it 'does not reg an offence for array with one element', ruby: 2.0 do
     inspect_source(cop,
                    ['[:three]'])
     expect(cop.offences).to be_empty
   end
 
-  it 'does nothing on Ruby 1.9', { ruby: 1.9 } do
+  it 'does nothing on Ruby 1.9', ruby: 1.9 do
     inspect_source(cop,
                    ['[:one, :two, :three]'])
     expect(cop.offences).to be_empty

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

@@ -3,7 +3,10 @@
 require 'spec_helper'
 
 describe Rubocop::Cop::Style::TrailingBlankLines do
-  subject(:cop) { described_class.new }
+  subject(:cop) { described_class.new(config) }
+  let(:config) do
+    Rubocop::Config.new('TrailingWhitespace' => { 'Enabled' => true })
+  end
 
   it 'accepts final newline' do
     inspect_source(cop, ['x = 0', ''])
@@ -15,4 +18,26 @@ describe Rubocop::Cop::Style::TrailingBlankLines do
     expect(cop.offences.size).to eq(1)
     expect(cop.messages).to eq(['3 trailing blank lines detected.'])
   end
+
+  it 'auto-corrects unwanted blank lines' do
+    new_source = autocorrect_source(cop, ['x = 0', '', '', '', ''])
+    expect(new_source).to eq(['x = 0', ''].join("\n"))
+  end
+
+  it 'does not auto-correct if it interferes with TrailingWhitespace' do
+    original = ['x = 0', '', '  ', '', '']
+    new_source = autocorrect_source(cop, original)
+    expect(new_source).to eq(original.join("\n"))
+  end
+
+  context 'with TrailingWhitespace disabled' do
+    let(:config) do
+      Rubocop::Config.new('TrailingWhitespace' => { 'Enabled' => false })
+    end
+
+    it 'auto-corrects even if some lines have space' do
+      new_source = autocorrect_source(cop, ['x = 0', '', '  ', '', ''])
+      expect(new_source).to eq(['x = 0', ''].join("\n"))
+    end
+  end
 end

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

@@ -20,4 +20,11 @@ describe Rubocop::Cop::Style::TrailingWhitespace do
     inspect_source(cop, ["x = 0\n"])
     expect(cop.offences).to be_empty
   end
+
+  it 'auto-corrects unwanted space' do
+    new_source = autocorrect_source(cop, ['x = 0 ',
+                                          "x = 0\t"])
+    expect(new_source).to eq(['x = 0',
+                              'x = 0'].join("\n"))
+  end
 end

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

@@ -201,6 +201,14 @@ describe Rubocop::Cop::Style::TrivialAccessors, :config do
     expect(cop.offences).to be_empty
   end
 
+  it 'treats splats as non-trivial' do
+    inspect_source(cop,
+                   [' def splatomatic(*values)',
+                    '   @splatomatic = values',
+                    ' end'])
+    expect(cop.offences).to be_empty
+  end
+
   it 'finds oneliner trivials' do
     inspect_source(cop,
                    ['class Oneliner',

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

@@ -2,8 +2,9 @@
 
 require 'spec_helper'
 
-describe Rubocop::Cop::Style::WordArray do
-  subject(:cop) { described_class.new }
+describe Rubocop::Cop::Style::WordArray, :config do
+  subject(:cop) { described_class.new(config) }
+  let(:cop_config) { { 'MinSize' => 0 } }
 
   it 'registers an offence for arrays of single quoted strings' do
     inspect_source(cop,
@@ -52,4 +53,34 @@ describe Rubocop::Cop::Style::WordArray do
                    ['["", "two", "three"]'])
     expect(cop.offences).to be_empty
   end
+
+  it 'does not register an offence for array with allowed number of strings' do
+    cop_config['MinSize'] = 3
+
+    inspect_source(cop,
+                   ['["one", "two", "three"]'])
+    expect(cop.offences).to be_empty
+  end
+
+  it 'does not register an offence for an array with comments in it' do
+    inspect_source(cop,
+                   ['[',
+                    '"foo", # comment here',
+                    '"bar", # this thing was done because of a bug',
+                    '"baz" # do not delete this line',
+                    ']'])
+
+    expect(cop.offences).to be_empty
+  end
+
+  it 'registers an offence for an array with comments outside of it' do
+    inspect_source(cop,
+                   ['[',
+                    '"foo",',
+                    '"bar",',
+                    '"baz"',
+                    '] # test'])
+
+    expect(cop.offences.size).to eq(1)
+  end
 end

data/spec/rubocop/cop/team_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 describe Rubocop::Cop::Team do
   subject(:team) { described_class.new(cop_classes, config, options) }
-  let(:cop_classes) { Rubocop::Cop::Cop.all }
+  let(:cop_classes) { Rubocop::Cop::Cop.non_rails }
   let(:config) { Rubocop::ConfigLoader.default_configuration }
   let(:options) { nil }
 
@@ -16,8 +16,8 @@ describe Rubocop::Cop::Team do
       it { should be_false }
     end
 
-    context 'when { autocorrect: true } is passed to .new' do
-      let(:options) { { autocorrect: true } }
+    context 'when { auto_correct: true } is passed to .new' do
+      let(:options) { { auto_correct: true } }
       it { should be_true }
     end
   end
@@ -91,7 +91,7 @@ describe Rubocop::Cop::Team do
     end
 
     context 'when autocorrection is enabled' do
-      let(:options) { { autocorrect: true } }
+      let(:options) { { auto_correct: true } }
 
       before do
         create_file(file_path, [

data/spec/rubocop/formatter/json_formatter_spec.rb

@@ -76,7 +76,7 @@ module Rubocop
       it 'outputs #output_hash as JSON' do
         formatter.finished(files)
         json = output.string
-        restored_hash = JSON.parse(json, { symbolize_names: true })
+        restored_hash = JSON.parse(json, symbolize_names: true)
         expect(restored_hash).to eq(formatter.output_hash)
       end
     end

data/spec/rubocop/options_spec.rb

@@ -5,8 +5,7 @@ require 'spec_helper'
 describe Rubocop::Options, :isolated_environment do
   include FileHelper
 
-  subject(:options) { described_class.new(config_store) }
-  let(:config_store) { Rubocop::ConfigStore.new }
+  subject(:options) { described_class.new }
 
   before(:each) do
     $stdout = StringIO.new
@@ -37,13 +36,10 @@ describe Rubocop::Options, :isolated_environment do
 
         expected_help = <<-END
 Usage: rubocop [options] [file1, file2, ...]
-    -d, --debug                      Display debug info.
-    -c, --config FILE                Specify configuration file.
         --only COP                   Run just one cop.
+    -c, --config FILE                Specify configuration file.
         --auto-gen-config            Generate a configuration file acting as a
                                      TODO list.
-        --show-cops                  Shows cops and their config for the
-                                     current directory.
     -f, --format FORMATTER           Choose an output formatter. This option
                                      can be specified multiple times to enable
                                      multiple formatters at the same time.
@@ -60,6 +56,9 @@ Usage: rubocop [options] [file1, file2, ...]
                                      specified --format, or the default format
                                      if no format is specified.
     -r, --require FILE               Require Ruby file.
+        --show-cops                  Shows cops and their config for the
+                                     current directory.
+    -d, --debug                      Display debug info.
     -R, --rails                      Run extra Rails cops.
     -l, --lint                       Run only lint cops.
     -a, --auto-correct               Auto-correct offences.
@@ -97,14 +96,6 @@ Usage: rubocop [options] [file1, file2, ...]
       end
     end
 
-    describe '--version' do
-      it 'exits cleanly' do
-        expect { options.parse ['-v'] }.to exit_with_code(0)
-        expect { options.parse ['--version'] }.to exit_with_code(0)
-        expect($stdout.string).to eq((Rubocop::Version::STRING + "\n") * 2)
-      end
-    end
-
     describe '--only' do
       it 'exits with error if an incorrect cop name is passed' do
         expect { options.parse(%w(--only 123)) }
@@ -112,88 +103,6 @@ Usage: rubocop [options] [file1, file2, ...]
       end
     end
 
-    describe '--show-cops' do
-      let(:cops) { Rubocop::Cop::Cop.all }
-
-      let(:global_conf) do
-        config_path =
-          Rubocop::ConfigLoader.configuration_file_for(Dir.pwd.to_s)
-        Rubocop::ConfigLoader.configuration_from_file(config_path)
-      end
-
-      let(:stdout) { $stdout.string }
-
-      before do
-        expect { options.parse ['--show-cops'] }.to exit_with_code(0)
-      end
-
-      # Extracts the first line out of the description
-      def short_description_of_cop(cop)
-        desc = full_description_of_cop(cop)
-        desc ? desc.lines.first.strip : ''
-      end
-
-      # Gets the full description of the cop or nil if no description is set.
-      def full_description_of_cop(cop)
-        cop_config = global_conf.for_cop(cop)
-        cop_config['Description']
-      end
-
-      it 'prints all available cops and their description' do
-        cops.each do |cop|
-          expect(stdout).to include cop.cop_name
-          expect(stdout).to include short_description_of_cop(cop)
-        end
-      end
-
-      it 'prints all types' do
-        cops
-          .types
-          .map(&:to_s)
-          .map(&:capitalize)
-          .each { |type| expect(stdout).to include(type) }
-      end
-
-      it 'prints all cops in their right type listing' do
-        lines = stdout.lines
-        lines.slice_before(/Type /).each do |slice|
-          types = cops.types.map(&:to_s).map(&:capitalize)
-          current = types.delete(slice.shift[/Type '(?<c>[^'']+)'/, 'c'])
-          # all cops in their type listing
-          cops.with_type(current).each do |cop|
-            expect(slice.any? { |l| l.include? cop.cop_name }).to be_true
-          end
-
-          # no cop in wrong type listing
-          types.each do |type|
-            cops.with_type(type).each do |cop|
-              expect(slice.any? { |l| l.include? cop.cop_name }).to be_false
-            end
-          end
-        end
-      end
-
-      it 'prints the current configuration' do
-        out = stdout.lines.to_a
-        cops.each do |cop|
-          conf = global_conf[cop.cop_name].dup
-          confstrt =
-            out.find_index { |i| i.include?("- #{cop.cop_name}") } + 1
-          c = out[confstrt, conf.keys.size].to_s
-          conf.delete('Description')
-          expect(c).to include(short_description_of_cop(cop))
-          conf.each do |k, v|
-            # ugly hack to get hash/array content tested
-            if v.kind_of?(Hash) || v.kind_of?(Array)
-              expect(c).to include "#{k}: #{v.to_s.dump[2, -2]}"
-            else
-              expect(c).to include "#{k}: #{v}"
-            end
-          end
-        end
-      end
-    end
-
     describe '--require' do
       let(:required_file_path) { './path/to/required_file.rb' }
 

data/spec/rubocop/processed_source_spec.rb

@@ -78,7 +78,7 @@ describe Rubocop::ProcessedSource do
       end
     end
 
-    context 'when the source has diagnostic with error level' do
+    context 'when the source has diagnostic with fatal level' do
       let(:level) { :fatal }
 
       it 'returns false' do
@@ -86,10 +86,10 @@ describe Rubocop::ProcessedSource do
       end
     end
 
-    context 'when the source has diagnostic with error level' do
+    context 'when the source has diagnostic with warning level' do
       let(:level) { :warning }
 
-      it 'returns false' do
+      it 'returns true' do
         expect(processed_source.valid_syntax?).to be_true
       end
     end

data/spec/spec_helper.rb

@@ -12,24 +12,19 @@ if ENV['TRAVIS'] && RUBY_ENGINE == 'jruby'
   ENV['TMPDIR'] = non_world_writable_tmp_dir
 end
 
-# Temporary disable the coverage report until Coveralls fix
-# their API or we find a way to not break the TRAVIS build
-# when Coveralls report error.
-# SimpleCov raises similar IOError - stream closed when ran
-# on Rubinius.
-# if ENV['TRAVIS'] || ENV['COVERAGE']
-  # require 'simplecov'
-
-  # if ENV['TRAVIS']
-  #   require 'coveralls'
-  #   SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-  # end
-
-  # SimpleCov.start do
-    # add_filter '/spec/'
-    # add_filter '/vendor/bundle/'
-  # end
-# end
+if ENV['TRAVIS'] || ENV['COVERAGE']
+  require 'simplecov'
+
+  if ENV['TRAVIS']
+    require 'coveralls'
+    SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+  end
+
+  SimpleCov.start do
+    add_filter '/spec/'
+    add_filter '/vendor/bundle/'
+  end
+end
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
@@ -79,19 +74,29 @@ RSpec.configure do |config|
   config.include(ExitCodeMatchers)
 end
 
-def inspect_source(cop, source)
-  processed_source = parse_source(source)
+def inspect_source_file(cop, source)
+  Tempfile.open('tmp') { |f| inspect_source(cop, source, f) }
+end
+
+def inspect_source(cop, source, file = nil)
+  processed_source = parse_source(source, file)
   fail 'Error parsing example code' unless processed_source.valid_syntax?
   _investigate(cop, processed_source)
 end
 
-def parse_source(source)
+def parse_source(source, file = nil)
   source = source.join($RS) if source.is_a?(Array)
-  Rubocop::SourceParser.parse(source)
+  if file
+    file.write(source)
+    file.rewind
+    Rubocop::SourceParser.parse(source, file.path)
+  else
+    Rubocop::SourceParser.parse(source)
+  end
 end
 
 def autocorrect_source(cop, source)
-  cop.instance_variable_get(:@options)[:autocorrect] = true
+  cop.instance_variable_get(:@options)[:auto_correct] = true
   processed_source = parse_source(source)
   _investigate(cop, processed_source)
 

data/spec/support/mri_syntax_checker.rb

@@ -17,24 +17,28 @@ module MRISyntaxChecker
     source_buffer = Parser::Source::Buffer.new('test', 1)
     source_buffer.source = source
 
-    offences = []
-
-    check_syntax(source).each_line do |line|
-      line_number, severity, message = process_line(line)
-      next unless line_number
-      next if grep_message && !message.include?(grep_message)
-      begin_pos = source_lines[0...(line_number - 1)].reduce(0) do |a, e|
-        a + e.length + "\n".length
-      end
-      offences << Rubocop::Cop::Offence.new(
-        severity,
-        Parser::Source::Range.new(source_buffer, begin_pos, begin_pos + 1),
-        message.capitalize,
-        fake_cop_name
-      )
+    offences = check_syntax(source).each_line.map do |line|
+      check_line(line, source_lines, source_buffer, fake_cop_name,
+                 grep_message)
     end
 
-    offences
+    offences.compact
+  end
+
+  def check_line(line, source_lines, source_buffer, fake_cop_name,
+                 grep_message)
+    line_number, severity, message = process_line(line)
+    return unless line_number
+    return if grep_message && !message.include?(grep_message)
+    begin_pos = source_lines[0...(line_number - 1)].reduce(0) do |a, e|
+      a + e.length + "\n".length
+    end
+    Rubocop::Cop::Offence.new(severity,
+                              Parser::Source::Range.new(source_buffer,
+                                                        begin_pos,
+                                                        begin_pos + 1),
+                              message.capitalize,
+                              fake_cop_name)
   end
 
   def check_syntax(source)