rubocop 0.9.0 → 0.9.1

data/spec/rubocop/cops/lint/ensure_return_spec.rb

@@ -31,6 +31,17 @@ module Rubocop
                           'end'])
           expect(er.offences).to be_empty
         end
+
+        it 'does not check when ensure block has no body' do
+          expect do
+            inspect_source(er,
+                           ['begin',
+                            '  something',
+                            'ensure',
+                            'end'])
+          end.to_not raise_exception
+
+        end
       end
     end
   end

data/spec/rubocop/cops/lint/literal_in_condition_spec.rb

@@ -9,7 +9,7 @@ module Rubocop
         let(:cop) { LiteralInCondition.new }
 
         %w(1 2.0 [1] {}).each do |lit|
-          it "registers an offence for literal #{lit} in condition" do
+          it "registers an offence for literal #{lit} in &&" do
             inspect_source(cop,
                            ["if x && #{lit}",
                             '  top',
@@ -17,9 +17,34 @@ module Rubocop
                            ])
             expect(cop.offences.size).to eq(1)
           end
-        end
 
-        %w(1 2.0 [1] {}).each do |lit|
+          it "registers an offence for literal #{lit} in complex cond" do
+            inspect_source(cop,
+                           ["if x && !(a && #{lit}) && y && z",
+                            '  top',
+                            'end'
+                           ])
+            expect(cop.offences.size).to eq(1)
+          end
+
+          it "registers an offence for literal #{lit} in !" do
+            inspect_source(cop,
+                           ["if !#{lit}",
+                            '  top',
+                            'end'
+                           ])
+            expect(cop.offences.size).to eq(1)
+          end
+
+          it "registers an offence for literal #{lit} in complex !" do
+            inspect_source(cop,
+                           ["if !(x && (y && #{lit}))",
+                            '  top',
+                            'end'
+                           ])
+            expect(cop.offences.size).to eq(1)
+          end
+
           it "accepts literal #{lit} if it's not an and/or operand" do
             inspect_source(cop,
                            ["if test(#{lit})",
@@ -28,6 +53,15 @@ module Rubocop
                            ])
             expect(cop.offences).to be_empty
           end
+
+          it "accepts literal #{lit} in non-toplevel and/or" do
+            inspect_source(cop,
+                           ["if (a || #{lit}).something",
+                            '  top',
+                            'end'
+                           ])
+            expect(cop.offences).to be_empty
+          end
         end
       end
     end

data/spec/rubocop/cops/lint/shadowing_outer_local_variable_spec.rb

@@ -158,6 +158,69 @@ module Rubocop
           include_examples 'mimics MRI 2.0'
         end
 
+        context 'when multiple block arguments have same name "_"' do
+          let(:source) do
+            [
+              'def some_method',
+              '  1.times do |_, foo, _|',
+              '  end',
+              'end'
+            ]
+          end
+
+          include_examples 'accepts'
+          include_examples 'mimics MRI 2.0'
+        end
+
+        context 'when multiple block arguments have ' +
+                'a same name starts with "_"' do
+          let(:source) do
+            [
+              'def some_method',
+              '  1.times do |_foo, bar, _foo|',
+              '  end',
+              'end'
+            ]
+          end
+
+          include_examples 'accepts'
+          include_examples 'mimics MRI 2.0'
+        end
+
+        context 'when a block argument has same name "_" ' +
+                'as outer scope variable "_"' do
+          let(:source) do
+            [
+              'def some_method',
+              '  _ = 1',
+              '  puts _',
+              '  1.times do |_|',
+              '  end',
+              'end'
+            ]
+          end
+
+          include_examples 'accepts'
+          include_examples 'mimics MRI 2.0'
+        end
+
+        context 'when a block argument has a same name starts with "_" ' +
+                'as an outer scope variable' do
+          let(:source) do
+            [
+              'def some_method',
+              '  _foo = 1',
+              '  puts _foo',
+              '  1.times do |_foo|',
+              '  end',
+              'end'
+            ]
+          end
+
+          include_examples 'accepts'
+          include_examples 'mimics MRI 2.0'
+        end
+
         context 'when a method argument has same name ' +
                 'as an outer scope variable' do
           let(:source) do

data/spec/rubocop/cops/lint/unused_local_variable_spec.rb

@@ -271,6 +271,61 @@ module Rubocop
           include_examples 'mimics MRI 2.0'
         end
 
