Removed a load of spurious messing with $:

kevinrutherford · Mar 2, 2009 · e60d1b8 · e60d1b8
1 parent a8a4b41
commit e60d1b8
Show file tree

Hide file tree

Showing 31 changed files with 18 additions and 66 deletions.
diff --git a/lib/reek/block_context.rb b/lib/reek/block_context.rb
@@ -1,5 +1,3 @@
-$:.unshift File.dirname(__FILE__)
-
 require 'reek/code_context'
 
 module Reek

diff --git a/lib/reek/class_context.rb b/lib/reek/class_context.rb
@@ -1,5 +1,3 @@
-$:.unshift File.dirname(__FILE__)
-
 require 'reek/code_context'
 
 class Class

diff --git a/lib/reek/code_context.rb b/lib/reek/code_context.rb
@@ -1,5 +1,3 @@
-$:.unshift File.dirname(__FILE__)
-
 module Reek
 
   #

diff --git a/lib/reek/code_parser.rb b/lib/reek/code_parser.rb
@@ -1,5 +1,3 @@
-$:.unshift File.dirname(__FILE__)
-
 require 'rubygems'
 require 'parse_tree'
 require 'sexp_processor'

diff --git a/lib/reek/if_context.rb b/lib/reek/if_context.rb
@@ -1,5 +1,3 @@
-$:.unshift File.dirname(__FILE__)
-
 require 'reek/code_context'
 
 module Reek

diff --git a/lib/reek/method_context.rb b/lib/reek/method_context.rb
@@ -1,5 +1,3 @@
-$:.unshift File.dirname(__FILE__)
-
 require 'reek/name'
 require 'reek/code_context'
 require 'reek/object_refs'

diff --git a/lib/reek/module_context.rb b/lib/reek/module_context.rb
@@ -1,5 +1,3 @@
-$:.unshift File.dirname(__FILE__)
-
 require 'reek/code_context'
 
 module Reek

diff --git a/lib/reek/object_refs.rb b/lib/reek/object_refs.rb
@@ -1,5 +1,3 @@
-$:.unshift File.dirname(__FILE__)
-
 require 'rubygems'
 require 'sexp_processor'
 

diff --git a/lib/reek/options.rb b/lib/reek/options.rb
@@ -1,5 +1,3 @@
-$:.unshift File.dirname(__FILE__)
-
 require 'optparse'
 
 module Reek

diff --git a/lib/reek/report.rb b/lib/reek/report.rb
@@ -1,7 +1,5 @@
-$:.unshift File.dirname(__FILE__)
-
 require 'set'
-require 'smells/smell_detector'
+require 'reek/smells/smell_detector'
 
 module Reek
   class Report

diff --git a/lib/reek/sexp_formatter.rb b/lib/reek/sexp_formatter.rb
@@ -1,5 +1,3 @@
-$:.unshift File.dirname(__FILE__)
-
 module Reek
   class SexpFormatter
     def self.format(sexp)

diff --git a/lib/reek/singleton_method_context.rb b/lib/reek/singleton_method_context.rb
@@ -1,5 +1,3 @@
-$:.unshift File.dirname(__FILE__)
-
 require 'reek/name'
 require 'reek/method_context'
 require 'reek/sexp_formatter'

diff --git a/lib/reek/smells/control_couple.rb b/lib/reek/smells/control_couple.rb
@@ -1,5 +1,3 @@
-$:.unshift File.dirname(__FILE__)
-
 require 'reek/smells/smell_detector'
 require 'reek/sexp_formatter'
 

diff --git a/lib/reek/smells/duplication.rb b/lib/reek/smells/duplication.rb
@@ -1,5 +1,3 @@
-$:.unshift File.dirname(__FILE__)
-
 require 'reek/smells/smell_detector'
 require 'reek/sexp_formatter'
 

diff --git a/lib/reek/smells/feature_envy.rb b/lib/reek/smells/feature_envy.rb
@@ -1,5 +1,3 @@
-$:.unshift File.dirname(__FILE__)
-
 require 'reek/smells/smell_detector'
 require 'reek/sexp_formatter'
 

diff --git a/lib/reek/smells/large_class.rb b/lib/reek/smells/large_class.rb
@@ -1,5 +1,3 @@
-$:.unshift File.dirname(__FILE__)
-
 require 'reek/smells/smell_detector'
 
 module Reek

diff --git a/lib/reek/smells/long_method.rb b/lib/reek/smells/long_method.rb
@@ -1,5 +1,3 @@
-$:.unshift File.dirname(__FILE__)
-
 require 'reek/smells/smell_detector'
 
 module Reek

diff --git a/lib/reek/smells/long_parameter_list.rb b/lib/reek/smells/long_parameter_list.rb
@@ -1,5 +1,3 @@
-$:.unshift File.dirname(__FILE__)
-
 require 'reek/smells/smell_detector'
 
 module Reek

