excellent 1.5.4 → 1.6.0

data/History.txt

@@ -1,3 +1,9 @@
+=======
+= 1.5.5
+
+* better option parsing in the executable, (thanks trans, http://github.com/trans)
+* added line count parser (not yet used), (thanks trans, http://github.com/trans)
+
 = 1.5.4
 
 * fixed handling of parser errors

data/README.rdoc

@@ -46,7 +46,7 @@ To analyse all the models in your Rails application, just do
 in your <tt>RAILS_ROOT</tt>. You can also invoke analysation through the Simplabs::Excellent::Runner class. Excellent can also produce HTML output. To
 get a formatted HTML report, just specify <tt>html:<filename></tt>:
 
-  excellent html:out.html app/models
+  excellent -o out.html app/models
 
 You can also use Excellent in a Rake task:
 
@@ -67,6 +67,6 @@ If you want to contribute, just fork the repo. Also I would appretiate suggestio
 
 == Author
 
-Copyright (c) 2008-2009 Marco Otte-Witte (http://simplabs.com), released under the MIT license.
+Copyright (c) 2008-2010 Marco Otte-Witte (http://simplabs.com), released under the MIT license.
 
 Excellent was inspired by roodi (http://github.com/martinjandrews/roodi), reek (http://github.com/kevinrutherford/reek) and flog (http://github.com/seattlerb/flog).

data/bin/excellent

@@ -1,31 +1,49 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
-
 require 'simplabs/excellent'
 require 'pathname'
+require 'optparse'
 
-excellent = Simplabs::Excellent::Runner.new
+options = {}
 
-if ARGV.first =~ /html:[^\s]+/
-  begin
-    output = File.open(ARGV.first.sub(/html:/, ''), 'w+')
-    formatter = Simplabs::Excellent::Formatters::Html.new(output)
-    ARGV.shift
-  rescue
+optparse = OptionParser.new do |opt|
+  opt.banner = 'Usage: excellent [OPTIONS] <PATH1> [<PATH2> ...]'
+  opt.on('--output', '-o [FILE]', 'Write HTML output to [FILE].') do |target|
+    options[:output] = target
+  end
+  opt.on_tail('--help', '-h', 'Help') do
+    puts optparse
+    exit
   end
-else
-  formatter = Simplabs::Excellent::Formatters::Text.new
 end
 
-if ARGV.empty?
+optparse.parse!
+
+target   = options[:output]
+paths    = ARGV.dup
+
+if paths.empty?
   puts "\n  You must specify one or more directories to analyse, e.g.:\n"
-  puts "\n    excellent app/\n\n"
+  puts "\n    excellent lib/\n\n"
   exit 1
 end
 
+if target
+  begin
+    fileio = File.open(target, 'w+')
+    formatter = Simplabs::Excellent::Formatters::Html.new(fileio)
+  rescue Errno::ENOENT
+    puts "\n  #{target} cannot be opened for writing. Specify a file name like so:\n"
+    puts "\n    excellent -o excellent.html lib/\n\n"
+  end
+else
+  formatter = Simplabs::Excellent::Formatters::Text.new
+end
+
+excellent = Simplabs::Excellent::Runner.new
+
 begin
-  excellent.check_paths(ARGV, formatter)
+  excellent.check_paths(paths, formatter)
 rescue ArgumentError
   puts "\n** Excellent cannot find the paths specified!\n\n"
   exit 1

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

@@ -24,8 +24,8 @@ module Simplabs
 
         def initialize(options = {}) #:nodoc:
           super()
-          @threshold         = options[:threshold] || DEFAULT_THRESHOLD
-          @interesting_nodes = [:defn, :defs]
+          @threshold            = options[:threshold] || DEFAULT_THRESHOLD
+          @interesting_contexts = [Parsing::MethodContext, Parsing::SingletonMethodContext]
         end
 
         def evaluate(context) #:nodoc:

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

@@ -22,8 +22,8 @@ module Simplabs
 
         def initialize(options = {}) #:nodoc:
           super()
-          @interesting_nodes = [:if, :while, :until]
-          @interesting_files = [/\.rb$/, /\.erb$/]
+          @interesting_contexts = [Parsing::IfContext, Parsing::WhileContext, Parsing::UntilContext]
+          @interesting_files    = [/\.rb$/, /\.erb$/]
         end
 
         def evaluate(context) #:nodoc:

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

@@ -6,15 +6,16 @@ module Simplabs
 
     module Checks
 
-      # This is the base class for all code checks. All checks must specify +interesting_nodes+. When one of these nodes is processed by Excellent, it
-      # will invoke the +evaluate_node+ method of all checks that specify the node as one if their +interesting_nodes+.
+      # This is the base class for all code checks. All checks must specify +interesting_contexts+. When one of these contexts is processed by Excellent, it
+      # will invoke the +evaluate_context+ method of all checks that specify the context as one if their +interesting_contexts+.
       class Base
 
         attr_reader :warnings
 
-        # An array of node types that are interesting for the check. These are symbols as returned by RubyParser (see http://parsetree.rubyforge.org/ruby_parser/),
-        # e.g. <tt>:if</tt> or <tt>:defn</tt>
-        attr_reader :interesting_nodes
+        # An array of contexts that are interesting for the check. These contexts are based on symbols as returned by RubyParser (see
+        # http://parsetree.rubyforge.org/ruby_parser/) and add some additional data,
+        # e.g. <tt>Ifcontext</tt> or <tt>MethodContext</tt>
+        attr_reader :interesting_contexts
 
         # An array of regular expressions for file names that are interesting for the check. These will usually be path extensions rather than longer
         # patterns (e.g. *.rb as well as *.erb files or *.rb files only).
@@ -27,12 +28,13 @@ module Simplabs
           @interesting_files = [/\.rb$/]
         end
 
-        # This method is called whenever Excellent processes a node that the check specified as one of the nodes it is interested in (see interesting_nodes).
+        # This method is called whenever Excellent processes a context that the check specified as one of the contexts it is interested in (see 
+        # interesting_contexts).
         #
         # ==== Parameters
         #
         # * <tt>context</tt> - This is the last context the code processor has constructed. It contains all information required to execute the check (see Simplabs::Excellent::Parsing::SexpContext).
-        def evaluate_node(context)
+        def evaluate_context(context)
           evaluate(context)
         end
 

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

@@ -17,8 +17,8 @@ module Simplabs
 
         def initialize #:nodoc:
           super
-          @interesting_nodes = [:case]
-          @interesting_files = [/\.rb$/, /\.erb$/]
+          @interesting_contexts = [Parsing::CaseContext]
+          @interesting_files    = [/\.rb$/, /\.erb$/]
         end
 
         def evaluate(context) #:nodoc:

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

@@ -18,7 +18,7 @@ module Simplabs
 
         def initialize(options = {}) #:nodoc:
           threshold = options[:threshold] || DEFAULT_THRESHOLD
-          super([:class], threshold)
+          super([Parsing::ClassContext], threshold)
         end
 
         protected

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

@@ -20,7 +20,7 @@ module Simplabs
       
         def initialize(options = {}) #:nodoc:
           pattern = options[:pattern] || DEFAULT_PATTERN
-          super([:class], pattern)
+          super([Parsing::ClassContext], pattern)
         end
       
         protected

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

@@ -17,7 +17,7 @@ module Simplabs
 
         def initialize #:nodoc:
           super
-          @interesting_nodes = [:if, :case]
+          @interesting_contexts = [Parsing::IfContext, Parsing::CaseContext]
         end
 
         def evaluate(context) #:nodoc:

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

@@ -30,7 +30,7 @@ module Simplabs
       
         def initialize(options = {}) #:nodoc:
           threshold = options[:threshold] || DEFAULT_THRESHOLD
-          super([:iter], threshold)
+          super([Parsing::BlockContext], threshold)
         end
       
         def evaluate(context) #:nodoc:

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

@@ -8,10 +8,10 @@ module Simplabs
 
       class CyclomaticComplexityCheck < Base #:nodoc:
 
-        def initialize(interesting_nodes, threshold)
+        def initialize(interesting_contexts, threshold)
           super()
-          @interesting_nodes = interesting_nodes
-          @threshold         = threshold
+          @interesting_contexts = interesting_contexts
+          @threshold            = threshold
         end
 
       end

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

@@ -30,7 +30,7 @@ module Simplabs
 
         def initialize(options = {}) #:nodoc:
           threshold = options[:threshold] || DEFAULT_THRESHOLD
-          super([:defn, :defs], threshold)
+          super([Parsing::MethodContext, Parsing::SingletonMethodContext], threshold)
         end
 
         def evaluate(context) #:nodoc:

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

@@ -15,7 +15,7 @@ module Simplabs
 
         def initialize #:nodoc:
           super
-          @interesting_nodes = [:resbody]
+          @interesting_contexts = [Parsing::ResbodyContext]
         end
 
         def evaluate(context) #:nodoc:

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

@@ -22,7 +22,7 @@ module Simplabs
 
         def initialize(options = {}) #:nodoc:
           threshold = options[:threshold] || DEFAULT_THRESHOLD
-          super([:iter], threshold)
+          super([Parsing::BlockContext], threshold)
         end
 
         protected

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

@@ -8,10 +8,10 @@ module Simplabs
 
       class FlogCheck < Base #:nodoc:
 
-        def initialize(interesting_nodes, threshold)
+        def initialize(interesting_contexts, threshold)
           super()
-          @interesting_nodes = interesting_nodes
-          @threshold         = threshold
+          @interesting_contexts = interesting_contexts
+          @threshold            = threshold
         end
 
         def evaluate(context)

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

@@ -22,7 +22,7 @@ module Simplabs
 
         def initialize(options = {}) #:nodoc:
           threshold = options[:threshold] || DEFAULT_THRESHOLD
-          super([:class], threshold)
+          super([Parsing::ClassContext], threshold)
         end
 
         protected

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

@@ -22,7 +22,7 @@ module Simplabs
 
         def initialize(options = {}) #:nodoc:
           threshold = options[:threshold] || DEFAULT_THRESHOLD
-          super([:defn, :defs], threshold)
+          super([Parsing::MethodContext, Parsing::SingletonMethodContext], threshold)
         end
 
         protected

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

@@ -25,8 +25,8 @@ module Simplabs
 
         def initialize #:nodoc:
           super
-          @interesting_nodes = [:for]
-          @interesting_files = [/\.rb$/, /\.erb$/]
+          @interesting_contexts = [Parsing::ForLoopContext]
+          @interesting_files    = [/\.rb$/, /\.erb$/]
         end
 
         def evaluate(context) #:nodoc:

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

@@ -16,8 +16,8 @@ module Simplabs
 
         def initialize #:nodoc:
           super
-          @interesting_nodes = [:gvar, :gasgn]
-          @interesting_files = [/\.rb$/, /\.erb$/]
+          @interesting_contexts = [Parsing::GvarContext, Parsing::GasgnContext]
+          @interesting_files    = [/\.rb$/, /\.erb$/]
         end
 
         def evaluate(context) #:nodoc:

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

@@ -8,10 +8,10 @@ module Simplabs
 
       class LineCountCheck < Base #:nodoc:
 
-        def initialize(interesting_nodes, threshold)
+        def initialize(interesting_contexts, threshold)
           super()
-          @interesting_nodes = interesting_nodes
-          @threshold         = threshold
+          @interesting_contexts = interesting_contexts
+          @threshold            = threshold
         end
 
         def evaluate(context)

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

@@ -18,7 +18,7 @@ module Simplabs
 
         def initialize(options = {}) #:nodoc:
           threshold = options[:threshold] || DEFAULT_THRESHOLD
-          super([:defn], threshold)
+          super([Parsing::MethodContext], threshold)
         end
 
         protected

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

@@ -20,7 +20,7 @@ module Simplabs
 
         def initialize(options = {}) #:nodoc:
           pattern = options['pattern'] || DEFAULT_PATTERN
-          super([:defn, :defs], pattern)
+          super([Parsing::MethodContext, Parsing::SingletonMethodContext], pattern)
         end
 
         protected

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

@@ -18,7 +18,7 @@ module Simplabs
 
         def initialize(options = {}) #:nodoc:
           threshold = options[:threshold] || DEFAULT_THRESHOLD
-          super([:module], threshold)
+          super([Parsing::ModuleContext], threshold)
         end
 
         protected

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

@@ -20,7 +20,7 @@ module Simplabs
 
         def initialize(options = {}) #:nodoc:
           pattern = options['pattern'] || DEFAULT_PATTERN
-          super([:module], pattern)
+          super([Parsing::ModuleContext], pattern)
         end
 
         protected

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

@@ -8,10 +8,10 @@ module Simplabs
 
       class NameCheck < Base #:nodoc:
 
-        def initialize(interesting_nodes, pattern)
+        def initialize(interesting_contexts, pattern)
           super()
-          @interesting_nodes = interesting_nodes
-          @pattern           = pattern
+          @interesting_contexts = interesting_contexts
+          @pattern              = pattern
         end
 
         def evaluate(context)

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

@@ -15,8 +15,8 @@ module Simplabs
 
         def initialize #:nodoc:
           super
-          @interesting_nodes = [:iter]
-          @interesting_files = [/\.rb$/, /\.erb$/]
+          @interesting_contexts = [Parsing::BlockContext]
+          @interesting_files    = [/\.rb$/, /\.erb$/]
         end
 
         def evaluate(context) #:nodoc:

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

@@ -19,8 +19,8 @@ module Simplabs
 
         def initialize(options = {}) #:nodoc:
           super()
-          @threshold         = options[:threshold] || DEFAULT_THRESHOLD
-          @interesting_nodes = [:defn, :iter, :defs]
+          @threshold            = options[:threshold] || DEFAULT_THRESHOLD
+          @interesting_contexts = [Parsing::MethodContext, Parsing::SingletonMethodContext, Parsing::BlockContext]
         end
 
         def evaluate(context) #:nodoc:

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

@@ -20,7 +20,7 @@ module Simplabs
 
           def initialize #:nodoc:
             super
-            @interesting_nodes = [:class]
+            @interesting_contexts = [Parsing::ClassContext]
           end
 
           def evaluate(context) #:nodoc:

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

@@ -21,7 +21,7 @@ module Simplabs
 
           def initialize #:nodoc:
             super
-            @interesting_nodes = [:class]
+            @interesting_contexts = [Parsing::ClassContext]
           end
 
           def evaluate(context) #:nodoc:

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

@@ -19,7 +19,7 @@ module Simplabs
 
           def initialize #:nodoc:
             super
-            @interesting_nodes = [:class]
+            @interesting_contexts = [Parsing::ClassContext]
           end
 
           def evaluate(context) #:nodoc:

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

@@ -18,12 +18,12 @@ module Simplabs
 
           def initialize #:nodoc:
             super
-            @interesting_nodes = [:ivar]
+            @interesting_contexts = [Parsing::IvarContext]
             @interesting_files = [/^_.*\.erb$/]
           end
 
           def evaluate(context) #:nodoc:
-            add_warning(context, 'Instance variable {{variable}} used in partial.', { :variable => context.full_name })
+            add_warning(context, 'Instance variable {{variable}} used in partial.', { :variable => context.full_name }, -1)
           end
 
         end

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

@@ -19,12 +19,12 @@ module Simplabs
 
           def initialize #:nodoc:
             super
-            @interesting_nodes = [:call]
-            @interesting_files = [/^.*\.(erb|rhtml)$/]
+            @interesting_contexts = [Parsing::CallContext]
+            @interesting_files    = [/^.*\.(erb|rhtml)$/]
           end
 
           def evaluate(context) #:nodoc:
-            add_warning(context, 'Params hash used in view.') if (context.full_name == 'params')
+            add_warning(context, 'Params hash used in view.', {}, -1) if (context.full_name == 'params')
           end
 
         end

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

@@ -19,12 +19,12 @@ module Simplabs
 
           def initialize #:nodoc:
             super
-            @interesting_nodes = [:call]
-            @interesting_files = [/^.*\.(erb|rhtml)$/]
+            @interesting_contexts = [Parsing::CallContext]
+            @interesting_files = [/^.*\.(erb|rhtml|haml)$/]
           end
 
           def evaluate(context) #:nodoc:
-            add_warning(context, 'Session hash used in view.') if (context.full_name == 'session')
+            add_warning(context, 'Session hash used in view.', {}, -1) if (context.full_name == 'session')
           end
 
         end

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

@@ -18,7 +18,7 @@ module Simplabs
 
           def initialize #:nodoc:
             super
-            @interesting_nodes = [:class]
+            @interesting_contexts = [Parsing::ClassContext]
           end
 
           def evaluate(context) #:nodoc:

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

@@ -16,7 +16,7 @@ module Simplabs
 
         def initialize #:nodoc:
           super
-          @interesting_nodes = [:cvar]
+          @interesting_contexts = [Parsing::CvarContext]
           @interesting_files = [/\.rb$/, /\.erb$/]
         end
 

data/lib/simplabs/excellent/formatters/html.rb

@@ -1,4 +1,5 @@
 require 'simplabs/excellent/formatters/base'
+require 'rubygems'
 
 module Simplabs
 
@@ -71,14 +72,11 @@ module Simplabs
           			}
 
           			dd {
-          				margin: 5px 0px 5px 20px;
-          			}
-
-          			dd.warning {
+          			  margin: 5px 0px 5px 20px;
           				background: #faf834;
           			}
 
-          			dd.warning span.lineNumber {
+          			dd span.lineNumber {
           				background: #ccc;
           				font-weight: bold;
           				padding: 3px;
@@ -86,7 +84,7 @@ module Simplabs
           				margin: 0 10px 0 0;
           			}
 
-          			dd.warning span.number {
+          			dd span.number {
           				width: 30px;
           				text-align: right;
           				display: inline-block;
@@ -109,6 +107,102 @@ module Simplabs
                   color: #fff;
                   background-color: #222;
                 }
+
+                .af { color:#00C }
+                .an { color:#007 }
+                .at { color:#f08 }
+                .av { color:#700 }
+                .aw { color:#C00 }
+                .bi { color:#509; font-weight:bold }
+                .c  { color:#888; }
+
+                .ch { color:#04D }
+                .ch .k { color:#04D }
+                .ch .dl { color:#039 }
+
+                .cl { color:#B06; font-weight:bold }
+                .co { color:#036; font-weight:bold }
+                .cr { color:#0A0 }
+                .cv { color:#369 }
+                .df { color:#099; font-weight:bold }
+                .di { color:#088; font-weight:bold }
+                .dl { color:black }
+                .do { color:#970 }
+                .dt { color:#34b }
+                .ds { color:#D42; font-weight:bold }
+                .e  { color:#666; font-weight:bold }
+                .en { color:#800; font-weight:bold }
+                .er { color:#F00; background-color:#FAA }
+                .ex { color:#F00; font-weight:bold }
+                .fl { color:#60E; font-weight:bold }
+                .fu { color:#06B; font-weight:bold }
+                .gv { color:#d70; font-weight:bold }
+                .hx { color:#058; font-weight:bold }
+                .i  { color:#00D; font-weight:bold }
+                .ic { color:#B44; font-weight:bold }
+
+                .il { background: #eee; color: black }
+                .il .il { background: #ddd }
+                .il .il .il { background: #ccc }
+                .il .idl { font-weight: bold; color: #777 }
+
+                .im { color:#f00; }
+                .in { color:#B2B; font-weight:bold }
+                .iv { color:#33B }
+                .la { color:#970; font-weight:bold }
+                .lv { color:#963 }
+                .oc { color:#40E; font-weight:bold }
+                .of { color:#000; font-weight:bold }
+                .op { }
+                .pc { color:#038; font-weight:bold }
+                .pd { color:#369; font-weight:bold }
+                .pp { color:#579; }
+                .ps { color:#00C; font-weight: bold; }
+                .pt { color:#349; font-weight:bold }
+                .r, .kw  { color:#080; font-weight:bold }
+
+                .ke { color: #808; }
+                .ke .dl { color: #606; }
+                .ke .ch { color: #80f; }
+                .vl { color: #088; }
+
+                .rx { background-color:#fff0ff }
+                .rx .k { color:#808 }
+                .rx .dl { color:#404 }
+                .rx .mod { color:#C2C }
+                .rx .fu  { color:#404; font-weight: bold }
+
+                .s { background-color:#fff0f0; color: #D20; }
+                .s .s { background-color:#ffe0e0 }
+                .s .s  .s { background-color:#ffd0d0 }
+                .s .k { }
+                .s .ch { color: #b0b; }
+                .s .dl { color: #710; }
+
+                .sh { background-color:#f0fff0; color:#2B2 }
+                .sh .k { }
+                .sh .dl { color:#161 }
+
+                .sy { color:#A60 }
+                .sy .k { color:#A60 }
+                .sy .dl { color:#630 }
+
+                .ta { color:#070 }
+                .tf { color:#070; font-weight:bold }
+                .ts { color:#D70; font-weight:bold }
+                .ty { color:#339; font-weight:bold }
+                .v  { color:#036 }
+                .xt { color:#444 }
+
+                .ins { background: #afa; }
+                .del { background: #faa; }
+                .chg { color: #aaf; background: #007; }
+                .head { color: #f8f; background: #505 }
+
+                .ins .ins { color: #080; font-weight:bold }
+                .del .del { color: #800; font-weight:bold }
+                .chg .chg { color: #66f; }
+                .head .head { color: #f4f; }
             	</style>
           	</head>
           	<body>
@@ -132,7 +226,9 @@ module Simplabs
         END
 
         WARNING_TEMPLATE = <<-END
-          <dd class="warning"><span class="lineNumber">Line <span class="number">{{line_number}}</span></span>{{message}}</dd>
+          <dd>
+            <span class="lineNumber">Line <span class="number">{{line_number}}</span></span>{{message}}
+          </dd>
         END
 
         FOOTER_TEMPLATE = <<-END

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

@@ -13,7 +13,17 @@ module Simplabs
 
         def initialize(exp, parent)
           super
-          @receiver  = exp[1].is_a?(Sexp) ? (exp[1][1].nil? ? exp[1][2].to_s : exp[1][1].to_s) : nil
+          @receiver  = if exp[1].is_a?(Sexp) && exp[1].node_type == :colon2
+            resolve_colon(exp[1])
+          elsif exp[1].is_a?(Sexp)
+            if exp[1].node_type != :call
+              exp[1][1].nil? ? exp[1][2].to_s : exp[1][1].to_s
+            else
+              nil
+            end
+          else
+            nil
+          end
           @method    = exp[2].to_s
           @full_name = [@receiver, @method].compact.join('.')
           record_validation

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

@@ -12,9 +12,11 @@ require 'simplabs/excellent/parsing/while_context'
 require 'simplabs/excellent/parsing/until_context'
 require 'simplabs/excellent/parsing/cvar_context'
 require 'simplabs/excellent/parsing/gvar_context'
+require 'simplabs/excellent/parsing/gasgn_context'
 require 'simplabs/excellent/parsing/ivar_context'
 require 'simplabs/excellent/parsing/resbody_context'
 require 'simplabs/excellent/parsing/call_context'
+require 'simplabs/excellent/parsing/constant_context'
 
 module Simplabs
 
@@ -35,8 +37,6 @@ module Simplabs
 
         def process(exp)
           super
-        rescue
-          #continue on errors
         end
 
         def process_class(exp)
@@ -68,7 +68,7 @@ module Simplabs
         end
 
         def process_gasgn(exp)
-          process_default(exp, GvarContext.new(exp, @contexts.last))
+          process_default(exp, GasgnContext.new(exp, @contexts.last))
         end
 
         def process_if(exp)
@@ -113,6 +113,10 @@ module Simplabs
           process_default(exp, ResbodyContext.new(exp, @contexts.last))
         end
 
+        def process_cdecl(exp)
+          process_default(exp, ConstantContext.new(exp, @contexts.last))
+        end
+
         def process_default(exp, context = nil)
           @contexts.push(context) if context
           @contexts.each do |c|
@@ -120,27 +124,25 @@ module Simplabs
             c.send(method, exp) if c.respond_to?(method)
           end
           exp.children.each { |sub| process(sub) }
-          apply_checks(exp)
+          apply_checks(exp.file, context) if context
           @contexts.pop if context
           exp
         end
 
         private
 
-          def apply_checks(exp)
-            if exp.is_a?(Sexp)
-              checks = @checks[exp.node_type] || []
-              checks.each { |check| check.evaluate_node(@contexts.last) if check.interesting_files.any? { |pattern| File.basename(exp.file) =~ pattern } }
-            end
+          def apply_checks(file, context)
+            checks = @checks[context.class] || []
+            checks.each { |check| check.evaluate_context(@contexts.last) if check.interesting_files.any? { |pattern| File.basename(file) =~ pattern } }
           end
 
           def setup_checks(checks)
             @checks = {}
             checks.each do |check|
-              check.interesting_nodes.each do |node|
-                @checks[node] ||= []
-                @checks[node] << check
-                @checks[node].uniq!
+              check.interesting_contexts.each do |context|
+                @checks[context] ||= []
+                @checks[context] << check
+                @checks[context].uniq!
               end
             end
           end

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

@@ -0,0 +1,20 @@
+module Simplabs
+
+  module Excellent
+
+    module Parsing
+
+      class ConstantContext < SexpContext #:nodoc:
+
+        def initialize(exp, parent)
+          super
+          @name = exp[1]
+        end
+
+      end
+
+    end
+
+  end
+
+end

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

@@ -12,7 +12,7 @@ module Simplabs
         end
 
         def full_name
-          return @name if @parent.blank?
+          return @name if !@parent
           full_name = @name
           parent    = @parent
           parent    = parent.parent until parent.is_a?(ClassContext) || parent.is_a?(ModuleContext)

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

@@ -0,0 +1,21 @@
+module Simplabs
+
+  module Excellent
+
+    module Parsing
+
+      class GasgnContext < SexpContext #:nodoc:
+
+        def initialize(exp, parent)
+          super
+          @name      = exp[1].to_s.sub(/^\$/, '')
+          @full_name = @name
+        end
+
+      end
+
+    end
+
+  end
+
+end

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

@@ -17,7 +17,7 @@ module Simplabs
           parent = @parent
           parent = parent.parent until parent.is_a?(ClassContext) || parent.is_a?(ModuleContext) || parent.nil?
           if parent
-            full_name = "#{parent.full_name}.#{full_name}"
+            full_name = "@#{full_name}"
           else
             @name
           end

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

@@ -33,7 +33,7 @@ module Simplabs
 
         def full_name
           parent = @parent.is_a?(BlockContext) ? @parent.parent : @parent
-          return @name if parent.blank?
+          return @name if !parent
           "#{parent.full_name}##{@name}"
         end
 

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

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'ruby_parser'
-require 'facets'
 require 'erb'
 
 module Simplabs

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

@@ -91,7 +91,7 @@ module Simplabs
         # 'Basket#add_product'.
         def full_name
           return @full_name if @full_name
-          return @name if @parent.blank?
+          return @name if !@parent
           "#{@parent.full_name}::#{@name}"
         end
 
@@ -116,6 +116,15 @@ module Simplabs
             found_assignment
           end
 
+          def resolve_colon(exp)
+            scope = if exp[1].node_type == :colon2
+              resolve_colon(exp[1])
+            elsif exp[1].node_type == :const
+              exp[1][1]
+            end
+            "#{scope.to_s}::#{exp[2].to_s}"
+          end
+
       end
 
     end

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

@@ -25,7 +25,7 @@ module Simplabs
         def full_name
           return @full_name if @full_name
           parent = @parent.is_a?(BlockContext) ? @parent.parent : @parent
-          return @name if parent.blank?
+          return @name if !parent
           "#{parent.full_name}.#{@name}"
         end
 

data/lib/simplabs/excellent/rake/excellent_task.rb

@@ -46,7 +46,7 @@ module Simplabs
             end
             task name do
               paths = @paths.join(' ')
-              format = @html ? " html:#{@html}" : ''
+              format = @html ? " -o #{@html}" : ''
               system("excellent#{format} #{paths}")
               $stdout.puts("\nWrote Excellent result to #{@html}\n\n") if @html
             end

data/spec/checks/rails/validations_check_spec.rb

@@ -45,7 +45,7 @@ describe Simplabs::Excellent::Checks::Rails::ValidationsCheck do
       warnings.should be_empty
     end
 
-    %(validate validate_on_create validate_on_update).each do |method|
+    %w(validate validate_on_create validate_on_update).each do |method|
 
       it "should accept an active record model that validates attribute by overriding #{method}" do
         code = <<-END

metadata

@@ -1,56 +1,45 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: excellent
-version: !ruby/object:Gem::Version 
-  version: 1.5.4
+version: !ruby/object:Gem::Version
+  version: 1.6.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Marco Otte-Witte
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-08-05 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2009-08-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ruby_parser
+  requirement: &70159583025320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2.0"
-    version: 
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70159583025320
+- !ruby/object:Gem::Dependency
   name: sexp_processor
+  requirement: &70159583024300 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "3.0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: facets
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2.7"
-    version: 
+  prerelease: false
+  version_requirements: *70159583024300
 description: 
 email: marco.otte-witte@simplabs.com
-executables: 
+executables:
 - excellent
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - History.txt
 - README.rdoc
 - VERSION.yml
@@ -104,11 +93,13 @@ files:
 - lib/simplabs/excellent/parsing/class_context.rb
 - lib/simplabs/excellent/parsing/code_processor.rb
 - lib/simplabs/excellent/parsing/conditional_context.rb
+- lib/simplabs/excellent/parsing/constant_context.rb
 - lib/simplabs/excellent/parsing/cvar_context.rb
 - lib/simplabs/excellent/parsing/cyclomatic_complexity_measure.rb
 - lib/simplabs/excellent/parsing/flog_measure.rb
 - lib/simplabs/excellent/parsing/for_loop_context.rb
 - lib/simplabs/excellent/parsing/gvar_context.rb
+- lib/simplabs/excellent/parsing/gasgn_context.rb
 - lib/simplabs/excellent/parsing/if_context.rb
 - lib/simplabs/excellent/parsing/ivar_context.rb
 - lib/simplabs/excellent/parsing/method_context.rb
@@ -156,34 +147,30 @@ files:
 - spec/checks/singleton_variable_check_spec.rb
 - spec/extensions/string_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 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 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 2
 summary: Source Code analysis gem for Ruby and Rails
 test_files: []
-