reek 1.2.4 → 1.2.5

data/History.txt

@@ -1,3 +1,8 @@
+== 1.2.5 (2009-11-19)
+
+=== Minor Changes
+* Ignores ruby_parser errors and pretneds the offending file was empty
+
 == 1.2.4 (2009-11-17)
 
 === Major Changes

data/lib/reek.rb

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

data/lib/reek/adapters/report.rb

@@ -11,20 +11,7 @@ module Reek
       @cwarnings = MaskingCollection.new
       @desc = sniffer.desc
       @display_masked_warnings = display_masked_warnings  # SMELL: Control Couple
-      sniffer.report_on(self)
-    end
-
-    def found_smell(warning)
-      @cwarnings.add(warning)
-      true
-    end
-
-    def found_masked_smell(warning)
-      @cwarnings.add_masked(warning)
-    end
-
-    def num_masked_smells       # SMELL: getter
-      @cwarnings.num_masked_items
+      sniffer.report_on(@cwarnings)
     end
 
     # Creates a formatted report of all the +Smells::SmellWarning+ objects recorded in

data/lib/reek/adapters/source.rb

@@ -11,15 +11,21 @@ module Reek
 
     attr_reader :desc
 
-    def initialize(code, desc)
+    def initialize(code, desc, parser = RubyParser.new)
       @source = code
       @desc = desc
+      @parser = parser
     end
 
     def configure(sniffer) end
 
     def syntax_tree
-      ast = RubyParser.new.parse(@source, @desc) || s()
+      begin
+        ast = @parser.parse(@source, @desc)
+      rescue Exception => error
+        $stderr.puts "#{desc}: #{error.class.name}: #{error}"
+      end
+      ast ||= s()
       TreeDresser.new.dress(ast)
     end
   end

data/lib/reek/masking_collection.rb

@@ -9,11 +9,11 @@ class MaskingCollection
     @visible_items = SortedSet.new
     @masked_items = SortedSet.new
   end
-  def add(item)
+  def found_smell(item)
     @visible_items.add(item)
     @masked_items.delete(item) if @masked_items.include?(item)
   end
-  def add_masked(item)
+  def found_masked_smell(item)
     @masked_items.add(item) unless @visible_items.include?(item)
   end
   def num_visible_items

data/lib/reek/smells/control_couple.rb

@@ -48,12 +48,11 @@ module Reek
         when IfContext
           return unless ctx.tests_a_parameter?
           found(ctx, "is controlled by argument #{SexpFormatter.format(ctx.if_expr)}")
-        when MethodContext
+        else
           ctx.parameters.default_assignments.each do |param, value|
             next unless [:true, :false].include?(value[0])
             found(ctx, "is controlled by argument #{param.to_s}")
           end
-        else
         end
       end
     end

data/lib/reek/smells/smell_detector.rb

@@ -31,10 +31,6 @@ module Reek
       DEFAULT_EXCLUDE_SET = []
 
       class << self
-        def class_name
-          self.name.split(/::/)[-1]
-        end
-
         def contexts      # :nodoc:
           [:defn, :defs]
         end
@@ -45,16 +41,6 @@ module Reek
             EXCLUDE_KEY => DEFAULT_EXCLUDE_SET
           }
         end
-
-        def create(config)
-          new(config[class_name])
-        end
-
-        def listen(hooks, config)
-          detector = create(config)
-          detector.listen_to(hooks)
-          detector
-        end
       end
 
       def initialize(config = self.class.default_config)

data/lib/reek/stop_context.rb

@@ -18,10 +18,6 @@ module Reek
       sym = name.to_s
       @myself.const_defined?(sym) ? @myself.const_get(sym) : nil
     end
-
-    def has_parameter(sym)
-      false
-    end
     
     def inside_a_block?
       false
@@ -31,18 +27,6 @@ module Reek
       false
     end
     
-    def num_statements
-      0
-    end
-    
-    def refs
-      @refs
-    end
-    
-    def record_depends_on_self
-      false
-    end
-    
     def outer_name
       ''
     end

data/lib/reek/tree_dresser.rb

@@ -5,10 +5,6 @@ module Reek
   # syntax tree more easily.
   #
   module SexpNode
-    def children
-      find_all { |item| Sexp === item }
-    end
-
     def is_language_node?
       first.class == Symbol
     end

