rubocop 0.14.1 → 0.15.0

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

@@ -52,4 +52,19 @@ describe Rubocop::Cop::Style::SpaceAfterMethodName do
                     'end'])
     expect(cop.offences).to be_empty
   end
+
+  it 'auto-corrects unwanted space' do
+    new_source = autocorrect_source(cop, ['def func (x)',
+                                          '  a',
+                                          'end',
+                                          'def self.func (x)',
+                                          '  a',
+                                          'end'])
+    expect(new_source).to eq(['def func(x)',
+                              '  a',
+                              'end',
+                              'def self.func(x)',
+                              '  a',
+                              'end'].join("\n"))
+  end
 end

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

@@ -15,4 +15,9 @@ describe Rubocop::Cop::Style::SpaceAfterSemicolon do
     inspect_source(cop, ['x = 1;'])
     expect(cop.messages).to be_empty
   end
+
+  it 'auto-corrects missing space' do
+    new_source = autocorrect_source(cop, 'x = 1;y = 2')
+    expect(new_source).to eq('x = 1; y = 2')
+  end
 end

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

@@ -11,6 +11,44 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces, :config do
     }
   end
 
+  context 'with space inside empty braces not allowed' do
+    let(:cop_config) { { 'EnforcedStyleForEmptyBraces' => 'no_space' } }
+
+    it 'accepts empty braces with no space inside' do
+      inspect_source(cop, ['each {}'])
+      expect(cop.messages).to be_empty
+    end
+
+    it 'registers an offence for empty braces with space inside' do
+      inspect_source(cop, ['each { }'])
+      expect(cop.messages).to eq(['Space inside empty braces detected.'])
+    end
+
+    it 'auto-corrects unwanted space' do
+      new_source = autocorrect_source(cop, 'each { }')
+      expect(new_source).to eq('each {}')
+    end
+  end
+
+  context 'with space inside empty braces allowed' do
+    let(:cop_config) { { 'EnforcedStyleForEmptyBraces' => 'space' } }
+
+    it 'accepts empty braces with space inside' do
+      inspect_source(cop, ['each { }'])
+      expect(cop.messages).to be_empty
+    end
+
+    it 'registers an offence for empty braces with no space inside' do
+      inspect_source(cop, ['each {}'])
+      expect(cop.messages).to eq(['Space missing inside empty braces.'])
+    end
+
+    it 'auto-corrects missing space' do
+      new_source = autocorrect_source(cop, 'each {}')
+      expect(new_source).to eq('each { }')
+    end
+  end
+
   it 'accepts braces surrounded by spaces' do
     inspect_source(cop, ['each { puts }'])
     expect(cop.messages).to be_empty
@@ -35,6 +73,11 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces, :config do
     expect(cop.highlights).to eq(['}'])
   end
 
+  it 'auto-corrects missing space' do
+    new_source = autocorrect_source(cop, 'each { puts}')
+    expect(new_source).to eq('each { puts }')
+  end
+
   context 'with passed in parameters' do
     it 'accepts left brace with inner space' do
       inspect_source(cop, ['each { |x| puts }'])
@@ -48,6 +91,11 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces, :config do
       expect(cop.highlights).to eq(['{'])
     end
 
+    it 'auto-corrects missing space' do
+      new_source = autocorrect_source(cop, 'each{|x| puts }')
+      expect(new_source).to eq('each { |x| puts }')
+    end
+
     context 'and space before block parameters not allowed' do
       let(:cop_config) do
         {
@@ -62,6 +110,11 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces, :config do
         expect(cop.highlights).to eq([' '])
       end
 
+      it 'auto-corrects unwanted space' do
+        new_source = autocorrect_source(cop, 'each { |x| puts }')
+        expect(new_source).to eq('each {|x| puts }')
+      end
+
       it 'accepts left brace without inner space' do
         inspect_source(cop, ['each {|x| puts }'])
         expect(cop.messages).to be_empty
@@ -102,6 +155,11 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces, :config do
       expect(cop.highlights).to eq(['{'])
     end
 
+    it 'auto-corrects missing space' do
+      new_source = autocorrect_source(cop, 'each{ puts }')
+      expect(new_source).to eq('each {puts}')
+    end
+
     context 'with passed in parameters' do
       context 'and space before block parameters allowed' do
         it 'accepts left brace with inner space' do
@@ -115,6 +173,11 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces, :config do
           expect(cop.messages).to eq(['Space between { and | missing.'])
           expect(cop.highlights).to eq(['{'])
         end
+
+        it 'auto-corrects missing space' do
+          new_source = autocorrect_source(cop, 'each {|x| puts}')
+          expect(new_source).to eq('each { |x| puts}')
+        end
       end
 
       context 'and space before block parameters not allowed' do
@@ -130,6 +193,11 @@ describe Rubocop::Cop::Style::SpaceAroundBlockBraces, :config do
           expect(cop.messages).to eq(['Space between { and | detected.'])
           expect(cop.highlights).to eq([' '])
         end
+
+        it 'auto-corrects unwanted space' do
+          new_source = autocorrect_source(cop, 'each { |x| puts}')
+          expect(new_source).to eq('each {|x| puts}')
+        end
       end
     end
   end

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

@@ -25,4 +25,9 @@ describe Rubocop::Cop::Style::SpaceAroundEqualsInParameterDefault do
     inspect_source(cop, ['def f(x, y = 0, z = {})', 'end'])
     expect(cop.messages).to be_empty
   end
+
+  it 'auto-corrects missing space' do
+    new_source = autocorrect_source(cop, ['def f(x, y=0, z=1)', 'end'])
+    expect(new_source).to eq(['def f(x, y = 0, z = 1)', 'end'].join("\n"))
+  end
 end

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

@@ -11,6 +11,11 @@ describe Rubocop::Cop::Style::SpaceAroundOperators do
       ["Surrounding space missing for operator '='."] * 3)
   end
 
