diff options
author | Xavier Noria <fxn@hashref.com> | 2011-05-14 02:36:29 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2011-05-14 02:37:41 +0200 |
commit | 26cfd1f2834aef5a5418ea23b7d883566e9c3b7b (patch) | |
tree | 9375ee0c983e98f8a97af083af7bfc5d50eb8d57 /railties/lib/rails/generators/app_base.rb | |
parent | 345beb8485a335439354724b6a2eb0a797d9bb5a (diff) | |
download | rails-26cfd1f2834aef5a5418ea23b7d883566e9c3b7b.tar.gz rails-26cfd1f2834aef5a5418ea23b7d883566e9c3b7b.tar.bz2 rails-26cfd1f2834aef5a5418ea23b7d883566e9c3b7b.zip |
application and plugin generation run bundle install unless --skip-gemfile or --skip-bundle
Diffstat (limited to 'railties/lib/rails/generators/app_base.rb')
-rw-r--r-- | railties/lib/rails/generators/app_base.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index a0a0f9ef66..8a09330ab2 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -28,6 +28,9 @@ module Rails class_option :skip_gemfile, :type => :boolean, :default => false, :desc => "Don't create a Gemfile" + class_option :skip_bundle, :type => :boolean, :default => false, + :desc => "Don't run bundle install" + class_option :skip_git, :type => :boolean, :aliases => "-G", :default => false, :desc => "Skip Git ignores and keeps" @@ -190,13 +193,12 @@ module Rails say_status :run, "bundle #{command}" Bundler::CLI.new.send(command) + rescue + say_status :failure, "bundler raised an exception, are you online?", :red end def run_bundle - unless options[:skip_gemfile] - command = dev_or_edge? ? 'install' : 'check' - bundle_command(command) - end + bundle_command('install') unless options[:skip_gemfile] || options[:skip_bundle] end def dev_or_edge? |