diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-01-13 15:42:10 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-01-13 15:42:10 +0100 |
| commit | 755fd79ff36fad1e41d93e6e49c3f5e486f6745a (patch) | |
| tree | 03b652c6529e09bf23fd2593c53f7ba142c28ff8 | |
| parent | e95031f55dd54945abebe6e9f8a12e428ada4146 (diff) | |
| download | rails-755fd79ff36fad1e41d93e6e49c3f5e486f6745a.tar.gz rails-755fd79ff36fad1e41d93e6e49c3f5e486f6745a.tar.bz2 rails-755fd79ff36fad1e41d93e6e49c3f5e486f6745a.zip | |
setup Bundler in engines `bin/rails` stub.
This is necessary when bundling gems locally using `BUNDLE_PATH`.
Without this patch `bin/rails` fails with:
```
/Users/senny/.rbenv/versions/2.0.0-p353/lib/ruby/site_ruby/2.0.0/rubygems/core_ext/kernel_require.rb:55:in `require': cannot load such file -- rails/all (LoadError)
from /Users/senny/.rbenv/versions/2.0.0-p353/lib/ruby/site_ruby/2.0.0/rubygems/core_ext/kernel_require.rb:55:in `require'
from bin/rails:7:in `<main>'
```
| -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' |