rubocop 0.25.0 → 0.26.0

data/spec/rubocop/config_loader_spec.rb

@@ -187,21 +187,25 @@ describe RuboCop::ConfigLoader do
 
       it 'returns the ancestor configuration plus local overrides' do
         config =
-          default_config
-          .merge('Metrics/LineLength' => {
-                   'Description' =>
-                   default_config['Metrics/LineLength']['Description'],
-                   'Enabled' => true,
-                   'Max' => 77,
-                   'AllowURI' => true
-                 },
-                 'Metrics/MethodLength' => {
-                   'Description' =>
-                   default_config['Metrics/MethodLength']['Description'],
-                   'Enabled' => true,
-                   'CountComments' => false,
-                   'Max' => 5
-                 })
+          default_config.merge(
+            'Metrics/LineLength' => {
+              'Description' =>
+              default_config['Metrics/LineLength']['Description'],
+              'StyleGuide' =>
+              'https://github.com/bbatsov/ruby-style-guide#80-character-limits',
+              'Enabled' => true,
+              'Max' => 77,
+              'AllowURI' => true
+            },
+            'Metrics/MethodLength' => {
+              'Description' =>
+              default_config['Metrics/MethodLength']['Description'],
+              'StyleGuide' =>
+              'https://github.com/bbatsov/ruby-style-guide#short-methods',
+              'Enabled' => true,
+              'CountComments' => false,
+              'Max' => 5
+            })
         expect(configuration_from_file).to eq(config)
       end
     end

data/spec/rubocop/cop/commissioner_spec.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-# rubocop:disable Metrics/LineLength
 
 require 'spec_helper'
 
@@ -44,7 +43,8 @@ describe RuboCop::Cop::Commissioner do
       commissioner.investigate(processed_source)
     end
 
-    it 'passes the input params to all cops/forces that implement their own #investigate method' do
+    it 'passes the input params to all cops/forces that implement their own' \
+       ' #investigate method' do
       source = []
       processed_source = parse_source(source)
       expect(cop).to receive(:investigate).with(processed_source)

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

@@ -1,5 +1,4 @@
 # encoding: utf-8
-# rubocop:disable Metrics/LineLength
 
 require 'spec_helper'
 
@@ -82,7 +81,8 @@ describe RuboCop::Cop::Lint::BlockAlignment do
                       '    end'
                      ])
       expect(cop.messages)
-        .to eq(['`end` at 2, 4 is not aligned with `a = b = c = test do |ala|` at 1, 0'])
+        .to eq(['`end` at 2, 4 is not aligned with' \
+                ' `a = b = c = test do |ala|` at 1, 0'])
     end
 
     it 'accepts end aligned with the first variable' do
@@ -122,7 +122,8 @@ describe RuboCop::Cop::Lint::BlockAlignment do
                     '  end'
                    ])
     expect(cop.messages)
-      .to eq(['`end` at 2, 2 is not aligned with `variable = test do |ala|` at 1, 0'])
+      .to eq(['`end` at 2, 2 is not aligned with `variable = test do |ala|`' \
+              ' at 1, 0'])
   end
 
   context 'when the block is defined on the next line' do
@@ -144,8 +145,8 @@ describe RuboCop::Cop::Lint::BlockAlignment do
                       'end'
                      ])
       expect(cop.messages)
-        .to eq(['`end` at 4, 0 is not aligned with `a_long_method_that_dont_fit_on_the_line ' \
-                'do |v|` at 2, 2'])
+        .to eq(['`end` at 4, 0 is not aligned with' \
+                ' `a_long_method_that_dont_fit_on_the_line do |v|` at 2, 2'])
     end
 
     it 'auto-corrects alignment' do
@@ -169,41 +170,43 @@ describe RuboCop::Cop::Lint::BlockAlignment do
   context 'when the method part is a call chain that spans several lines' do
     # Example from issue 346 of bbatsov/rubocop on github:
     it 'accepts pretty alignment style' do