+  it 'auto-corrects assignment without space on both sides' do
+    new_source = autocorrect_source(cop, ['x=0', 'y= 0', 'z =0'])
+    expect(new_source).to eq(['x = 0', 'y = 0', 'z = 0'].join("\n"))
+  end
+
   it 'registers an offence for ternary operator without space' do
     inspect_source(cop, ['x == 0?1:2'])
     expect(cop.messages).to eq(
@@ -18,6 +23,11 @@ describe Rubocop::Cop::Style::SpaceAroundOperators do
        "Surrounding space missing for operator ':'."])
   end
 
+  it 'auto-corrects a ternary operator without space' do
+    new_source = autocorrect_source(cop, 'x == 0?1:2')
+    expect(new_source).to eq('x == 0 ? 1 : 2')
+  end
+
   it 'registers an offence in presence of modifier if statement' do
     check_modifier('if')
   end
@@ -41,6 +51,10 @@ describe Rubocop::Cop::Style::SpaceAroundOperators do
     expect(cop.offences.map(&:line)).to eq([1, 2])
     expect(cop.messages).to eq(
       ["Surrounding space missing for operator '='."] * 2)
+
+    new_source = autocorrect_source(cop, src)
+    expect(new_source)
+      .to eq(src.map { |line| line.sub(/=/, ' = ') }.join("\n"))
   end
 
   it 'registers an offence for binary operators that could be unary' do
@@ -51,12 +65,27 @@ describe Rubocop::Cop::Style::SpaceAroundOperators do
        "Surrounding space missing for operator '+'."])
   end
 
+  it 'auto-corrects missing space in binary operators that could be unary' do
+    new_source = autocorrect_source(cop, ['a-3', 'x&0xff', 'z+0'])
+    expect(new_source).to eq(['a - 3', 'x & 0xff', 'z + 0'].join("\n"))
+  end
+
   it 'registers an offence for arguments to a method' do
     inspect_source(cop, ['puts 1+2'])
     expect(cop.messages).to eq(
       ["Surrounding space missing for operator '+'."])
   end
 
+  it 'auto-corrects missing space in arguments to a method' do
+    new_source = autocorrect_source(cop, 'puts 1+2')
+    expect(new_source).to eq('puts 1 + 2')
+  end
+
+  it 'accepts operator surrounded by tabs' do
+    inspect_source(cop, ["a\t+\tb"])
+    expect(cop.messages).to be_empty
+  end
+
   it 'accepts operator symbols' do
     inspect_source(cop, ['func(:-)'])
     expect(cop.messages).to be_empty
@@ -156,6 +185,13 @@ describe Rubocop::Cop::Style::SpaceAroundOperators do
               "Surrounding space missing for operator '&&'."])
   end
 
