kevinrutherford-reek 1.0.1 → 1.1.1

data/spec/reek/smells/uncommunicative_name_spec.rb

@@ -46,6 +46,11 @@ describe UncommunicativeName, "local variable name" do
   it 'should report variable name only once' do
     'def simple(fred) x = jim(45); x = y end'.should reek_only_of(:UncommunicativeName, /x/)
   end
+
+  it 'should report a bad name inside a block' do
+    src = 'def clean(text) text.each { q2 = 3 } end'
+    src.should reek_of(:UncommunicativeName, /q2/)
+  end
 end
 
 describe UncommunicativeName, "parameter name" do
@@ -64,7 +69,7 @@ describe UncommunicativeName, "block parameter name" do
   it "should report parameter's name" do
     'def help() @stuff.each {|x|} end'.should reek_only_of(:UncommunicativeName, /x/, /block/, /variable name/)
   end
-  
+
   it "should report method name via if context" do
     src = <<EOS
 def bad

data/spec/reek/smells/utility_function_spec.rb

@@ -7,17 +7,11 @@ include Reek::Smells
 
 describe UtilityFunction do
 
-  before(:each) do
-    @rpt = Report.new
-    @cchk = CodeParser.new(@rpt, SmellConfig.new.smell_listeners)
-  end
-
   it 'should not report attrset' do
     class Fred
       attr_writer :xyz
     end
-    @cchk.check_object(Fred)
-    @rpt.should be_empty
+    Fred.should_not reek
   end
 
   it 'should count usages of self'do
@@ -43,8 +37,7 @@ describe UtilityFunction do
     class Son < Father
       def thing(ff); ff; end
     end
-    @cchk.check_object(Son)
-    @rpt.should be_empty
+    Son.should_not reek
   end
 
   it 'should not report class method' do
@@ -93,4 +86,8 @@ describe UtilityFunction, 'should only report a method containing a call' do
   it 'should not report references to self' do
     'def into; self; end'.should_not reek
   end
+
+  it 'should recognise an ivar reference within a block' do
+    'def clean(text) text.each { @fred = 3} end'.should_not reek
+  end
 end

data/spec/{samples → slow}/inline_spec.rb

@@ -2,23 +2,27 @@ require File.dirname(__FILE__) + '/../spec_helper.rb'
 
 describe 'sample gem source code' do
   it "reports the correct smells in inline.rb" do