-      src = ['def foo(bar)',
-             '  bar.get_stuffs',
-             '      .reject do |stuff| ',
-             '        stuff.with_a_very_long_expression_that_doesnt_fit_the_line',
-             '      end.select do |stuff|',
-             '        stuff.another_very_long_expression_that_doesnt_fit_the_line',
-             '      end',
-             '      .select do |stuff|',
-             '        stuff.another_very_long_expression_that_doesnt_fit_the_line',
-             '      end',
-             'end']
+      src = [
+        'def foo(bar)',
+        '  bar.get_stuffs',
+        '      .reject do |stuff| ',
+        '        stuff.with_a_very_long_expression_that_doesnt_fit_the_line',
+        '      end.select do |stuff|',
+        '        stuff.another_very_long_expression_that_doesnt_fit_the_line',
+        '      end',
+        '      .select do |stuff|',
+        '        stuff.another_very_long_expression_that_doesnt_fit_the_line',
+        '      end',
+        'end']
       inspect_source(cop, src)
       expect(cop.offenses).to be_empty
     end
 
     it 'registers offenses for misaligned ends' do
-      src = ['def foo(bar)',
-             '  bar.get_stuffs',
-             '      .reject do |stuff|',
-             '        stuff.with_a_very_long_expression_that_doesnt_fit_the_line',
-             '        end.select do |stuff|',
-             '        stuff.another_very_long_expression_that_doesnt_fit_the_line',
-             '    end',
-             '      .select do |stuff|',
-             '        stuff.another_very_long_expression_that_doesnt_fit_the_line',
-             '        end',
-             'end']
+      src = [
+        'def foo(bar)',
+        '  bar.get_stuffs',
+        '      .reject do |stuff|',
+        '        stuff.with_a_very_long_expression_that_doesnt_fit_the_line',
+        '        end.select do |stuff|',
+        '        stuff.another_very_long_expression_that_doesnt_fit_the_line',
+        '    end',
+        '      .select do |stuff|',
+        '        stuff.another_very_long_expression_that_doesnt_fit_the_line',
+        '        end',
+        'end']
       inspect_source(cop, src)
       expect(cop.messages)
-        .to eq(['`end` at 5, 8 is not aligned with `bar.get_stuffs` at 2, 2 or' \
-                ' `.reject do |stuff|` at 3, 6',
-                '`end` at 7, 4 is not aligned with `bar.get_stuffs` at 2, 2 or' \
-                ' `end.select do |stuff|` at 5, 8',
-                '`end` at 10, 8 is not aligned with `bar.get_stuffs` at 2, 2 or' \
-                ' `.select do |stuff|` at 8, 6'])
+        .to eq(['`end` at 5, 8 is not aligned with `bar.get_stuffs` at 2, 2' \
+                ' or `.reject do |stuff|` at 3, 6',
+                '`end` at 7, 4 is not aligned with `bar.get_stuffs` at 2, 2' \
+                ' or `end.select do |stuff|` at 5, 8',
+                '`end` at 10, 8 is not aligned with `bar.get_stuffs` at 2, 2' \
+                ' or `.select do |stuff|` at 8, 6'])
     end
 
     # Example from issue 393 of bbatsov/rubocop on github:
@@ -242,17 +245,18 @@ describe RuboCop::Cop::Lint::BlockAlignment do
     end
 
     it 'auto-corrects misaligned ends with the start of the expression' do
-      src = ['def foo(bar)',
-             '  bar.get_stuffs',
-             '      .reject do |stuff|',
-             '        stuff.with_a_very_long_expression_that_doesnt_fit_the_line',
-             '        end.select do |stuff|',
-             '        stuff.another_very_long_expression_that_doesnt_fit_the_line',
-             '    end',
-             '      .select do |stuff|',
-             '        stuff.another_very_long_expression_that_doesnt_fit_the_line',
-             '        end',
-             'end']
+      src = [
+        'def foo(bar)',
+        '  bar.get_stuffs',
+        '      .reject do |stuff|',
+        '        stuff.with_a_very_long_expression_that_doesnt_fit_the_line',
+        '        end.select do |stuff|',
+        '        stuff.another_very_long_expression_that_doesnt_fit_the_line',
+        '    end',
+        '      .select do |stuff|',
+        '        stuff.another_very_long_expression_that_doesnt_fit_the_line',
+        '        end',
+        'end']
 
       aligned_src = [
         'def foo(bar)',
@@ -289,7 +293,8 @@ describe RuboCop::Cop::Lint::BlockAlignment do
              '    end']
       inspect_source(cop, src)
       expect(cop.messages)
