rubocop 0.7.1 → 0.7.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fb18ed08073976272837da47ef0ba86606395c5b
+  data.tar.gz: f8c1cab8cf88ce7f1cbbb4815349e83cce88b5e3
+SHA512:
+  metadata.gz: 19e21fa9f97a22498da1cf6fe7512e1fe64923ec9b87d10c4abcfbe7583acfc0f6f68bb32d6c4bf020425c20856c4fe9e323c7fda6e435f2dc694556111a819a
+  data.tar.gz: 4d9e3e6896f2a836d626ef81147288a5eec30bb084f22ad565de20805d52d3a5ee3f9c16cd96d833ae463beca321e6ba45e8dd9e216b5068cce6f549478db9e5

data/CHANGELOG.md

@@ -4,8 +4,16 @@
 
 ### New features
 
+## 0.7.2 (05/13/2013)
+
 ### Bugs fixed
 
+* [#155](https://github.com/bbatsov/rubocop/issues/155) 'Do not use semicolons to terminate expressions.' is not implemented correctly
+* `OpMethod` now handles definition of unary operators without crashing.
+* `SymbolSnakeCase` now handles aliasing of operators without crashing.
+* `RescueException` now handles the splat operator `*` in a `rescue` clause without crashing.
+* [#159](https://github.com/bbatsov/rubocop/issues/159) AvoidFor cop misses many violations
+
 ## 0.7.1 (05/11/2013)
 
 ### Bugs fixed

data/lib/rubocop/cop/cop.rb

@@ -116,17 +116,17 @@ module Rubocop
       end
 
       def keywords(tokens)
-        # we need to keep track of the previous token to avoid
-        # interpreting :some_keyword as the keyword some_keyword
+        # We need to keep track of the previous token to avoid
+        # interpreting :some_keyword as the keyword some_keyword.
         prev = Token.new(0, :init, '')
-        # same goes for defs so we need to track those as well
+        # Same goes for defs so we need to track those as well.
         keywords = []
 
-        tokens.each do |t|
-          keywords << t if prev.type != :on_symbeg && t.type == :on_kw
-          # def with name that's a kw confuses Ripper.lex
-          penultimate = keywords[-2]
-          keywords.pop if penultimate && penultimate.text == 'def'
+        tokens.reject { |t| whitespace?(t) }.each do |t|
+          if prev.type != :on_symbeg && t.type == :on_kw &&
+              [prev.type, prev.text] != [:on_kw, 'def']
+            keywords << t
+          end
           prev = t
         end
 

data/lib/rubocop/cop/op_method.rb

@@ -7,22 +7,30 @@ module Rubocop
 
       def inspect(file, source, tokens, sexp)
         each(:def, sexp) do |s|
-          if s[1][0] == :@op && !%w([] []= <<).include?(s[1][1])
-            if s[2][0] == :paren
-              # param is surrounded by braces
-              param = s[2][1][1][0]
-            else
-              param = s[2][1][0]
-            end
-
-            unless param[1] == 'other'
+          if binary_operator?(s) && !%w([] []= <<).include?(s[1][1])
+            params = parameters(s[2])
+            unless params[0][1] == 'other'
               add_offence(:convention,
-                          param[2].lineno,
+                          params[0][2].lineno,
                           sprintf(ERROR_MESSAGE, s[1][1]))
             end
           end
         end
       end
+
+      private
+
+      def binary_operator?(def_sexp)
+        def_sexp[1][0] == :@op && parameters(def_sexp[2]).size == 1
+      end
+
+      def parameters(param_sexp)
+        if param_sexp[0] == :paren # param is surrounded by braces?
+          parameters(param_sexp[1])
+        else
+          param_sexp[1] || []
+        end
+      end
     end
   end
 end

data/lib/rubocop/cop/rescue_exception.rb

@@ -30,6 +30,9 @@ module Rubocop
         elsif s[1][0][0] == :const_path_ref
           # rescue Module::Class
           false
+        elsif s[1][0] == :mrhs_add_star
+          # rescue *ERRORS
+          false
         else
           true
         end

data/lib/rubocop/cop/semicolon.rb

@@ -33,9 +33,10 @@ module Rubocop
       def index_of_first_token_on_line(ix, lineno)
         # Index of last token on the previous line
         prev_line_ix =
-          @tokens[0...ix].rindex { |t| t.pos.lineno < lineno } || 0
+          @tokens[0...ix].rindex { |t| t.pos.lineno < lineno } || -1
+        first = prev_line_ix + 1
         # Index of first non-whitespace token on the current line.
-        prev_line_ix + @tokens[prev_line_ix..ix].index { |t| !whitespace?(t) }
+        first + @tokens[first..ix].index { |t| !whitespace?(t) }
       end
 
       def handle_exceptions_to_the_rule(token_1_ix)

data/lib/rubocop/cop/symbol_array.rb

@@ -12,7 +12,7 @@ module Rubocop
             array_elems = s[1]
 
             # no need to check empty arrays
-            return unless array_elems && array_elems.size > 1
+            next unless array_elems && array_elems.size > 1
 
             symbol_array = array_elems.all? { |e| e[0] == :symbol_literal }
 

data/lib/rubocop/cop/symbol_snake_case.rb

@@ -14,7 +14,7 @@ module Rubocop
 
       def check_for_symbols(sexp)
         each(:symbol_literal, sexp) do |s|
-          symbol_type = s[1][1][0]
+          symbol_type = s[1][0] == :symbol ? s[1][1][0] : s[1][0]
 
           # don't check operators
           next if symbol_type == :@op

data/lib/rubocop/cop/word_array.rb

@@ -10,7 +10,7 @@ module Rubocop
           array_elems = s[1]
 
           # no need to check empty arrays
-          return unless array_elems && array_elems.size > 1
+          next unless array_elems && array_elems.size > 1
 
           string_array = array_elems.all? { |e| e[0] == :string_literal }
 

data/lib/rubocop/version.rb

@@ -2,6 +2,6 @@
 
 module Rubocop
   module Version
-    STRING = '0.7.1'
+    STRING = '0.7.2'
   end
 end

data/rubocop.gemspec

@@ -1,4 +1,5 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
+
 $LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 require 'rubocop/version'
 require 'English'

data/spec/rubocop/cli_spec.rb

@@ -191,7 +191,7 @@ module Rubocop
     end
 
     it 'exits with error if an incorrect cop name is passed to --only' do
-      expect(cli.run(['--only', '123'])).to eq(1)
+      expect(cli.run(%w(--only 123))).to eq(1)
       expect($stdout.string).to eq("Unrecognized cop name: 123.\n")
     end
 

data/spec/rubocop/cops/avoid_for_spec.rb

@@ -10,8 +10,10 @@ module Rubocop
       it 'registers an offence for for' do
         inspect_source(af,
                        'file.rb',
-                       ['for n in [1, 2, 3] do',
-                        '  puts n',
+                       ['def func',
+                        '  for n in [1, 2, 3] do',
+                        '    puts n',
+                        '  end',
                         'end'])
         expect(af.offences.size).to eq(1)
         expect(af.offences.map(&:message))

data/spec/rubocop/cops/leading_comment_space_spec.rb

@@ -45,7 +45,8 @@ module Rubocop
       it 'does not register an offence for #! on first line' do
         inspect_source(lcs,
                        'file.rb',
-                       ['#!/usr/bin/ruby'])
+                       ['#!/usr/bin/ruby',
+                        'test'])
         expect(lcs.offences).to be_empty
       end
 

data/spec/rubocop/cops/method_length_spec.rb

@@ -106,7 +106,7 @@ module Rubocop
 
       it 'properly counts lines when method ends with block' do
         inspect_source(method_length, '', ['def m()',
-                                           '  do',
+                                           '  something do',
                                            '    a = 2',
                                            '    a = 3',
                                            '    a = 4',

data/spec/rubocop/cops/op_method_spec.rb

@@ -64,6 +64,22 @@ module Rubocop
                         'end'])
         expect(om.offences).to be_empty
       end
+
+      it 'does not register an offence for non binary operators' do
+        inspect_source(om,
+                       'file.rb',
+                       ['def -@', # Unary minus
+                        'end',
+                        '',
+                        # This + is not a unary operator. It can only be
+                        # called with dot notation.
+                        'def +',
+                        'end',
+                        '',
+                        'def *(a, b)', # Quite strange, but legal ruby.
+                        'end'])
+        expect(om.offences).to be_empty
+      end
     end
   end
 end

data/spec/rubocop/cops/rescue_exception_spec.rb

@@ -68,6 +68,18 @@ module Rubocop
                         'end'])
         expect(re.offences).to be_empty
       end
