rubocop 0.24.1 → 0.25.0

data/spec/rubocop/config_spec.rb

@@ -41,7 +41,7 @@ describe RuboCop::Config do
     context 'when the configuration includes any unrecognized parameter' do
       before do
         create_file(configuration_path, [
-          'Style/LineLength:',
+          'Metrics/LineLength:',
           '  Enabled: true',
           '  Min: 10'
         ])
@@ -50,7 +50,7 @@ describe RuboCop::Config do
       it 'raises validation error' do
         expect { configuration.validate }
           .to raise_error(described_class::ValidationError,
-                          /^unrecognized parameter Style\/LineLength:Min/)
+                          /^unrecognized parameter Metrics\/LineLength:Min/)
       end
     end
 
@@ -59,7 +59,7 @@ describe RuboCop::Config do
       # configuration, but are nonetheless allowed for any cop.
       before do
         create_file(configuration_path, [
-          'Style/LineLength:',
+          'Metrics/LineLength:',
           '  Exclude:',
           '    - lib/file.rb',
           '  Include:',

data/spec/rubocop/cop/commissioner_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# rubocop:disable Style/LineLength
+# rubocop:disable Metrics/LineLength
 
 require 'spec_helper'
 

data/spec/rubocop/cop/cop_spec.rb

@@ -17,7 +17,7 @@ describe RuboCop::Cop::Cop do
   describe '.qualified_cop_name' do
     it 'adds namespace if the cop name is found in exactly one namespace' do
       expect(described_class.qualified_cop_name('LineLength', '--only'))
-        .to eq('Style/LineLength')
+        .to eq('Metrics/LineLength')
     end
 
     it 'returns the given cop name if it is not found in any namespace' do
@@ -26,8 +26,8 @@ describe RuboCop::Cop::Cop do
     end
 
     it 'returns the given cop name if it already has a namespace' do
-      expect(described_class.qualified_cop_name('Style/LineLength', '--only'))
-        .to eq('Style/LineLength')
+      expect(described_class.qualified_cop_name('Metrics/LineLength', '--only'))
+        .to eq('Metrics/LineLength')
     end
 
     it 'raises an error if the cop name is in more than one namespace' do

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

@@ -1,18 +1,57 @@
 # encoding: utf-8
-# rubocop:disable Style/LineLength
+# rubocop:disable Metrics/LineLength
 
 require 'spec_helper'
 
 describe RuboCop::Cop::Lint::BlockAlignment do
   subject(:cop) { described_class.new }
 
-  it 'registers an offense for mismatched block end' do
+  context 'when the block has no arguments' do
+    it 'registers an offense for mismatched block end' do
+      inspect_source(cop,
+                     ['test do',
+                      '  end'
+                     ])
+      expect(cop.messages)
+        .to eq(['`end` at 2, 2 is not aligned with `test do` at 1, 0'])
+    end
+
+    it 'auto-corrects alignment' do
+      new_source = autocorrect_source(cop, ['test do',
+                                            '  end'
+                                           ])
+
+      expect(new_source).to eq(['test do',
+                                'end'].join("\n"))
+    end
+  end
+
+  context 'when the block has arguments' do
+    it 'registers an offense for mismatched block end' do
+      inspect_source(cop,
+                     ['test do |ala|',
+                      '  end'
+                     ])
+      expect(cop.messages)
+        .to eq(['`end` at 2, 2 is not aligned with `test do |ala|` at 1, 0'])
+    end
+
+    it 'auto-corrects alignment' do
+      new_source = autocorrect_source(cop, ['test do |ala|',
+                                            '  end'
+                                           ])
+
+      expect(new_source).to eq(['test do |ala|',
+                                'end'].join("\n"))
+    end
+  end
+
+  it 'acepts a block end that does not begin its line' do
     inspect_source(cop,
-                   ['test do |ala|',
-                    '  end'
+                   ['  scope :bar, lambda { joins(:baz)',
+                    '                       .distinct }'
                    ])
-    expect(cop.messages)
-      .to eq(['`end` at 2, 2 is not aligned with `test do |ala|` at 1, 0'])
+    expect(cop.offenses).to be_empty
   end
 
   context 'when the block is a logical operand' do
@@ -53,6 +92,17 @@ describe RuboCop::Cop::Lint::BlockAlignment do
                      ])
       expect(cop.offenses).to be_empty
     end
+
+    it 'auto-corrects alignment to the block start' do
+      new_source = autocorrect_source(cop,
+                                      ['a = b = c = test do |ala|',
+                                       '    end'
+                                      ])
+
+      expect(new_source).to eq(['a = b = c = test do |ala|',
+                                '            end'
+                               ].join("\n"))
+    end
   end
 
   context 'and the block is an operand' do
@@ -97,6 +147,23 @@ describe RuboCop::Cop::Lint::BlockAlignment do
         .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
+      new_source = autocorrect_source(
+        cop,
+        ['variable =',
+         '  a_long_method_that_dont_fit_on_the_line do |v|',
+         '    v.foo',
+         'end'
+        ])
+
+      expect(new_source)
+        .to eq(['variable =',
+                '  a_long_method_that_dont_fit_on_the_line do |v|',
+                '    v.foo',
+                '  end'
+               ].join("\n"))
+    end
   end
 
   context 'when the method part is a call chain that spans several lines' do
@@ -173,6 +240,36 @@ describe RuboCop::Cop::Lint::BlockAlignment do
       inspect_source(cop, src)
       expect(cop.offenses).to be_empty
     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']
+
+      aligned_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'].join("\n")
+
+      new_source = autocorrect_source(cop, src)
+      expect(new_source).to eq(aligned_src)
+    end
   end
 
   context 'when variables of a mass assignment spans several lines' do
@@ -194,6 +291,16 @@ describe RuboCop::Cop::Lint::BlockAlignment do
       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'])
     end
+
+    it 'can not auto-correct' do
+      src = ['e,',
+             'f = [5, 6].map do |i|',
+             '  i - 5',
+             '    end']
+
+      new_source = autocorrect_source(cop, src)
+      expect(new_source).to eq(src.join("\n"))
+    end
   end
 
   it 'accepts end aligned with an instance variable' do

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

@@ -23,13 +23,17 @@ describe RuboCop::Cop::Lint::Debugger do
 
   it 'reports an offense for pry bindings' do
     src = ['binding.pry',
-           'binding.remote_pry']
+           'binding.remote_pry',
+           'binding.pry_remote']
     inspect_source(cop, src)
