@@ -1,7 +1,7 @@ #!/usr/bin/env ruby # # Reek examines Ruby source code for smells. -# Visit http://reek.rubyforge.org/ for docs etc. +# Visit http://wiki.github.com/kevinrutherford/reek for docs etc. # # Author: Kevin Rutherford # bin/reek @@ -17,7 +17,7 @@ module Reek sniffer.configure(LargeClass, disabled_config) end - def can_parse_objects? + def self.can_parse_objects? return true if Object.const_defined?(:ParseTree) begin require 'parse_tree' @@ -28,7 +28,7 @@ module Reek end def syntax_tree - if can_parse_objects? + if ObjectSource.can_parse_objects? ObjectSource.unify(ParseTree.new.parse_tree(@source)) else throw ArgumentError.new('You must install the ParseTree gem to use this feature') lib/reek/adapters/object_source.rb @@ -11,6 +11,7 @@ include Reek::Smells describe LargeClass, 'checking Class objects' do it 'should not report class with 26 methods' do + pending('test requires ParseTree') unless ObjectSource.can_parse_objects? class BigOne 26.times do |i| define_method "method#{i}".to_sym do @@ -22,6 +23,7 @@ describe LargeClass, 'checking Class objects' do end it 'should not report short class' do + pending('test requires ParseTree') unless ObjectSource.can_parse_objects? class ShortClass def method1() @var1; end def method2() @var2; end @@ -35,6 +37,7 @@ describe LargeClass, 'checking Class objects' do describe LargeClass, 'counting instance variables' do it 'should not report class with 10 ivars' do + pending('test requires ParseTree') unless ObjectSource.can_parse_objects? class ManyIvars def method @vara = @varb = @varc = @vard = @vare @@ -45,10 +48,12 @@ describe LargeClass, 'checking Class objects' do end it 'ignores class with only a couple of ivars' do + pending('test requires ParseTree') unless ObjectSource.can_parse_objects? LargeClass.should_not reek_of(:LargeClass) end it 'ignores fq class with only a couple of ivars' do + pending('test requires ParseTree') unless ObjectSource.can_parse_objects? Reek::Smells::LargeClass.should_not reek_of(:LargeClass) end end spec/reek/smells/large_class_spec.rb @@ -7,13 +7,6 @@ include Reek::Smells describe UtilityFunction do - it 'should not report attrset' do - class Fred - attr_writer :xyz - end - Fred.should_not reek - end - it 'should count usages of self'do 'def <=>(other) Options[:sort_order].compare(self, other) end'.should_not reek end @@ -29,16 +22,6 @@ describe UtilityFunction do it 'should report message chain' do 'def simple(arga) arga.b.c end'.should reek_of(:UtilityFunction, /simple/) end - - it 'should not report overriding methods' do - class Father - def thing(ff); @kids = 0; end - end - class Son < Father - def thing(ff); ff; end - end - Son.should_not reek - end it 'does not report a method that calls super' do 'def child(arg) super; arg.to_s; end'.should_not reek @@ -81,3 +64,24 @@ describe UtilityFunction, 'should only report a method containing a call' do 'def clean(text) text.each { @fred = 3} end'.should_not reek end end + +describe UtilityFunction do + it 'should not report attrset' do + pending('test requires ParseTree') unless ObjectSource.can_parse_objects? + class Fred + attr_writer :xyz + end + Fred.should_not reek + end + + it 'should not report overriding methods' do + pending('test requires ParseTree') unless ObjectSource.can_parse_objects? + class Father + def thing(ff); @kids = 0; end + end + class Son < Father + def thing(ff); ff; end + end + Son.should_not reek + end +end spec/reek/smells/utility_function_spec.rb @@ -130,7 +130,7 @@ begin task :major => ['release:minor', 'rubyforge:gem', 'rubyforge:news'] do end end -rescue Gem::LoadError +rescue LoadError end def pkg_files tasks/deployment.rake @@ -42,5 +42,5 @@ begin rf.post_news(PROJECT_NAME, proj.subject, proj.news) end end -rescue Gem::LoadError +rescue LoadError end tasks/rubyforge.rake 632a1e3276258aa3d2d7cddc5f32bc3118cadead Kevin Rutherford kevin@rutherford-software.com http://github.com/kevinrutherford/reek/commit/d29087d1a5cc250bdd35dbf632cb5a9b8bfcead6 d29087d1a5cc250bdd35dbf632cb5a9b8bfcead6 2009-07-24T12:34:30-07:00 2009-07-24T12:34:30-07:00 Reduced dependency on ParseTree in the tests 25df25f99a375048daac01ce05895ff5c6d10ee5 Kevin Rutherford kevin@rutherford-software.com