excellent 1.6.0 → 1.7.0

data/History.txt

@@ -1,4 +1,15 @@
 =======
+= 1.7.0
+
+* fixed issue #24
+* updated ruby_parser and sexp_processor dependencies
+* fixed some wrong line number reports
+
+= 1.6.0
+
+* added Gemfile
+* internal refactoring/cleanups
+
 = 1.5.5
 
 * better option parsing in the executable, (thanks trans, http://github.com/trans)

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

@@ -21,10 +21,15 @@ module Simplabs
           super([Parsing::ClassContext], threshold)
         end
 
+        def evaluate(context)
+          line_count = context.line_count == 1 ? 1 : context.line_count + 1
+          add_warning(*warning_args(context, line_count)) unless line_count <= @threshold
+        end
+
         protected
 
-          def warning_args(context) #:nodoc:
-            [context, '{{class}} has {{count}} lines.', { :class => context.full_name, :count => context.line_count }]
+          def warning_args(context, line_count) #:nodoc:
+            [context, '{{class}} has {{count}} lines.', { :class => context.full_name, :count => line_count }]
           end
 
       end

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

@@ -22,7 +22,7 @@ module Simplabs
 
         def evaluate(context) #:nodoc:
           if tested_parameter = context.tests_parameter?
-            add_warning(context, '{{method}} is coupled to {{argument}}.', { :method => context.parent.full_name, :argument => tested_parameter.to_s }, -2)
+            add_warning(context, '{{method}} is coupled to {{argument}}.', { :method => context.parent.full_name, :argument => tested_parameter.to_s })
           end
         end
 

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

@@ -24,7 +24,7 @@ module Simplabs
         protected
 
           def warning_args(context) #:nodoc:
-            [context, '{{method}} has {{count}} lines.', { :method => context.full_name, :count => context.line_count }]
+            [context, '{{method}} has {{count}} lines.', { :method => context.full_name, :count => context.line_count + 1 }]
           end
 
       end

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

@@ -24,7 +24,7 @@ module Simplabs
         protected
 
           def warning_args(context) #:nodoc:
-            [context, '{{module}} has {{count}} lines.', { :module => context.full_name, :count => context.line_count }]
+            [context, '{{module}} has {{count}} lines.', { :module => context.full_name, :count => context.line_count + 1 }]
           end
 
       end

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

@@ -23,7 +23,7 @@ module Simplabs
           end
 
           def evaluate(context) #:nodoc:
-            add_warning(context, 'Instance variable {{variable}} used in partial.', { :variable => context.full_name }, -1)
+            add_warning(context, 'Instance variable {{variable}} used in partial.', { :variable => context.full_name }, RUBY_VERSION =~ /1\.9/ ? -1 : 0)
           end
 
         end

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

@@ -24,7 +24,7 @@ module Simplabs
           end
 
           def evaluate(context) #:nodoc:
-            add_warning(context, 'Params hash used in view.', {}, -1) if (context.full_name == 'params')
+            add_warning(context, 'Params hash used in view.', {}, RUBY_VERSION =~ /1\.9/ ? -1 : 0) if (context.full_name == 'params')
           end
 
         end

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

@@ -24,7 +24,7 @@ module Simplabs
           end
 
           def evaluate(context) #:nodoc:
-            add_warning(context, 'Session hash used in view.', {}, -1) if (context.full_name == 'session')
+            add_warning(context, 'Session hash used in view.', {}, RUBY_VERSION =~ /1\.9/ ? -1 : 0) if (context.full_name == 'session')
           end
 
         end

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

@@ -88,12 +88,24 @@ module Simplabs
         end
 
         def process_args(exp)
-          exp[1..-1].each { |parameter| @contexts.last.parameters << parameter if parameter.is_a?(Symbol) }
+          exp[1..-1].each do |parameter|
+            case parameter
+              when Sexp
+                case parameter[0]
+                  when :masgn
+                    parameter[1..-1].each { |parameter| @contexts.last.parameters << parameter }
+                  when :lasgn
+                    @contexts.last.parameters << parameter[1]
+                end
+              when Symbol
+                @contexts.last.parameters << parameter if parameter.is_a?(Symbol)
+            end
+          end
           process_default(exp)
         end
 
         def process_masgn(exp)
-          exp[1][1..-1].each { |parameter| @contexts.last.parameters << parameter[1] if parameter[1].is_a?(Symbol) } if @contexts.last.is_a?(BlockContext)
+          exp[1..-1].each { |parameter| @contexts.last.parameters << parameter[1] if parameter[1].is_a?(Symbol) } if @contexts.last.is_a?(BlockContext)
           process_default(exp)
         end
 

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

@@ -19,7 +19,7 @@ module Simplabs
         private
 
           def silent_parse(content, filename)
-            @parser ||= RubyParser.new
+            @parser ||= RubyParser.for_current_ruby
             content = ::ERB.new(content, nil, '-').src if filename =~ /\.erb$/
             sexp = @parser.parse(content, filename)
             sexp

data/spec/checks/case_missing_else_check_spec.rb

@@ -11,8 +11,10 @@ describe Simplabs::Excellent::Checks::CaseMissingElseCheck do
     it 'should accept case statements that do have an else clause' do
       code = <<-END
         case foo
-          when "bar": "ok"
-          else "good"
+          when "bar"
+            "ok"
+          else
+            "good"
           end
       END
       @excellent.check_code(code)
@@ -24,8 +26,10 @@ describe Simplabs::Excellent::Checks::CaseMissingElseCheck do
     it 'should reject case statements that do not have an else clause' do
       code = <<-END
         case foo
-          when "bar": "ok"
-          when "bar": "bad"
+          when "bar"
+            "ok"
+          when "bar"
+            "bad"
           end
       END
       @excellent.check_code(code)
@@ -33,7 +37,7 @@ describe Simplabs::Excellent::Checks::CaseMissingElseCheck do
 
       warnings.should_not be_empty
       warnings[0].info.should        == {}
-      warnings[0].line_number.should == 2
+      warnings[0].line_number.should == 1
       warnings[0].message.should     == 'Case statement is missing else clause.'
     end
 

data/spec/checks/control_coupling_check_spec.rb

@@ -58,7 +58,7 @@ describe Simplabs::Excellent::Checks::ControlCouplingCheck do
           end
         END
 
-        verify_warning_found(code)
+        verify_warning_found(code, 2)
       end
 
     end
@@ -70,7 +70,7 @@ describe Simplabs::Excellent::Checks::ControlCouplingCheck do
         end
       END
 
-      verify_warning_found(code)
+      verify_warning_found(code, 3) # this should actually be line 2
     end
 
     it "should reject methods with case statements using a parameter" do
@@ -85,18 +85,18 @@ describe Simplabs::Excellent::Checks::ControlCouplingCheck do
         end
       END
 
-      verify_warning_found(code)
+      verify_warning_found(code, 2)
     end
 
   end
 
-  def verify_warning_found(code)
+  def verify_warning_found(code, line)
     @excellent.check_code(code)
     warnings = @excellent.warnings
 
     warnings.should_not be_empty
     warnings[0].info.should        == { :method => 'write', :argument => 'quoted' }
-    warnings[0].line_number.should == 1
+    warnings[0].line_number.should == line
     warnings[0].message.should     == 'write is coupled to quoted.'
   end
 

data/spec/checks/singleton_variable_check_spec.rb

@@ -17,7 +17,7 @@ describe Simplabs::Excellent::Checks::SingletonVariableCheck do
 
       warnings.should_not be_empty
       warnings[0].info.should        == { :variable => 'foo' }
-      warnings[0].line_number.should == 2
+      warnings[0].line_number.should == 1
       warnings[0].message.should     == 'Singleton variable foo used.'
     end
 
@@ -36,7 +36,7 @@ describe Simplabs::Excellent::Checks::SingletonVariableCheck do
 
       warnings.should_not be_empty
       warnings[0].info.should        == { :variable => 'Outer::Inner::Class.foo' }
-      warnings[0].line_number.should == 5
+      warnings[0].line_number.should == 4
       warnings[0].message.should     == 'Singleton variable Outer::Inner::Class.foo used.'
     end
 
@@ -57,7 +57,7 @@ describe Simplabs::Excellent::Checks::SingletonVariableCheck do
 
       warnings.should_not be_empty
       warnings[0].info.should        == { :variable => 'Outer::Inner::Class.foo' }
-      warnings[0].line_number.should == 6
+      warnings[0].line_number.should == 5
       warnings[0].message.should     == 'Singleton variable Outer::Inner::Class.foo used.'
     end
 

metadata

@@ -1,45 +1,61 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: excellent
-version: !ruby/object:Gem::Version
-  version: 1.6.0
+version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: 
+  segments: 
+  - 1
+  - 7
+  - 0
+  version: 1.7.0
 platform: ruby
-authors:
+authors: 
 - Marco Otte-Witte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2009-08-05 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2009-08-05 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: ruby_parser
-  requirement: &70159583025320 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70159583025320
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: sexp_processor
-  requirement: &70159583024300 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 4
+        - 0
+        version: "4.0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70159583024300
+  version_requirements: *id002
 description: 
 email: marco.otte-witte@simplabs.com
-executables:
+executables: 
 - excellent
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - History.txt
 - README.rdoc
 - VERSION.yml
@@ -149,28 +165,37 @@ 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 2
 summary: Source Code analysis gem for Ruby and Rails
 test_files: []
+