data/reek.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{reek}
-  s.version = "1.2.4"
+  s.version = "1.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kevin Rutherford"]
-  s.date = %q{2009-11-17}
+  s.date = %q{2009-11-19}
   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/profile.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/adapters/application.rb", "lib/reek/adapters/command_line.rb", "lib/reek/adapters/config_file.rb", "lib/reek/adapters/core_extras.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/help_command.rb", "lib/reek/if_context.rb", "lib/reek/masking_collection.rb", "lib/reek/method_context.rb", "lib/reek/module_context.rb", "lib/reek/name.rb", "lib/reek/object_refs.rb", "lib/reek/reek_command.rb", "lib/reek/sexp_formatter.rb", "lib/reek/singleton_method_context.rb", "lib/reek/smell_warning.rb", "lib/reek/smells/attribute.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/tree_dresser.rb", "lib/reek/version_command.rb", "lib/reek/yield_call_context.rb", "reek.gemspec", "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/help_command_spec.rb", "spec/reek/if_context_spec.rb", "spec/reek/masking_collection_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/reek_command_spec.rb", "spec/reek/singleton_method_context_spec.rb", "spec/reek/smell_warning_spec.rb", "spec/reek/smells/attribute_spec.rb", "spec/reek/smells/behaves_like_variable_detector.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/reek/tree_dresser_spec.rb", "spec/reek/version_command_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/profile.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/adapters/application.rb", "lib/reek/adapters/command_line.rb", "lib/reek/adapters/config_file.rb", "lib/reek/adapters/core_extras.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/help_command.rb", "lib/reek/if_context.rb", "lib/reek/masking_collection.rb", "lib/reek/method_context.rb", "lib/reek/module_context.rb", "lib/reek/name.rb", "lib/reek/object_refs.rb", "lib/reek/reek_command.rb", "lib/reek/sexp_formatter.rb", "lib/reek/singleton_method_context.rb", "lib/reek/smell_warning.rb", "lib/reek/smells/attribute.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/tree_dresser.rb", "lib/reek/version_command.rb", "lib/reek/yield_call_context.rb", "reek.gemspec", "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/adapters/source_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/help_command_spec.rb", "spec/reek/if_context_spec.rb", "spec/reek/masking_collection_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/reek_command_spec.rb", "spec/reek/singleton_method_context_spec.rb", "spec/reek/smell_warning_spec.rb", "spec/reek/smells/attribute_spec.rb", "spec/reek/smells/behaves_like_variable_detector.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/reek/tree_dresser_spec.rb", "spec/reek/version_command_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

data/spec/reek/adapters/report_spec.rb

@@ -29,21 +29,3 @@ describe ReportSection, "smell_list" do
     @lines[1].should match(/[Feature Envy]/)
   end
 end
-
-describe ReportSection, " as a SortedSet" do
-  it 'should only add a smell once' do
-    rpt = ReportSection.new(''.sniff, false)
-    rpt.found_smell SmellWarning.new(Smells::FeatureEnvy.new, "self", 'too many!', false)
-    rpt.found_smell SmellWarning.new(Smells::FeatureEnvy.new, "self", 'too many!', false)
-    lines = rpt.smell_list.split("\n")
-    lines.should have(1).lines
-  end
-
-  it 'should not count an identical masked smell' do
-    rpt = ReportSection.new(''.sniff, false)
-    # SMELL: Duplication -- the SmellWarning knows whether to call << or record_masked_smell
-    rpt.found_smell SmellWarning.new(Smells::FeatureEnvy.new, "self", 'too many!', false)
-    rpt.found_masked_smell(SmellWarning.new(Smells::FeatureEnvy.new, "self", 'too many!', true))
-    rpt.header.should == 'string -- 1 warning'
-  end
-end

data/spec/reek/adapters/source_spec.rb

@@ -0,0 +1,16 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+require 'reek/adapters/source'
+
+include Reek
+
+describe Source do
+  context 'when the parser fails' do
+    it 'returns an empty syntax tree' do
+      parser = mock('parser')
+      parser.should_receive(:parse).and_raise(SyntaxError)
+      src = Source.new('', '', parser)
+      src.syntax_tree.should == s()
+    end
+  end
+end

