diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/generator/actions.rb | 4 | ||||
| -rw-r--r-- | railties/lib/generator/generators/app.rb | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/railties/lib/generator/actions.rb b/railties/lib/generator/actions.rb index 767a89b750..feb31b9995 100644 --- a/railties/lib/generator/actions.rb +++ b/railties/lib/generator/actions.rb @@ -226,7 +226,7 @@ module Rails # capify! # def capify! - log :capify + log :capify, "" in_root { run('capify .', false) } end @@ -237,7 +237,7 @@ module Rails # freeze! # def freeze!(args = {}) - log :freeze + log :vendor, "rails" in_root { run('rake rails:freeze:edge', false) } end diff --git a/railties/lib/generator/generators/app.rb b/railties/lib/generator/generators/app.rb index 8b22437db6..6a7edc5934 100644 --- a/railties/lib/generator/generators/app.rb +++ b/railties/lib/generator/generators/app.rb @@ -19,7 +19,6 @@ module Rails::Generators class_option :database, :type => :string, :aliases => "-d", :default => DEFAULT_DATABASE, :desc => "Preconfigure for selected database (options: #{DATABASES.join('/')})" - # TODO Make use of this option class_option :freeze, :type => :boolean, :aliases => "-f", :default => false, :desc => "Freeze Rails in vendor/rails from the gems" @@ -168,6 +167,10 @@ module Rails::Generators empty_directory "vendor/plugins" end + def freeze? + freeze! if options[:freeze] + end + protected def app_name |