summaryrefslogtreecommitdiff
path: root/lib/bundler/shared_helpers.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/bundler/shared_helpers.rb')
-rw-r--r--lib/bundler/shared_helpers.rb10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb
index 783f0e5712..6c9a711813 100644
--- a/lib/bundler/shared_helpers.rb
+++ b/lib/bundler/shared_helpers.rb
@@ -48,7 +48,13 @@ module Bundler
end
def env_file
- default_gemfile.dirname.join(".bundle/environment.rb")
+ app_config_path.join("environment.rb")
+ end
+
+ def app_config_path
+ ENV['BUNDLE_APP_CONFIG'] ?
+ Pathname.new(ENV['BUNDLE_APP_CONFIG']) :
+ default_gemfile.dirname.join(".bundle")
end
private
@@ -164,4 +170,4 @@ module Bundler
extend self
end
-end \ No newline at end of file
+end