0
@@ -1,3 +1,6 @@
0
+* Remove use of opts.on { |options[:name] } style hash assignment. References #4440. [headius@headius.com]
0
+
0
+
0
 *1.1.3* (June 27th, 2006)
0
 
0
 * Updated to Active Record 1.14.3, Action Pack 1.12.2, ActionWebService 1.1.3, ActionMailer 1.2.2

0
@@ -4,8 +4,8 @@
0
 options = { :sandbox => false, :irb => irb }
0
 OptionParser.new do |opt|
0
   opt.banner = "Usage: console [environment] [options]"
0
-  opt.on('-s', '--sandbox', 'Rollback database modifications on exit.') { |options[:sandbox]| }
0
-  opt.on("--irb=[#{irb}]", 'Invoke a different irb.') { |options[:irb]| }
0
+  opt.on('-s', '--sandbox', 'Rollback database modifications on exit.') { |v| options[:sandbox] = v }
0
+  opt.on("--irb=[#{irb}]", 'Invoke a different irb.') { |v| options[:irb] = v }
0
   opt.parse!(ARGV)
0
 end
0
 

0
@@ -117,8 +117,8 @@
0
 
0
   opts.on("  Options:")
0
 
0
-  opts.on("-a", "--action=name", "reload|graceful|kill (default: #{OPTIONS[:action]})", String)  { |OPTIONS[:action]| }
0
-  opts.on("-d", "--dispatcher=path", "default: #{OPTIONS[:dispatcher]}", String)                 { |OPTIONS[:dispatcher]| }
0
+  opts.on("-a", "--action=name", "reload|graceful|kill (default: #{OPTIONS[:action]})", String)  { |v| OPTIONS[:action] = v }
0
+  opts.on("-d", "--dispatcher=path", "default: #{OPTIONS[:dispatcher]}", String)                 { |v| OPTIONS[:dispatcher] = v }
0
 
0
   opts.separator ""
0
 

0
@@ -65,11 +65,11 @@
0
 
0
   opts.on("  Options:")
0
 
0
-  opts.on("-p", "--port=number",      Integer, "Starting port number (default: #{OPTIONS[:port]})")                { |OPTIONS[:port]| }
0
-  opts.on("-i", "--instances=number", Integer, "Number of instances (default: #{OPTIONS[:instances]})")            { |OPTIONS[:instances]| }
0
-  opts.on("-r", "--repeat=seconds",   Integer, "Repeat spawn attempts every n seconds (default: off)")             { |OPTIONS[:repeat]| }
0
-  opts.on("-e", "--environment=name", String,  "test|development|production (default: #{OPTIONS[:environment]})")  { |OPTIONS[:environment]| }
0
-  opts.on("-s", "--spawner=path",     String,  "default: #{OPTIONS[:spawner]}")                                    { |OPTIONS[:spawner]| }
0
+  opts.on("-p", "--port=number",      Integer, "Starting port number (default: #{OPTIONS[:port]})")                { |v| OPTIONS[:port] = v }
0
+  opts.on("-i", "--instances=number", Integer, "Number of instances (default: #{OPTIONS[:instances]})")            { |v| OPTIONS[:instances] = v }
0
+  opts.on("-r", "--repeat=seconds",   Integer, "Repeat spawn attempts every n seconds (default: off)")             { |v| OPTIONS[:repeat] = v }
0
+  opts.on("-e", "--environment=name", String,  "test|development|production (default: #{OPTIONS[:environment]})")  { |v| OPTIONS[:environment] = v }
0
+  opts.on("-s", "--spawner=path",     String,  "default: #{OPTIONS[:spawner]}")                                    { |v| OPTIONS[:spawner] = v }
0
   opts.on("-d", "--dispatcher=path",  String,  "default: #{OPTIONS[:dispatcher]}") { |dispatcher| OPTIONS[:dispatcher] = File.expand_path(dispatcher) }
0
 
0
   opts.separator ""

0
@@ -36,9 +36,9 @@
0
 
0
   opts.on("  Options:")
0
 
0
-  opts.on("-c", "--command=path",    String) { |OPTIONS[:command]| }
0
-  opts.on("-i", "--interval=seconds", Float) { |OPTIONS[:interval]| }
0
-  opts.on("-d", "--daemon")                  { |OPTIONS[:daemon]| }
0
+  opts.on("-c", "--command=path",    String) { |v| OPTIONS[:command] = v }
0
+  opts.on("-i", "--interval=seconds", Float) { |v| OPTIONS[:interval] = v }
0
+  opts.on("-d", "--daemon")                  { |v| OPTIONS[:daemon] = v }
0
 
0
   opts.separator ""
