reek 2.0.4 → 2.1.0

data/spec/reek/smells/duplicate_method_call_spec.rb

@@ -1,8 +1,8 @@
-require 'spec_helper'
-require 'reek/smells/duplicate_method_call'
-require 'reek/core/code_context'
-require 'reek/core/tree_walker'
-require 'reek/smells/smell_detector_shared'
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/smells/duplicate_method_call'
+require_relative '../../../lib/reek/core/code_context'
+require_relative '../../../lib/reek/core/tree_walker'
+require_relative 'smell_detector_shared'
 
 describe Reek::Smells::DuplicateMethodCall do
   context 'when a smell is reported' do
@@ -16,7 +16,7 @@ describe Reek::Smells::DuplicateMethodCall do
           other[@thing]
         end
       EOS
-      ctx = Reek::Core::CodeContext.new(nil, src.to_reek_source.syntax_tree)
+      ctx = Reek::Core::CodeContext.new(nil, Reek::Source::SourceCode.from(src).syntax_tree)
       smells = @detector.examine_context(ctx)
       expect(smells.length).to eq(1)
       @warning = smells[0]

data/spec/reek/smells/feature_envy_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
-require 'reek/smells/feature_envy'
-require 'reek/smells/smell_detector_shared'
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/smells/feature_envy'
+require_relative 'smell_detector_shared'
 
 describe Reek::Smells::FeatureEnvy do
   context 'with no smell' do
@@ -74,7 +74,7 @@ describe Reek::Smells::FeatureEnvy do
         def envy(arga)
           arga.b(arga) + arga.c(@fred)
         end
-      ').to reek_only_of(:FeatureEnvy)
+      ').to reek_of(:FeatureEnvy, name: 'arga')
     end
   end
 
@@ -88,7 +88,8 @@ describe Reek::Smells::FeatureEnvy do
         total *= 1.15
       end
       EOS
-    expect(src).to reek_only_of(:FeatureEnvy)
+    expect(src).to reek_of(:FeatureEnvy, name: 'total')
+    expect(src).not_to reek_of(:FeatureEnvy, name: 'fred')
   end
 
   it 'should report multiple affinities' do
@@ -100,8 +101,8 @@ describe Reek::Smells::FeatureEnvy do
         total += fred.tax
       end
       EOS
-    expect(src).to reek_of(:FeatureEnvy,  name: 'total')
-    expect(src).to reek_of(:FeatureEnvy,  name: 'fred')
+    expect(src).to reek_of(:FeatureEnvy, name: 'total')
+    expect(src).to reek_of(:FeatureEnvy, name: 'fred')
   end
 
   it 'should not be fooled by duplication' do
@@ -179,9 +180,7 @@ describe Reek::Smells::FeatureEnvy do
     EOS
     expect(src).not_to reek_of(:FeatureEnvy)
   end
-end
 
-describe Reek::Smells::FeatureEnvy do
   it 'counts references to self correctly' do
     ruby = <<-EOS
       def report
@@ -231,7 +230,7 @@ describe Reek::Smells::FeatureEnvy do
           #{@receiver}.fred
         end
       EOS
-      source = src.to_reek_source
+      source = Reek::Source::SourceCode.from(src)
       @mctx = Reek::Core::TreeWalker.new.process_def(source.syntax_tree)
       @smells = @detector.examine_context(@mctx)
     end

data/spec/reek/smells/irresponsible_module_spec.rb

@@ -1,7 +1,7 @@
-require 'spec_helper'
-require 'reek/core/code_context'
-require 'reek/smells/irresponsible_module'
-require 'reek/smells/smell_detector_shared'
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/core/code_context'
+require_relative '../../../lib/reek/smells/irresponsible_module'
+require_relative 'smell_detector_shared'
 
 describe Reek::Smells::IrresponsibleModule do
   before(:each) do
@@ -27,13 +27,13 @@ describe Reek::Smells::IrresponsibleModule do
       # test class
       class Responsible; end
     EOS
-    ctx = Reek::Core::CodeContext.new(nil, src.to_reek_source.syntax_tree)
+    ctx = Reek::Core::CodeContext.new(nil, Reek::Source::SourceCode.from(src).syntax_tree)
     expect(@detector.examine_context(ctx)).to be_empty
   end
 
   it 'reports a class without a comment' do
     src = "class #{@bad_module_name}; end"