+  it 'auto-corrects missing space' do
+    new_source = autocorrect_source(cop, ['x+= a+b-c*d/e%f^g|h&i||j',
+                                          'y -=k&&l'])
+    expect(new_source).to eq(['x += a + b - c * d / e % f ^ g | h & i || j',
+                              'y -= k && l'].join("\n"))
+  end
+
   it 'accepts operators with spaces' do
     inspect_source(cop,
                    ['x += a + b - c * d / e % f ^ g | h & i || j',
@@ -181,6 +217,13 @@ describe Rubocop::Cop::Style::SpaceAroundOperators do
       ['Space around operator ** detected.'])
   end
 
+  it 'auto-corrects unwanted space around **' do
+    new_source = autocorrect_source(cop, ['x = a * b ** 2',
+                                          'y = a * b** 2'])
+    expect(new_source).to eq(['x = a * b**2',
+                              'y = a * b**2'].join("\n"))
+  end
+
   it 'accepts exponent operator without spaces' do
     inspect_source(cop, ['x = a * b**2'])
     expect(cop.offences).to be_empty

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

@@ -44,4 +44,27 @@ describe Rubocop::Cop::Style::SpaceBeforeModifierKeyword do
     inspect_source(cop, 'a ? b : c')
     expect(cop.offences).to be_empty
   end
+
+  it 'auto-corrects missing space' do
+    new_source = autocorrect_source(cop, ['(a = 3)if a == 2',
+                                          'a = "test"if a == 2',
+                                          'a = 42unless a == 2',
+                                          'a = [1,2,3]unless a == 2',
+                                          'a = {:a => "b"}if a == 2',
+                                          '(a = 3)while b',
+                                          'a = "test"until b',
+                                          'a = 42while b',
+                                          'a = [1,2,3]until b',
+                                          'a = {:a => "b"}while b'])
+    expect(new_source).to eq(['(a = 3) if a == 2',
+                              'a = "test" if a == 2',
+                              'a = 42 unless a == 2',
+                              'a = [1,2,3] unless a == 2',
+                              'a = {:a => "b"} if a == 2',
+                              '(a = 3) while b',
+                              'a = "test" until b',
+                              'a = 42 while b',
+                              'a = [1,2,3] until b',
+                              'a = {:a => "b"} while b'].join("\n"))
+  end
 end

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

@@ -42,4 +42,11 @@ describe Rubocop::Cop::Style::SpaceInsideBrackets do
     expect(cop.messages).to eq(
       ['Space inside square brackets detected.'])
   end
+
+  it 'auto-corrects unwanted space' do
+    new_source = autocorrect_source(cop, ['a = [1, 2 ]',
+                                          'b = [ 1, 2]'])
+    expect(new_source).to eq(['a = [1, 2]',
+                              'b = [1, 2]'].join("\n"))
+  end
 end

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

@@ -4,26 +4,83 @@ require 'spec_helper'
 
 describe Rubocop::Cop::Style::SpaceInsideHashLiteralBraces, :config do
   subject(:cop) { described_class.new(config) }
-  let(:cop_config) { { 'EnforcedStyleIsWithSpaces' => true } }
+  let(:cop_config) { { 'EnforcedStyle' => 'space' } }
+
+  context 'with space inside empty braces not allowed' do
+    let(:cop_config) { { 'EnforcedStyleForEmptyBraces' => 'no_space' } }
+
+    it 'accepts empty braces with no space inside' do
+      inspect_source(cop, ['h = {}'])
+      expect(cop.messages).to be_empty
+    end
+
+    it 'registers an offence for empty braces with space inside' do
+      inspect_source(cop, ['h = { }'])
+      expect(cop.messages)
+        .to eq(['Space inside empty hash literal braces detected.'])
+      expect(cop.highlights).to eq([' '])
+    end
+
+    it 'auto-corrects unwanted space' do
+      new_source = autocorrect_source(cop, 'h = { }')
+      expect(new_source).to eq('h = {}')
+    end
+  end
+
+  context 'with space inside empty braces allowed' do
+    let(:cop_config) { { 'EnforcedStyleForEmptyBraces' => 'space' } }
+
+    it 'accepts empty braces with space inside' do
+      inspect_source(cop, ['h = { }'])
+      expect(cop.messages).to be_empty
+    end
+
+    it 'registers an offence for empty braces with no space inside' do
+      inspect_source(cop, ['h = {}'])
+      expect(cop.messages)
+        .to eq(['Space inside empty hash literal braces missing.'])
+      expect(cop.highlights).to eq(['{'])
+    end
+
+    it 'auto-corrects missing space' do
+      new_source = autocorrect_source(cop, 'h = {}')
+      expect(new_source).to eq('h = { }')
+    end
+  end
 
   it 'registers an offence for hashes with no spaces if so configured' do
     inspect_source(cop,
                    ['h = {a: 1, b: 2}',
                     'h = {a => 1 }'])
-    expect(cop.messages).to eq(
-      ['Space inside hash literal braces missing.'] * 3)
+    expect(cop.messages).to eq(['Space inside { missing.',
+                                'Space inside } missing.',
+                                'Space inside { missing.'])
     expect(cop.highlights).to eq(['{', '}', '{'])
   end
 
-  context 'when EnforcedStyleIsWithSpaces is disabled' do
-    let(:cop_config) { { 'EnforcedStyleIsWithSpaces' => false } }
+  it 'auto-corrects missing space' do
+    new_source = autocorrect_source(cop, ['h = {a: 1, b: 2}',
+                                          'h = {a => 1 }'])
+    expect(new_source).to eq(['h = { a: 1, b: 2 }',
+                              'h = { a => 1 }'].join("\n"))
+  end
+
+  context 'when EnforcedStyle is no_space' do
+    let(:cop_config) { { 'EnforcedStyle' => 'no_space' } }
 
     it 'registers an offence for hashes with spaces' do
       inspect_source(cop,
                      ['h = { a: 1, b: 2 }'])
-      expect(cop.messages).to eq(
-        ['Space inside hash literal braces detected.'] * 2)
-      expect(cop.highlights).to eq(['{', '}'])
+      expect(cop.messages).to eq(['Space inside { detected.',
+                                  'Space inside } detected.'])
+      expect(cop.highlights).to eq([' ', ' '])
+    end
+
+    it 'auto-corrects unwanted space' do
+      new_source = autocorrect_source(cop, ['h = { a: 1, b: 2 }',
+                                            'h = {a => 1 }'])
+      expect(new_source).to eq(['h = {a: 1, b: 2}',
+                                'h = {a => 1}'].join("\n"))
     end
 
     it 'accepts hashes with no spaces' do
@@ -41,11 +98,6 @@ describe Rubocop::Cop::Style::SpaceInsideHashLiteralBraces, :config do
                       '}'])
       expect(cop.offences).to be_empty
     end