data/spec/reek/code_parser_spec.rb

@@ -21,14 +21,16 @@ end
 
 describe CodeParser, 'when a yield is the receiver' do
   it 'reports no problems' do
-    source = 'def values(*args)
+    src = <<EOS
+def values(*args)
   @to_sql += case
-    when block_given? then " #{yield.to_sql}"
-    else " values (#{args.to_sql})"
+    when block_given? then yield.to_sql
+    else args.to_sql
   end
   self
-end'
-    source.should_not reek
+end
+EOS
+    src.should_not reek
   end
 end
 

data/spec/reek/masking_collection_spec.rb

@@ -78,7 +78,7 @@ describe MaskingCollection do
   context 'with one visible item' do
     before :each do
       @item = "hello"
-      @collection.add(@item)
+      @collection.found_smell(@item)
     end
     it_should_behave_like 'one visible item'
   end
@@ -86,7 +86,7 @@ describe MaskingCollection do
   context 'with one masked item' do
     before :each do
       @item = "hiding!"
-      @collection.add_masked(@item)
+      @collection.found_masked_smell(@item)
     end
     it_should_behave_like 'one masked item'
   end
@@ -95,8 +95,8 @@ describe MaskingCollection do
     before :each do
       @visible = "visible"
       @masked = "masked"
-      @collection.add_masked(@masked)
-      @collection.add(@visible)
+      @collection.found_masked_smell(@masked)
+      @collection.found_smell(@visible)
     end
     it 'has one visible item' do
       @collection.num_visible_items.should == 1
@@ -131,8 +131,8 @@ describe MaskingCollection do
   context 'with one visible item added twice' do
     before :each do
       @item = "hello"
-      @collection.add(@item)
-      @collection.add(@item)
+      @collection.found_smell(@item)
+      @collection.found_smell(@item)
     end
     it_should_behave_like 'one visible item'
   end
@@ -140,8 +140,8 @@ describe MaskingCollection do
   context 'with one masked item added twice' do
     before :each do
       @item = "hello"
-      @collection.add_masked(@item)
-      @collection.add_masked(@item)
+      @collection.found_masked_smell(@item)
+      @collection.found_masked_smell(@item)
     end
     it_should_behave_like 'one masked item'
   end
@@ -150,8 +150,8 @@ describe MaskingCollection do
     before :each do
       @first_item = "hello"
       @second_item = "goodbye"
-      @collection.add(@first_item)
-      @collection.add(@second_item)
+      @collection.found_smell(@first_item)
+      @collection.found_smell(@second_item)
     end
     it 'has 2 visible items' do
       @collection.num_visible_items.should == 2
@@ -186,8 +186,8 @@ describe MaskingCollection do
     before :each do
       @first_item = "hello"
       @second_item = "goodbye"
-      @collection.add_masked(@first_item)
-      @collection.add_masked(@second_item)
+      @collection.found_masked_smell(@first_item)
+      @collection.found_masked_smell(@second_item)
     end
     it 'has 0 visible items' do
       @collection.num_visible_items.should == 0
@@ -219,8 +219,8 @@ describe MaskingCollection do
   context 'with one masked item later made visible' do
     before :each do
       @item = "hello"
-      @collection.add_masked(@item)
-      @collection.add(@item)
+      @collection.found_masked_smell(@item)
+      @collection.found_smell(@item)
     end
     it_should_behave_like 'one visible item'
   end
@@ -228,8 +228,8 @@ describe MaskingCollection do
   context 'with one visible item later masked' do
     before :each do
       @item = "hello"
-      @collection.add(@item)
-      @collection.add_masked(@item)
+      @collection.found_smell(@item)
+      @collection.found_masked_smell(@item)
     end
     it_should_behave_like 'one visible item'
   end

data/spec/reek/smells/feature_envy_spec.rb

@@ -20,44 +20,41 @@ describe FeatureEnvy do
   end
 
   it 'should not report single use' do
-    'def no_envy(arga)
-        arga.barg(@item)
-      end'.should_not reek
+    'def no_envy(arga) arga.barg(@item) end'.should_not reek
   end
 
   it 'should not report return value' do
-    'def no_envy(arga)
-       arga.barg(@item)
-       arga
-     end'.should_not reek
+    'def no_envy(arga) arga.barg(@item); arga end'.should_not reek
   end
 
   it 'should report many calls to parameter' do