-    ctx = Reek::Core::CodeContext.new(nil, src.to_reek_source.syntax_tree)
+    ctx = Reek::Core::CodeContext.new(nil, Reek::Source::SourceCode.from(src).syntax_tree)
     smells = @detector.examine_context(ctx)
     expect(smells.length).to eq(1)
     expect(smells[0].smell_category).to eq(Reek::Smells::IrresponsibleModule.smell_category)
@@ -65,7 +65,7 @@ describe Reek::Smells::IrresponsibleModule do
 
   it 'reports a fq module name correctly' do
     src = 'class Foo::Bar; end'
-    ctx = Reek::Core::CodeContext.new(nil, src.to_reek_source.syntax_tree)
+    ctx = Reek::Core::CodeContext.new(nil, Reek::Source::SourceCode.from(src).syntax_tree)
     smells = @detector.examine_context(ctx)
     expect(smells.length).to eq(1)
     expect(smells[0].smell_category).to eq(described_class.smell_category)

data/spec/reek/smells/long_parameter_list_spec.rb

@@ -1,7 +1,7 @@
-require 'spec_helper'
-require 'reek/core/code_context'
-require 'reek/smells/long_parameter_list'
-require 'reek/smells/smell_detector_shared'
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/core/code_context'
+require_relative '../../../lib/reek/smells/long_parameter_list'
+require_relative 'smell_detector_shared'
 
 describe Reek::Smells::LongParameterList do
   context 'for methods with few parameters' do
@@ -89,7 +89,7 @@ describe Reek::Smells::LongParameterList do
           true
         end
       EOS
-      ctx = Reek::Core::CodeContext.new(nil, src.to_reek_source.syntax_tree)
+      ctx = Reek::Core::CodeContext.new(nil, Reek::Source::SourceCode.from(src).syntax_tree)
       @smells = @detector.examine_context(ctx)
       @warning = @smells[0]
     end

data/spec/reek/smells/long_yield_list_spec.rb

@@ -1,7 +1,7 @@
-require 'spec_helper'
-require 'reek/core/code_context'
-require 'reek/smells/long_yield_list'
-require 'reek/smells/smell_detector_shared'
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/core/code_context'
+require_relative '../../../lib/reek/smells/long_yield_list'
+require_relative 'smell_detector_shared'
 
 describe Reek::Smells::LongYieldList do
   before(:each) do
@@ -38,7 +38,7 @@ describe Reek::Smells::LongYieldList do
           yield(arga,argb,arga,argb)
           end
       EOS
-      ctx = Reek::Core::CodeContext.new(nil, src.to_reek_source.syntax_tree)
+      ctx = Reek::Core::CodeContext.new(nil, Reek::Source::SourceCode.from(src).syntax_tree)
       @smells = @detector.examine_context(ctx)
       @warning = @smells[0]
     end

data/spec/reek/smells/module_initialize_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
-require 'reek/smells/module_initialize'
-require 'reek/smells/smell_detector_shared'
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/smells/module_initialize'
+require_relative 'smell_detector_shared'
 
 describe Reek::Smells::ModuleInitialize do
   context 'module' do

data/spec/reek/smells/nested_iterators_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
-require 'reek/smells/nested_iterators'
-require 'reek/smells/smell_detector_shared'
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/smells/nested_iterators'
+require_relative 'smell_detector_shared'
 
 describe Reek::Smells::NestedIterators do
   context 'with no iterators' do
@@ -237,7 +237,7 @@ describe Reek::Smells::NestedIterators do
           end
         end
       EOS
-      ctx = Reek::Core::CodeContext.new(nil, src.to_reek_source.syntax_tree)
+      ctx = Reek::Core::CodeContext.new(nil, Reek::Source::SourceCode.from(src).syntax_tree)
       @warning = @detector.examine_context(ctx)[0]
     end
 

data/spec/reek/smells/nil_check_spec.rb

@@ -1,7 +1,7 @@
-require 'spec_helper'
-require 'reek/core/code_context'
-require 'reek/smells/nil_check'
-require 'reek/smells/smell_detector_shared'
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/core/code_context'
+require_relative '../../../lib/reek/smells/nil_check'
+require_relative 'smell_detector_shared'
 
 describe Reek::Smells::NilCheck do
   context 'for methods' do
