kevinrutherford-reek 1.1.3.12 → 1.1.3.13

data/History.txt

@@ -1,6 +1,7 @@
 == 1.2 (in progress -- see github)
 
 === Major Changes
+* Reek passes all its tests under ruby 1.8.6, 1.8.7 and 1.9.1 (fixed #16)
 * Reek's output reports are now formatted differently:
 ** Reek is no longer silent about smell-free source code
 ** Output now reports on all files examined, even if they have no smells

data/lib/reek.rb

@@ -1,5 +1,5 @@
 $:.unshift File.dirname(__FILE__)
 
 module Reek # :doc:
-  VERSION = '1.1.3.12'
+  VERSION = '1.1.3.13'
 end

data/lib/reek/class_context.rb

@@ -2,8 +2,11 @@ require 'set'
 require 'reek/code_context'
 
 class Class
-  def is_overriding_method?(sym)
-    instance_methods(false).include?(sym) and superclass.instance_methods(true).include?(sym)
+  def is_overriding_method?(name)
+    sym = name.to_sym
+    mine = instance_methods(false)
+    dads = superclass.instance_methods(true)
+    (mine.include?(sym) and dads.include?(sym)) or (mine.include?(name) and dads.include?(name))
   end
 end
 
@@ -21,6 +24,7 @@ module Reek
       CodeParser.new(sniffer).process_class(source.syntax_tree)
     end
 
+    # SMELL: inconsistent with other contexts (not linked to the sexp)
     def initialize(outer, name, superclass = nil)
       super(outer, nil)
       @name = name

data/lib/reek/code_context.rb

@@ -23,6 +23,7 @@ module Reek
       @myself = nil
     end
 
+    # SMELL: Temporary Field -- @name isn't always initialized
     def matches?(strings)
       me = @name.to_s
       strings.any? do |str|

data/reek.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{reek}
-  s.version = "1.1.3.12"
+  s.version = "1.1.3.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kevin Rutherford"]
-  s.date = %q{2009-07-25}
+  s.date = %q{2009-07-26}
   s.default_executable = %q{reek}
   s.description = %q{Code smell detector for Ruby}
   s.email = ["kevin@rutherford-software.com"]
@@ -20,7 +20,7 @@ For more information on reek, see http://wiki.github.com/kevinrutherford/reek
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{reek}
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Code smell detector for Ruby}
 
   if s.respond_to? :specification_version then

data/spec/quality/reek_source_spec.rb

@@ -8,7 +8,7 @@ describe 'Reek source code' do
   nucleus = Dir['lib/reek/**.rb'] - Dir['lib/reek/adapters/**/*.rb']
   nucleus.each do |src|
     it "#{src} contains no references from the nucleus out to the adapters" do
-      File.new(src).lines.grep(/adapters/).should be_empty
+      IO.readlines(src).grep(/adapters/).should be_empty
     end
   end
 

data/spec/reek/class_context_spec.rb

@@ -20,6 +20,7 @@ class Fred
   def simply(arga, argb, argc, argd) f(3);false end
 end
 EOEX
+
     src.should reek_of(:LongParameterList, /Fred/, /simple/)
     src.should reek_of(:LongParameterList, /Fred/, /simply/)
   end
@@ -33,23 +34,24 @@ class Fred
     def textile_popup_help(name, windowW, windowH) f(3);end
 end
 EOEX
+    
     src.should reek_of(:LongParameterList, /Fred/, /textile_bq/)
     src.should reek_of(:LongParameterList, /Fred/, /textile_fn_/)
     src.should reek_of(:LongParameterList, /Fred/, /textile_p/)
   end
 end
 
+class Above
+  def above() end
+  def both() end
+end
+
+class Below < Above
+  def both() end
+  def below() end
+end
+
 describe ClassContext, 'overridden methods' do
-  class Above
-    def above() end
-    def both() end
-  end
-  
-  class Below < Above
-    def both() end
-    def below() end
-  end
-  
   describe 'of loaded class' do
     before :each do
       @ctx = ClassContext.create(StopContext.new, [0, :Below])
@@ -97,16 +99,16 @@ describe 'Integration defect:' do
   end
 end
 
-describe CodeContext, 'find class' do
-  module Mod1
-    class Klass1
-      module Mod2
-        class Klass2
-        end
+module Mod1
+  class Klass1
+    module Mod2
+      class Klass2
       end
     end
   end
+end
 
+describe CodeContext, 'find class' do
   before :each do
     @stop = StopContext.new
     @mod1 = ModuleContext.create(@stop, [0, :Mod1])

