Fixed a NestedIterators and a FeatureEnvy within Sniffer

Manifest.txt

@@ -30,9 +30,9 @@ lib/reek/smells/long_parameter_list.rb
 lib/reek/smells/long_yield_list.rb
 lib/reek/smells/nested_iterators.rb
 lib/reek/smells/smell_detector.rb
-lib/reek/smells/smells.rb
 lib/reek/smells/uncommunicative_name.rb
 lib/reek/smells/utility_function.rb
+lib/reek/sniffer.rb
 lib/reek/source.rb
 lib/reek/spec.rb
 lib/reek/stop_context.rb

lib/reek/smells/smell_detector.rb

@@ -37,6 +37,7 @@ def self.default_config
       def self.listen(hooks, config)
         detector = new(config[class_name])
         contexts.each { |ctx| hooks[ctx] << detector }
+        detector
       end
 
       def initialize(config)

lib/reek/sniffer.rb

@@ -55,15 +55,16 @@ class Sniffer
     def initialize
       defaults_file = File.join(File.dirname(__FILE__), '..', '..', 'config', 'defaults.reek')
       @config = YAML.load_file(defaults_file)
-      @listeners = nil
+      @detectors = nil
+      @listeners = []
     end
 
     def smell_listeners()
-      unless @listeners
-        @listeners = Hash.new {|hash,key| hash[key] = [] }
-        SMELL_CLASSES.each { |smell| smell.listen(@listeners, @config) }
+      unless @detectors
+        @detectors = Hash.new {|hash,key| hash[key] = [] }
+        SMELL_CLASSES.each { |smell| @listeners << smell.listen(@detectors, @config) }
       end
-      @listeners
+      @detectors
     end
 
     def load_local(file)
@@ -86,14 +87,7 @@ def disable(smell)
     end
 
     def report_on(report)
-      smell_listeners.each_value do |group|
-        report_group(group, report)
-      end
-    end
-
-    def report_group(group, report)
-      group.each {|smell| smell.report_on(report)}
-      @listeners       # BUG -- this line only needed to shut up FeatureEnvy
+      @listeners.each {|smell| smell.report_on(report)}
     end
 
     def examine(scope, type)