@@ -11,7 +11,7 @@ describe Reek::Smells::NilCheck do
         foo.nil?
       end
       EOS
-      ctx = Reek::Core::CodeContext.new(nil, src.to_reek_source.syntax_tree)
+      ctx = Reek::Core::CodeContext.new(nil, Reek::Source::SourceCode.from(src).syntax_tree)
       detector = build(:smell_detector, smell_type: :NilCheck, source: 'source_name')
       smells = detector.examine_context(ctx)
       expect(smells[0].lines).to eq [2]

data/spec/reek/smells/prima_donna_method_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
-require 'reek/core/module_context'
-require 'reek/smells/smell_detector_shared'
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/core/module_context'
+require_relative 'smell_detector_shared'
 
 describe Reek::Smells::PrimaDonnaMethod do
   it 'should report nothing when method and bang counterpart exist' do
@@ -14,7 +14,10 @@ describe Reek::Smells::PrimaDonnaMethod do
   describe 'the right smell' do
     let(:detector) { build(:smell_detector, smell_type: :PrimaDonnaMethod, source: 'source_name') }
     let(:src)      { 'class C; def m!; end; end' }
-    let(:ctx)      { Reek::Core::ModuleContext.new(nil, src.to_reek_source.syntax_tree) }
+    let(:ctx)      do
+      Reek::Core::ModuleContext.new(nil,
+                                    Reek::Source::SourceCode.from(src).syntax_tree)
+    end
 
     it 'should be reported' do
       smells = detector.examine_context(ctx)

data/spec/reek/smells/repeated_conditional_spec.rb

@@ -1,7 +1,8 @@
-require 'spec_helper'
-require 'reek/smells/repeated_conditional'
-require 'reek/core/code_context'
-require 'reek/smells/smell_detector_shared'
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/smells/repeated_conditional'
+require_relative '../../../lib/reek/core/code_context'
+require_relative 'smell_detector_shared'
+require_relative '../../../lib/reek/source/source_code'
 
 describe Reek::Smells::RepeatedConditional do
   before(:each) do
@@ -13,7 +14,7 @@ describe Reek::Smells::RepeatedConditional do
 
   context 'with no conditionals' do
     it 'gathers an empty hash' do
-      ast = 'module Stable; end'.to_reek_source.syntax_tree
+      ast = Reek::Source::SourceCode.from('module Stable; end').syntax_tree
       ctx = Reek::Core::CodeContext.new(nil, ast)
       expect(@detector.conditional_counts(ctx).length).to eq(0)
     end
@@ -21,7 +22,7 @@ describe Reek::Smells::RepeatedConditional do
 
   context 'with a test of block_given?' do
     it 'does not record the condition' do
-      ast = 'def fred() yield(3) if block_given?; end'.to_reek_source.syntax_tree
+      ast = Reek::Source::SourceCode.from('def fred() yield(3) if block_given?; end').syntax_tree
       ctx = Reek::Core::CodeContext.new(nil, ast)
       expect(@detector.conditional_counts(ctx).length).to eq(0)
     end
@@ -29,7 +30,7 @@ describe Reek::Smells::RepeatedConditional do
 
   context 'with an empty condition' do
     it 'does not record the condition' do
-      ast = 'def fred() case; when 3; end; end'.to_reek_source.syntax_tree
+      ast = Reek::Source::SourceCode.from('def fred() case; when 3; end; end').syntax_tree
       ctx = Reek::Core::CodeContext.new(nil, ast)
       expect(@detector.conditional_counts(ctx).length).to eq(0)
     end
@@ -38,7 +39,7 @@ describe Reek::Smells::RepeatedConditional do
   context 'with three identical conditionals' do
     before :each do
       @cond = '@field == :sym'
-      @cond_expr = @cond.to_reek_source.syntax_tree
+      @cond_expr = Reek::Source::SourceCode.from(@cond).syntax_tree
       src = <<-EOS
         class Scrunch
           def first
@@ -56,7 +57,7 @@ describe Reek::Smells::RepeatedConditional do
         end
       EOS
 
-      ast = src.to_reek_source.syntax_tree
+      ast = Reek::Source::SourceCode.from(src).syntax_tree
       @ctx = Reek::Core::CodeContext.new(nil, ast)
       @conds = @detector.conditional_counts(@ctx)
     end