-    'def envy(arga)
-      arga.b(arga) + arga.c(@fred)
-    end'.should reek_only_of(:FeatureEnvy, /arga/)
+    'def envy(arga) arga.b(arga) + arga.c(@fred) end'.should reek_only_of(:FeatureEnvy, /arga/)
   end
 
   it 'should report highest affinity' do
-    ruby = 'def total_envy
-      fred = @item
-      total = 0
-      total += fred.price
-      total += fred.tax
-      total *= 1.15
-    end'
-    ruby.should reek_only_of(:FeatureEnvy, /total/)
+    src = <<EOS
+def total_envy
+  fred = @item
+  total = 0
+  total += fred.price
+  total += fred.tax
+  total *= 1.15
+end
+EOS
+    src.should reek_only_of(:FeatureEnvy, /total/)
   end
 
   it 'should report multiple affinities' do
-    ruby = 'def total_envy
-      fred = @item
-      total = 0
-      total += fred.price
-      total += fred.tax
-    end'
-    ruby.should reek_of(:FeatureEnvy, /total/)
-    ruby.should reek_of(:FeatureEnvy, /fred/)
+    src = <<EOS
+def total_envy
+  fred = @item
+  total = 0
+  total += fred.price
+  total += fred.tax
+end
+EOS
+    src.should reek_of(:FeatureEnvy, /total/)
+    src.should reek_of(:FeatureEnvy, /fred/)
   end
 
   it 'should ignore global variables' do
@@ -77,45 +74,27 @@ describe FeatureEnvy do
   end
 
   it 'should not report ivar usage in a parameter' do
-    'def no_envy
-        @item.price + tax(@item) - savings(@item)
-      end'.should_not reek
+    'def no_envy() @item.price + tax(@item) - savings(@item) end'.should_not reek
   end
 
   it 'should not be fooled by duplication' do
-    'def feed(thing)
-        @cow.feed_to(thing.pig)
-        @duck.feed_to(thing.pig)
-      end'.should reek_only_of(:Duplication, /thing.pig/)
+    'def feed(thing) @cow.feed_to(thing.pig); @duck.feed_to(thing.pig) end'.should reek_only_of(:Duplication, /thing.pig/)
   end
 
   it 'should count local calls' do
-    'def feed(thing)
-        cow.feed_to(thing.pig)
-        duck.feed_to(thing.pig)
-      end'.should reek_only_of(:Duplication, /thing.pig/)
+    'def feed(thing) cow.feed_to(thing.pig); duck.feed_to(thing.pig) end'.should reek_only_of(:Duplication, /thing.pig/)
   end
 
   it 'should not report single use of an lvar' do
-    'def no_envy()
-       lv = @item
-       lv.to_a
-     end'.should_not reek
+    'def no_envy() lv = @item; lv.to_a end'.should_not reek
   end
 
   it 'should not report returning an lvar' do
-    'def no_envy()
-       lv = @item
-       lv.to_a
-       lv
-     end'.should_not reek
+    'def no_envy() lv = @item; lv.to_a; lv end'.should_not reek
   end
 
   it 'should report many calls to lvar' do
-    'def envy
-       lv = @item
-       lv.price + lv.tax
-     end'.should reek_only_of(:FeatureEnvy, /lv/)
+    'def envy() lv = @item; lv.price + lv.tax; end'.should reek_only_of(:FeatureEnvy, /lv/)
     #
     # def moved_version
     #   price + tax
@@ -127,19 +106,19 @@ describe FeatureEnvy do
   end
 
   it 'ignores lvar usage in a parameter' do
-    'def no_envy
-       lv = @item
-       lv.price + tax(lv) - savings(lv)
-     end'.should_not reek
+    'def no_envy() lv = @item; lv.price + tax(lv) - savings(lv); end'.should_not reek
   end
 
   it 'ignores multiple ivars' do
-    'def func
-       @other.a
-       @other.b
-       @nother.c
-       @nother.d
-     end'.should_not reek
+    src = <<EOS
+def func
+  @other.a
+  @other.b
+  @nother.c
+  @nother.d
+end
+EOS
+    src.should_not reek
     #
     # def other.func(me)
     #   a