+        context 'when a named capture is unreferenced in top level' do
+          let(:source) do
+            [
+              "/(?<foo>\w+)/ =~ 'FOO'",
+            ]
+          end
+
+          it 'registers an offence' do
+            inspect_source(cop, source)
+            expect(cop.offences).to have(1).item
+            expect(cop.offences.first.message)
+              .to include('unused variable - foo')
+            expect(cop.offences.first.line).to eq(1)
+          end
+
+          include_examples 'mimics MRI 2.0'
+        end
+
+        context 'when a named capture is unreferenced ' +
+                'in other than top level' do
+          let(:source) do
+            [
+              'def some_method',
+              "  /(?<foo>\w+)/ =~ 'FOO'",
+              'end'
+            ]
+          end
+
+          it 'registers an offence' do
+            inspect_source(cop, source)
+            expect(cop.offences).to have(1).item
+            expect(cop.offences.first.message)
+              .to include('unused variable - foo')
+            expect(cop.offences.first.line).to eq(2)
+          end
+
+          # MRI 2.0 accepts this case, but I have no idea why it does so
+          # and there's no convincing reason to conform to this behavior,
+          # so RuboCop does not mimic MRI in this case.
+        end
+
+        context 'when a named capture is referenced' do
+          let(:source) do
+            [
+              'def some_method',
+              "  /(?<foo>\w+)/ =~ 'bar'",
+              '  puts foo',
+              'end'
+            ]
+          end
+
+          include_examples 'accepts'
+          include_examples 'mimics MRI 2.0'
+        end
+
         context 'when a variable is assigned in begin ' +
                 'and referenced outside' do
           let(:source) do
@@ -387,6 +442,19 @@ module Rubocop
           include_examples 'mimics MRI 2.0'
         end
 
+        context 'when a keyword splat method argument is used' do
+          let(:source) do
+            [
+              'def some_method(name: value, **rest_keywords)',
+              '  p rest_keywords',
+              'end'
+            ]
+          end
+
+          include_examples 'accepts'
+          include_examples 'mimics MRI 2.0'
+        end
+
         context 'when a keyword splat method argument is not used' do
           let(:source) do
             [

data/spec/rubocop/cops/offence_spec.rb

@@ -102,8 +102,8 @@ module Rubocop
           source_buffer = Parser::Source::Buffer.new('test', 1)
           source_buffer.source = source.join("\n")
           begin_pos = source[0...(line - 1)].reduce(0) do |a, e|
-                        a + e.length + "\n".length
-                      end + column
+            a + e.length + "\n".length
+          end + column
           Parser::Source::Range.new(source_buffer, begin_pos, begin_pos + 1)
         end
 

data/spec/rubocop/cops/style/collection_methods_spec.rb

@@ -6,39 +6,43 @@ module Rubocop
   module Cop
     module Style
       describe CollectionMethods do
-        let(:cm) { CollectionMethods.new }
+        CollectionMethods.config = {
+          'PreferredMethods' => {
+            'collect' => 'map',
+            'inject' => 'reduce',
+            'detect' => 'find',
+            'find_all' => 'select'
+          }
+        }
 
-        it 'registers an offence for collect' do
-          inspect_source(cm, ['[1, 2, 3].collect { |e| e + 1 }'])
-          expect(cm.offences.size).to eq(1)
-          expect(cm.offences.map(&:message))
-            .to eq(['Prefer map over collect.'])
-        end
+        let(:cop) { CollectionMethods.new }
 
-        it 'registers an offence for inject' do
-          inspect_source(cm, ['[1, 2, 3].inject { |e| e + 1 }'])
-          expect(cm.offences.size).to eq(1)
-          expect(cm.offences.map(&:message))
-            .to eq(['Prefer reduce over inject.'])
-        end
+        CollectionMethods.preferred_methods.keys.each do |method|
+          it "registers an offence for #{method} with block" do
+            inspect_source(cop, ["[1, 2, 3].#{method} { |e| e + 1 }"])
+            expect(cop.offences.size).to eq(1)
+            preferred_method = CollectionMethods.preferred_methods[method]
+            expect(cop.messages)
+              .to eq(["Prefer #{preferred_method} over #{method}."])
+          end
 
-        it 'registers an offence for detect' do
-          inspect_source(cm, ['[1, 2, 3].detect { |e| e + 1 }'])
-          expect(cm.offences.size).to eq(1)
-          expect(cm.offences.map(&:message))
-            .to eq(['Prefer find over detect.'])
-        end
+          it "registers an offence for #{method} with proc param" do
+            inspect_source(cop, ["[1, 2, 3].#{method}(&:test)"])
+            expect(cop.offences.size).to eq(1)
+            preferred_method = CollectionMethods.preferred_methods[method]
+            expect(cop.messages)
+              .to eq(["Prefer #{preferred_method} over #{method}."])
+          end
 
-        it 'registers an offence for find_all' do
-          inspect_source(cm, ['[1, 2, 3].find_all { |e| e + 1 }'])
-          expect(cm.offences.size).to eq(1)
-          expect(cm.offences.map(&:message))
-            .to eq(['Prefer select over find_all.'])
-        end
+          it "accepts #{method} with more than 1 param" do
+            inspect_source(cop, ["[1, 2, 3].#{method}(other, &:test)"])
+            expect(cop.offences).to be_empty
+          end
 
-        it 'ignores find_all without an explicit receiver' do
-          inspect_source(cm, ['find_all { |e| e + 1 }'])
-          expect(cm.offences).to be_empty
+          it "accepts #{method} without a block" do
+            inspect_source(cop, ["[1, 2, 3].#{method}"])
+            expect(cop.offences).to be_empty
+          end
         end
       end
     end

data/spec/rubocop/cops/style/dot_position_spec.rb

@@ -8,21 +8,56 @@ module Rubocop
       describe DotPosition do
         let(:cop) { DotPosition.new }
 
-        it 'registers an offence for trailing dot in multi-line method call' do
-          inspect_source(cop, ['something.',
-                               '  method_name'])
-          expect(cop.offences.size).to eq(1)
+        context 'Leading dots style' do
+          before { DotPosition.config = { 'Style' => 'Leading' } }
+
+          it 'registers an offence for trailing dot in multi-line call' do
+            inspect_source(cop, ['something.',
+                                 '  method_name'])
+            expect(cop.offences.size).to eq(1)
+          end
+
+          it 'accepts leading do in multi-line method call' do
+            inspect_source(cop, ['something',
+                                 '  .method_name'])
+            expect(cop.offences).to be_empty
+          end
+
+          it 'does not err on method call with no dots' do
+            inspect_source(cop, ['puts something'])
+            expect(cop.offences).to be_empty
+          end
         end
 
-        it 'accepts leading do in multi-line method call' do
-          inspect_source(cop, ['something',
-                               '  .method_name'])
-          expect(cop.offences).to be_empty
+        context 'Trailing dots style' do
+          before { DotPosition.config = { 'Style' => 'Trailing' } }
+
+          it 'registers an offence for leading dot in multi-line call' do
+            inspect_source(cop, ['something',
+                                 '  .method_name'])
+            expect(cop.offences.size).to eq(1)
+          end
+
+          it 'accepts trailing dot in multi-line method call' do
+            inspect_source(cop, ['something.',
+                                 '  method_name'])
+            expect(cop.offences).to be_empty
+          end
+
+          it 'does not err on method call with no dots' do
+            inspect_source(cop, ['puts something'])
+            expect(cop.offences).to be_empty
+          end
         end
 
-        it 'does not err on method call with no dots' do
-          inspect_source(cop, ['puts something'])
-          expect(cop.offences).to be_empty
+        context 'Unknown style' do
+          before { DotPosition.config = { 'Style' => 'test' } }
+
+          it 'raises an exception' do
+            expect do
+              inspect_source(cop, ['something.top'])
+            end.to raise_error(RuntimeError)
+          end
         end
       end
     end

data/spec/rubocop/cops/style/multiline_if_then_spec.rb

@@ -75,6 +75,22 @@ module Rubocop
                                'end'])
           expect(mit.offences).to be_empty
         end