-
-    it 'accepts empty hashes without spaces' do
-      inspect_source(cop, ['h = {}'])
-      expect(cop.offences).to be_empty
-    end
   end
 
   it 'accepts hashes with spaces by default' do
@@ -55,16 +107,6 @@ describe Rubocop::Cop::Style::SpaceInsideHashLiteralBraces, :config do
     expect(cop.offences).to be_empty
   end
 
-  it 'accepts empty hashes without spaces by default' do
-    inspect_source(cop, ['h = {}'])
-    expect(cop.offences).to be_empty
-  end
-
-  it 'accepts empty hashes without spaces even if configured true' do
-    inspect_source(cop, ['h = {}'])
-    expect(cop.offences).to be_empty
-  end
-
   it 'accepts hash literals with no braces' do
     inspect_source(cop, ['x(a: b.c)'])
     expect(cop.offences).to be_empty

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

@@ -24,4 +24,11 @@ describe Rubocop::Cop::Style::SpaceInsideParens do
     inspect_source(cop, ['split("\n")'])
     expect(cop.messages).to be_empty
   end
+
+  it 'auto-corrects unwanted space' do
+    new_source = autocorrect_source(cop, ['f( 3)',
+                                          'g(3 )'])
+    expect(new_source).to eq(['f(3)',
+                              'g(3)'].join("\n"))
+  end
 end

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

@@ -30,8 +30,13 @@ describe Rubocop::Cop::Style::SpecialGlobalVars do
     inspect_source(cop, ['puts $$'])
     expect(cop.offences.size).to eq(1)
     expect(cop.messages)
-      .to eq(['Prefer $PID or $PROCESS_ID from English library' +
-        ' over $$.'])
+      .to eq(['Prefer $PROCESS_ID or $PID from the English library over $$.'])
+  end
+
+  it 'is clear about variables from the English library vs those not' do
+    inspect_source(cop, ['puts $*'])
+    expect(cop.messages)
+      .to eq(['Prefer $ARGV from the English library, or ARGV over $*.'])
   end
 
   it 'does not register an offence for backrefs like $1' do
@@ -43,4 +48,9 @@ describe Rubocop::Cop::Style::SpecialGlobalVars do
     new_source = autocorrect_source(cop, '$:')
     expect(new_source).to eq('$LOAD_PATH')
   end
+
+  it 'auto-corrects $/ to $INPUT_RECORD_SEPARATOR' do
+    new_source = autocorrect_source(cop, '$/')
+    expect(new_source).to eq('$INPUT_RECORD_SEPARATOR')
+  end
 end

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

@@ -84,6 +84,12 @@ describe Rubocop::Cop::Style::StringLiterals, :config do
       expect(cop.offences).to be_empty
     end
 
+    it 'can handle character literals' do
+      src = 'a = ?/'
+      inspect_source(cop, src)
+      expect(cop.offences).to be_empty
+    end
+
     it 'auto-corrects " with \'' do
       new_source = autocorrect_source(cop, 's = "abc"')
       expect(new_source).to eq("s = 'abc'")