Browse files

Merge branch 'master' into rails

  • Loading branch information...
2 parents 9093a87 + 74e369c commit 4de0a1ce23015f84f34c91bcff677d522a9b6a54 @winton committed Jan 2, 2011
Showing with 4 additions and 1 deletion.
  1. +4 −1 lib/gem_template/gems.rb
View
5 lib/gem_template/gems.rb
@@ -38,7 +38,10 @@ def activate(*gems)
gems.flatten.collect(&:to_sym).each do |name|
version = @versions[name]
- if defined?(gem)
+ vendor = File.expand_path("../../../vendor/#{name}/lib", __FILE__)
+ if File.exists?(vendor)
+ $:.unshift vendor
+ elsif defined?(gem)
gem name.to_s, version
else
puts "#{name} #{"(#{version})" if version} failed to activate" if @config.warn

0 comments on commit 4de0a1c

Please sign in to comment.