+
+      it 'does not crash when the splat operator is used in a rescue' do
+        inspect_source(re,
+                       'file.rb',
+                       ['ERRORS = [Exception]',
+                        'begin',
+                        '  a = 3 / 0',
+                        'rescue *ERRORS',
+                        '  puts e',
+                        'end'])
+        expect(re.offences).to be_empty
+      end
     end
   end
 end

data/spec/rubocop/cops/{rescue_modifier.rb → rescue_modifier_spec.rb}

@@ -29,9 +29,9 @@ module Rubocop
         inspect_source(rm,
                        'file.rb',
                        ['begin',
-                        'test',
+                        '  test',
                         'rescue',
-                        'handle',
+                        '  handle',
                         'end'])
         expect(rm.offences).to be_empty
       end

data/spec/rubocop/cops/semicolon_spec.rb

@@ -81,8 +81,20 @@ module Rubocop
       it 'accepts one line empty class definitions' do
         inspect_source(s,
                        'file.rb',
-                       ['  class Foo < Exception; end',
-                        '  class Bar; end'])
+                       ['# Prefer a single-line format for class ...',
+                        'class Foo < Exception; end',
+                        '',
+                        'class Bar; end'])
+        expect(s.offences).to be_empty
+      end
+
+      it 'accepts one line empty method definitions' do
+        inspect_source(s,
+                       'file.rb',
+                       ['# One exception to the rule are empty-body methods',
+                        'def no_op; end',
+                        '',
+                        'def foo; end'])
         expect(s.offences).to be_empty
       end
 