-        .to eq(['`end` at 4, 4 is not aligned with `e,` at 1, 0 or `f = [5, 6].map do |i|` at 2, 0'])
+        .to eq(['`end` at 4, 4 is not aligned with `e,` at 1, 0 or' \
+                ' `f = [5, 6].map do |i|` at 2, 0'])
     end
 
     it 'can not auto-correct' do
@@ -311,13 +316,15 @@ describe RuboCop::Cop::Lint::BlockAlignment do
     expect(cop.offenses).to be_empty
   end
 
-  it 'registers an offense for mismatched block end with an instance variable' do
+  it 'registers an offense for mismatched block end with' \
+     ' an instance variable' do
     inspect_source(cop,
                    ['@variable = test do |ala|',
                     '  end'
                    ])
     expect(cop.messages)
-      .to eq(['`end` at 2, 2 is not aligned with `@variable = test do |ala|` at 1, 0'])
+      .to eq(['`end` at 2, 2 is not aligned with `@variable = test do |ala|`' \
+              ' at 1, 0'])
   end
 
   it 'accepts end aligned with a class variable' do
@@ -334,7 +341,8 @@ describe RuboCop::Cop::Lint::BlockAlignment do
                     '  end'
                    ])
     expect(cop.messages)
-      .to eq(['`end` at 2, 2 is not aligned with `@@variable = test do |ala|` at 1, 0'])
+      .to eq(['`end` at 2, 2 is not aligned with `@@variable = test do |ala|`' \
+              ' at 1, 0'])
   end
 
   it 'accepts end aligned with a global variable' do
@@ -351,7 +359,8 @@ describe RuboCop::Cop::Lint::BlockAlignment do
                     '  end'
                    ])
     expect(cop.messages)
-      .to eq(['`end` at 2, 2 is not aligned with `$variable = test do |ala|` at 1, 0'])
+      .to eq(['`end` at 2, 2 is not aligned with `$variable = test do |ala|`' \
+              ' at 1, 0'])
   end
 
   it 'accepts end aligned with a constant' do
@@ -368,7 +377,8 @@ describe RuboCop::Cop::Lint::BlockAlignment do
                     '  end'
                    ])
     expect(cop.messages)
-      .to eq(['`end` at 2, 2 is not aligned with `Module::CONSTANT = test do |ala|` at 1, 0'])
+      .to eq(['`end` at 2, 2 is not aligned with' \
+              ' `Module::CONSTANT = test do |ala|` at 1, 0'])
   end
 
   it 'accepts end aligned with a method call' do
@@ -387,7 +397,8 @@ describe RuboCop::Cop::Lint::BlockAlignment do
                     '  end'
                    ])
     expect(cop.messages)
-      .to eq(['`end` at 3, 2 is not aligned with `parser.childs << lambda do |token|` at 1, 0'])
+      .to eq(['`end` at 3, 2 is not aligned with' \
+              ' `parser.childs << lambda do |token|` at 1, 0'])
   end
 
   it 'accepts end aligned with a method call with arguments' do
@@ -399,14 +410,16 @@ describe RuboCop::Cop::Lint::BlockAlignment do
     expect(cop.offenses).to be_empty
   end
 
-  it 'registers an offense for mismatched end with a method call with arguments' do
+  it 'registers an offense for mismatched end with a method call' \
+     ' with arguments' do
     inspect_source(cop,
                    ['@h[:f] = f.each_pair.map do |f, v|',
                     '  v = 1',
                     '  end'
                    ])
     expect(cop.messages)