-    expect(cop.offenses.size).to eq(2)
+    expect(cop.offenses.size).to eq(3)
     expect(cop.messages)
       .to eq(['Remove debugger entry point `binding.pry`.',
-              'Remove debugger entry point `binding.remote_pry`.'])
-    expect(cop.highlights).to eq(['binding.pry', 'binding.remote_pry'])
+              'Remove debugger entry point `binding.remote_pry`.',
+              'Remove debugger entry point `binding.pry_remote`.'])
+    expect(cop.highlights).to eq(['binding.pry',
+                                  'binding.remote_pry',
+                                  'binding.pry_remote'])
   end
 
   it 'does not report an offense for non-pry binding' do
@@ -38,7 +42,7 @@ describe RuboCop::Cop::Lint::Debugger do
     expect(cop.offenses).to be_empty
   end
 
-  %w(debugger byebug).each do |comment|
+  %w(debugger byebug pry remote_pry pry_remote).each do |comment|
     it "does not report an offense for #{comment} in comments" do
       src = ["# #{comment}"]
       inspect_source(cop, src)
@@ -46,7 +50,7 @@ describe RuboCop::Cop::Lint::Debugger do
     end
   end
 
-  %w(debugger byebug pry).each do |method_name|
+  %w(debugger byebug pry remote_pry pry_remote).each do |method_name|
     it "does not report an offense for a #{method_name} method" do
       src = ["code.#{method_name}"]
       inspect_source(cop, src)

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

@@ -1516,6 +1516,18 @@ describe RuboCop::Cop::Lint::UselessAssignment do
     include_examples 'mimics MRI 2.1'
   end
 
