diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-01-21 05:58:01 -0800 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-01-21 05:58:01 -0800 |
| commit | c60e06261b9e26110f8ac639224c153d4ff77752 (patch) | |
| tree | 7ffd33d8c92c68beb22340b6fbd0f4f7fa3d2e62 /railties/lib | |
| parent | 6f0aa1d64dafd72275c934ed14529ccfada55d1d (diff) | |
| parent | 755fd79ff36fad1e41d93e6e49c3f5e486f6745a (diff) | |
| download | rails-c60e06261b9e26110f8ac639224c153d4ff77752.tar.gz rails-c60e06261b9e26110f8ac639224c153d4ff77752.tar.bz2 rails-c60e06261b9e26110f8ac639224c153d4ff77752.zip | |
Merge pull request #13696 from senny/engine_bin_rails_load_bundler
setup Bundler in engines `bin/rails` stub.
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/bin/rails.tt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/plugin/templates/bin/rails.tt b/railties/lib/rails/generators/rails/plugin/templates/bin/rails.tt index c8de9f3e0f..3ea6c6d7d4 100644 --- a/railties/lib/rails/generators/rails/plugin/templates/bin/rails.tt +++ b/railties/lib/rails/generators/rails/plugin/templates/bin/rails.tt @@ -3,5 +3,9 @@ ENGINE_ROOT = File.expand_path('../..', __FILE__) ENGINE_PATH = File.expand_path('../../lib/<%= name -%>/engine', __FILE__) +# Set up gems listed in the Gemfile. +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE']) + require 'rails/all' require 'rails/engine/commands' |