@@ -77,7 +78,7 @@ describe Reek::Smells::RepeatedConditional do
   context 'with a matching if and case' do
     before :each do
       cond = '@field == :sym'
-      @cond_expr = cond.to_reek_source.syntax_tree
+      @cond_expr = Reek::Source::SourceCode.from(cond).syntax_tree
       src = <<-EOS
         class Scrunch
           def alpha
@@ -92,7 +93,7 @@ describe Reek::Smells::RepeatedConditional do
         end
       EOS
 
-      ast = src.to_reek_source.syntax_tree
+      ast = Reek::Source::SourceCode.from(src).syntax_tree
       ctx = Reek::Core::CodeContext.new(nil, ast)
       @conds = @detector.conditional_counts(ctx)
     end

data/spec/reek/smells/smell_detector_shared.rb

@@ -1,7 +1,5 @@
-require 'spec_helper'
-require 'reek/core/smell_configuration'
-
-include Reek::Core
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/core/smell_configuration'
 
 shared_examples_for 'SmellDetector' do
   context 'exception matching follows the context' do
@@ -23,7 +21,8 @@ shared_examples_for 'SmellDetector' do
 
   context 'configuration' do
     it 'becomes disabled when disabled' do
-      @detector.configure_with(SmellConfiguration::ENABLED_KEY => false)
+      enabled_key = Reek::Core::SmellConfiguration::ENABLED_KEY
+      @detector.configure_with(enabled_key => false)
       expect(@detector).not_to be_enabled
     end
   end

data/spec/reek/smells/too_many_instance_variables_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
-require 'reek/smells/too_many_instance_variables'
-require 'reek/smells/smell_detector_shared'
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/smells/too_many_instance_variables'
+require_relative 'smell_detector_shared'
 
 describe Reek::Smells::TooManyInstanceVariables do
   before(:each) do
@@ -72,7 +72,7 @@ describe Reek::Smells::TooManyInstanceVariables do
         end
       end
     EOS
-    ctx = Reek::Core::CodeContext.new(nil, src.to_reek_source.syntax_tree)
+    ctx = Reek::Core::CodeContext.new(nil, Reek::Source::SourceCode.from(src).syntax_tree)
     @warning = @detector.examine_context(ctx)[0]
     expect(@warning.source).to eq(@source_name)
     expect(@warning.smell_category).to eq(Reek::Smells::TooManyInstanceVariables.smell_category)

data/spec/reek/smells/too_many_methods_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
-require 'reek/smells/too_many_methods'
-require 'reek/smells/smell_detector_shared'
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/smells/too_many_methods'
+require_relative 'smell_detector_shared'
 
 describe Reek::Smells::TooManyMethods do
   before(:each) do
@@ -19,7 +19,8 @@ describe Reek::Smells::TooManyMethods do
           def m2; end
         end
       EOS
-      ctx = ModuleContext.new(nil, src.to_reek_source.syntax_tree)
+      syntax_tree = Reek::Source::SourceCode.from(src).syntax_tree
+      ctx = Reek::Core::ModuleContext.new(nil, syntax_tree)
       expect(@detector.examine_context(ctx)).to be_empty
     end
 
@@ -31,7 +32,8 @@ describe Reek::Smells::TooManyMethods do
           def m3; end
         end
       EOS
-      ctx = ModuleContext.new(nil, src.to_reek_source.syntax_tree)
+      syntax_tree = Reek::Source::SourceCode.from(src).syntax_tree
+      ctx = Reek::Core::ModuleContext.new(nil, syntax_tree)
       smells = @detector.examine_context(ctx)
       expect(smells.length).to eq(1)
       expect(smells[0].smell_type).to eq(described_class.smell_type)
@@ -53,7 +55,8 @@ describe Reek::Smells::TooManyMethods do
           end
         end
       EOS
-      ctx = ModuleContext.new(nil, src.to_reek_source.syntax_tree)
+      syntax_tree = Reek::Source::SourceCode.from(src).syntax_tree
+      ctx = Reek::Core::ModuleContext.new(nil, syntax_tree)
       expect(@detector.examine_context(ctx)).to be_empty
     end
   end
@@ -67,7 +70,8 @@ describe Reek::Smells::TooManyMethods do
       end
     EOS
 