0
 

0
@@ -10,7 +10,7 @@
0
 
0
   opts.on("-e", "--environment=name", String,
0
           "Specifies the environment for the runner to operate under (test/development/production).",
0
-          "Default: development") { |options[:environment]| }
0
+          "Default: development") { |v| options[:environment] = v }
0
 
0
   opts.separator ""
0
 

0
@@ -19,13 +19,13 @@
0
 
0
   opts.on("-p", "--port=port", Integer,
0
           "Runs Rails on the specified port.",
0
-          "Default: 3000") { |OPTIONS[:port]| }
0
+          "Default: 3000") { |v| OPTIONS[:port] = v }
0
   opts.on("-b", "--binding=ip", String,
0
           "Binds Rails to the specified ip.",
0
-          "Default: 0.0.0.0") { |OPTIONS[:ip]| }
0
+          "Default: 0.0.0.0") { |v| OPTIONS[:ip] = v }
0
   opts.on("-e", "--environment=name", String,
0
           "Specifies the environment to run this server under (test/development/production).",
0
-          "Default: development") { |OPTIONS[:environment]| }
0
+          "Default: development") { |v| OPTIONS[:environment] = v }
0
   opts.on("-m", "--mime-types=filename", String,
0
                   "Specifies an Apache style mime.types configuration file to be used for mime types",
0
                   "Default: none") { |mime_types_file| OPTIONS[:mime_types] = WEBrick::HTTPUtils::load_mime_types(mime_types_file) }
0
@@ -36,7 +36,7 @@
0
 
0
   opts.on("-c", "--charset=charset", String,
0
           "Set default charset for output.",
0
-          "Default: UTF-8") { |OPTIONS[:charset]| }
0
+          "Default: UTF-8") { |v| OPTIONS[:charset] = v }
0
 
0
   opts.separator ""
0
 

0
@@ -96,15 +96,15 @@
0
       opt.separator 'Options:'
0
       opt.on("-r", "--ruby=path", String,
0
              "Path to the Ruby binary of your choice (otherwise scripts use env, dispatchers current path).",
0
-             "Default: #{DEFAULT_SHEBANG}") { |options[:shebang]| }
0
+             "Default: #{DEFAULT_SHEBANG}") { |v| options[:shebang] = v }
0
 
0
       opt.on("-d", "--database=name", String,
0
             "Preconfigure for selected database (options: mysql/oracle/postgresql/sqlite2/sqlite3).",
0
-            "Default: mysql") { |options[:db]| }
0
+            "Default: mysql") { |v| options[:db] = v }
0
 
0
       opt.on("-f", "--freeze", 
0
             "Freeze Rails in vendor/rails from the gems generating the skeleton",
0
-            "Default: false") { |options[:freeze]| }
0
+            "Default: false") { |v| options[:freeze] = v }
0
     end
0
     
0
     def mysql_socket_location

0
@@ -29,7 +29,7 @@
0
       opt.separator ''
0
       opt.separator 'Options:'
0
       opt.on("--skip-migration", 
0
-             "Don't generate a migration file for this model") { |options[:skip_migration]| }
0
+             "Don't generate a migration file for this model") { |v| options[:skip_migration] = v }
0
     end
0
 end

0
@@ -121,12 +121,12 @@
0
           opt.separator ''
0
           opt.separator 'General Options:'
0
 
0
-          opt.on('-p', '--pretend', 'Run but do not make any changes.') { |options[:pretend]| }
0
+          opt.on('-p', '--pretend', 'Run but do not make any changes.') { |v| options[:pretend] = v }
0
           opt.on('-f', '--force', 'Overwrite files that already exist.') { options[:collision] = :force }
0
           opt.on('-s', '--skip', 'Skip files that already exist.') { options[:collision] = :skip }
0
-          opt.on('-q', '--quiet', 'Suppress normal output.') { |options[:quiet]| }
0
-          opt.on('-t', '--backtrace', 'Debugging: show backtrace on errors.') { |options[:backtrace]| }
0
-          opt.on('-h', '--help', 'Show this help message.') { |options[:help]| }
0
+          opt.on('-q', '--quiet', 'Suppress normal output.') { |v| options[:quiet] = v }
0
+          opt.on('-t', '--backtrace', 'Debugging: show backtrace on errors.') { |v| options[:backtrace] = v }
0
+          opt.on('-h', '--help', 'Show this help message.') { |v| options[:help] = v }
0
           opt.on('-c', '--svn', 'Modify files with subversion. (Note: svn must be in path)') do
0
             options[:svn] = `svn status`.inject({}) do |opt, e|
0
               opt[e.chomp[7..-1]] = true