@@ -151,21 +130,20 @@ describe FeatureEnvy do
   end
 
   it 'ignores frequent use of a call' do
-    'def func
-       other.a
-       other.b
-       nother.c
-     end'.should_not reek_of(:FeatureEnvy)
+    'def func() other.a; other.b; nother.c end'.should_not reek_of(:FeatureEnvy)
   end
 
   it 'counts self references correctly' do
-    'def adopt!(other)
-      other.keys.each do |key|
-        self[key] += 3
-        self[key] = o4
-      end
-      self
-    end'.should_not reek
+    src = <<EOS
+def adopt!(other)
+  other.keys.each do |key|
+    self[key] += 3
+    self[key] = o4
+  end
+  self
+end
+EOS
+    src.should_not reek
   end
 end
 
@@ -182,7 +160,6 @@ def report
   @report
 end
 EOS
-
     ruby.should_not reek
   end
 

data/spec/reek/smells/nested_iterators_spec.rb

@@ -11,23 +11,32 @@ describe NestedIterators do
   end
 
   it 'should not report method with successive iterators' do
-    'def bad(fred)
-      @fred.each {|item| item.each }
-      @jim.each {|ting| ting.each }
-    end'.should_not reek
+    src = <<EOS
+def bad(fred)
+  @fred.each {|item| item.each }
+  @jim.each {|ting| ting.each }
+end
+EOS
+    src.should_not reek
   end
 
   it 'should not report method with chained iterators' do
-    'def chained
-      @sig.keys.sort_by { |xray| xray.to_s }.each { |min| md5 << min.to_s }
-    end'.should_not reek
+    src = <<EOS
+def chained
+  @sig.keys.sort_by { |xray| xray.to_s }.each { |min| md5 << min.to_s }
+end
+EOS
+    src.should_not reek
   end
 
   it 'should report nested iterators only once per method' do
-    'def bad(fred)
-      @fred.each {|item| item.each {|part| @joe.send} }
-      @jim.each {|ting| ting.each {|piece| @hal.send} }
-    end'.should reek_only_of(:NestedIterators)
+    src = <<EOS
+def bad(fred)
+  @fred.each {|item| item.each {|part| @joe.send} }
+  @jim.each {|ting| ting.each {|piece| @hal.send} }
+end
+EOS
+    src.should reek_only_of(:NestedIterators)
   end
 end
 

data/spec/reek/smells/utility_function_spec.rb

@@ -29,22 +29,16 @@ describe UtilityFunction do
 
   context 'with only one call' do
     it 'does not report a call to a parameter' do
-      'def simple(arga)
-         arga.to_s
-       end'.should_not reek_of(:UtilityFunction, /simple/)
+      'def simple(arga) arga.to_s end'.should_not reek_of(:UtilityFunction, /simple/)
     end
     it 'does not report a call to a constant' do
-      'def simple(arga)
-         FIELDS[arga]
-       end'.should_not reek
+      'def simple(arga) FIELDS[arga] end'.should_not reek
     end
   end
 
   context 'with two or more calls' do
     it 'reports two calls' do
-      'def simple(arga)
-         arga.to_s + arga.to_i
-       end'.should reek_of(:UtilityFunction, /simple/)
+      'def simple(arga) arga.to_s + arga.to_i end'.should reek_of(:UtilityFunction, /simple/)
     end
     it 'should count usages of self'do
       'def <=>(other) Options[:sort_order].compare(self, other) end'.should_not reek

data/spec/reek/stop_context_spec.rb

@@ -12,7 +12,7 @@ describe StopContext do
 
   context 'with a module that is not loaded' do
     it 'does not find the module' do
-      @stop.find_module('CGI').should == nil
+      @stop.find_module('Nobbles').should == nil
     end
     it 'does not find an unqualified class in the module' do
       @stop.find_module('HtmlExtension').should == nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: reek
 version: !ruby/object:Gem::Version 
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors: 
 - Kevin Rutherford
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-17 00:00:00 +00:00
+date: 2009-11-19 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -120,6 +120,7 @@ files:
 - 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/adapters/source_spec.rb
 - spec/reek/block_context_spec.rb
 - spec/reek/class_context_spec.rb
 - spec/reek/code_context_spec.rb