-      .to eq(['`end` at 3, 2 is not aligned with `@h[:f] = f.each_pair.map do |f, v|` at 1, 0'])
+      .to eq(['`end` at 3, 2 is not aligned with' \
+              ' `@h[:f] = f.each_pair.map do |f, v|` at 1, 0'])
   end
 
   it 'does not raise an error for nested block in a method call' do
@@ -425,15 +438,16 @@ describe RuboCop::Cop::Lint::BlockAlignment do
     expect(cop.offenses).to be_empty
   end
 
-  it 'registers an offense for mismatched end not aligned with the block that is an argument' do
+  it 'registers an offense for mismatched end not aligned with the block' \
+     ' that is an argument' do
     inspect_source(cop,
                    ['expect(arr.all? do |o|',
                     '  o.valid?',
                     '  end)'
                    ])
     expect(cop.messages)
-      .to eq(['`end` at 3, 2 is not aligned with `arr.all? do |o|` at 1, 7 or ' \
-              '`expect(arr.all? do |o|` at 1, 0'])
+      .to eq(['`end` at 3, 2 is not aligned with `arr.all? do |o|` at 1, 7 or' \
+              ' `expect(arr.all? do |o|` at 1, 0'])
   end
 
   it 'accepts end aligned with an op-asgn (+=, -=)' do
@@ -469,7 +483,8 @@ describe RuboCop::Cop::Lint::BlockAlignment do
                     '  end'
                    ])
     expect(cop.messages)
-      .to eq(['`end` at 2, 2 is not aligned with `variable &&= test do |ala|` at 1, 0'])
+      .to eq(['`end` at 2, 2 is not aligned with `variable &&= test do |ala|`' \
+              ' at 1, 0'])
   end
 
   it 'accepts end aligned with an or-asgn (||=)' do
@@ -486,7 +501,8 @@ describe RuboCop::Cop::Lint::BlockAlignment do
                     '  end'
                    ])
     expect(cop.messages)
-      .to eq(['`end` at 2, 2 is not aligned with `variable ||= test do |ala|` at 1, 0'])
+      .to eq(['`end` at 2, 2 is not aligned with `variable ||= test do |ala|`' \
+              ' at 1, 0'])
   end
 
   it 'accepts end aligned with a mass assignment' do

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

@@ -36,6 +36,13 @@ describe RuboCop::Cop::Lint::SpaceBeforeFirstArg do
       inspect_source(cop, ['a.something=c', 'a.something,b=c,d'])
       expect(cop.offenses).to be_empty
     end
+
+    it 'auto-corrects method call with no space before the first arg' do
+      new_source = autocorrect_source(cop, ['something?x',
+                                            'a.something!y, z'])
+      expect(new_source).to eq(['something? x',
+                                'a.something! y, z'].join("\n"))
+    end
   end
 
   context 'for method calls with parentheses' do

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

@@ -687,6 +687,33 @@ describe RuboCop::Cop::Lint::UselessAssignment do
     end
   end
 
+  context 'when a variable is reassigned and unreferenced in a if branch ' \
+          'while the variable is referenced in the paired else branch ' do
+    let(:source) do
+      [
+        'def some_method(flag)',
+        '  foo = 1',
+        '',
+        '  if flag',
+        '    puts foo',
+        '    foo = 2',
+        '  else',
+        '    puts foo',
+        '  end',
+        'end'
+      ]
+    end
+
+    it 'registers an offense for the reassignment in the if branch' do
+      inspect_source(cop, source)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
+        .to eq('Useless assignment to variable - `foo`.')
+      expect(cop.offenses.first.line).to eq(6)
+      expect(cop.highlights).to eq(['foo'])
+    end
+  end
+
   context 'when a variable is assigned in branch of modifier if ' \
           'that references the variable in its conditional clause' \
           'and referenced after the branching' do
@@ -1243,6 +1270,29 @@ describe RuboCop::Cop::Lint::UselessAssignment do
     end
   end
 
