kevinrutherford-reek 1.1.3.9 → 1.1.3.10

data/lib/reek/source.rb

@@ -1,139 +1,36 @@
-require 'reek/code_parser'
-require 'reek/report'
 require 'reek/sniffer'
-require 'ruby_parser'
 
 module Reek
 
   #
   # A +Source+ object represents a chunk of Ruby source code.
   #
-  # The various class methods are factories that will create +Source+
-  # instances from various types of input.
-  #
   class Source
 
-    #
-    # Factory method: creates a +Source+ object by reading Ruby code from
-    # the +IO+ stream. The stream is consumed upto end-of-file, but the
-    # source code is not parsed until +report+ is called. +desc+ provides
-    # a string description to be used in the header of formatted reports.
-    #
-    def self.from_io(ios, desc)
-      code = ios.readlines.join
-      return new(code, desc)
-    end
-
-    #
-    # Factory method: creates a +Source+ object by reading Ruby code from
-    # the +code+ string. The code is not parsed until +report+ is called.
-    #
-    def self.from_s(code)
-      return new(code, 'string')
-    end
-
-    #
-    # Factory method: creates a +Source+ object by reading Ruby code from
-    # File +file+. The source code is not parsed until +report+ is called.
-    #
-    def self.from_f(file)
-      from_path(file.path)
-    end
-
     #
     # Factory method: creates a +Source+ object by reading Ruby code from
     # the named file. The source code is not parsed until +report+ is called.
     #
-    def self.from_path(filename)
+    def self.from_path(filename, sniffer)
       code = IO.readlines(filename).join
-      sniffer = Sniffer.new.configure_along_path(filename)
+      # SMELL: Greedy Method
+      # The Sniffer should ask this source to configure it.
+      sniffer.configure_along_path(filename)
       return new(code, filename, sniffer)
     end
 
-    #
-    # Factory method: creates a +Source+ object from an array of file paths.
-    # No source code is actually parsed until the report is accessed.
-    #
-    def self.from_pathlist(paths)
-      sources = paths.map {|path| Source.from_path(path) }
-      SourceList.new(sources)
-    end
+    attr_reader :desc
+    attr_reader :sniffer          # SMELL -- bidirectional link
 
-    def initialize(code, desc, sniffer = Sniffer.new)     # :nodoc:
+    def initialize(code, desc, sniffer)     # :nodoc:
       @source = code
       @desc = desc
       @sniffer = sniffer
+      @sniffer.source = self
     end
 
-    def generate_syntax_tree
+    def syntax_tree
       RubyParser.new.parse(@source, @desc) || s()
     end
-
-    #
-    # Returns a +Report+ listing the smells found in this source. The first
-    # call to +report+ parses the source code and constructs a list of
-    # +SmellWarning+s found; subsequent calls simply return this same list.
-    #
-    def report
-      unless @report
-        parser = CodeParser.new(@sniffer)
-        parser.process(generate_syntax_tree)
-        @report = Report.new(@sniffer)
-      end
-      @report
-    end
-
-    def smelly?
-      report.length > 0
-    end
-
-    #
-    # Checks this source for instances of +smell_class+, and returns +true+
-    # only if one of them has a report string matching all of the +patterns+.
-    #
-    def has_smell?(smell_class, patterns)
-      report.has_smell?(smell_class, patterns)
-    end
-
-    # Creates a formatted report of all the +Smells::SmellWarning+ objects recorded in
-    # this report, with a heading.
-    def full_report
-      report.full_report(@desc)
-    end
-
-    def to_s
-      @desc
-    end
-  end
-
-  #
-  # Represents a list of Sources as if they were a single source.
-  #
-  class SourceList
-    def initialize(sources)
-      @sources = sources
-    end
-
-    #
-    # Checks this source for instances of +smell_class+, and returns +true+
-    # only if one of them has a report string matching all of the +patterns+.
-    #
-    def has_smell?(smell_class, patterns=[])
-      report.has_smell?(smell_class, patterns)
-    end
-
-    def smelly?
-      @sources.any? {|source| source.smelly? }
-    end
-
-    def full_report
-      ReportList.new(@sources).full_report
-    end
-
-    def report
-      ReportList.new(@sources)
-    end
   end
 end
