excellent 1.7.1 → 1.7.2

data/History.txt

@@ -1,8 +1,15 @@
 =======
+= 1.7.2
+
+* fixed Simplabs::Excellent::Checks::Rails::CustomInitializeMethodCheck
+* fixed Simplabs::Excellent::Checks::MethodNameCheck so it allows method names that exist in Ruby itself
+* fixed Simplabs::Excellent::Checks::GlobalVariableCheck so it doesn't report false positives for rescue bodies
+
 = 1.7.1
 
 * fixed excellent for Ruby 2.0
 * some internal cleanup
+* support -v switch on command line
 
 = 1.7.0
 

data/VERSION.yml

@@ -1,4 +1,4 @@
---- 
+---
 :major: 1
-:minor: 5
-:patch: 4
+:minor: 7
+:patch: 2

data/lib/simplabs/excellent.rb

@@ -9,7 +9,7 @@ module Simplabs #:nodoc:
 
   module Excellent #:nodoc:
 
-    VERSION = '1.7.1'
+    VERSION = '1.7.2'
 
   end
 

data/lib/simplabs/excellent/checks/global_variable_check.rb

@@ -21,7 +21,9 @@ module Simplabs
         end
 
         def evaluate(context) #:nodoc:
-          add_warning(context, 'Global variable {{variable}} used.', { :variable => context.full_name })
+          if context.is_a?(Parsing::GasgnContext) || !context.reassigned_local_exception_var?
+            add_warning(context, 'Global variable {{variable}} used.', { :variable => context.full_name })
+          end
         end
 
       end

data/lib/simplabs/excellent/checks/method_name_check.rb

@@ -17,10 +17,11 @@ module Simplabs
       class MethodNameCheck < NameCheck
 
         DEFAULT_PATTERN = /^[_a-z<>=\[|+-\/\*\~\%\&`\|\^]+[_a-z0-9_<>=~@\[\]]*[=!\?]?$/
+        WHITELIST       = %w([] ! !=  !~ % & * ** + +@ - -@ / < << <= <=> == === =~ > >= >> ^ ` | ~)
 
         def initialize(options = {}) #:nodoc:
           pattern = options['pattern'] || DEFAULT_PATTERN
-          super([Parsing::MethodContext, Parsing::SingletonMethodContext], pattern)
+          super([Parsing::MethodContext, Parsing::SingletonMethodContext], pattern, WHITELIST)
         end
 
         protected

data/lib/simplabs/excellent/checks/name_check.rb

@@ -8,14 +8,18 @@ module Simplabs
 
       class NameCheck < Base #:nodoc:
 
-        def initialize(interesting_contexts, pattern)
+        def initialize(interesting_contexts, pattern, whitelist = [])
           super()
           @interesting_contexts = interesting_contexts
           @pattern              = pattern
+          @whitelist            = whitelist
         end
 
         def evaluate(context)
-          add_warning(*warning_args(context)) unless context.name.to_s =~ @pattern
+          name = context.name.to_s
+          if !@whitelist.include?(name) && !(name =~ @pattern)
+            add_warning(*warning_args(context))
+          end
         end
 
       end

data/lib/simplabs/excellent/checks/rails/custom_initialize_method_check.rb

@@ -23,7 +23,7 @@ module Simplabs
           end
 
           def evaluate(context) #:nodoc:
-            add_warning(context, '{{class}} defines initialize method.', { :class => context.full_name }) if context.active_record_model? && !context.defines_initializer?
+            add_warning(context, '{{class}} defines initialize method.', { :class => context.full_name }) if context.active_record_model? && context.defines_initializer?
           end
 
         end

data/lib/simplabs/excellent/parsing/class_context.rb

@@ -70,7 +70,7 @@ module Simplabs
         end
 
         def process_defn(exp)
-          @initializer = true if exp[2] == :initialize
+          @initializer = exp[1] == :initialize
           super
         end
 

data/lib/simplabs/excellent/parsing/conditional_context.rb

@@ -12,7 +12,7 @@ module Simplabs
 
           def contains_parameter?
             return false unless @parent.is_a?(MethodContext)
-            return @exp[1][1] if @exp[1][0] == :lvar and @parent.has_parameter?(@exp[1][1])
+            return @exp[1][1] if !!@exp[1] && @exp[1][0] == :lvar and @parent.has_parameter?(@exp[1][1])
             false
           end
 

data/lib/simplabs/excellent/parsing/cvar_context.rb

@@ -15,8 +15,12 @@ module Simplabs
           return @name if !@parent
           full_name = @name
           parent    = @parent
-          parent    = parent.parent until parent.is_a?(ClassContext) || parent.is_a?(ModuleContext)
-          full_name = "#{parent.full_name}.#{full_name}"
+          parent = parent.parent until parent.is_a?(ClassContext) || parent.is_a?(ModuleContext) rescue nil
+          if !!parent
+            "#{parent.full_name}.#{full_name}"
+          else
+            full_name
+          end
         end
 
       end

data/lib/simplabs/excellent/parsing/gvar_context.rb

@@ -12,6 +12,14 @@ module Simplabs
           @full_name = @name
         end
 
+        def reassigned_local_exception_var?
+          if self.parent.is_a?(Simplabs::Excellent::Parsing::ResbodyContext)
+            @name == '!' && self.parent.assigns_exception_to_local_variable?.inspect
+          else
+            false
+          end
+        end
+
       end
 
     end

data/lib/simplabs/excellent/parsing/resbody_context.rb

@@ -17,6 +17,12 @@ module Simplabs
           @contains_statements
         end
 
+        def assigns_exception_to_local_variable?
+          @exp[1][2].node_type == :lasgn && @exp[1][2][2].to_a == [:gvar, :$!]
+        rescue
+          false
+        end
+
         private
 
           def contains_statements?(exp = @exp)

metadata

@@ -1,61 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: excellent
-version: !ruby/object:Gem::Version 
-  hash: 9
+version: !ruby/object:Gem::Version
+  version: 1.7.2
   prerelease: 
-  segments: 
-  - 1
-  - 7
-  - 1
-  version: 1.7.1
 platform: ruby
-authors: 
+authors:
 - Marco Otte-Witte
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-08-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2009-08-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ruby_parser
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sexp_processor
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: sexp_processor
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 4
-        - 0
-        version: "4.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: 
 email: marco.otte-witte@simplabs.com
-executables: 
+executables:
 - excellent
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - History.txt
 - README.rdoc
 - VERSION.yml
@@ -164,37 +158,29 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/simplabs/excellent
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --inline-source
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 2
 summary: Source Code analysis gem for Ruby and Rails
 test_files: []
-
+has_rdoc: true