lib shouldn't manage load path

carlhuda · Sep 23, 2009 · 5ae1227 · 5ae1227
1 parent 642e3b4
commit 5ae1227
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/Thorfile b/Thorfile
@@ -10,11 +10,13 @@ class Default < Thor
   include Thor::RakeCompat
 
   Spec::Rake::SpecTask.new(:spec) do |t|
+    t.libs << 'lib'
     t.spec_opts = ['--options', "spec/spec.opts"]
     t.spec_files = FileList['spec/**/*_spec.rb']
   end
 
   Spec::Rake::SpecTask.new(:rcov) do |t|
+    t.libs << 'lib'
     t.spec_opts = ['--options', "spec/spec.opts"]
     t.spec_files = FileList['spec/**/*_spec.rb']
     t.rcov = true

diff --git a/lib/thor.rb b/lib/thor.rb
@@ -1,4 +1,3 @@
-$:.unshift File.expand_path(File.dirname(__FILE__))
 require 'thor/base'
 require 'thor/group'
 require 'thor/actions'

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,7 +1,5 @@
 $TESTING=true
 
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
-
 require 'thor'
 require 'stringio'
 require 'rubygems'