-
-require 'reek/object_source'

data/lib/reek/spec.rb

@@ -1,4 +1,4 @@
-require 'reek/source'
+require 'reek/sniffer'
 
 module Reek
 
@@ -34,7 +34,7 @@ module Reek
   # And a more complex example, making use of one of the factory methods for
   # +Source+ so that the code is parsed and analysed only once:
   # 
-  #   ruby = 'def double_thing() @other.thing.foo + @other.thing.foo end'.to_source
+  #   ruby = 'def double_thing() @other.thing.foo + @other.thing.foo end'.sniff
   #   ruby.should reek_of(:Duplication, /@other.thing[^\.]/)
   #   ruby.should reek_of(:Duplication, /@other.thing.foo/)
   #   ruby.should_not reek_of(:FeatureEnvy)
@@ -42,67 +42,67 @@ module Reek
   module Spec
     class ShouldReek        # :nodoc:
       def matches?(actual)
-        @source = actual.to_source
-        @source.smelly?
+        @sniffer = actual.sniff
+        @sniffer.smelly?
       end
       def failure_message_for_should
         "Expected source to reek, but it didn't"
       end
       def failure_message_for_should_not
-        "Expected no smells, but got:\n#{@source.full_report}"
+        "Expected no smells, but got:\n#{@sniffer.quiet_report}"
       end
     end
 
-    #
-    # Returns +true+ if and only if the target source code contains smells.
-    #
-    def reek
-      ShouldReek.new
-    end
-
     class ShouldReekOf        # :nodoc:
       def initialize(klass, patterns)
         @klass = klass
         @patterns = patterns
       end
       def matches?(actual)
-        @source = actual.to_source
-        @source.has_smell?(@klass, @patterns)
+        @sniffer = actual.sniff
+        @sniffer.has_smell?(@klass, @patterns)
       end
       def failure_message_for_should
-        "Expected #{@source} to reek of #{@klass}, but it didn't"
+        "Expected #{@sniffer.desc} to reek of #{@klass}, but it didn't"
       end
       def failure_message_for_should_not
-        "Expected #{@source} not to reek of #{@klass}, but got:\n#{@source.full_report}"
+        "Expected #{@sniffer.desc} not to reek of #{@klass}, but got:\n#{@sniffer.quiet_report}"
       end
     end
 
-    #
-    # Checks the target source code for instances of +smell_class+,
-    # and returns +true+ only if one of them has a report string matching
-    # all of the +patterns+.
-    #
-    def reek_of(smell_class, *patterns)
-      ShouldReekOf.new(smell_class, patterns)
-    end
-
     class ShouldReekOnlyOf        # :nodoc:
       def initialize(klass, patterns)
         @klass = klass
         @patterns = patterns
       end
       def matches?(actual)
-        @source = actual.to_source
-        @source.report.length == 1 and @source.has_smell?(@klass, @patterns)
+        @sniffer = actual.sniff
+        @sniffer.smells_only_of?(@klass, @patterns)
       end
       def failure_message_for_should
-        "Expected source to reek only of #{@klass}, but got:\n#{@source.full_report}"
+        "Expected #{@sniffer.desc} to reek only of #{@klass}, but got:\n#{@sniffer.quiet_report}"
       end
       def failure_message_for_should_not
-        "Expected source not to reek only of #{@klass}, but it did"
+        "Expected #{@sniffer.desc} not to reek only of #{@klass}, but it did"
       end
     end
 