+  context 'when an anonymous keyword splat method argument is defined' do
+    let(:source) do
+      [
+        'def some_method(name: value, **)',
+        'end'
+      ]
+    end
+
+    include_examples 'accepts' unless RUBY_VERSION < '2.0'
+    include_examples 'mimics MRI 2.1'
+  end
+
   context 'when a block argument is not used' do
     let(:source) do
       [

data/spec/rubocop/cop/{style → metrics}/block_nesting_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe RuboCop::Cop::Style::BlockNesting, :config do
+describe RuboCop::Cop::Metrics::BlockNesting, :config do
   subject(:cop) { described_class.new(config) }
   let(:cop_config) { { 'Max' => 2 } }
 

data/spec/rubocop/cop/{style → metrics}/class_length_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe RuboCop::Cop::Style::ClassLength, :config do
+describe RuboCop::Cop::Metrics::ClassLength, :config do
   subject(:cop) { described_class.new(config) }
   let(:cop_config) { { 'Max' => 5, 'CountComments' => false } }
 

data/spec/rubocop/cop/{style → metrics}/cyclomatic_complexity_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe RuboCop::Cop::Style::CyclomaticComplexity, :config do
+describe RuboCop::Cop::Metrics::CyclomaticComplexity, :config do
   subject(:cop) { described_class.new(config) }
 
   context 'when Max is 1' do

data/spec/rubocop/cop/{style → metrics}/if_unless_modifier_spec.rb

@@ -7,7 +7,7 @@ describe RuboCop::Cop::Style::IfUnlessModifier do
 
   subject(:cop) { described_class.new(config) }
   let(:config) do
-    hash = { 'Style/LineLength' => { 'Max' => 80 } }
+    hash = { 'Metrics/LineLength' => { 'Max' => 80 } }
     RuboCop::Config.new(hash)
   end
 
@@ -128,7 +128,7 @@ describe RuboCop::Cop::Style::IfUnlessModifier do
     context 'when the maximum line length is specified by the cop itself' do
       let(:config) do
         hash = {
-          'Style/LineLength' => { 'Max' => 100 },
+          'Metrics/LineLength' => { 'Max' => 100 },
           'Style/IfUnlessModifier' => { 'MaxLineLength' => 80 }
         }
         RuboCop::Config.new(hash)

data/spec/rubocop/cop/{style → metrics}/line_length_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe RuboCop::Cop::Style::LineLength, :config do
+describe RuboCop::Cop::Metrics::LineLength, :config do
   subject(:cop) { described_class.new(config) }
   let(:cop_config) { { 'Max' => 80 } }
 
@@ -40,11 +40,11 @@ describe RuboCop::Cop::Style::LineLength, :config do
     end
 
     context 'and the excessive characters include a complete URL' do
-      # rubocop:disable Style/LineLength
+      # rubocop:disable Metrics/LineLength
       let(:source) { <<-END }
         # See: http://google.com/, http://gmail.com/, https://maps.google.com/, http://plus.google.com/
       END
-      # rubocop:enable Style/LineLength
+      # rubocop:enable Metrics/LineLength
 
       it 'registers an offense for the line' do
         inspect_source(cop, source)
@@ -59,12 +59,12 @@ describe RuboCop::Cop::Style::LineLength, :config do
 
     context 'and the excessive characters include part of an URL ' \
             'and another word' do
-      # rubocop:disable Style/LineLength
+      # rubocop:disable Metrics/LineLength
       let(:source) { <<-END }
         # See: https://github.com/bbatsov/rubocop/commit/3b48d8bdf5b1c2e05e35061837309890f04ab08c and
         #   http://google.com/
       END
-      # rubocop:enable Style/LineLength
+      # rubocop:enable Metrics/LineLength
 
       it 'registers an offense for the line' do
         inspect_source(cop, source)
@@ -79,11 +79,11 @@ describe RuboCop::Cop::Style::LineLength, :config do
 
     context 'and an error other than URI::InvalidURIError is raised ' \
             'while validating an URI-ish string' do
-      # rubocop:disable Style/LineLength
+      # rubocop:disable Metrics/LineLength
       let(:source) { <<-END }
         xxxxxxxxxxxxxxxxxxxxxxxxxxxxzxxxxxxxxxxx = LDAP::DEFAULT_GROUP_UNIQUE_MEMBER_LIST_KEY
       END
-      # rubocop:enable Style/LineLength
+      # rubocop:enable Metrics/LineLength
 
       it 'does not crash' do
         expect { inspect_source(cop, source) }.not_to raise_error

data/spec/rubocop/cop/{style → metrics}/method_length_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe RuboCop::Cop::Style::MethodLength, :config do
+describe RuboCop::Cop::Metrics::MethodLength, :config do
   subject(:cop) { described_class.new(config) }
   let(:cop_config) { { 'Max' => 5, 'CountComments' => false } }
 

data/spec/rubocop/cop/{style → metrics}/parameter_lists_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe RuboCop::Cop::Style::ParameterLists, :config do
+describe RuboCop::Cop::Metrics::ParameterLists, :config do
   subject(:cop) { described_class.new(config) }
   let(:cop_config) do
     {

data/spec/rubocop/cop/metrics/perceived_complexity_spec.rb

@@ -0,0 +1,222 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe RuboCop::Cop::Metrics::PerceivedComplexity, :config do
+  subject(:cop) { described_class.new(config) }
+
+  context 'when Max is 1' do
+    let(:cop_config) { { 'Max' => 1 } }
+
+    it 'accepts a method with no decision points' do
+      inspect_source(cop, ['def method_name',
+                           '  call_foo',
+                           'end'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'accepts complex code outside of methods' do
+      inspect_source(cop,
+                     ['def method_name',
+                      '  call_foo',
+                      'end',
+                      '',
+                      'if first_condition then',
+                      '  call_foo if second_condition && third_condition',
+                      '  call_bar if fourth_condition || fifth_condition',
+                      'end'])
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'registers an offense for an if modifier' do
+      inspect_source(cop, ['def self.method_name',
+                           '  call_foo if some_condition',
+                           'end'])
+      expect(cop.messages)
+        .to eq(['Perceived complexity for method_name is too high. [2/1]'])
+      expect(cop.highlights).to eq(['def'])
+      expect(cop.config_to_allow_offenses).to eq('Max' => 2)
+    end
+
+    it 'registers an offense for an unless modifier' do
+      inspect_source(cop, ['def method_name',
+                           '  call_foo unless some_condition',
+                           'end'])
+      expect(cop.messages)
+        .to eq(['Perceived complexity for method_name is too high. [2/1]'])
+    end
+
+    it 'registers an offense for elsif and else blocks' do
+      inspect_source(cop, ['def method_name',
+                           '  if first_condition then',
+                           '    call_foo',
+                           '  elsif second_condition then',
+                           '    call_bar',
+                           '  else',
+                           '    call_bam',
+                           '  end',
+                           'end'])
+      expect(cop.messages)
+        .to eq(['Perceived complexity for method_name is too high. [4/1]'])
+    end
+
+    it 'registers an offense for a ternary operator' do
+      inspect_source(cop, ['def method_name',
+                           '  value = some_condition ? 1 : 2',
+                           'end'])
+      expect(cop.messages)
+        .to eq(['Perceived complexity for method_name is too high. [2/1]'])
+    end
+
+    it 'registers an offense for a while block' do
+      inspect_source(cop, ['def method_name',
+                           '  while some_condition do',
+                           '    call_foo',
+                           '  end',
+                           'end'])
+      expect(cop.messages)
+        .to eq(['Perceived complexity for method_name is too high. [2/1]'])
+    end
+
+    it 'registers an offense for an until block' do
+      inspect_source(cop, ['def method_name',
+                           '  until some_condition do',
+                           '    call_foo',
+                           '  end',
+                           'end'])
+      expect(cop.messages)
+        .to eq(['Perceived complexity for method_name is too high. [2/1]'])
+    end
+
+    it 'registers an offense for a for block' do
+      inspect_source(cop, ['def method_name',
+                           '  for i in 1..2 do',
+                           '    call_method',
+                           '  end',
+                           'end'])
+      expect(cop.messages)
+        .to eq(['Perceived complexity for method_name is too high. [2/1]'])
+    end
+
+    it 'registers an offense for a rescue block' do
+      inspect_source(cop, ['def method_name',
+                           '  begin',
+                           '    call_foo',
+                           '  rescue Exception',
+                           '    call_bar',
+                           '  end',
+                           'end'])
+      expect(cop.messages)
+        .to eq(['Perceived complexity for method_name is too high. [2/1]'])
+    end
+
+    it 'registers an offense for a case/when block' do
+      inspect_source(cop, ['def method_name',
+                           '  case value',
+                           '  when 1 then call_foo_1',
+                           '  when 2 then call_foo_2',
+                           '  when 3 then call_foo_3',
+                           '  when 4 then call_foo_4',
+                           '  end',
+                           'end'])
+      # The `case` node plus the first `when` score one complexity point
+      # together. The other `when` nodes get 0.2 complexity points.
+      expect(cop.messages)
+        .to eq(['Perceived complexity for method_name is too high. [3/1]'])
+    end
+
+    it 'registers an offense for a case/when block without an expression ' \
+       'after case' do
+      inspect_source(cop, ['def method_name',
+                           '  case',
+                           '  when value == 1',
+                           '    call_foo',
+                           '  when value == 2',
+                           '    call_bar',
+                           '  end',
+                           'end'])
+      # Here, the `case` node doesn't count, but each when scores one
+      # complexity point.
+      expect(cop.messages)
+        .to eq(['Perceived complexity for method_name is too high. [3/1]'])
+    end
+
+    it 'registers an offense for &&' do
+      inspect_source(cop, ['def method_name',
+                           '  call_foo && call_bar',
+                           'end'])
+      expect(cop.messages)
+        .to eq(['Perceived complexity for method_name is too high. [2/1]'])
+    end
+
+    it 'registers an offense for and' do
+      inspect_source(cop, ['def method_name',
+                           '  call_foo and call_bar',
+                           'end'])
+      expect(cop.messages)
+        .to eq(['Perceived complexity for method_name is too high. [2/1]'])
+    end
+
+    it 'registers an offense for ||' do
+      inspect_source(cop, ['def method_name',
+                           '  call_foo || call_bar',
+                           'end'])
+      expect(cop.messages)
+        .to eq(['Perceived complexity for method_name is too high. [2/1]'])
+    end
+
+    it 'registers an offense for or' do
+      inspect_source(cop, ['def method_name',
+                           '  call_foo or call_bar',
+                           'end'])
+      expect(cop.messages)
+        .to eq(['Perceived complexity for method_name is too high. [2/1]'])
+    end
+
+    it 'deals with nested if blocks containing && and ||' do
+      inspect_source(cop,
+                     ['def method_name',
+                      '  if first_condition then',
+                      '    call_foo if second_condition && third_condition',
+                      '    call_bar if fourth_condition || fifth_condition',
+                      '  end',
+                      'end'])
+      expect(cop.messages)
+        .to eq(['Perceived complexity for method_name is too high. [6/1]'])
+    end
+
+    it 'counts only a single method' do
+      inspect_source(cop, ['def method_name_1',
+                           '  call_foo if some_condition',
+                           'end',
+                           '',
+                           'def method_name_2',
+                           '  call_foo if some_condition',
+                           'end'])
+      expect(cop.messages)
+        .to eq(['Perceived complexity for method_name_1 is too high. [2/1]',
+                'Perceived complexity for method_name_2 is too high. [2/1]'])
+    end
+  end
+
+  context 'when Max is 2' do
+    let(:cop_config) { { 'Max' => 2 } }
+
+    it 'counts stupid nested if and else blocks' do
+      inspect_source(cop, ['def method_name',                   # 1
+                           '  if first_condition then',         # 2
+                           '    call_foo',
+                           '  else',                            # 3
+                           '    if second_condition then',      # 4
+                           '      call_bar',
+                           '    else',                          # 5
+                           '      call_bam if third_condition', # 6
+                           '    end',
+                           '    call_baz if fourth_condition',  # 7
+                           '  end',
+                           'end'])
+      expect(cop.messages)
+        .to eq(['Perceived complexity for method_name is too high. [7/2]'])
+    end
+  end
+end