require users vendor directory on load

soxSox · Oct 15, 2007 · c489d67 · c489d67
1 parent 2679e40
commit c489d67
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,2 +1,3 @@
+v0.1.6 Additions:  require users vendor directory on load
 v0.1.5 Mutex and before-filters
 v0.1.0 Released!
diff --git a/Manifest b/Manifest
@@ -30,6 +30,7 @@ lib/sinatra/sessions.rb
 lib/sinatra/test_methods.rb
 lib/sinatra.rb
 LICENSE
+Manifest
 RakeFile
 README
 sinatra.gemspec
@@ -50,4 +51,3 @@ vendor/erb/lib/erb.rb
 vendor/haml/init.rb
 vendor/haml/lib/haml.rb
 Rakefile
-Manifest
diff --git a/lib/sinatra.rb b/lib/sinatra.rb
@@ -38,6 +38,8 @@
 Sinatra::Loader.load_files Dir.glob(SINATRA_ROOT + '/lib/sinatra/*.rb')
 Sinatra::Loader.load_files Dir.glob(SINATRA_ROOT + '/vendor/*/init.rb')
 
+Sinatra::Loader.load_files Dir.glob(File.dirname($0) + '/vendor/*/init.rb')
+
 Sinatra::Environment.prepare
 
 at_exit do