+    #
+    # Returns +true+ if and only if the target source code contains smells.
+    #
+    def reek
+      ShouldReek.new
+    end
+
+    #
+    # Checks the target source code for instances of +smell_class+,
+    # and returns +true+ only if one of them has a report string matching
+    # all of the +patterns+.
+    #
+    def reek_of(smell_class, *patterns)
+      ShouldReekOf.new(smell_class, patterns)
+    end
+
     #
     # As for reek_of, but the matched smell warning must be the only warning of
     # any kind in the target source code's Reek report.
@@ -113,32 +113,6 @@ module Reek
   end
 end
 
-class File
-  def to_source
-    Reek::Source.from_f(self)
-  end
-end
-
-class String
-  def to_source
-    Reek::Source.from_s(self)
-  end
-end
-
-class Array
-  def to_source
-    Reek::Source.from_pathlist(self)
-  end
-end
-
-module Reek
-  class Source
-    def to_source
-      self
-    end
-  end
-end
-
 if Object.const_defined?(:Spec)
   Spec::Runner.configure do |config|
     config.include(Reek::Spec)

data/lib/reek.rb

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

data/reek.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{reek}
-  s.version = "1.1.3.9"
+  s.version = "1.1.3.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kevin Rutherford"]
-  s.date = %q{2009-07-06}
+  s.date = %q{2009-07-15}
   s.default_executable = %q{reek}
   s.description = %q{Code smell detector for Ruby}
   s.email = ["kevin@rutherford-software.com"]
   s.executables = ["reek"]