data/spec/rubocop/cops/space_around_operators_spec.rb

@@ -128,7 +128,7 @@ module Rubocop
       end
 
       it 'accepts an assignment followed by newline' do
-        inspect_source(space, 'file.rb', ['x =\n  0'])
+        inspect_source(space, 'file.rb', ['x =', '0'])
         expect(space.offences).to be_empty
       end
 

data/spec/rubocop/cops/symbol_snake_case_spec.rb

@@ -77,6 +77,12 @@ module Rubocop
         expect(snake_case.offences).to be_empty
       end
 
+      it 'can handle an alias of and operator without crashing' do
+        inspect_source(snake_case, 'file.rb',
+                       ['alias + add'])
+        expect(snake_case.offences).to be_empty
+      end
+
       it 'registers an offence for SCREAMING_SNAKE_CASE' do
         inspect_source(snake_case, 'file.rb',
                        ['test = :BAD_IDEA'])

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.7.1
-  prerelease: 
+  version: 0.7.2
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -14,23 +13,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,13 +90,13 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
-description: ! "    Automatic Ruby code style checking tool.\n    Aims to enforce
-  the community-driven Ruby Style Guide.\n"
+description: |2
+      Automatic Ruby code style checking tool.
+      Aims to enforce the community-driven Ruby Style Guide.
 email: bozhidar@batsov.com
 executables:
 - rubocop
@@ -273,7 +261,7 @@ files:
 - spec/rubocop/cops/percent_r_spec.rb
 - spec/rubocop/cops/reduce_arguments_spec.rb
 - spec/rubocop/cops/rescue_exception_spec.rb
-- spec/rubocop/cops/rescue_modifier.rb
+- spec/rubocop/cops/rescue_modifier_spec.rb
 - spec/rubocop/cops/semicolon_spec.rb
 - spec/rubocop/cops/single_line_blocks_spec.rb
 - spec/rubocop/cops/single_line_methods_spec.rb
@@ -307,30 +295,26 @@ files:
 homepage: http://github.com/bbatsov/rubocop
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3818294500784627882
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Automatic Ruby code style checking tool.
 test_files:
 - spec/project_spec.rb
@@ -394,7 +378,7 @@ test_files:
 - spec/rubocop/cops/percent_r_spec.rb
 - spec/rubocop/cops/reduce_arguments_spec.rb
 - spec/rubocop/cops/rescue_exception_spec.rb
-- spec/rubocop/cops/rescue_modifier.rb
+- spec/rubocop/cops/rescue_modifier_spec.rb
 - spec/rubocop/cops/semicolon_spec.rb
 - spec/rubocop/cops/single_line_blocks_spec.rb
 - spec/rubocop/cops/single_line_methods_spec.rb