+
+        it 'does not get confused by a postfix unless' do
+          inspect_source(mit,
+                         ['two unless one',
+                         ])
+          expect(mit.offences).to be_empty
+        end
+
+        it 'does not get confused by a nested postfix unless' do
+          inspect_source(mit,
+                         ['if two',
+                          '  puts 1',
+                          'end unless two'
+                         ])
+          expect(mit.offences).to be_empty
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Bozhidar Batsov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-01 00:00:00.000000000 Z
+date: 2013-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta9
+        version: 2.0.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta9
+        version: 2.0.0.pre1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -193,6 +193,7 @@ files:
 - lib/rubocop/cop/style/favor_unless_over_negated_if.rb
 - lib/rubocop/cop/style/hash_syntax.rb
 - lib/rubocop/cop/style/if_then_else.rb
+- lib/rubocop/cop/style/if_with_semicolon.rb
 - lib/rubocop/cop/style/lambda.rb
 - lib/rubocop/cop/style/leading_comment_space.rb
 - lib/rubocop/cop/style/line_continuation.rb
@@ -200,8 +201,10 @@ files:
 - lib/rubocop/cop/style/method_and_variable_snake_case.rb
 - lib/rubocop/cop/style/method_call_parentheses.rb
 - lib/rubocop/cop/style/method_length.rb
+- lib/rubocop/cop/style/multiline_if_then.rb
 - lib/rubocop/cop/style/not.rb
 - lib/rubocop/cop/style/numeric_literals.rb
+- lib/rubocop/cop/style/one_line_conditional.rb
 - lib/rubocop/cop/style/op_method.rb
 - lib/rubocop/cop/style/parameter_lists.rb
 - lib/rubocop/cop/style/parentheses_around_condition.rb