From 81a6a60dc6dff2ad8c2a45bf17fc40e760224e30 Mon Sep 17 00:00:00 2001 From: Nicholas Seckar Date: Wed, 28 Jun 2006 20:53:00 +0000 Subject: Remove opts.on { |options[:option_name] } style hash assignment. Closes #4440. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4502 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../rails_generator/generators/applications/app/app_generator.rb | 6 +++--- .../generators/components/model/model_generator.rb | 2 +- railties/lib/rails_generator/options.rb | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'railties/lib/rails_generator') diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb index 6d58b98fbe..bbdd3cb206 100644 --- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb +++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb @@ -97,15 +97,15 @@ class AppGenerator < Rails::Generator::Base opt.separator 'Options:' opt.on("-r", "--ruby=path", String, "Path to the Ruby binary of your choice (otherwise scripts use env, dispatchers current path).", - "Default: #{DEFAULT_SHEBANG}") { |options[:shebang]| } + "Default: #{DEFAULT_SHEBANG}") { |v| options[:shebang] = v } opt.on("-d", "--database=name", String, "Preconfigure for selected database (options: mysql/oracle/postgresql/sqlite2/sqlite3).", - "Default: mysql") { |options[:db]| } + "Default: mysql") { |v| options[:db] = v } opt.on("-f", "--freeze", "Freeze Rails in vendor/rails from the gems generating the skeleton", - "Default: false") { |options[:freeze]| } + "Default: false") { |v| options[:freeze] = v } end def mysql_socket_location diff --git a/railties/lib/rails_generator/generators/components/model/model_generator.rb b/railties/lib/rails_generator/generators/components/model/model_generator.rb index 0940b57f73..e242482632 100644 --- a/railties/lib/rails_generator/generators/components/model/model_generator.rb +++ b/railties/lib/rails_generator/generators/components/model/model_generator.rb @@ -29,6 +29,6 @@ class ModelGenerator < Rails::Generator::NamedBase opt.separator '' opt.separator 'Options:' opt.on("--skip-migration", - "Don't generate a migration file for this model") { |options[:skip_migration]| } + "Don't generate a migration file for this model") { |v| options[:skip_migration] = v } end end diff --git a/railties/lib/rails_generator/options.rb b/railties/lib/rails_generator/options.rb index 4329f930a3..042e05107d 100644 --- a/railties/lib/rails_generator/options.rb +++ b/railties/lib/rails_generator/options.rb @@ -120,16 +120,16 @@ module Rails opt.separator '' opt.separator 'Rails Info:' opt.on('-v', '--version', 'Show the Rails version number and quit.') - opt.on('-h', '--help', 'Show this help message and quit.') { |options[:help]| } + opt.on('-h', '--help', 'Show this help message and quit.') { |v| options[:help] = v } opt.separator '' opt.separator 'General Options:' - opt.on('-p', '--pretend', 'Run but do not make any changes.') { |options[:pretend]| } + opt.on('-p', '--pretend', 'Run but do not make any changes.') { |v| options[:pretend] = v } opt.on('-f', '--force', 'Overwrite files that already exist.') { options[:collision] = :force } opt.on('-s', '--skip', 'Skip files that already exist.') { options[:collision] = :skip } - opt.on('-q', '--quiet', 'Suppress normal output.') { |options[:quiet]| } - opt.on('-t', '--backtrace', 'Debugging: show backtrace on errors.') { |options[:backtrace]| } + opt.on('-q', '--quiet', 'Suppress normal output.') { |v| options[:quiet] = v } + opt.on('-t', '--backtrace', 'Debugging: show backtrace on errors.') { |v| options[:backtrace] = v } opt.on('-c', '--svn', 'Modify files with subversion. (Note: svn must be in path)') do options[:svn] = `svn status`.inject({}) do |opt, e| opt[e.chomp[7..-1]] = true -- cgit v1.2.3