data/spec/reek/code_context_spec.rb

@@ -13,7 +13,7 @@ describe CodeContext, 'to_s' do
 
   it "should report full context" do
     element = StopContext.new
-    element = ModuleContext.new(element, [0, :mod])
+    element = ModuleContext.new(element, Name.new(:mod))
     element = ClassContext.new(element, [0, :klass])
     element = MethodContext.new(element, [0, :bad])
     element = BlockContext.new(element, nil)
@@ -40,7 +40,7 @@ end
 describe CodeContext, 'instance variables' do
   it 'should pass instance variables down to the first class' do
     element = StopContext.new
-    element = ModuleContext.new(element, [0, :mod])
+    element = ModuleContext.new(element, Name.new(:mod))
     class_element = ClassContext.new(element, [0, :klass])
     element = MethodContext.new(class_element, [0, :bad])
     element = BlockContext.new(element, nil)
@@ -54,7 +54,7 @@ describe CodeContext, 'generics' do
   it 'should pass unknown method calls down the stack' do
     stop = StopContext.new
     def stop.bananas(arg1, arg2) arg1 + arg2 + 43 end
-    element = ModuleContext.new(stop, [0, :mod])
+    element = ModuleContext.new(stop, Name.new(:mod))
     class_element = ClassContext.new(element, [0, :klass])
     element = MethodContext.new(class_element, [0, :bad])
     element = BlockContext.new(element, nil)
@@ -65,19 +65,19 @@ end
 describe CodeContext do
   it 'should recognise itself in a collection of names' do
     element = StopContext.new
-    element = ModuleContext.new(element, [0, :mod])
+    element = ModuleContext.new(element, Name.new(:mod))
     element.matches?(['banana', 'mod']).should == true
   end
 
   it 'should recognise itself in a collection of REs' do
     element = StopContext.new
-    element = ModuleContext.new(element, [0, :mod])
+    element = ModuleContext.new(element, Name.new(:mod))
     element.matches?([/banana/, /mod/]).should == true
   end
 
   it 'should recognise its fq name in a collection of names' do
     element = StopContext.new
-    element = ModuleContext.new(element, [0, :mod])
+    element = ModuleContext.new(element, Name.new(:mod))
     element = ClassContext.create(element, [0, :klass])
     element.matches?(['banana', 'mod']).should == true
     element.matches?(['banana', 'mod::klass']).should == true
@@ -85,7 +85,7 @@ describe CodeContext do
 
   it 'should recognise its fq name in a collection of names' do
     element = StopContext.new
-    element = ModuleContext.new(element, [0, :mod])
+    element = ModuleContext.new(element, Name.new(:mod))
     element = ClassContext.create(element, [0, :klass])
     element.matches?([/banana/, /mod/]).should == true
     element.matches?([/banana/, /mod::klass/]).should == true

data/spec/reek/method_context_spec.rb

@@ -24,8 +24,8 @@ end
 describe MethodContext, 'matching fq names' do
   before :each do
     element = StopContext.new
-    element = ModuleContext.new(element, [0, :mod])
-    element = ClassContext.new(element, [0, :klass])
+    element = ModuleContext.new(element, Name.new(:mod))
+    element = ClassContext.new(element, Name.new(:klass))
     @element = MethodContext.new(element, [0, :meth])
   end
 

data/spec/reek/singleton_method_context_spec.rb

@@ -10,7 +10,7 @@ describe SingletonMethodContext, 'outer_name' do
 
   it "should report full context" do
     element = StopContext.new
-    element = ModuleContext.new(element, [0, :mod])
+    element = ModuleContext.new(element, Name.new(:mod))
     element = SingletonMethodContext.new(element,  [:defs, [:call, nil, :a, [:arglist]], :b, nil])
     element.outer_name.should match(/mod::a\.b/)
   end

data/spec/reek/smells/utility_function_spec.rb

@@ -73,7 +73,7 @@ describe UtilityFunction do
     end
     Fred.should_not reek
   end
-  
+
   it 'should not report overriding methods' do
     pending('test requires ParseTree') unless ObjectSource.can_parse_objects?
     class Father

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kevinrutherford-reek
 version: !ruby/object:Gem::Version 
-  version: 1.1.3.12
+  version: 1.1.3.13
 platform: ruby
 authors: 
 - Kevin Rutherford
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-25 00:00:00 -07:00
+date: 2009-07-26 00:00:00 -07:00
 default_executable: reek
 dependencies: 
 - !ruby/object:Gem::Dependency