reek 1.2.0 → 1.2.1

data/reek.gemspec

@@ -2,22 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = %q{reek}
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kevin Rutherford"]
-  s.date = %q{2009-09-20}
+  s.date = %q{2009-10-03}
   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", "License.txt", "README.rdoc"]
-  s.files = ["History.txt", "License.txt", "README.rdoc", "Rakefile", "bin/reek", "config/defaults.reek", "features/masking_smells.feature", "features/options.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/adapters/application.rb", "lib/reek/adapters/config_file.rb", "lib/reek/adapters/core_extras.rb", "lib/reek/adapters/object_source.rb", "lib/reek/adapters/rake_task.rb", "lib/reek/adapters/report.rb", "lib/reek/adapters/source.rb", "lib/reek/adapters/spec.rb", "lib/reek/block_context.rb", "lib/reek/class_context.rb", "lib/reek/code_context.rb", "lib/reek/code_parser.rb", "lib/reek/command_line.rb", "lib/reek/configuration.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/sexp_formatter.rb", "lib/reek/singleton_method_context.rb", "lib/reek/smell_warning.rb", "lib/reek/smells/control_couple.rb", "lib/reek/smells/data_clump.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/simulated_polymorphism.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/stop_context.rb", "lib/reek/yield_call_context.rb", "reek.gemspec", "spec/quality/reek_source_spec.rb", "spec/reek/adapters/report_spec.rb", "spec/reek/adapters/should_reek_of_spec.rb", "spec/reek/adapters/should_reek_only_of_spec.rb", "spec/reek/adapters/should_reek_spec.rb", "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/configuration_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/singleton_method_context_spec.rb", "spec/reek/smell_warning_spec.rb", "spec/reek/smells/control_couple_spec.rb", "spec/reek/smells/data_clump_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/simulated_polymorphism_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/exceptions.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/not_quite_masked/dirty.rb", "spec/samples/not_quite_masked/masked.reek", "spec/samples/optparse.rb", "spec/samples/overrides/masked/dirty.rb", "spec/samples/overrides/masked/lower.reek", "spec/samples/overrides/upper.reek", "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/spec.opts", "spec/spec_helper.rb", "tasks/reek.rake", "tasks/test.rake"]
+  s.files = ["History.txt", "License.txt", "README.rdoc", "Rakefile", "bin/reek", "config/defaults.reek", "features/masking_smells.feature", "features/options.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/adapters/application.rb", "lib/reek/adapters/command_line.rb", "lib/reek/adapters/config_file.rb", "lib/reek/adapters/core_extras.rb", "lib/reek/adapters/object_source.rb", "lib/reek/adapters/rake_task.rb", "lib/reek/adapters/report.rb", "lib/reek/adapters/source.rb", "lib/reek/adapters/spec.rb", "lib/reek/block_context.rb", "lib/reek/class_context.rb", "lib/reek/code_context.rb", "lib/reek/code_parser.rb", "lib/reek/configuration.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/sexp_formatter.rb", "lib/reek/singleton_method_context.rb", "lib/reek/smell_warning.rb", "lib/reek/smells/class_variable.rb", "lib/reek/smells/control_couple.rb", "lib/reek/smells/data_clump.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/simulated_polymorphism.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/stop_context.rb", "lib/reek/yield_call_context.rb", "reek.gemspec", "spec/quality/reek_source_spec.rb", "spec/reek/adapters/report_spec.rb", "spec/reek/adapters/should_reek_of_spec.rb", "spec/reek/adapters/should_reek_only_of_spec.rb", "spec/reek/adapters/should_reek_spec.rb", "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/configuration_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/singleton_method_context_spec.rb", "spec/reek/smell_warning_spec.rb", "spec/reek/smells/class_variable_spec.rb", "spec/reek/smells/control_couple_spec.rb", "spec/reek/smells/data_clump_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/simulated_polymorphism_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/reek/stop_context_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/exceptions.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/not_quite_masked/dirty.rb", "spec/samples/not_quite_masked/masked.reek", "spec/samples/optparse.rb", "spec/samples/overrides/masked/dirty.rb", "spec/samples/overrides/masked/lower.reek", "spec/samples/overrides/upper.reek", "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/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
 }
-  s.rdoc_options = ["--main", "README.txt"]
+  s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{reek}
   s.rubygems_version = %q{1.3.5}

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
-      IO.readlines(src).grep(/adapters/).should be_empty
+      IO.readlines(src).grep(/adapters/).should == []
     end
   end
 

data/spec/reek/adapters/report_spec.rb

@@ -9,7 +9,7 @@ include Reek
 
 describe ReportSection, " when empty" do
   before(:each) do
-    @rpt = ReportSection.new(''.sniff)
+    @rpt = ReportSection.new(''.sniff, '%m%c %w (%s)', false)
   end
 
   it 'has an empty quiet_report' do
@@ -19,7 +19,7 @@ end
 
 describe ReportSection, "smell_list" do
   before(:each) do
