Removed LazyClass Analyser

bin/reek

@@ -5,18 +5,18 @@
 #
 
 require 'reek'
-require 'reek/options'
 require 'reek/source'
+require 'reek/options'
 
 sources = Reek::Options.parse(ARGV)
 exitstatus = 0
 sources.each do |src|
-  warnings = Reek::Analyser.new(src).analyse
+  warnings = src.analyse
   next if warnings.empty?
   if sources.size == 1
     puts warnings.to_s
   else
-    puts "\"#{src.filename}\" -- #{warnings.length} warnings:"
+    puts "\"#{src}\" -- #{warnings.length} warnings:"
     puts warnings.to_s
     puts
   end

lib/reek.rb

@@ -1,32 +1,8 @@
 $:.unshift File.dirname(__FILE__)
 
-require 'reek/code_parser'
 require 'reek/report'
+require 'reek/smells/smells'
 
 module Reek # :doc:
-
   VERSION = '0.3.1.1'
-
-  #
-  # Analyse the given source, looking for code smells.
-  # The source can be a filename or a String containing Ruby code.
-  # Returns a +Report+ listing the smells found.
-  #
-  class Analyser
-    def initialize(src)
-      @source = src
-      @config = SmellConfig.new
-      src.configure(@config)
-    end
-
-    #
-    # Returns a +Report+ listing the smells found.
-    #
-    def analyse
-      report = Report.new
-      smells = @config.smell_listeners
-      CodeParser.new(report, smells).check_source(@source.source)
-      report
-    end
-  end
 end

lib/reek/code_parser.rb

@@ -9,7 +9,6 @@
 require 'reek/method_context'
 require 'reek/singleton_method_context'
 require 'reek/yield_call_context'
-require 'reek/smells/smells'
 
 module Reek
 

lib/reek/smells/smells.rb

@@ -72,6 +72,7 @@ def load_local(file)
         cf = YAML.load_file(rfile)
         @config.value_merge!(cf)
       end
+      self
     end
 
     def all_reekfiles(path)

lib/reek/source.rb

@@ -1,19 +1,33 @@
+require 'reek/code_parser'
+
 module Reek
   class Source
-    attr_reader :source
-
     def initialize(filename)
       if File.exists?(filename)
         @source = IO.readlines(filename).join
         @dir = File.dirname(filename)
+        @filename = filename
       else
         @source = filename
         @dir = '.'
+        @filename = "source code"
       end
     end
 
-    def configure(config)
-      config.load_local(@dir)
+    #
+    # Analyse the given source, looking for code smells.
+    # The source can be a filename or a String containing Ruby code.
+    # Returns a +Report+ listing the smells found.
+    #
+    def analyse
+      report = Report.new
+      smells = SmellConfig.new.load_local(@dir).smell_listeners
+      CodeParser.new(report, smells).check_source(@source)
+      report
+    end
+
+    def to_s
+      @filename
     end
   end
 end

lib/reek/yield_call_context.rb

@@ -1,4 +1,3 @@
-require 'reek/smells/smells'
 require 'reek/code_context'
 
 module Reek

spec/integration/script_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require 'reek'
 
 describe 'version number' do
   it 'should report the correct value' do

spec/reek/code_checks.rb

@@ -1,4 +1,4 @@
-require 'reek'
+require 'reek/source'
 require 'reek/code_parser'
 require 'reek/report'
 
@@ -9,7 +9,7 @@ module CodeChecks
   def check(desc, src, expected, pending_str = nil)
     it(desc) do
       pending(pending_str) unless pending_str.nil?
-      rpt = Analyser.new(Source.new(src)).analyse
+      rpt = Source.new(src).analyse
       rpt.length.should == expected.length
       (0...rpt.length).each do |line|
         expected[line].each { |patt| rpt[line].report.should match(patt) }

spec/reek/report_spec.rb

@@ -2,7 +2,7 @@
 
 require 'reek/smells/smell_detector'
 require 'reek/report'
-require 'reek'
+require 'reek/source'
 
 include Reek
 
@@ -22,7 +22,7 @@
 
 describe Report, "to_s" do
   before(:each) do
-    rpt = Analyser.new(Source.new('def simple(a) a[3] end')).analyse
+    rpt = Source.new('def simple(a) a[3] end').analyse
     @report = rpt.to_s.split("\n")
   end