-    ctx = ModuleContext.new(nil, src.to_reek_source.syntax_tree)
+    syntax_tree = Reek::Source::SourceCode.from(src).syntax_tree
+    ctx = Reek::Core::ModuleContext.new(nil, syntax_tree)
     @warning = @detector.examine_context(ctx)[0]
     expect(@warning.source).to eq(@source_name)
     expect(@warning.smell_category).to eq(described_class.smell_category)

data/spec/reek/smells/too_many_statements_spec.rb

@@ -1,13 +1,14 @@
-require 'spec_helper'
-require 'reek/smells/too_many_statements'
-require 'reek/smells/smell_detector_shared'
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/smells/too_many_statements'
+require_relative 'smell_detector_shared'
+require_relative '../../../lib/reek/source/source_code'
 
 def process_method(source)
-  Reek::Core::TreeWalker.new.process_def(source.to_reek_source.syntax_tree)
+  Reek::Core::TreeWalker.new.process_def(Reek::Source::SourceCode.from(source).syntax_tree)
 end
 
 def process_singleton_method(source)
-  Reek::Core::TreeWalker.new.process_defs(source.to_reek_source.syntax_tree)
+  Reek::Core::TreeWalker.new.process_defs(Reek::Source::SourceCode.from(source).syntax_tree)
 end
 
 describe Reek::Smells::TooManyStatements do

data/spec/reek/smells/uncommunicative_method_name_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
-require 'reek/smells/uncommunicative_method_name'
-require 'reek/smells/smell_detector_shared'
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/smells/uncommunicative_method_name'
+require_relative 'smell_detector_shared'
 
 describe Reek::Smells::UncommunicativeMethodName do
   before do
@@ -21,7 +21,7 @@ describe Reek::Smells::UncommunicativeMethodName do
     context 'with a bad name' do
       before do
         src = "def #{method_name}; end"
-        ctx = Reek::Core::CodeContext.new(nil, src.to_reek_source.syntax_tree)
+        ctx = Reek::Core::CodeContext.new(nil, Reek::Source::SourceCode.from(src).syntax_tree)
         smells = @detector.examine_context(ctx)
         @warning = smells[0]
       end

data/spec/reek/smells/uncommunicative_module_name_spec.rb

@@ -1,7 +1,7 @@
-require 'spec_helper'
-require 'reek/smells/uncommunicative_module_name'
-require 'reek/smells/smell_detector_shared'
-require 'reek/core/code_context'
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/smells/uncommunicative_module_name'
+require_relative 'smell_detector_shared'
+require_relative '../../../lib/reek/core/code_context'
 
 describe Reek::Smells::UncommunicativeModuleName do
   before do
@@ -30,7 +30,7 @@ describe Reek::Smells::UncommunicativeModuleName do
 
     it 'reports a bad scoped name' do
       src = "#{type} Foo::X; end"
-      ctx = Reek::Core::CodeContext.new(nil, src.to_reek_source.syntax_tree)
+      ctx = Reek::Core::CodeContext.new(nil, Reek::Source::SourceCode.from(src).syntax_tree)
       smells = @detector.examine_context(ctx)
       expect(smells.length).to eq(1)
       expect(smells[0].smell_category).to eq(Reek::Smells::UncommunicativeModuleName.smell_category)
@@ -43,7 +43,7 @@ describe Reek::Smells::UncommunicativeModuleName do
   context 'accepting names' do
     it 'accepts Inline::C' do
       src = 'module Inline::C; end'
-      ctx = Reek::Core::CodeContext.new(nil, src.to_reek_source.syntax_tree)
+      ctx = Reek::Core::CodeContext.new(nil, Reek::Source::SourceCode.from(src).syntax_tree)
       expect(@detector.examine_context(ctx)).to be_empty
     end
   end
@@ -51,7 +51,7 @@ describe Reek::Smells::UncommunicativeModuleName do
   context 'looking at the YAML' do
     before :each do
       src = 'module Printer2; end'
-      ctx = Reek::Core::CodeContext.new(nil, src.to_reek_source.syntax_tree)
+      ctx = Reek::Core::CodeContext.new(nil, Reek::Source::SourceCode.from(src).syntax_tree)
       smells = @detector.examine_context(ctx)
       @warning = smells[0]
     end