aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-05-13 22:22:26 +0200
committerXavier Noria <fxn@hashref.com>2011-05-13 22:22:26 +0200
commitc55d7ab9cbe33ecc0999da9e32e7e229da55c55f (patch)
tree01cf0209c1e9ad1b778a1cffcc997c67f7493674 /railties/lib
parenta44f228fde67345dbfac9983e5ef338a8f67307a (diff)
downloadrails-c55d7ab9cbe33ecc0999da9e32e7e229da55c55f.tar.gz
rails-c55d7ab9cbe33ecc0999da9e32e7e229da55c55f.tar.bz2
rails-c55d7ab9cbe33ecc0999da9e32e7e229da55c55f.zip
move bundler loading down to #bundle_command
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/generators/app_base.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 40e8f39201..a0a0f9ef66 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -5,8 +5,6 @@ require 'rails/version' unless defined?(Rails::VERSION)
require 'rbconfig'
require 'open-uri'
require 'uri'
-require 'bundler'
-require 'bundler/cli'
module Rails
module Generators
@@ -187,6 +185,9 @@ module Rails
end
def bundle_command(command)
+ require 'bundler'
+ require 'bundler/cli'
+
say_status :run, "bundle #{command}"
Bundler::CLI.new.send(command)
end