reek 2.0.4 → 2.1.0

data/spec/reek/core/method_context_spec.rb

@@ -1,14 +1,12 @@
-require 'spec_helper'
-require 'reek/core/method_context'
-require 'reek/core/stop_context'
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/core/method_context'
+require_relative '../../../lib/reek/core/stop_context'
 
-include Reek::Core
-
-describe MethodContext, 'matching' do
+describe Reek::Core::MethodContext, 'matching' do
   before :each do
     exp = double('exp').as_null_object
     expect(exp).to receive(:full_name).at_least(:once).and_return('mod')
-    @element = MethodContext.new(StopContext.new, exp)
+    @element = Reek::Core::MethodContext.new(Reek::Core::StopContext.new, exp)
   end
 
   it 'should recognise itself in a collection of names' do
@@ -22,33 +20,36 @@ describe MethodContext, 'matching' do
   end
 end
 
-describe MethodContext do
+describe Reek::Core::MethodContext do
   it 'should record ivars as refs to self' do
-    mctx = MethodContext.new(StopContext.new, s(:def, :feed, s(:args), nil))
+    sexp = s(:def, :feed, s(:args), nil)
+    mctx = Reek::Core::MethodContext.new(Reek::Core::StopContext.new, sexp)
     expect(mctx.envious_receivers).to eq([])
     mctx.record_call_to(s(:send, s(:ivar, :@cow), :feed_to))
     expect(mctx.envious_receivers).to eq([])
   end
 
   it 'should count calls to self' do
-    mctx = MethodContext.new(StopContext.new, s(:def, :equals, s(:args), nil))
+    sexp = s(:def, :equals, s(:args), nil)
+    mctx = Reek::Core::MethodContext.new(Reek::Core::StopContext.new, sexp)
     mctx.refs.record_reference_to([:lvar, :other])
     mctx.record_call_to(s(:send, s(:self), :thing))
     expect(mctx.envious_receivers).to be_empty
   end
 
   it 'should recognise a call on self' do
-    mc = MethodContext.new(StopContext.new, s(:def, :deep, s(:args), nil))
+    sexp = s(:def, :deep, s(:args), nil)
+    mc = Reek::Core::MethodContext.new(Reek::Core::StopContext.new, sexp)
     mc.record_call_to(s(:send, s(:lvar, :text), :each, s(:arglist)))
     mc.record_call_to(s(:send, nil, :shelve, s(:arglist)))
     expect(mc.envious_receivers).to be_empty
   end
 end
 
-describe MethodParameters, 'default assignments' do
+describe Reek::Core::MethodParameters, 'default assignments' do
   def assignments_from(src)
-    exp = src.to_reek_source.syntax_tree
-    ctx = MethodContext.new(StopContext.new, exp)
+    exp = Reek::Source::SourceCode.from(src).syntax_tree
+    ctx = Reek::Core::MethodContext.new(Reek::Core::StopContext.new, exp)
     ctx.parameters.default_assignments
   end
 

data/spec/reek/core/module_context_spec.rb

@@ -1,10 +1,8 @@
-require 'spec_helper'
-require 'reek/core/module_context'
-require 'reek/core/stop_context'
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/core/module_context'
+require_relative '../../../lib/reek/core/stop_context'
 
