rubocop 0.27.1 → 0.28.0

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

@@ -19,6 +19,14 @@ describe RuboCop::Cop::Style::LineEndConcatenation do
     expect(cop.offenses.size).to eq(1)
   end
 
+  it 'registers an offense for string concat with << and \ at line ends' do
+    inspect_source(cop,
+                   ['top = "test " \\',
+                    '"foo" <<',
+                    '"bar"'])
+    expect(cop.offenses.size).to eq(1)
+  end
+
   it 'registers an offense for dynamic string concat at line end' do
     inspect_source(cop,
                    ['top = "test#{x}" +',

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

@@ -188,6 +188,27 @@ describe RuboCop::Cop::Style::MultilineOperationIndentation do
       expect(cop.config_to_allow_offenses).to eq('EnforcedStyle' => 'indented')
     end
 
+    it 'registers an offense for misaligned string operand when the first ' \
+       'operand has backslash continuation' do
+      inspect_source(cop,
+                     ["flash[:error] = 'Here is a string ' \\",
+                      "                'That spans' <<",
+                      "  'multiple lines'"])
+      expect(cop.messages).to eq(['Align the operands of an expression in an ' \
+                                  'assignment spanning multiple lines.'])
+      expect(cop.highlights).to eq(["'multiple lines'"])
+    end
+
+    it 'registers an offense for misaligned string operand when plus is used' do
+      inspect_source(cop,
+                     ["flash[:error] = 'Here is a string ' +",
+                      "                'That spans' <<",
+                      "  'multiple lines'"])
+      expect(cop.messages).to eq(['Align the operands of an expression in an ' \
+                                  'assignment spanning multiple lines.'])
+      expect(cop.highlights).to eq(["'multiple lines'"])
+    end
+
     it 'registers an offense for misaligned operands in unless condition' do
       inspect_source(cop,
                      ['unless a',
@@ -198,7 +219,7 @@ describe RuboCop::Cop::Style::MultilineOperationIndentation do
                                   '`unless` statement spanning multiple ' \
                                   'lines.'])
       expect(cop.highlights).to eq(['.b'])
-      expect(cop.config_to_allow_offenses).to be_nil
+      expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
     end
 
     it 'registers an offense for misaligned operands in while condition' do
@@ -399,7 +420,19 @@ describe RuboCop::Cop::Style::MultilineOperationIndentation do
       expect(cop.messages).to be_empty
     end
 
-    it 'registers an offense for aligned operatiors in assignment' do
+    it 'registers an offense for correct + unrecognized style' do
+      inspect_source(cop,
+                     ['a ||',
+                      '  b',
+                      'c and',
+                      '    d'])
+      expect(cop.messages).to eq(['Use 2 (not 4) spaces for indenting an ' \
+                                  'expression spanning multiple lines.'])
+      expect(cop.highlights).to eq(%w(d))
+      expect(cop.config_to_allow_offenses).to eq('Enabled' => false)
+    end
+
+    it 'registers an offense for aligned operators in assignment' do
       inspect_source(cop,
                      ['formatted_int = int_part',
                       '                .abs',

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

@@ -55,7 +55,7 @@ describe RuboCop::Cop::Style::NegatedIf do
     expect(cop.offenses).to be_empty
   end
 
-  it 'accepts an if where only part of the contition is negated' do
+  it 'accepts an if where only part of the condition is negated' do
     inspect_source(cop,
                    ['if !condition && another_condition',
                     '  some_method',

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

@@ -38,7 +38,7 @@ describe RuboCop::Cop::Style::NegatedWhile do
     expect(cop.offenses.map(&:line)).to eq([1, 4])
   end
 
-  it 'accepts an while where only part of the contition is negated' do
+  it 'accepts an while where only part of the condition is negated' do
     inspect_source(cop,
                    ['while !a_condition && another_condition',
                     '  some_method',
@@ -51,8 +51,10 @@ describe RuboCop::Cop::Style::NegatedWhile do
   end
 
   it 'autocorrects by replacing while not with until' do
-    corrected = autocorrect_source(cop, 'something while !x.even?')
-    expect(corrected).to eq 'something until x.even?'
+    corrected = autocorrect_source(cop, ['something while !x.even?',
+                                         'something while(!x.even?)'])
+    expect(corrected).to eq ['something until x.even?',
+                             'something until(x.even?)'].join("\n")
   end
 
   it 'autocorrects by replacing until not with while' do

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

@@ -63,7 +63,7 @@ describe RuboCop::Cop::Style::PercentQLiterals, :config do
       end
 
       it 'accepts %q' do
-        # This is most probably a mistake, but not this cop's responisibility.
+        # This is most probably a mistake, but not this cop's responsibility.
         inspect_source(cop, ['%q(#{1 + 2})'])
         expect(cop.offenses).to be_empty
       end

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

@@ -14,4 +14,9 @@ describe RuboCop::Cop::Style::PerlBackrefs do
     new_source = autocorrect_source(cop, '$1')
     expect(new_source).to eq('Regexp.last_match[1]')
   end
+
+  it 'auto-corrects #$1 to #{Regexp.last_match[1]}' do
+    new_source = autocorrect_source(cop, '"#$1"')
+    expect(new_source).to eq('"#{Regexp.last_match[1]}"')
+  end
 end

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

@@ -231,7 +231,6 @@ describe RuboCop::Cop::Style::SignalException, :config do
                                 '  raise',
                                 'end'].join("\n"))
     end
-
   end
 
   context 'when enforced style is `fail`' do

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

@@ -11,7 +11,7 @@ describe RuboCop::Cop::Style::SingleLineBlockParams, :config do
     }
   end
 
-  it 'find wrong argument names in calls with different syntax' do
+  it 'finds wrong argument names in calls with different syntax' do
     inspect_source(cop,
                    ['def m',
                     '  [0, 1].reduce { |c, d| c + d }',
@@ -42,6 +42,18 @@ describe RuboCop::Cop::Style::SingleLineBlockParams, :config do
     expect(cop.offenses).to be_empty
   end
 
+  it 'allows an unused parameter to have a leading underscore' do
+    inspect_source(cop,
+                   ['File.foreach(filename).reduce(0) { |a, _e| a + 1 }'])
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'finds incorrectly named parameters with leading underscores' do
+    inspect_source(cop,
+                   ['File.foreach(filename).reduce(0) { |_x, _y| }'])
+    expect(cop.messages).to eq(['Name `reduce` block params `|a, e|`.'])
+  end
+
   it 'ignores do..end blocks' do
     inspect_source(cop,
                    ['def m',

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

@@ -54,4 +54,9 @@ describe RuboCop::Cop::Style::SpecialGlobalVars do
     new_source = autocorrect_source(cop, '$/')
     expect(new_source).to eq('$INPUT_RECORD_SEPARATOR')
   end
+
+  it 'auto-corrects #$: to #{$LOAD_PATH}' do
+    new_source = autocorrect_source(cop, '"#$:"')
+    expect(new_source).to eq('"#{$LOAD_PATH}"')
+  end
 end

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

@@ -39,6 +39,11 @@ describe RuboCop::Cop::Style::StringLiterals, :config do
       expect(cop.offenses).to be_empty
     end
 
+    it 'accepts single quotes in interpolation' do
+      inspect_source(cop, [%q("hello#{hash['there']}")])
+      expect(cop.offenses).to be_empty
+    end
+
     it 'accepts %q and %Q quotes' do
       inspect_source(cop, ['a = %q(x) + %Q[x]'])
       expect(cop.offenses).to be_empty
@@ -95,7 +100,7 @@ describe RuboCop::Cop::Style::StringLiterals, :config do
       expect(cop.offenses).to be_empty
     end
 
-    it 'accepts double quotes within embedded expression' do
+    it 'accepts double quotes in interpolation' do
       src = ['"#{"A"}"']
       inspect_source(cop, src)
       expect(cop.offenses).to be_empty
@@ -157,6 +162,11 @@ describe RuboCop::Cop::Style::StringLiterals, :config do
       expect(cop.offenses).to be_empty
     end
 
+    it 'accepts single quotes in interpolation' do
+      inspect_source(cop, [%q("hello#{hash['there']}")])
+      expect(cop.offenses).to be_empty
+    end
+
     it 'accepts %q and %Q quotes' do
       inspect_source(cop, ['a = %q(x) + %Q[x]'])
       expect(cop.offenses).to be_empty

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

@@ -7,7 +7,8 @@ describe RuboCop::Cop::Style::SymbolProc, :config do
 
   let(:cop_config) { { 'IgnoredMethods' => %w(respond_to) } }
 
-  it 'registers an offense for a block with paratermess method call on param' do
+  it 'registers an offense for a block with parameterless method call on ' \
+     'param' do
     inspect_source(cop, 'coll.map { |e| e.upcase }')
     expect(cop.offenses.size).to eq(1)
     expect(cop.messages)
@@ -39,6 +40,18 @@ describe RuboCop::Cop::Style::SymbolProc, :config do
     expect(cop.offenses).to be_empty
   end
 
+  it 'accepts proc with 1 argument' do
+    inspect_source(cop, ['proc { |x| x.method }'])
+
+    expect(cop.offenses).to be_empty
+  end
+
+  it 'accepts Proc.new with 1 argument' do
+    inspect_source(cop, ['Proc.new { |x| x.method }'])
+
+    expect(cop.offenses).to be_empty
+  end
+
   it 'accepts ignored method' do
     inspect_source(cop, ['respond_to { |format| format.xml }'])
 
@@ -74,6 +87,12 @@ describe RuboCop::Cop::Style::SymbolProc, :config do
     expect(corrected).to eq 'coll.map(&:upcase)'
   end
 
+  it 'autocorrects multiple aliases with symbols as proc' do
+    corrected = autocorrect_source(cop, ['coll.map { |s| s.upcase }' \
+                                         '.map { |s| s.downcase }'])
+    expect(corrected).to eq 'coll.map(&:upcase).map(&:downcase)'
+  end
+
   it 'does not crash with a bare method call' do
     run = -> { inspect_source(cop, ['coll.map { |s| bare_method }']) }
     expect(&run).not_to raise_error

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

@@ -10,12 +10,12 @@ describe RuboCop::Cop::Style::Tab do
     expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for a line indented with multiple tabs' do
+  it 'registers an offense for a line indented with multiple tabs' do
     inspect_source(cop, ["\t\t\tx = 0"])
     expect(cop.offenses.size).to eq(1)
   end
 
-  it 'registers an offence for a line indented with mixed whitespace' do
+  it 'registers an offense for a line indented with mixed whitespace' do
     inspect_source(cop, [" \tx = 0"])
     expect(cop.offenses.size).to eq(1)
   end

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

@@ -316,7 +316,7 @@ describe RuboCop::Cop::Style::TrailingComma, :config do
 
       # this is a sad parse error
       it 'accepts no trailing comma in a method call with a block' \
-         ' paramter at the end' do
+         ' parameter at the end' do
         inspect_source(cop, ['some_method(',
                              '              a,',
                              '              b,',

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

@@ -93,4 +93,9 @@ describe RuboCop::Cop::Style::UnneededCapitalW do
     new_source = autocorrect_source(cop, '%W(one two three)')
     expect(new_source).to eq('%w(one two three)')
   end
+
+  it 'auto-corrects an array of words with different bracket' do
+    new_source = autocorrect_source(cop, '%W[one two three]')
+    expect(new_source).to eq('%w[one two three]')
+  end
 end

data/spec/rubocop/cop/team_spec.rb

@@ -115,7 +115,7 @@ describe RuboCop::Cop::Team do
         [RuboCop::Cop::Lint::Void, RuboCop::Cop::Metrics::LineLength]
       end
 
-      it 'returns only intances of the classes' do
+      it 'returns only instances of the classes' do
         expect(cops.size).to eq(2)
         cops.sort! { |a, b| a.name <=> b.name }
         expect(cops[0].name).to eq('Lint/Void')
@@ -137,7 +137,7 @@ describe RuboCop::Cop::Team do
       end
       let(:cop_names) { cops.map(&:name) }
 
-      it 'does not return intances of the classes' do
+      it 'does not return instances of the classes' do
         expect(cops).not_to be_empty
         expect(cop_names).not_to include('Lint/Void')
         expect(cop_names).not_to include('Metrics/LineLength')

data/spec/rubocop/formatter/offense_count_formatter_spec.rb

@@ -70,7 +70,6 @@ module RuboCop
           end
         end
       end
-
     end
   end
 end

data/spec/rubocop/options_spec.rb

@@ -37,6 +37,8 @@ describe RuboCop::Options, :isolated_environment do
         expected_help = <<-END
 Usage: rubocop [options] [file1, file2, ...]
         --only [COP1,COP2,...]       Run only the given cop(s).
+        --only-guide-cops            Run only cops for rules that link to a
+                                     style guide.
     -c, --config FILE                Specify configuration file.
         --auto-gen-config            Generate a configuration file acting as a
                                      TODO list.

data/spec/rubocop/target_finder_spec.rb

@@ -109,7 +109,7 @@ describe RuboCop::TargetFinder, :isolated_environment do
       end
 
       context 'normally' do
-        it 'does not exludes them' do
+        it 'does not exclude them' do
           expect(found_basenames)
             .to eq(['ruby1.rb', 'ruby2.rb', 'executable', 'ruby3.rb'])
         end
@@ -118,13 +118,30 @@ describe RuboCop::TargetFinder, :isolated_environment do
       context "when it's forced to adhere file exclusion configuration" do
         let(:force_exclusion) { true }
 
-        it 'exludes them' do
+        it 'excludes them' do
           expect(found_basenames).to eq(['ruby2.rb'])
         end
       end
     end
   end
 
+  describe '#find_files' do
+    let(:found_files) { target_finder.find_files(base_dir, flags) }
+    let(:found_basenames) { found_files.map { |f| File.basename(f) } }
+    let(:base_dir) { Dir.pwd }
+    let(:flags) { 0 }
+
+    it 'does not search excluded top level directories' do
+      config = double('config')
+      exclude_property = { 'Exclude' => [File.expand_path('dir1/**/*')] }
+      allow(config).to receive(:[]).with('AllCops').and_return(exclude_property)
+      allow(config_store).to receive(:for).and_return(config)
+
+      expect(found_basenames).not_to include('ruby1.rb')
+      expect(found_basenames).to include('ruby3.rb')
+    end
+  end
+
   describe '#target_files_in_dir' do
     let(:found_files) { target_finder.target_files_in_dir(base_dir) }
     let(:found_basenames) { found_files.map { |f| File.basename(f) } }
@@ -157,6 +174,8 @@ describe RuboCop::TargetFinder, :isolated_environment do
       allow(config).to receive(:file_to_include?) do |file|
         File.basename(file) == 'file'
       end
+      allow(config)
+        .to receive(:[]).with('AllCops').and_return('Exclude' => [])
       allow(config).to receive(:file_to_exclude?).and_return(false)
       allow(config_store).to receive(:for).and_return(config)
 
@@ -165,6 +184,8 @@ describe RuboCop::TargetFinder, :isolated_environment do
 
     it 'does not pick files specified to be excluded in config' do
       config = double('config').as_null_object
+      allow(config)
+        .to receive(:[]).with('AllCops').and_return('Exclude' => [])
       allow(config).to receive(:file_to_include?).and_return(false)
       allow(config).to receive(:file_to_exclude?) do |file|
         File.basename(file) == 'ruby2.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.27.1
+  version: 0.28.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-08 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -324,9 +324,11 @@ files:
 - lib/rubocop/cop/style/double_negation.rb
 - lib/rubocop/cop/style/each_with_object.rb
 - lib/rubocop/cop/style/else_alignment.rb
+- lib/rubocop/cop/style/empty_else.rb
 - lib/rubocop/cop/style/empty_line_between_defs.rb
 - lib/rubocop/cop/style/empty_lines.rb
 - lib/rubocop/cop/style/empty_lines_around_access_modifier.rb
+- lib/rubocop/cop/style/empty_lines_around_block_body.rb
 - lib/rubocop/cop/style/empty_lines_around_class_body.rb
 - lib/rubocop/cop/style/empty_lines_around_method_body.rb
 - lib/rubocop/cop/style/empty_lines_around_module_body.rb
@@ -335,6 +337,7 @@ files:
 - lib/rubocop/cop/style/end_block.rb
 - lib/rubocop/cop/style/end_of_line.rb
 - lib/rubocop/cop/style/even_odd.rb
+- lib/rubocop/cop/style/extra_spacing.rb
 - lib/rubocop/cop/style/file_name.rb
 - lib/rubocop/cop/style/flip_flop.rb
 - lib/rubocop/cop/style/for.rb
@@ -482,6 +485,7 @@ files:
 - relnotes/v0.26.1.md
 - relnotes/v0.27.0.md
 - relnotes/v0.27.1.md
+- relnotes/v0.28.0.md
 - rubocop.gemspec
 - spec/.rubocop.yml
 - spec/fixtures/html_formatter/expected.html
@@ -593,8 +597,10 @@ files:
 - spec/rubocop/cop/style/double_negation_spec.rb
 - spec/rubocop/cop/style/each_with_object_spec.rb
 - spec/rubocop/cop/style/else_alignment_spec.rb
+- spec/rubocop/cop/style/empty_else_spec.rb
 - spec/rubocop/cop/style/empty_line_between_defs_spec.rb
 - spec/rubocop/cop/style/empty_lines_around_access_modifier_spec.rb
+- spec/rubocop/cop/style/empty_lines_around_block_body_spec.rb
 - spec/rubocop/cop/style/empty_lines_around_class_body_spec.rb
 - spec/rubocop/cop/style/empty_lines_around_method_body_spec.rb
 - spec/rubocop/cop/style/empty_lines_around_module_body_spec.rb
@@ -604,6 +610,7 @@ files:
 - spec/rubocop/cop/style/end_block_spec.rb
 - spec/rubocop/cop/style/end_of_line_spec.rb
 - spec/rubocop/cop/style/even_odd_spec.rb
+- spec/rubocop/cop/style/extra_spacing_spec.rb
 - spec/rubocop/cop/style/file_name_spec.rb
 - spec/rubocop/cop/style/flip_flop_spec.rb
 - spec/rubocop/cop/style/for_spec.rb
@@ -872,8 +879,10 @@ test_files:
 - spec/rubocop/cop/style/double_negation_spec.rb
 - spec/rubocop/cop/style/each_with_object_spec.rb
 - spec/rubocop/cop/style/else_alignment_spec.rb
+- spec/rubocop/cop/style/empty_else_spec.rb
 - spec/rubocop/cop/style/empty_line_between_defs_spec.rb
 - spec/rubocop/cop/style/empty_lines_around_access_modifier_spec.rb
+- spec/rubocop/cop/style/empty_lines_around_block_body_spec.rb
 - spec/rubocop/cop/style/empty_lines_around_class_body_spec.rb
 - spec/rubocop/cop/style/empty_lines_around_method_body_spec.rb
 - spec/rubocop/cop/style/empty_lines_around_module_body_spec.rb
@@ -883,6 +892,7 @@ test_files:
 - spec/rubocop/cop/style/end_block_spec.rb
 - spec/rubocop/cop/style/end_of_line_spec.rb
 - spec/rubocop/cop/style/even_odd_spec.rb
+- spec/rubocop/cop/style/extra_spacing_spec.rb
 - spec/rubocop/cop/style/file_name_spec.rb
 - spec/rubocop/cop/style/flip_flop_spec.rb
 - spec/rubocop/cop/style/for_spec.rb