-    rpt = ReportSection.new('def simple(a) a[3] end'.sniff)
+    rpt = ReportSection.new('def simple(a) a[3] end'.sniff, false, '%m%c %w (%s)')
     @lines = rpt.smell_list.split("\n")
   end
 
@@ -32,7 +32,7 @@ end
 
 describe ReportSection, " as a SortedSet" do
   it 'should only add a smell once' do
-    rpt = ReportSection.new(''.sniff)
+    rpt = ReportSection.new(''.sniff, false, '%m%c %w (%s)')
     rpt << SmellWarning.new(Smells::FeatureEnvy.new, "self", 'too many!', false)
     rpt << SmellWarning.new(Smells::FeatureEnvy.new, "self", 'too many!', false)
     lines = rpt.smell_list.split("\n")
@@ -40,7 +40,7 @@ describe ReportSection, " as a SortedSet" do
   end
 
   it 'should not count an identical masked smell' do
-    rpt = ReportSection.new(''.sniff)
+    rpt = ReportSection.new(''.sniff, false, '%m%c %w (%s)')
     # SMELL: Duplication -- the SmellWarning knows whether to call << or record_masked_smell
     rpt << SmellWarning.new(Smells::FeatureEnvy.new, "self", 'too many!', false)
     rpt.record_masked_smell(SmellWarning.new(Smells::FeatureEnvy.new, "self", 'too many!', true))

data/spec/reek/adapters/should_reek_of_spec.rb

@@ -6,103 +6,127 @@ require 'reek/adapters/spec'
 include Reek
 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'
