aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-01-15 13:39:56 +0100
committerJosé Valim <jose.valim@gmail.com>2010-01-15 13:39:56 +0100
commit5252f5c1c96001795d3e723ad8e48117e34c045b (patch)
tree19e882cc8a09863e56a36d767d2b5108f84db3fe /railties/lib/rails
parentc905fce35f51b00933ab06725fc3548036caa07c (diff)
downloadrails-5252f5c1c96001795d3e723ad8e48117e34c045b.tar.gz
rails-5252f5c1c96001795d3e723ad8e48117e34c045b.tar.bz2
rails-5252f5c1c96001795d3e723ad8e48117e34c045b.zip
Bundle automatically if --dev or --edge is given as option.
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/generators/rails/app/app_generator.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index ba3eb67fe0..d58d245168 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -168,12 +168,14 @@ module Rails::Generators
raise Error, "The template [#{rails_template}] could not be loaded. Error: #{e}"
end
+ def bundle_if_dev_or_edge
+ run "gem bundle" if dev_or_edge?
+ end
+
protected
attr_accessor :rails_template
def set_default_accessors!
- app_name # Cache app name
-
self.rails_template = case options[:template]
when /^http:\/\//
options[:template]