diff --git a/lib/reek/smells/long_yield_list.rb b/lib/reek/smells/long_yield_list.rb
@@ -1,5 +1,3 @@
-$:.unshift File.dirname(__FILE__)
-
 require 'reek/smells/smell_detector'
 
 module Reek

diff --git a/lib/reek/smells/nested_iterators.rb b/lib/reek/smells/nested_iterators.rb
@@ -1,5 +1,3 @@
-$:.unshift File.dirname(__FILE__)
-
 require 'reek/smells/smell_detector'
 
 module Reek

diff --git a/lib/reek/smells/smell_detector.rb b/lib/reek/smells/smell_detector.rb
@@ -1,5 +1,3 @@
-$:.unshift File.dirname(__FILE__)
-
 require 'reek/options'
 
 class Class
@@ -13,6 +11,15 @@ module Reek
   module Smells
 
     class SmellDetector
+
+      # The name of the config field that lists the names of code contexts
+      # that should not be checked. Add this field to the config for each
+      # smell that should ignore this code element.
+      EXCLUDE_KEY = 'exceptions'
+
+      # The name fo the config field that specifies whether a smell is
+      # enabled. Set to +true+ or +false+.
+      ENABLED_KEY = 'enabled'
 
       def self.class_name
         self.name.split(/::/)[-1]
@@ -24,8 +31,8 @@ def self.contexts      # :nodoc:
 
       def self.default_config
         {
-          'enabled' => true,
-          'exceptions' => []
+          ENABLED_KEY => true,
+          EXCLUDE_KEY => []
         }
       end
 
@@ -35,8 +42,8 @@ def self.listen(hooks, config)
       end
 
       def initialize(config)
-        @enabled = config['enabled']
-        @exceptions = config['exceptions']
+        @enabled = config[ENABLED_KEY]
+        @exceptions = config[EXCLUDE_KEY]
       end
 
       def examine(context, report)

diff --git a/lib/reek/smells/smells.rb b/lib/reek/smells/smells.rb
@@ -1,5 +1,3 @@
-$:.unshift File.dirname(__FILE__)
-
 require 'reek/smells/control_couple'
 require 'reek/smells/duplication'
 require 'reek/smells/feature_envy'

diff --git a/lib/reek/smells/uncommunicative_name.rb b/lib/reek/smells/uncommunicative_name.rb
@@ -1,5 +1,3 @@
-$:.unshift File.dirname(__FILE__)
-
 require 'reek/smells/smell_detector'
 
 module Reek

diff --git a/lib/reek/smells/utility_function.rb b/lib/reek/smells/utility_function.rb
@@ -1,5 +1,3 @@
-$:.unshift File.dirname(__FILE__)
-
 require 'reek/smells/smell_detector'
 
 module Reek

diff --git a/lib/reek/stop_context.rb b/lib/reek/stop_context.rb
@@ -1,5 +1,3 @@
-$:.unshift File.dirname(__FILE__)
-
 module Reek
   class StopContext
 

diff --git a/lib/reek/yield_call_context.rb b/lib/reek/yield_call_context.rb
@@ -1,5 +1,3 @@
-$:.unshift File.dirname(__FILE__)
-
 require 'reek/smells/smells'
 require 'reek/code_context'
 

diff --git a/spec/reek/code_checks.rb b/spec/reek/code_checks.rb
@@ -1,8 +1,6 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
-
+require 'reek'
 require 'reek/code_parser'
 require 'reek/report'
-require 'reek'
 
 module CodeChecks
 

diff --git a/spec/reek/smells/duplication_spec.rb b/spec/reek/smells/duplication_spec.rb
@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
-
 require 'spec/reek/code_checks'
 require 'reek/smells/duplication'
 
@@ -53,7 +51,7 @@
 describe Duplication, 'when disabled' do
   before :each do
     @ctx = MethodContext.new(StopContext.new, [0, :double_thing])
-    @dup = Duplication.new({'enabled' => false})
+    @dup = Duplication.new({SmellDetector::ENABLED_KEY => false})
     @rpt = Report.new
   end
 

diff --git a/tasks/defaults.rake b/tasks/defaults.rake
@@ -1,5 +1,3 @@
-$:.unshift 'lib'
-
 require 'rake/clean'
 require 'reek/smells/smells'
 require 'yaml'

diff --git a/tasks/deployment.rake b/tasks/deployment.rake
@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'newgem'
 require 'rubigen'
-require File.dirname(__FILE__) + '/../lib/reek'
+require 'reek'
 
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)

diff --git a/tasks/rspec.rake b/tasks/rspec.rake
@@ -11,6 +11,7 @@ CLEAN.include(REPORT_DIR)
 desc "runs the specs and reports coverage in #{REPORT_DIR}"
 Spec::Rake::SpecTask.new(:spec) do |t|
   t.spec_files = UNITS
+  t.ruby_opts = ['-Ilib']
 #  t.rcov = true
 #  t.rcov_dir = REPORT_DIR
 #  t.rcov_opts = ['--exclude', 'spec,\.autotest']