+# belongs in its own spec file
+describe ReekMatcher do
+  it 'reports quietly' do
     @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(Report.new(@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(Report.new(@smelly_dir.sniff.sniffers).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(Report.new(@smelly_file.sniff).quiet_report)
-  end
-end
-
-describe ShouldReekOf, 'report formatting' do
-  before :each do
-    sn_clean = 'def clean() @thing = 4; end'.sniff
-    sn_dirty = 'def dirty() thing.cool + thing.cool; end'.sniff
-    sniffers = SnifferSet.new([sn_clean, sn_dirty], '')
-    @matcher = ShouldReekOf.new(:UncommunicativeName, [/Dirty/, /@s/])
-    @matcher.matches?(sniffers)
-    @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(2).warnings
-  end
-
-  it 'doesnt mention the clean source' do
-    @headers.should have(1).headers
+describe ShouldReekOf do
+  context 'rdoc demo example' do
+    before :each do
+      @ruby = 'def double_thing() @other.thing.foo + @other.thing.foo end'
+    end
+
+    shared_examples_for 'reek as documented' do
+      it 'reports duplicate calls to @other.thing' do
+        @ruby.should reek_of(:Duplication, /@other.thing[^\.]/)
+      end
+      it 'reports duplicate calls to @other.thing.foo' do
+        @ruby.should reek_of(:Duplication, /@other.thing.foo/)
+      end
+      it 'does not report any feature envy' do
+        @ruby.should_not reek_of(:FeatureEnvy)
+      end
+    end
+
+    context 'using source code' do
+      it_should_behave_like 'reek as documented'
+    end
+
+    context 'using a sniffer' do
+      before :each do
+        @ruby = @ruby.sniff
+      end
+
+      it_should_behave_like 'reek as documented'
+    end
+  end
+
+  context 'checking code in a string' do
+    before :each do
+      @clean_code = 'def good() true; end'
+      @smelly_code = 'def x() y = 4; end'
+      @expected_report = Reek::Spec::ReekMatcher::create_reporter(@smelly_code.sniff).report
+      @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(@expected_report)
+    end
+  end
+
+  context '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(QuietReport.new(@smelly_dir.sniff.sniffers, '%m%c %w (%s)').report)
+    end
+  end
+
+  context '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(QuietReport.new(@smelly_file.sniff, '%m%c %w (%s)').report)
+    end
+  end
+
+  context 'report formatting' do
+    before :each do
+      sn_clean = 'def clean() @thing = 4; end'.sniff
+      sn_dirty = 'def dirty() thing.cool + thing.cool; end'.sniff
+      sniffers = SnifferSet.new([sn_clean, sn_dirty], '')
+      @matcher = ShouldReekOf.new(:UncommunicativeName, [/Dirty/, /@s/])
+      @matcher.matches?(sniffers)
+      @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(2).warnings
+    end
+
+    it 'doesnt mention the clean source' do
+      @headers.should have(1).headers
+    end
   end
 end

data/spec/reek/adapters/should_reek_only_of_spec.rb

@@ -44,7 +44,7 @@ describe ShouldReekOnlyOf, '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.should include(Report.new(@smelly_dir.sniff.sniffers).quiet_report)
+    @matcher.failure_message_for_should.should include(QuietReport.new(@smelly_dir.sniff.sniffers, '%m%c %w (%s)').report)
   end
 end
 
@@ -65,7 +65,7 @@ describe ShouldReekOnlyOf, '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.should include(Report.new(@smelly_file.sniff).quiet_report)
+    @matcher.failure_message_for_should.should include(QuietReport.new(@smelly_file.sniff, '%m%c %w (%s)').report)
   end
 end
 

data/spec/reek/adapters/should_reek_spec.rb

@@ -23,7 +23,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(Report.new(@smelly_code.sniff).quiet_report)
+    @matcher.failure_message_for_should_not.should include(QuietReport.new(@smelly_code.sniff, '%m%c %w (%s)').report)
   end
 end
 
@@ -44,7 +44,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(Report.new(@smelly_dir.sniff.sniffers).quiet_report)
+    @matcher.failure_message_for_should_not.should include(QuietReport.new(@smelly_dir.sniff.sniffers, '%m%c %w (%s)').report)
   end
 end
 
@@ -65,7 +65,7 @@ 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(Report.new(@smelly_file.sniff).quiet_report)
+    @matcher.failure_message_for_should_not.should include(QuietReport.new(@smelly_file.sniff, '%m%c %w (%s)').report)
   end
 end
 

data/spec/reek/class_context_spec.rb

@@ -116,16 +116,6 @@ describe CodeContext, 'find class' do
     @mod2 = ModuleContext.create(@klass1, [0, :Mod2])
     @klass2 = ClassContext.create(@mod2, [0, :Klass2])
   end
-
-  describe StopContext do
-    it 'should not find unqualified class' do
-      @stop.find_module('Klass2').should == nil
-    end
-
-    it 'should find unqualified module' do
-      @stop.find_module('Mod1').name.should == 'Mod1'
-    end
-  end
   
   describe ModuleContext do
     it 'should find local name' do

data/spec/reek/code_parser_spec.rb

@@ -36,4 +36,108 @@ describe CodeParser do
   it 'copes with a yield to an ivar' do
     'def options() ozz.on { |@list| @prompt = !@list } end'.should_not reek
   end
-end
+end
+
+describe CodeParser do
+  context 'with no class variables' do
+    it 'records nothing in the class' do
+      klass = ClassContext.from_s('class Fred; end')
+      klass.class_variables.should be_empty
+    end
+    it 'records nothing in the module' do
+      ctx = ModuleContext.from_s('module Fred; end')
+      ctx.class_variables.should be_empty
+    end
+  end
+
+  context 'with one class variable' do
+    shared_examples_for 'one variable found' do
+      it 'records the class variable' do
+        @ctx.class_variables.should include(Name.new(:@@tools))
+      end
+      it 'records only that class variable' do
+        @ctx.class_variables.length.should == 1
+      end
+    end
+
+    context 'declared in a class' do
+      before :each do
+        @ctx = ClassContext.from_s('class Fred; @@tools = {}; end')
+      end
+
+      it_should_behave_like 'one variable found'
+    end
+
+    context 'used in a class' do
+      before :each do
+        @ctx = ClassContext.from_s('class Fred; def jim() @@tools = {}; end; end')
+      end
+
+      it_should_behave_like 'one variable found'
+    end
+
+    context 'indexed in a class' do
+      before :each do
+        @ctx = ClassContext.from_s('class Fred; def jim() @@tools[mash] = {}; end; end')
+      end
+
+      it_should_behave_like 'one variable found'
+    end
+
+    context 'declared and used in a class' do
+      before :each do
+        @ctx = ClassContext.from_s('class Fred; @@tools = {}; def jim() @@tools = {}; end; end')
+      end
+
+      it_should_behave_like 'one variable found'
+    end
+
+    context 'used twice in a class' do
+      before :each do
+        @ctx = ClassContext.from_s('class Fred; def jeff() @@tools = {}; end; def jim() @@tools = {}; end; end')
+      end
+
+      it_should_behave_like 'one variable found'
+    end
+
+    context 'declared in a module' do
+      before :each do
+        @ctx = ClassContext.from_s('module Fred; @@tools = {}; end')
+      end
+
+      it_should_behave_like 'one variable found'
+    end
+
+    context 'used in a module' do
+      before :each do
+        @ctx = ClassContext.from_s('module Fred; def jim() @@tools = {}; end; end')
+      end
+
+      it_should_behave_like 'one variable found'
+    end
+
+    context 'indexed in a module' do
+      before :each do
+        @ctx = ClassContext.from_s('module Fred; def jim() @@tools[mash] = {}; end; end')
+      end
+
+      it_should_behave_like 'one variable found'
+    end
+
+    context 'declared and used in a module' do
+      before :each do
+        @ctx = ClassContext.from_s('module Fred; @@tools = {}; def jim() @@tools = {}; end; end')
+      end
+
+      it_should_behave_like 'one variable found'
+    end
+
+    context 'used twice in a module' do
+      before :each do
+        @ctx = ClassContext.from_s('module Fred; def jeff() @@tools = {}; end; def jim() @@tools = {}; end; end')
+      end
+
+      it_should_behave_like 'one variable found'
+    end
+  end
+end