summaryrefslogtreecommitdiff
path: root/lib/bundler/installer.rb
diff options
context:
space:
mode:
authorPostmodern <postmodern.mod3@gmail.com>2012-01-07 17:41:31 -0800
committerPostmodern <postmodern.mod3@gmail.com>2012-03-07 23:03:02 -0800
commit95f9c3dc541a8dd7dea7aa485c1620259f9fc27d (patch)
treecec689b8cf877233ab79c67576332b13b874c158 /lib/bundler/installer.rb
parentff04fa295f182b4fc8672aeab03929cac774935a (diff)
downloadbundler-95f9c3dc541a8dd7dea7aa485c1620259f9fc27d.tar.gz
Moved lib/bundler/templates to data/bundler/templates.
* This complies with the Ruby Packaging Specification (http://chneukirchen.github.com/rps/), lib/ is for code data/ is for static data. * This also prevents YARD from throwing warning as it attempts to parse Erb .rb files as Ruby code.
Diffstat (limited to 'lib/bundler/installer.rb')
-rw-r--r--lib/bundler/installer.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/bundler/installer.rb b/lib/bundler/installer.rb
index 40d4fed2bc..e261f49f30 100644
--- a/lib/bundler/installer.rb
+++ b/lib/bundler/installer.rb
@@ -1,8 +1,11 @@
+require 'bundler/config'
require 'erb'
require 'rubygems/dependency_installer'
module Bundler
class Installer < Environment
+ include Config
+
class << self
attr_accessor :post_install_messages
end
@@ -129,7 +132,7 @@ module Bundler
def generate_bundler_executable_stubs(spec)
bin_path = Bundler.bin_path
- template = File.read(File.expand_path('../templates/Executable', __FILE__))
+ template = File.read(File.join(Config::TEMPLATES,'Executable'))
relative_gemfile_path = Bundler.default_gemfile.relative_path_from(bin_path)
ruby_command = Thor::Util.ruby_command