+  context 'when a rescued error variable is wrongly tried to be referenced ' \
+          'in another rescue body' do
+    let(:source) do
+      [
+        'begin',
+        '  do_something',
+        'rescue FirstError => error',
+        'rescue SecondError',
+        '  p error # => nil',
+        'end'
+      ]
+    end
+
+    it 'registers an offense' do
+      inspect_source(cop, source)
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.first.message)
+        .to eq('Useless assignment to variable - `error`.')
+      expect(cop.offenses.first.line).to eq(3)
+      expect(cop.highlights).to eq(['error'])
+    end
+  end
+
   context 'when a method argument is reassigned ' \
           'and zero arity super is called' do
     let(:source) do
@@ -1609,4 +1659,127 @@ describe RuboCop::Cop::Lint::UselessAssignment do
     include_examples 'accepts'
     include_examples 'mimics MRI 2.1'
   end
+
+  describe 'similar name suggestion' do
+    context "when there's a similar variable-like method invocation" do
+      let(:source) do
+        [
+          'def some_method',
+          '  enviromnent = {}',
+          '  another_symbol',
+          '  puts environment',
+          'end'
+        ]
+      end
+
+      it 'suggests the method name' do
+        inspect_source(cop, source)
+        expect(cop.offenses.size).to eq(1)
+        expect(cop.offenses.first.message).to eq(
+          'Useless assignment to variable - `enviromnent`. ' \
+          'Did you mean `environment`?'
+        )
+      end
+    end
+
+    context "when there's a similar variable" do
+      let(:source) do
+        [
+          'def some_method',
+          '  environment = nil',
+          '  another_symbol',
+          '  enviromnent = {}',
+          '  puts environment',
+          'end'
+        ]
+      end
+
+      it 'suggests the variable name' do
+        inspect_source(cop, source)
+        expect(cop.offenses.size).to eq(1)
+        expect(cop.offenses.first.message).to eq(
+          'Useless assignment to variable - `enviromnent`. ' \
+          'Did you mean `environment`?'
+        )
+      end
+    end
+
+    context 'when there are only less similar names' do
+      let(:source) do
+        [
+          'def some_method',
+          '  enviromnent = {}',
+          '  another_symbol',
+          '  puts envelope',
+          'end'
+        ]
+      end
+
+      it 'does not suggest any name' do
+        inspect_source(cop, source)
+        expect(cop.offenses.size).to eq(1)
+        expect(cop.offenses.first.message)
+          .to eq('Useless assignment to variable - `enviromnent`.')
+      end
+    end
+
+    context "when there's a similar method invocation with explicit receiver" do
+      let(:source) do
+        [
+          'def some_method',
+          '  enviromnent = {}',
+          '  another_symbol',
+          '  puts self.environment',
+          'end'
+        ]
+      end
+
+      it 'does not suggest any name' do
+        inspect_source(cop, source)
+        expect(cop.offenses.size).to eq(1)
+        expect(cop.offenses.first.message)
+          .to eq('Useless assignment to variable - `enviromnent`.')
+      end
+    end
+
+    context "when there's a similar method invocation with arguments" do
+      let(:source) do
+        [
+          'def some_method',
+          '  enviromnent = {}',
+          '  another_symbol',
+          '  puts environment(1)',
+          'end'
+        ]
+      end
+
+      it 'does not suggest any name' do
+        inspect_source(cop, source)
+        expect(cop.offenses.size).to eq(1)
+        expect(cop.offenses.first.message)
+          .to eq('Useless assignment to variable - `enviromnent`.')
+      end
+    end
+
+    context "when there's a similar name but it's in inner scope" do
+      let(:source) do
+        [
+          'class SomeClass',
+          '  enviromnent = {}',
+          '',
+          '  def some_method(environment)',
+          '    puts environment',
+          '  end',
+          'end'
+        ]
+      end
+
+      it 'does not suggest any name' do
+        inspect_source(cop, source)
+        expect(cop.offenses.size).to eq(1)
+        expect(cop.offenses.first.message)
+          .to eq('Useless assignment to variable - `enviromnent`.')
+      end
+    end
+  end
 end