-include Reek::Core
-
-describe ModuleContext do
+describe Reek::Core::ModuleContext do
   it 'should report module name for smell in method' do
     expect('
       module Fred
@@ -21,7 +19,7 @@ module Fred
   end
 end
 
-describe ModuleContext do
+describe Reek::Core::ModuleContext do
   it 'should recognise global constant' do
     expect('# module for test
 module ::Global

data/spec/reek/core/object_refs_spec.rb

@@ -1,11 +1,9 @@
-require 'spec_helper'
-require 'reek/core/object_refs'
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/core/object_refs'
 
-include Reek::Core
-
-describe ObjectRefs do
+describe Reek::Core::ObjectRefs do
   before(:each) do
-    @refs = ObjectRefs.new
+    @refs = Reek::Core::ObjectRefs.new
   end
 
   context 'when empty' do

data/spec/reek/core/singleton_method_context_spec.rb

@@ -1,9 +1,7 @@
-require 'spec_helper'
-require 'reek/core/module_context'
-require 'reek/core/singleton_method_context'
-require 'reek/core/stop_context'
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/core/module_context'
+require_relative '../../../lib/reek/core/singleton_method_context'
+require_relative '../../../lib/reek/core/stop_context'
 
-include Reek::Core
-
-describe SingletonMethodContext do
+describe Reek::Core::SingletonMethodContext do
 end

data/spec/reek/core/smell_configuration_spec.rb

@@ -1,11 +1,9 @@
-require 'spec_helper'
-require 'reek/core/smell_configuration'
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/core/smell_configuration'
 
-include Reek::Core
-
-describe SmellConfiguration do
+describe Reek::Core::SmellConfiguration do
   it 'returns the default value when key not found' do
-    cf = SmellConfiguration.new({})
+    cf = Reek::Core::SmellConfiguration.new({})
     expect(cf.value('fred', nil, 27)).to eq(27)
   end
 
@@ -14,7 +12,7 @@ describe SmellConfiguration do
       @base_config = { 'enabled' => true, 'exclude' => [],
                        'reject' => [/^.$/, /[0-9]$/, /[A-Z]/],
                        'accept' => ['_'] }
-      @smell_config = SmellConfiguration.new(@base_config)
+      @smell_config = Reek::Core::SmellConfiguration.new(@base_config)
     end
 
     it { expect(@smell_config.merge!({})).to eq(@base_config) }

data/spec/reek/core/smell_repository_spec.rb

@@ -1,17 +1,17 @@
-require 'spec_helper'
-require 'reek/core/smell_repository'
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/core/smell_repository'
 
-include Reek::Core
-
-describe SmellRepository do
+describe Reek::Core::SmellRepository do
   describe '.smell_types' do
+    let(:smell_types) { Reek::Core::SmellRepository.smell_types }
+
     it 'should include existing smell_types' do
-      expect(SmellRepository.smell_types).to include(Reek::Smells::IrresponsibleModule)
-      expect(SmellRepository.smell_types).to include(Reek::Smells::TooManyStatements)
+      expect(smell_types).to include(Reek::Smells::IrresponsibleModule)
+      expect(smell_types).to include(Reek::Smells::TooManyStatements)
     end
 
     it 'should exclude certain smell_types' do
-      expect(SmellRepository.smell_types).to_not include(Reek::Smells::SmellDetector)
+      expect(smell_types).to_not include(Reek::Smells::SmellDetector)
     end
   end
 end

data/spec/reek/core/stop_context_spec.rb

@@ -1,12 +1,9 @@
-require 'spec_helper'
-require 'reek/core/stop_context'
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/core/stop_context'
 
-include Reek
-include Reek::Core
-
-describe StopContext do
+describe Reek::Core::StopContext do
   before :each do
-    @stop = StopContext.new
+    @stop = Reek::Core::StopContext.new
   end
 
   context 'full_name' do

data/spec/reek/core/tree_walker_spec.rb

@@ -1,9 +1,7 @@
-require 'spec_helper'
-require 'reek/core/tree_walker'
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/core/tree_walker'
 
-include Reek::Core
-
-describe TreeWalker, 'with no method definitions' do
+describe Reek::Core::TreeWalker, 'with no method definitions' do
   it 'reports no problems for empty source code' do
     expect('').not_to reek
   end
@@ -13,14 +11,14 @@ class Fred; end').not_to reek
   end
 end
 
-describe TreeWalker, 'with a global method definition' do
+describe Reek::Core::TreeWalker, 'with a global method definition' do
   it 'reports no problems for simple method' do
     src = 'def Outermost::fred() true; end'
     expect(src).not_to reek
   end
 end
 
-describe TreeWalker, 'when a yield is the receiver' do
+describe Reek::Core::TreeWalker, 'when a yield is the receiver' do
   it 'reports no problems' do
     src = <<EOS
 def values(*args)

data/spec/reek/core/warning_collector_spec.rb

@@ -1,12 +1,10 @@
-require 'spec_helper'
-require 'reek/core/warning_collector'
-require 'reek/smell_warning'
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/core/warning_collector'
+require_relative '../../../lib/reek/smell_warning'
 
-include Reek::Core
-
-describe WarningCollector do
+describe Reek::Core::WarningCollector do
   before(:each) do
-    @collector = WarningCollector.new
+    @collector = Reek::Core::WarningCollector.new
   end
 
   context 'when empty' do

data/spec/reek/examiner_spec.rb

@@ -1,7 +1,5 @@
-require 'spec_helper'
-require 'reek/examiner'
-
-include Reek
+require_relative '../spec_helper'
+require_relative '../../lib/reek/examiner'
 
 shared_examples_for 'no smells found' do
   it 'is not smelly' do
@@ -24,14 +22,14 @@ shared_examples_for 'one smell found' do
   end
 end
 
-describe Examiner do
+describe Reek::Examiner do
   before :each do
     @expected_first_smell = 'NestedIterators'
   end
 
   context 'with a fragrant String' do
     before :each do
-      @examiner = Examiner.new('def good() true; end')
+      @examiner = Reek::Examiner.new('def good() true; end')
     end
 
     it_should_behave_like 'no smells found'
@@ -39,7 +37,7 @@ describe Examiner do
 
   context 'with a smelly String' do
     before :each do
-      @examiner = Examiner.new('def fine() y = 4; end')
+      @examiner = Reek::Examiner.new('def fine() y = 4; end')
       @expected_first_smell = 'UncommunicativeName'
     end
 
@@ -55,7 +53,7 @@ describe Examiner do
 
     before :each do
       smelly_dir = Dir['spec/samples/all_but_one_masked/*.rb']
-      @examiner = Examiner.new(smelly_dir)
+      @examiner = Reek::Examiner.new(smelly_dir)
     end
 
     it_should_behave_like 'one smell found'
@@ -64,7 +62,7 @@ describe Examiner do
   context 'with a fragrant Dir' do
     before :each do
       clean_dir = Dir['spec/samples/three_clean_files/*.rb']
-      @examiner = Examiner.new(clean_dir)
+      @examiner = Reek::Examiner.new(clean_dir)
     end
 
     it_should_behave_like 'no smells found'
@@ -79,7 +77,7 @@ describe Examiner do
 
     before :each do
       smelly_dir = Dir['spec/samples/masked_by_dotfile/*.rb']
-      @examiner = Examiner.new(smelly_dir)
+      @examiner = Reek::Examiner.new(smelly_dir)
     end
 
     it_should_behave_like 'one smell found'
@@ -94,7 +92,7 @@ describe Examiner do
 
     before :each do
       smelly_file = File.new(Dir['spec/samples/all_but_one_masked/d*.rb'][0])
-      @examiner = Examiner.new(smelly_file)
+      @examiner = Reek::Examiner.new(smelly_file)
     end
 
     it_should_behave_like 'one smell found'
@@ -103,7 +101,7 @@ describe Examiner do
   context 'with a fragrant File' do
     before :each do
       clean_file = File.new(Dir['spec/samples/three_clean_files/*.rb'][0])
-      @examiner = Examiner.new(clean_file)
+      @examiner = Reek::Examiner.new(clean_file)
     end
 
     it_should_behave_like 'no smells found'

data/spec/reek/smell_warning_spec.rb

@@ -1,9 +1,7 @@
-require 'spec_helper'
-require 'reek/smell_warning'
+require_relative '../spec_helper'
+require_relative '../../lib/reek/smell_warning'
 
-include Reek
-
-describe SmellWarning do
+describe Reek::SmellWarning do
   let(:duplication_detector)  { build(:smell_detector, smell_type: 'DuplicateMethodCall') }
   let(:feature_envy_detector) { build(:smell_detector, smell_type: 'FeatureEnvy') }
   let(:utility_function_detector) { build(:smell_detector, smell_type: 'UtilityFunction') }
@@ -119,10 +117,10 @@ describe SmellWarning do
         @smell_type = 'FeatureEnvy'
         @parameters = { 'one' => 34, 'two' => 'second' }
         @detector = Reek::Smells::FeatureEnvy.new @source
-        @warning = SmellWarning.new(@detector, context: @context_name,
-                                               lines: @lines,
-                                               message: @message,
-                                               parameters: @parameters)
+        @warning = Reek::SmellWarning.new(@detector, context: @context_name,
+                                                     lines: @lines,
+                                                     message: @message,
+                                                     parameters: @parameters)
         @yaml = @warning.yaml_hash
       end
 

data/spec/reek/smells/attribute_spec.rb

@@ -1,7 +1,7 @@
-require 'spec_helper'
-require 'reek/smells/attribute'
-require 'reek/core/module_context'
-require 'reek/smells/smell_detector_shared'
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/smells/attribute'
+require_relative '../../../lib/reek/core/module_context'
+require_relative 'smell_detector_shared'
 
 describe Reek::Smells::Attribute do
   before :each do
@@ -14,7 +14,7 @@ describe Reek::Smells::Attribute do
   context 'with no attributes' do
     it 'records nothing in the module' do
       src = 'module Fred; 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
@@ -26,7 +26,7 @@ describe Reek::Smells::Attribute do
 
     shared_examples_for 'one attribute found' do
       before :each do
-        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)
       end
 

data/spec/reek/smells/boolean_parameter_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
-require 'reek/smells/boolean_parameter'
-require 'reek/smells/smell_detector_shared'
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/smells/boolean_parameter'
+require_relative 'smell_detector_shared'
 
 describe Reek::Smells::BooleanParameter do
   context 'parameter defaulted with boolean' do
@@ -49,7 +49,7 @@ describe Reek::Smells::BooleanParameter do
 
     it 'reports the fields correctly' do
       src = 'def cc(arga = true) end'
-      ctx = Reek::Core::MethodContext.new(nil, src.to_reek_source.syntax_tree)
+      ctx = Reek::Core::MethodContext.new(nil, Reek::Source::SourceCode.from(src).syntax_tree)
       @detector.examine(ctx)
       smells = @detector.smells_found.to_a
       expect(smells.length).to eq(1)

data/spec/reek/smells/class_variable_spec.rb

@@ -1,7 +1,7 @@
-require 'spec_helper'
-require 'reek/smells/class_variable'
-require 'reek/core/module_context'
-require 'reek/smells/smell_detector_shared'
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/smells/class_variable'
+require_relative '../../../lib/reek/core/module_context'
+require_relative 'smell_detector_shared'
 
 describe Reek::Smells::ClassVariable do
   before :each do
@@ -27,7 +27,7 @@ describe Reek::Smells::ClassVariable do
   context 'with one class variable' do
     shared_examples_for 'one variable found' do
       before :each do
-        ast = @src.to_reek_source.syntax_tree
+        ast = Reek::Source::SourceCode.from(@src).syntax_tree
         @smells = @detector.examine_context(Reek::Core::CodeContext.new(nil, ast))
       end
 
@@ -99,7 +99,7 @@ describe Reek::Smells::ClassVariable do
         #{@class_variable} = {}
       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(described_class.smell_category)

data/spec/reek/smells/control_parameter_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
-require 'reek/smells/control_parameter'
-require 'reek/smells/smell_detector_shared'
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/smells/control_parameter'
+require_relative 'smell_detector_shared'
 
 describe Reek::Smells::ControlParameter do
   before(:each) do
@@ -272,7 +272,7 @@ describe Reek::Smells::ControlParameter do
           puts "hello" if arg
         end
       EOS
-      ctx = Reek::Core::MethodContext.new(nil, src.to_reek_source.syntax_tree)
+      ctx = Reek::Core::MethodContext.new(nil, Reek::Source::SourceCode.from(src).syntax_tree)
       smells = @detector.examine(ctx)
       expect(smells.length).to eq(1)
       @warning = smells[0]

data/spec/reek/smells/data_clump_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
-require 'reek/smells/data_clump'
-require 'reek/smells/smell_detector_shared'
+require_relative '../../spec_helper'
+require_relative '../../../lib/reek/smells/data_clump'
+require_relative 'smell_detector_shared'
 
 shared_examples_for 'a data clump detector' do
   it 'does not report small parameter sets' do
@@ -25,7 +25,7 @@ shared_examples_for 'a data clump detector' do
           def third(pa, pb) pa - pb + @fred; end
         end
       EOS
-      ctx = Reek::Core::ModuleContext.new(nil, @src.to_reek_source.syntax_tree)
+      ctx = Reek::Core::ModuleContext.new(nil, Reek::Source::SourceCode.from(@src).syntax_tree)
       detector = build(:smell_detector, smell_type: :DataClump)
       @smells = detector.examine_context(ctx)
     end