-    ruby = File.new('spec/samples/inline.rb').to_source
+    ruby = File.new("#{SAMPLES_DIR}/inline.rb").to_source
     ruby.should reek_of(:ControlCouple, /Inline::C#parse_signature/, /raw/)
     ruby.should reek_of(:ControlCouple, /Module#inline/, /options/)
-    ruby.should reek_of(:Duplication, /Inline::C#build/, /\$\?\.==\(0\)/)
+    ruby.should reek_of(:Duplication, /Inline::C#build/, /\(\$\?\ == 0\)/)
     ruby.should reek_of(:Duplication, /Inline::C#build/, /Inline.directory/)
     ruby.should reek_of(:Duplication, /Inline::C#build/, /io.puts/)
-    ruby.should reek_of(:Duplication, /Inline::C#build/, /io.puts\(#endif\)/)
-    ruby.should reek_of(:Duplication, /Inline::C#build/, /io.puts\(#ifdef __cplusplus\)/)
-    ruby.should reek_of(:Duplication, /Inline::C#crap_for_windoze/, /Config::CONFIG\[libdir\]/)
-    ruby.should reek_of(:Duplication, /Inline::C#generate/, /result.sub!\(\(\?-mix:\\A\\n\), \)/)
-    ruby.should reek_of(:Duplication, /Inline::C#generate/, /signature\[args\]/)
-    ruby.should reek_of(:Duplication, /Inline::C#generate/, /signature\[args\].map/)
+    ruby.should reek_of(:Duplication, /Inline::C#build/, /io.puts\("#endif"\)/)
+    ruby.should reek_of(:Duplication, /Inline::C#build/, /io.puts\("#ifdef __cplusplus"\)/)
+    ruby.should reek_of(:Duplication, /Inline::C#build/, /module_name/)
+    ruby.should reek_of(:Duplication, /Inline::C#build/, /warn\("Output:\\n\#\{result\}"\)/)
+    ruby.should reek_of(:Duplication, /Inline::C#crap_for_windoze/, /Config::CONFIG\["libdir"\]/)
+    ruby.should reek_of(:Duplication, /Inline::C#generate/, /result.sub!\(\/\\A\\n\/, ""\)/)
+    ruby.should reek_of(:Duplication, /Inline::C#generate/, /signature\["args"\]/)
+    ruby.should reek_of(:Duplication, /Inline::C#generate/, /signature\["args"\].map/)
     ruby.should reek_of(:Duplication, /Inline::C#initialize/, /stack.empty?/)
+    ruby.should reek_of(:Duplication, /Inline::C#load/, /so_name/)
     ruby.should reek_of(:Duplication, /Inline::self.rootdir/, /env.nil?/)
     ruby.should reek_of(:Duplication, /Module#inline/, /Inline.const_get\(lang\)/)
     ruby.should reek_of(:FeatureEnvy, /Inline::C#strip_comments/, /src/)
-    ruby.should reek_of(:LargeClass, /Inline::C/)
+    ruby.should reek_of(:LargeClass, /Inline::C/, /methods/)
+    ruby.should reek_of(:LargeClass, /Inline::C/, /instance variables/)
     ruby.should reek_of(:LongMethod, /File#self.write_with_backup/)
     ruby.should reek_of(:LongMethod, /Inline::C#build/)
     ruby.should reek_of(:LongMethod, /Inline::C#generate/)
@@ -35,6 +39,6 @@ describe 'sample gem source code' do
     ruby.should reek_of(:UncommunicativeName, /Inline::C#module_name/, /'x'/)
     ruby.should reek_of(:UncommunicativeName, /Inline::C#parse_signature/, /'x'/)
     ruby.should reek_of(:UtilityFunction, /Inline::C#strip_comments/)
-    ruby.report.should have_at_most(32).smells
+    ruby.report.should have_at_most(36).smells
   end
 end

data/spec/{samples → slow}/optparse_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper.rb'
 
 describe 'sample gem source code' do
   it "reports the correct smells in optparse.rb" do
-    ruby = File.new('spec/samples/optparse.rb').to_source
+    ruby = File.new("#{SAMPLES_DIR}/optparse.rb").to_source
     ruby.should reek_of(:ControlCouple, /OptionParser#List#accept/, /pat/)
     ruby.should reek_of(:ControlCouple, /OptionParser#List#update/, /lopts/)
     ruby.should reek_of(:ControlCouple, /OptionParser#List#update/, /sopts/)
@@ -10,24 +10,33 @@ describe 'sample gem source code' do
     ruby.should reek_of(:ControlCouple, /OptionParser#Switch#NoArgument#parse/, /arg/)
     ruby.should reek_of(:ControlCouple, /OptionParser#Switch#OptionalArgument#parse/, /arg/)
     ruby.should reek_of(:ControlCouple, /OptionParser#Switch#RequiredArgument#parse/, /arg/)
+    ruby.should reek_of(:ControlCouple, /OptionParser#block/, /o/)
+    ruby.should reek_of(:ControlCouple, /OptionParser#block/, /s/)
+    ruby.should reek_of(:ControlCouple, /OptionParser#block\/block/, /pkg/)
+    ruby.should reek_of(:ControlCouple, /OptionParser#getopts\/block/, /val/)
     ruby.should reek_of(:ControlCouple, /OptionParser#parse_in_order/, /setter/)
     ruby.should reek_of(:Duplication, /OptionParser#Completion::complete/, /candidates.size/)
     ruby.should reek_of(:Duplication, /OptionParser#Completion::complete/, /k.id2name/)
     ruby.should reek_of(:Duplication, /OptionParser#Switch#parse_arg/, /s.length/)
-    ruby.should reek_of(:Duplication, /OptionParser#Switch#summarize/, /block.max/)
-    ruby.should reek_of(:Duplication, /OptionParser#Switch#summarize/, /block.max.to_i/)
-    ruby.should reek_of(:Duplication, /OptionParser#Switch#summarize/, /indent.+\(l\)/)
+    ruby.should reek_of(:Duplication, /OptionParser#Switch#summarize/, /left.collect \{ \|s\| s\.length \}\.max/)
+    ruby.should reek_of(:Duplication, /OptionParser#Switch#summarize/, /left.collect \{ \|s\| s\.length \}\.max\.to_i/)
+    ruby.should reek_of(:Duplication, /OptionParser#Switch#summarize/, /\(indent \+ l\)/)
     ruby.should reek_of(:Duplication, /OptionParser#Switch#summarize/, /left.collect/)
     ruby.should reek_of(:Duplication, /OptionParser#Switch#summarize/, /left.shift/)
     ruby.should reek_of(:Duplication, /OptionParser#Switch#summarize/, /left\[-1\]/)
     ruby.should reek_of(:Duplication, /OptionParser#Switch#summarize/, /s.length/)
-    ruby.should reek_of(:Duplication, /OptionParser#make_switch/, /default_style.guess\(arg=a\)/)
-    ruby.should reek_of(:Duplication, /OptionParser#make_switch/, /long.<<\(o=q.downcase\)/)
-    ruby.should reek_of(:Duplication, /OptionParser#make_switch/, /pattern.method\(convert\)/)
-    ruby.should reek_of(:Duplication, /OptionParser#make_switch/, /pattern.method\(convert\).to_proc/)
-    ruby.should reek_of(:Duplication, /OptionParser#make_switch/, /pattern.respond_to\?\(convert\)/)
+    ruby.should reek_of(:Duplication, /OptionParser#getopts/, /result\[opt\] = false/)
+    ruby.should reek_of(:Duplication, /OptionParser#make_switch/, /default_style.guess\(arg = a\)/)
+    ruby.should reek_of(:Duplication, /OptionParser#make_switch/, /\(long << o = q.downcase\)/)
+    ruby.should reek_of(:Duplication, /OptionParser#make_switch/, /notwice\(a \? \(Object\) : \(TrueClass\), klass, "type"\)/)
+    ruby.should reek_of(:Duplication, /OptionParser#make_switch/, /notwice\(NilClass, klass, "type"\)/)
+    ruby.should reek_of(:Duplication, /OptionParser#make_switch/, /pattern.method\(:convert\)/)
+    ruby.should reek_of(:Duplication, /OptionParser#make_switch/, /pattern.method\(:convert\).to_proc/)
+    ruby.should reek_of(:Duplication, /OptionParser#make_switch/, /pattern.respond_to\?\(:convert\)/)
     ruby.should reek_of(:Duplication, /OptionParser#make_switch/, /q.downcase/)
-    ruby.should reek_of(:Duplication, /OptionParser#make_switch/, /sdesc.<<\("-\#\{q\}"\)/)
+    ruby.should reek_of(:Duplication, /OptionParser#make_switch/, /search\(:atype, o\)/)
+    ruby.should reek_of(:Duplication, /OptionParser#make_switch/, /search\(:atype, FalseClass\)/)
+    ruby.should reek_of(:Duplication, /OptionParser#make_switch/, /\(sdesc << "-\#\{q\}"\)/)
     ruby.should reek_of(:Duplication, /OptionParser#order/, /argv\[0\]/)
     ruby.should reek_of(:Duplication, /OptionParser#parse/, /argv\[0\]/)
     ruby.should reek_of(:Duplication, /OptionParser#parse_in_order/, /\$\!.set_option\(arg, true\)/)
@@ -45,7 +54,6 @@ describe 'sample gem source code' do
     ruby.should reek_of(:LargeClass, /OptionParser/)
     ruby.should reek_of(:LongMethod, /OptionParser#Completion::complete/)
     ruby.should reek_of(:LongMethod, /OptionParser#List#update/)
-    ruby.should reek_of(:LongMethod, /OptionParser#Switch#PlacedArgument#parse/)
     ruby.should reek_of(:LongMethod, /OptionParser#Switch#parse_arg/)
     ruby.should reek_of(:LongMethod, /OptionParser#Switch#summarize/)
     ruby.should reek_of(:LongMethod, /OptionParser#getopts/)
@@ -95,6 +103,6 @@ describe 'sample gem source code' do
     ruby.should reek_of(:UncommunicativeName, /OptionParser#summarize/, /'l'/)
     ruby.should reek_of(:UncommunicativeName, /OptionParser#ver/, /'v'/)
     ruby.should reek_of(:UncommunicativeName, /block/, /'q'/)
-    ruby.report.should have_at_most(92).smells
+    ruby.report.should have_at_most(116).smells
   end
 end

data/spec/{samples → slow}/redcloth_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper.rb'
 
 describe 'sample gem source code' do
   it "reports the correct smells in redcloth.rb" do
-    ruby = File.new('spec/samples/redcloth.rb').to_source
+    ruby = File.new("#{SAMPLES_DIR}/redcloth.rb").to_source
     ruby.should reek_of(:ControlCouple, /RedCloth#blocks\/block/, /deep_code/)
     ruby.should reek_of(:ControlCouple, /RedCloth#check_refs/, /text/)
     ruby.should reek_of(:ControlCouple, /RedCloth#pba/, /text_in/)
@@ -13,23 +13,31 @@ describe 'sample gem source code' do
     ruby.should reek_of(:Duplication, /RedCloth#block_textile_lists/, /depth.last/)
     ruby.should reek_of(:Duplication, /RedCloth#block_textile_lists/, /depth.last.length/)
     ruby.should reek_of(:Duplication, /RedCloth#block_textile_lists/, /depth\[i\]/)
-    ruby.should reek_of(:Duplication, /RedCloth#block_textile_lists/, /line_id.-\(1\)/)
-    ruby.should reek_of(:Duplication, /RedCloth#block_textile_lists/, /lines\[line_id.-\(1\)\]/)
+    ruby.should reek_of(:Duplication, /RedCloth#block_textile_lists/, /\(line_id - 1\)/)
+    ruby.should reek_of(:Duplication, /RedCloth#block_textile_lists/, /lines\[\(line_id - 1\)\]/)
     ruby.should reek_of(:Duplication, /RedCloth#block_textile_lists/, /tl.length/)
     ruby.should reek_of(:Duplication, /RedCloth#clean_html/, /tags\[tag\]/)
     ruby.should reek_of(:Duplication, /RedCloth#pba/, /\$1.length/)
     ruby.should reek_of(:Duplication, /RedCloth#rip_offtags/, /@pre_list.last/)
-    ruby.should reek_of(:Duplication, /RedCloth#rip_offtags/, /@pre_list.last.<<\(line\)/)
-    ruby.should reek_of(:Duplication, /RedCloth#rip_offtags/, /codepre.-\(used_offtags.length\)/)
-    ruby.should reek_of(:Duplication, /RedCloth#rip_offtags/, /codepre.-\(used_offtags.length\).>\(0\)/)
+    ruby.should reek_of(:Duplication, /RedCloth#rip_offtags/, /\(@pre_list.last << line\)/)
+    ruby.should reek_of(:Duplication, /RedCloth#rip_offtags/, /\(codepre - used_offtags.length\)/)
+    ruby.should reek_of(:Duplication, /RedCloth#rip_offtags/, /\(\(codepre - used_offtags.length\) > 0\)/)
     ruby.should reek_of(:Duplication, /RedCloth#rip_offtags/, /codepre.zero?/)
+    ruby.should reek_of(:Duplication, /RedCloth#rip_offtags/, /htmlesc\(line, :NoQuotes\)/)
     ruby.should reek_of(:Duplication, /RedCloth#rip_offtags/, /used_offtags.length/)
-    ruby.should reek_of(:Duplication, /RedCloth#rip_offtags/, /used_offtags\[notextile\]/)
+    ruby.should reek_of(:Duplication, /RedCloth#rip_offtags/, /used_offtags\["notextile"\]/)
+    ruby.should reek_of(:FeatureEnvy, /RedCloth#block_markdown_atx/, /text/)
+    ruby.should reek_of(:FeatureEnvy, /RedCloth#block_markdown_rule/, /text/)
+    ruby.should reek_of(:FeatureEnvy, /RedCloth#block_markdown_setext/, /text/)
+    ruby.should reek_of(:FeatureEnvy, /RedCloth#block_textile_lists/, /depth/)
+    ruby.should reek_of(:FeatureEnvy, /RedCloth#clean_html/, /raw/)
     ruby.should reek_of(:FeatureEnvy, /RedCloth#clean_html/, /tags/)
     ruby.should reek_of(:FeatureEnvy, /RedCloth#clean_white_space/, /text/)
     ruby.should reek_of(:FeatureEnvy, /RedCloth#flush_left/, /indt/)
     ruby.should reek_of(:FeatureEnvy, /RedCloth#flush_left/, /text/)
+    ruby.should reek_of(:FeatureEnvy, /RedCloth#footnote_ref/, /text/)
     ruby.should reek_of(:FeatureEnvy, /RedCloth#htmlesc/, /str/)
+    ruby.should reek_of(:FeatureEnvy, /RedCloth#incoming_entities/, /text/)
     ruby.should reek_of(:FeatureEnvy, /RedCloth#no_textile/, /text/)
     ruby.should reek_of(:FeatureEnvy, /RedCloth#pba/, /style/)
     ruby.should reek_of(:FeatureEnvy, /RedCloth#pba/, /text/)
@@ -88,6 +96,6 @@ describe 'sample gem source code' do
     ruby.should reek_of(:UtilityFunction, /RedCloth#incoming_entities/)
     ruby.should reek_of(:UtilityFunction, /RedCloth#no_textile/)
     ruby.should reek_of(:UtilityFunction, /RedCloth#v_align/)
-    ruby.report.should have_at_most(85).smells
+    ruby.report.should have_at_most(93).smells
   end
 end

data/spec/{reek/source_spec.rb → slow/source_list_spec.rb}

@@ -4,7 +4,7 @@ require 'reek/source'
 
 include Reek
 
-describe SourceList do
+describe SourceList, 'from_pathlist' do
 
   describe 'with no smells in any source' do
     before :each do
@@ -22,11 +22,11 @@ describe SourceList do
 
   describe 'with smells in one source' do
     before :each do
-      @src = Source.from_pathlist(['spec/samples/inline.rb', 'lib/reek.rb'])
+      @src = Source.from_pathlist(["#{SAMPLES_DIR}/inline.rb", 'lib/reek.rb'])
     end
 
     it 'reports some smells in the samples' do
-      @src.report.length.should == 32
+      @src.report.should have_at_least(30).smells
     end
 
     it 'is smelly' do

data/spec/spec_helper.rb

@@ -9,3 +9,5 @@ rescue LoadError
 end
 
 require 'reek/spec'
+
+SAMPLES_DIR = 'spec/slow/samples' unless Object.const_defined?('SAMPLES_DIR')

data/tasks/rspec.rake

@@ -3,7 +3,7 @@ require 'spec/rake/spectask'
 
 namespace 'rspec' do
   FAST = FileList['spec/reek/**/*_spec.rb']
-  SLOW = FileList['spec/integration/**/*_spec.rb', 'spec/samples/**/*_spec.rb']
+  SLOW = FileList['spec/slow/**/*_spec.rb']
 
   Spec::Rake::SpecTask.new('fast') do |t|
     t.spec_files = FAST

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kevinrutherford-reek
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Kevin Rutherford
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-06 00:00:00 -07:00
+date: 2009-05-08 00:00:00 -07:00
 default_executable: reek
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "3.0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: ruby2ruby
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.2"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: sexp_processor
   type: :runtime
@@ -82,8 +92,7 @@ files:
 - lib/reek/stop_context.rb
 - lib/reek/yield_call_context.rb
 - reek.gemspec
-- spec/integration/reek_source_spec.rb
-- spec/integration/script_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
@@ -91,6 +100,7 @@ files:
 - 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/options_spec.rb
 - spec/reek/report_spec.rb
@@ -106,13 +116,15 @@ files:
 - spec/reek/smells/smell_spec.rb
 - spec/reek/smells/uncommunicative_name_spec.rb
 - spec/reek/smells/utility_function_spec.rb
-- spec/reek/source_spec.rb
-- spec/samples/inline.rb
-- spec/samples/inline_spec.rb
-- spec/samples/optparse.rb
-- spec/samples/optparse_spec.rb
-- spec/samples/redcloth.rb
-- spec/samples/redcloth_spec.rb
+- spec/slow/inline_spec.rb
+- spec/slow/optparse_spec.rb
+- spec/slow/redcloth_spec.rb
+- spec/slow/reek_source_spec.rb
+- spec/slow/samples/inline.rb
+- spec/slow/samples/optparse.rb
+- spec/slow/samples/redcloth.rb
+- spec/slow/script_spec.rb
+- spec/slow/source_list_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - tasks/reek.rake
@@ -145,7 +157,7 @@ requirements: []
 rubyforge_project: reek
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Code smell detector for Ruby
 test_files: []