-  s.extra_rdoc_files = ["History.txt", "README.txt"]
-  s.files = ["History.txt", "README.txt", "Rakefile", "bin/reek", "config/defaults.reek", "features/masking_smells.feature", "features/options.feature", "features/rake_task.feature", "features/reports.feature", "features/samples.feature", "features/stdin.feature", "features/step_definitions/reek_steps.rb", "features/support/env.rb", "lib/reek.rb", "lib/reek/block_context.rb", "lib/reek/class_context.rb", "lib/reek/code_context.rb", "lib/reek/code_parser.rb", "lib/reek/config_file.rb", "lib/reek/detector_stack.rb", "lib/reek/exceptions.reek", "lib/reek/if_context.rb", "lib/reek/method_context.rb", "lib/reek/module_context.rb", "lib/reek/name.rb", "lib/reek/object_refs.rb", "lib/reek/object_source.rb", "lib/reek/options.rb", "lib/reek/rake_task.rb", "lib/reek/report.rb", "lib/reek/sexp_formatter.rb", "lib/reek/singleton_method_context.rb", "lib/reek/smell_warning.rb", "lib/reek/smells/control_couple.rb", "lib/reek/smells/duplication.rb", "lib/reek/smells/feature_envy.rb", "lib/reek/smells/large_class.rb", "lib/reek/smells/long_method.rb", "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/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/yield_call_context.rb", "reek.gemspec", "spec/reek/block_context_spec.rb", "spec/reek/class_context_spec.rb", "spec/reek/code_context_spec.rb", "spec/reek/code_parser_spec.rb", "spec/reek/config_spec.rb", "spec/reek/if_context_spec.rb", "spec/reek/method_context_spec.rb", "spec/reek/module_context_spec.rb", "spec/reek/name_spec.rb", "spec/reek/object_refs_spec.rb", "spec/reek/object_source_spec.rb", "spec/reek/options_spec.rb", "spec/reek/report_spec.rb", "spec/reek/singleton_method_context_spec.rb", "spec/reek/smell_warning_spec.rb", "spec/reek/smells/control_couple_spec.rb", "spec/reek/smells/duplication_spec.rb", "spec/reek/smells/feature_envy_spec.rb", "spec/reek/smells/large_class_spec.rb", "spec/reek/smells/long_method_spec.rb", "spec/reek/smells/long_parameter_list_spec.rb", "spec/reek/smells/nested_iterators_spec.rb", "spec/reek/smells/smell_detector_spec.rb", "spec/reek/smells/uncommunicative_name_spec.rb", "spec/reek/smells/utility_function_spec.rb", "spec/reek/spec_spec.rb", "spec/samples/corrupt_config_file/corrupt.reek", "spec/samples/corrupt_config_file/dirty.rb", "spec/samples/empty_config_file/dirty.rb", "spec/samples/empty_config_file/empty.reek", "spec/samples/inline.rb", "spec/samples/masked/dirty.rb", "spec/samples/masked/masked.reek", "spec/samples/optparse.rb", "spec/samples/redcloth.rb", "spec/samples/three_clean_files/clean_one.rb", "spec/samples/three_clean_files/clean_three.rb", "spec/samples/three_clean_files/clean_two.rb", "spec/samples/two_smelly_files/dirty_one.rb", "spec/samples/two_smelly_files/dirty_two.rb", "spec/slow/inline_spec.rb", "spec/slow/optparse_spec.rb", "spec/slow/redcloth_spec.rb", "spec/slow/reek_source_spec.rb", "spec/slow/source_list_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "tasks/reek.rake", "tasks/test.rake"]
+  s.extra_rdoc_files = ["History.txt", "License.txt", "README.txt"]
+  s.files = ["History.txt", "License.txt", "README.txt", "Rakefile", "bin/reek", "config/defaults.reek", "features/masking_smells.feature", "features/options.feature", "features/rake_task.feature", "features/reports.feature", "features/samples.feature", "features/stdin.feature", "features/step_definitions/reek_steps.rb", "features/support/env.rb", "lib/reek.rb", "lib/reek/block_context.rb", "lib/reek/class_context.rb", "lib/reek/code_context.rb", "lib/reek/code_parser.rb", "lib/reek/config_file.rb", "lib/reek/core_extras.rb", "lib/reek/detector_stack.rb", "lib/reek/exceptions.reek", "lib/reek/if_context.rb", "lib/reek/method_context.rb", "lib/reek/module_context.rb", "lib/reek/name.rb", "lib/reek/object_refs.rb", "lib/reek/object_source.rb", "lib/reek/options.rb", "lib/reek/rake_task.rb", "lib/reek/report.rb", "lib/reek/sexp_formatter.rb", "lib/reek/singleton_method_context.rb", "lib/reek/smell_warning.rb", "lib/reek/smells/control_couple.rb", "lib/reek/smells/duplication.rb", "lib/reek/smells/feature_envy.rb", "lib/reek/smells/large_class.rb", "lib/reek/smells/long_method.rb", "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/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/yield_call_context.rb", "reek.gemspec", "spec/reek/block_context_spec.rb", "spec/reek/class_context_spec.rb", "spec/reek/code_context_spec.rb", "spec/reek/code_parser_spec.rb", "spec/reek/config_spec.rb", "spec/reek/if_context_spec.rb", "spec/reek/method_context_spec.rb", "spec/reek/module_context_spec.rb", "spec/reek/name_spec.rb", "spec/reek/object_refs_spec.rb", "spec/reek/object_source_spec.rb", "spec/reek/options_spec.rb", "spec/reek/report_spec.rb", "spec/reek/should_reek_of_spec.rb", "spec/reek/should_reek_only_of_spec.rb", "spec/reek/should_reek_spec.rb", "spec/reek/singleton_method_context_spec.rb", "spec/reek/smell_warning_spec.rb", "spec/reek/smells/control_couple_spec.rb", "spec/reek/smells/duplication_spec.rb", "spec/reek/smells/feature_envy_spec.rb", "spec/reek/smells/large_class_spec.rb", "spec/reek/smells/long_method_spec.rb", "spec/reek/smells/long_parameter_list_spec.rb", "spec/reek/smells/nested_iterators_spec.rb", "spec/reek/smells/smell_detector_spec.rb", "spec/reek/smells/uncommunicative_name_spec.rb", "spec/reek/smells/utility_function_spec.rb", "spec/reek/sniffer_spec.rb", "spec/samples/all_but_one_masked/clean_one.rb", "spec/samples/all_but_one_masked/dirty.rb", "spec/samples/all_but_one_masked/masked.reek", "spec/samples/clean_due_to_masking/clean_one.rb", "spec/samples/clean_due_to_masking/clean_three.rb", "spec/samples/clean_due_to_masking/clean_two.rb", "spec/samples/clean_due_to_masking/dirty_one.rb", "spec/samples/clean_due_to_masking/dirty_two.rb", "spec/samples/clean_due_to_masking/masked.reek", "spec/samples/corrupt_config_file/corrupt.reek", "spec/samples/corrupt_config_file/dirty.rb", "spec/samples/empty_config_file/dirty.rb", "spec/samples/empty_config_file/empty.reek", "spec/samples/inline.rb", "spec/samples/masked/dirty.rb", "spec/samples/masked/masked.reek", "spec/samples/mixed_results/clean_one.rb", "spec/samples/mixed_results/clean_three.rb", "spec/samples/mixed_results/clean_two.rb", "spec/samples/mixed_results/dirty_one.rb", "spec/samples/mixed_results/dirty_two.rb", "spec/samples/optparse.rb", "spec/samples/redcloth.rb", "spec/samples/three_clean_files/clean_one.rb", "spec/samples/three_clean_files/clean_three.rb", "spec/samples/three_clean_files/clean_two.rb", "spec/samples/two_smelly_files/dirty_one.rb", "spec/samples/two_smelly_files/dirty_two.rb", "spec/slow/inline_spec.rb", "spec/slow/optparse_spec.rb", "spec/slow/redcloth_spec.rb", "spec/slow/reek_source_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "tasks/reek.rake", "tasks/test.rake"]
   s.homepage = %q{http://wiki.github.com/kevinrutherford/reek}
   s.post_install_message = %q{
 For more information on reek, see http://wiki.github.com/kevinrutherford/reek

data/spec/reek/object_source_spec.rb

@@ -8,9 +8,9 @@ describe Dir do
     Dir['spec/samples/two_smelly_files/*.rb'].should reek_of(:UncommunicativeName)
   end
 
-  it 'reports correct smells via SourceList' do
-    src = Dir['spec/samples/two_smelly_files/*.rb'].to_source
-    src.has_smell?(:UncommunicativeName).should be_true
+  it 'reports correct smells via Dir' do
+    sniffer = Dir['spec/samples/two_smelly_files/*.rb'].sniff
+    sniffer.has_smell?(:UncommunicativeName).should be_true
   end
 
   it 'copes with daft file specs' do

data/spec/reek/report_spec.rb

@@ -9,7 +9,7 @@ include Reek
 
 describe Report, " when empty" do
   before(:each) do
-    @rpt = Report.new
+    @rpt = Report.new(Sniffer.new)
   end
 
   it 'should have zero length' do
@@ -19,12 +19,16 @@ describe Report, " when empty" do
   it 'should claim to be empty' do
     @rpt.should be_empty
   end
+
+  it 'has an empty quiet_report' do
+    @rpt.quiet_report.should == ''
+  end
 end
 
-describe Report, "to_s" do
+describe Report, "smell_list" do
   before(:each) do
-    rpt = Source.from_s('def simple(a) a[3] end').report
-    @report = rpt.to_s.split("\n")
+    rpt = 'def simple(a) a[3] end'.sniff.report
+    @report = rpt.smell_list.split("\n")
   end
 
   it 'should mention every smell name' do
@@ -36,7 +40,7 @@ end
 
 describe Report, " as a SortedSet" do
   it 'should only add a smell once' do
-    rpt = Report.new
+    rpt = Report.new(Sniffer.new)
     rpt << SmellWarning.new(Smells::FeatureEnvy.new, "self", 'too many!')
     rpt.length.should == 1
     rpt << SmellWarning.new(Smells::FeatureEnvy.new, "self", 'too many!')

data/spec/reek/should_reek_of_spec.rb

@@ -0,0 +1,105 @@
+require File.dirname(__FILE__) + '/../spec_helper.rb'
+
+require 'reek/spec'
+
+include Reek::Spec
+
+describe ShouldReekOf, 'rdoc demo example' do
+  it 'works on a common source' do
+    ruby = 'def double_thing() @other.thing.foo + @other.thing.foo end'
+    ruby.should reek_of(:Duplication, /@other.thing[^\.]/)
+    ruby.should reek_of(:Duplication, /@other.thing.foo/)
+    ruby.should_not reek_of(:FeatureEnvy)
+  end
+
+  it 'works on a common sniffer' do
+    ruby = 'def double_thing() @other.thing.foo + @other.thing.foo end'.sniff
+    ruby.should reek_of(:Duplication, /@other.thing[^\.]/)
+    ruby.should reek_of(:Duplication, /@other.thing.foo/)
+    ruby.should_not reek_of(:FeatureEnvy)
+  end
+end
+
+describe ShouldReekOf, 'checking code in a string' do
+  before :each do
+    @clean_code = 'def good() true; end'
+    @smelly_code = 'def x() y = 4; end'
+    @matcher = ShouldReekOf.new(:UncommunicativeName, [/x/, /y/])
+  end
+
+  it 'matches a smelly String' do
+    @matcher.matches?(@smelly_code).should be_true
+  end
+
+  it 'doesnt match a fragrant String' do
+    @matcher.matches?(@clean_code).should be_false
+  end
+
+  it 'reports the smells when should_not fails' do
+    @matcher.matches?(@smelly_code).should be_true
+    @matcher.failure_message_for_should_not.should include(@smelly_code.sniff.quiet_report)
+  end
+end
+
+describe ShouldReekOf, 'checking code in a Dir' do
+  before :each do
+    @clean_dir = Dir['spec/samples/three_clean_files/*.rb']
+    @smelly_dir = Dir['spec/samples/two_smelly_files/*.rb']
+    @matcher = ShouldReekOf.new(:UncommunicativeName, [/Dirty/, /@s/])
+  end
+
+  it 'matches a smelly String' do
+    @matcher.matches?(@smelly_dir).should be_true
+  end
+
+  it 'doesnt match a fragrant String' do
+    @matcher.matches?(@clean_dir).should be_false
+  end
+
+  it 'reports the smells when should_not fails' do
+    @matcher.matches?(@smelly_dir).should be_true
+    @matcher.failure_message_for_should_not.should include(@smelly_dir.sniff.quiet_report)
+  end
+end
+
+describe ShouldReekOf, 'checking code in a File' do
+  before :each do
+    @clean_file = File.new(Dir['spec/samples/three_clean_files/*.rb'][0])
+    @smelly_file = File.new(Dir['spec/samples/two_smelly_files/*.rb'][0])
+    @matcher = ShouldReekOf.new(:UncommunicativeName, [/Dirty/, /@s/])
+  end
+
+  it 'matches a smelly String' do
+    @matcher.matches?(@smelly_file).should be_true
+  end
+
+  it 'doesnt match a fragrant String' do
+    @matcher.matches?(@clean_file).should be_false
+  end
+
+  it 'reports the smells when should_not fails' do
+    @matcher.matches?(@smelly_file).should be_true
+    @matcher.failure_message_for_should_not.should include(@smelly_file.sniff.quiet_report)
+  end
+end
+
+describe ShouldReekOf, 'report formatting' do
+  before :each do
+    @smelly_dir = Dir['spec/samples/mixed_results/*.rb']
+    @matcher = ShouldReekOf.new(:UncommunicativeName, [/Dirty/, /@s/])
+    @matcher.matches?(@smelly_dir)
+    @lines = @matcher.failure_message_for_should_not.split("\n").map {|str| str.chomp}
+    @error_message = @lines.shift
+    @smells = @lines.grep(/^  /)
+    @headers = (@lines - @smells)
+  end
+
+  it 'mentions every smell in the report' do
+    @smells.should have(12).warnings
+  end
+
+  it 'doesnt mention the clean files' do
+    @headers.should have(2).headers
+    @headers.should_not include('clean')
+  end
+end

data/spec/reek/should_reek_only_of_spec.rb

@@ -0,0 +1,85 @@
+require File.dirname(__FILE__) + '/../spec_helper.rb'
+
+require 'reek/spec'
+
+include Reek::Spec
+
+describe ShouldReekOnlyOf, 'checking code in a string' do
+  before :each do
+    @clean_code = 'def good() true; end'
+    @smelly_code = 'def fine() y = 4; end'
+    @matcher = ShouldReekOnlyOf.new(:UncommunicativeName, [/y/])
+  end
+
+  it 'matches a smelly String' do
+    @matcher.matches?(@smelly_code).should be_true
+  end
+
+  it 'doesnt match a fragrant String' do
+    @matcher.matches?(@clean_code).should be_false
+  end
+
+  it 'reports the smells when should_not fails' do
+    @matcher.matches?(@smelly_code).should be_true
+    @matcher.failure_message_for_should_not.should include('UncommunicativeName')
+  end
+end
+
+describe ShouldReekOnlyOf, 'checking code in a Dir' do
+  before :each do
+    @clean_dir = Dir['spec/samples/three_clean_files/*.rb']
+    @smelly_dir = Dir['spec/samples/all_but_one_masked/*.rb']
+    @matcher = ShouldReekOnlyOf.new(:NestedIterators, [/Dirty\#a/])
+  end
+
+  it 'matches a smelly String' do
+    @matcher.matches?(@smelly_dir).should be_true
+  end
+
+  it 'doesnt match a fragrant String' do
+    @matcher.matches?(@clean_dir).should be_false
+  end
+
+  it 'reports the smells when should_not fails' do
+    @matcher.matches?(@smelly_dir).should be_true
+    @matcher.failure_message_for_should.should include(@smelly_dir.sniff.quiet_report)
+  end
+end
+
+describe ShouldReekOnlyOf, 'checking code in a File' do
+  before :each do
+    @clean_file = File.new(Dir['spec/samples/three_clean_files/*.rb'][0])
+    @smelly_file = File.new(Dir['spec/samples/all_but_one_masked/d*.rb'][0])
+    @matcher = ShouldReekOnlyOf.new(:NestedIterators, [/Dirty\#a/])
+  end
+
+  it 'matches a smelly String' do
+    @matcher.matches?(@smelly_file).should be_true
+  end
+
+  it 'doesnt match a fragrant String' do
+    @matcher.matches?(@clean_file).should be_false
+  end
+
+  it 'reports the smells when should_not fails' do
+    @matcher.matches?(@smelly_file).should be_true
+    @matcher.failure_message_for_should.should include(@smelly_file.sniff.quiet_report)
+  end
+end
+
+describe ShouldReekOnlyOf, 'report formatting' do
+  before :each do
+    @smelly_dir = Dir['spec/samples/all_but_one_masked/*.rb']
+    @matcher = ShouldReekOnlyOf.new(:NestedIterators, [/Dirty\#a/])
+    @matcher.matches?(@smelly_dir)
+    @lines = @matcher.failure_message_for_should.split("\n").map {|str| str.chomp}
+    @error_message = @lines.shift
+    @smells = @lines.grep(/^  /)
+    @headers = (@lines - @smells)
+  end
+
+  it 'doesnt mention the clean files' do
+    @headers.should have(1).header
+    @headers.should_not include('clean')
+  end
+end

data/spec/reek/{spec_spec.rb → should_reek_spec.rb}

@@ -21,7 +21,7 @@ describe ShouldReek, 'checking code in a string' do
 
   it 'reports the smells when should_not fails' do
     @matcher.matches?(@smelly_code).should be_true
-    @matcher.failure_message_for_should_not.should include(@smelly_code.to_source.full_report)
+    @matcher.failure_message_for_should_not.should include(@smelly_code.sniff.quiet_report)
   end
 end
 
@@ -42,7 +42,7 @@ describe ShouldReek, 'checking code in a Dir' do
 
   it 'reports the smells when should_not fails' do
     @matcher.matches?(@smelly_dir).should be_true
-    @matcher.failure_message_for_should_not.should include(@smelly_dir.to_source.full_report)
+    @matcher.failure_message_for_should_not.should include(@smelly_dir.sniff.quiet_report)
   end
 end
 
@@ -63,6 +63,27 @@ describe ShouldReek, 'checking code in a File' do
 
   it 'reports the smells when should_not fails' do
     @matcher.matches?(@smelly_file).should be_true
-    @matcher.failure_message_for_should_not.should include(@smelly_file.to_source.full_report)
+    @matcher.failure_message_for_should_not.should include(@smelly_file.sniff.quiet_report)
+  end
+end
+
+describe ShouldReek, 'report formatting' do
+  before :each do
+    @smelly_dir = Dir['spec/samples/mixed_results/*.rb']
+    @matcher = ShouldReek.new
+    @matcher.matches?(@smelly_dir)
+    @lines = @matcher.failure_message_for_should_not.split("\n").map {|str| str.chomp}
+    @error_message = @lines.shift
+    @smells = @lines.grep(/^  /)
+    @headers = (@lines - @smells)
+  end
+
+  it 'mentions every smell in the report' do
+    @smells.should have(12).warnings
+  end
+
+  it 'doesnt mention the clean files' do
+    @headers.should have(2).headers
+    @headers.should_not include('clean')
   end
 end

data/spec/reek/smells/duplication_spec.rb

@@ -21,7 +21,7 @@ describe Duplication, "repeated method calls" do
   end
 
   it 'should report nested calls' do
-    ruby = 'def double_thing() @other.thing.foo + @other.thing.foo end'.to_source
+    ruby = 'def double_thing() @other.thing.foo + @other.thing.foo end'.sniff
     ruby.should reek_of(:Duplication, /@other.thing[^\.]/)
     ruby.should reek_of(:Duplication, /@other.thing.foo/)
   end

data/spec/reek/smells/large_class_spec.rb

@@ -1,6 +1,7 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
 require 'reek/code_parser'
 require 'reek/report'
+require 'reek/object_source'
 require 'reek/smells/large_class'
 
 include Reek

data/spec/reek/smells/long_method_spec.rb

@@ -8,8 +8,8 @@ include Reek
 include Reek::Smells
 
 def process_method(src)
-  source = Source.from_s(src)
-  CodeParser.new(Sniffer.new).process_defn(source.generate_syntax_tree)
+  sniffer = src.sniff
+  CodeParser.new(sniffer).process_defn(sniffer.source.syntax_tree)
 end
 
 describe LongMethod do
@@ -26,7 +26,7 @@ describe LongMethod do
   end
 
   it 'should only report a long method once' do
-    source =<<EOS
+    src = <<EOS
 def standard_entries(rbconfig)
   @abc = rbconfig
   rubypath = File.join(@abc['bindir'], @abcf['ruby_install_name'] + cff['EXEEXT'])
@@ -44,7 +44,7 @@ def standard_entries(rbconfig)
   end
 end
 EOS
-    source.should reek_only_of(:LongMethod)
+    src.should reek_only_of(:LongMethod)
   end
 
   it 'should report long inner block' do