ruby-changes:15109
From: nobu <ko1@a...>
Date: Sat, 20 Mar 2010 12:31:34 +0900 (JST)
Subject: [ruby-changes:15109] Ruby:r26986 (trunk, ruby_1_8): * lib: fixed typo. a patch by Sho Hashimoto in .
nobu 2010-03-20 12:30:59 +0900 (Sat, 20 Mar 2010) New Revision: 26986 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26986 Log: * lib: fixed typo. a patch by Sho Hashimoto in [ruby-dev:40716]. Modified files: branches/ruby_1_8/ChangeLog branches/ruby_1_8/lib/cgi.rb branches/ruby_1_8/lib/ipaddr.rb branches/ruby_1_8/lib/irb/notifier.rb branches/ruby_1_8/lib/irb/output-method.rb branches/ruby_1_8/lib/net/https.rb branches/ruby_1_8/lib/net/smtp.rb branches/ruby_1_8/lib/optparse.rb branches/ruby_1_8/lib/rexml/entity.rb branches/ruby_1_8/lib/shell/command-processor.rb branches/ruby_1_8/lib/shell/process-controller.rb branches/ruby_1_8/lib/thwait.rb branches/ruby_1_8/lib/xmlrpc/server.rb branches/ruby_1_8/version.h trunk/ChangeLog trunk/lib/cgi/core.rb trunk/lib/cgi/html.rb trunk/lib/csv.rb trunk/lib/ipaddr.rb trunk/lib/irb/notifier.rb trunk/lib/irb/output-method.rb trunk/lib/irb/xmp.rb trunk/lib/net/https.rb trunk/lib/net/smtp.rb trunk/lib/optparse.rb trunk/lib/prime.rb trunk/lib/rake/packagetask.rb trunk/lib/rexml/entity.rb trunk/lib/rubygems/commands/dependency_command.rb trunk/lib/rubygems/spec_fetcher.rb trunk/lib/rubygems.rb trunk/lib/shell/command-processor.rb trunk/lib/shell/process-controller.rb trunk/lib/thwait.rb trunk/lib/xmlrpc/server.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 26985) +++ ChangeLog (revision 26986) @@ -1,3 +1,7 @@ +Sat Mar 20 12:30:54 2010 Nobuyoshi Nakada <nobu@r...> + + * lib: fixed typo. a patch by Sho Hashimoto in [ruby-dev:40716]. + Sat Mar 20 11:32:18 2010 Tanaka Akira <akr@f...> * tool/transcode-tblgen.rb (each_firstbyte_range): tuned for less Index: lib/rake/packagetask.rb =================================================================== --- lib/rake/packagetask.rb (revision 26985) +++ lib/rake/packagetask.rb (revision 26986) @@ -1,4 +1,4 @@ -# Define a package task libarary to aid in the definition of +# Define a package task library to aid in the definition of # redistributable package files. require 'rake' Index: lib/xmlrpc/server.rb =================================================================== --- lib/xmlrpc/server.rb (revision 26985) +++ lib/xmlrpc/server.rb (revision 26986) @@ -133,7 +133,7 @@ begin ret = obj.call(*args) # call the original service-method # could convert the return value - resuce + rescue # rescue exceptions end } Index: lib/rexml/entity.rb =================================================================== --- lib/rexml/entity.rb (revision 26985) +++ lib/rexml/entity.rb (revision 26986) @@ -25,7 +25,7 @@ # Create a new entity. Simple entities can be constructed by passing a # name, value to the constructor; this creates a generic, plain entity # reference. For anything more complicated, you have to pass a Source to - # the constructor with the entity definiton, or use the accessor methods. + # the constructor with the entity definition, or use the accessor methods. # +WARNING+: There is no validation of entity state except when the entity # is read from a stream. If you start poking around with the accessors, # you can easily create a non-conformant Entity. The best thing to do is Index: lib/rubygems/spec_fetcher.rb =================================================================== --- lib/rubygems/spec_fetcher.rb (revision 26985) +++ lib/rubygems/spec_fetcher.rb (revision 26986) @@ -53,7 +53,7 @@ end ## - # Retuns the local directory to write +uri+ to. + # Returns the local directory to write +uri+ to. def cache_dir(uri) File.join @dir, "#{uri.host}%#{uri.port}", File.dirname(uri.path) Index: lib/rubygems/commands/dependency_command.rb =================================================================== --- lib/rubygems/commands/dependency_command.rb (revision 26985) +++ lib/rubygems/commands/dependency_command.rb (revision 26986) @@ -159,7 +159,7 @@ response end - # Retuns list of [specification, dep] that are satisfied by spec. + # Returns list of [specification, dep] that are satisfied by spec. def find_reverse_dependencies(spec) result = [] Index: lib/csv.rb =================================================================== --- lib/csv.rb (revision 26985) +++ lib/csv.rb (revision 26986) @@ -1212,7 +1212,7 @@ # Note that a passed String *is* modfied by this method. Call dup() before # passing if you need a new String. # - # The +options+ parameter can be anthing CSV::new() understands. This method + # The +options+ parameter can be anything CSV::new() understands. This method # understands an additional <tt>:encoding</tt> parameter when not passed a # String to set the base Encoding for the output. CSV needs this hint if you # plan to output non-ASCII compatible data. @@ -1238,7 +1238,7 @@ # This method is a shortcut for converting a single row (Array) into a CSV # String. # - # The +options+ parameter can be anthing CSV::new() understands. This method + # The +options+ parameter can be anything CSV::new() understands. This method # understands an additional <tt>:encoding</tt> parameter to set the base # Encoding for the output. This method will try to guess your Encoding from # the first non-+nil+ field in +row+, if possible, but you may need to use @@ -1372,7 +1372,7 @@ # a into an Array. Note that if +line+ contains multiple rows, anything # beyond the first row is ignored. # - # The +options+ parameter can be anthing CSV::new() understands. + # The +options+ parameter can be anything CSV::new() understands. # def self.parse_line(line, options = Hash.new) new(line, options).shift Index: lib/rubygems.rb =================================================================== --- lib/rubygems.rb (revision 26985) +++ lib/rubygems.rb (revision 26986) @@ -310,7 +310,7 @@ ## # Find the full path to the executable for gem +name+. If the +exec_name+ # is not given, the gem's default_executable is chosen, otherwise the - # specifed executable's path is returned. +version_requirements+ allows you + # specified executable's path is returned. +version_requirements+ allows you # to specify specific gem versions. def self.bin_path(name, exec_name = nil, *version_requirements) Index: lib/thwait.rb =================================================================== --- lib/thwait.rb (revision 26985) +++ lib/thwait.rb (revision 26986) @@ -2,7 +2,7 @@ # thwait.rb - thread synchronization class # $Release Version: 0.9 $ # $Revision: 1.3 $ -# by Keiju ISHITSUKA(Nihpon Rational Software Co.,Ltd.) +# by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd.) # # -- # feature: Index: lib/ipaddr.rb =================================================================== --- lib/ipaddr.rb (revision 26985) +++ lib/ipaddr.rb (revision 26986) @@ -444,7 +444,7 @@ # automatically from a specified string, you can specify one # explicitly by the optional second argument. # - # Otherwise an IP addess is generated from a packed in_addr value + # Otherwise an IP address is generated from a packed in_addr value # and an address family. # # The IPAddr class defines many methods and operators, and some of @@ -472,7 +472,7 @@ #Socket.getaddrinfo(left, nil, Socket::AF_INET6, Socket::SOCK_STREAM, nil, # Socket::AI_NUMERICHOST) begin - IPSocket.getaddress(prefix) # test if address is vaild + IPSocket.getaddress(prefix) # test if address is valid rescue raise ArgumentError, "invalid address" end Index: lib/irb/output-method.rb =================================================================== --- lib/irb/output-method.rb (revision 26985) +++ lib/irb/output-method.rb (revision 26986) @@ -1,5 +1,5 @@ # -# output-method.rb - optput methods used by irb +# output-method.rb - output methods used by irb # $Release Version: 0.9.6$ # $Revision$ # by Keiju ISHITSUKA(keiju@r...) Index: lib/irb/notifier.rb =================================================================== --- lib/irb/notifier.rb (revision 26985) +++ lib/irb/notifier.rb (revision 26986) @@ -25,7 +25,7 @@ end module_function :def_notifier - class AbstructNotifier + class AbstractNotifier def initialize(prefix, base_notifier) @prefix = prefix @base_notifier = base_notifier @@ -72,7 +72,7 @@ end end - class CompositeNotifier<AbstructNotifier + class CompositeNotifier<AbstractNotifier def initialize(prefix, base_notifier) super @@ -93,7 +93,7 @@ def level_notifier=(value) case value - when AbstructNotifier + when AbstractNotifier @level_notifier = value when Integer l = @notifiers[value] @@ -107,7 +107,7 @@ alias level= level_notifier= end - class LeveledNotifier<AbstructNotifier + class LeveledNotifier<AbstractNotifier include Comparable def initialize(base, level, prefix) Index: lib/irb/xmp.rb =================================================================== --- lib/irb/xmp.rb (revision 26985) +++ lib/irb/xmp.rb (revision 26986) @@ -75,7 +75,7 @@ if @encoding and exps.encoding != @encoding enc = Encoding.compatible?(@exps.join("\n"), exps) if enc.nil? - raise Encoding::CompatibilityError, "Encoding in which the passed exression is encoded is not compatible to the preceding's one" + raise Encoding::CompatibilityError, "Encoding in which the passed expression is encoded is not compatible to the preceding's one" else @encoding = enc end Index: lib/optparse.rb =================================================================== --- lib/optparse.rb (revision 26985) +++ lib/optparse.rb (revision 26986) @@ -1563,7 +1563,7 @@ yesno = CompletingHash.new %w[- no false].each {|el| yesno[el] = false} %w[+ yes true].each {|el| yesno[el] = true} - yesno['nil'] = false # shoud be nil? + yesno['nil'] = false # should be nil? accept(TrueClass, yesno) {|arg, val| val == nil or val} # # Similar to TrueClass, but defaults to false. Index: lib/cgi/html.rb =================================================================== --- lib/cgi/html.rb (revision 26985) +++ lib/cgi/html.rb (revision 26986) @@ -455,7 +455,7 @@ # image_button("url", "name", "string") # # <INPUT TYPE="image" SRC="url" NAME="name" ALT="string"> # - # image_button("SRC" => "url", "ATL" => "strng") + # image_button("SRC" => "url", "ALT" => "string") # # <INPUT TYPE="image" SRC="url" ALT="string"> def image_button(src = "", name = nil, alt = nil) attributes = if src.kind_of?(String) Index: lib/cgi/core.rb =================================================================== --- lib/cgi/core.rb (revision 26985) +++ lib/cgi/core.rb (revision 26986) @@ -408,7 +408,7 @@ # values is an Array. attr_reader :params - # Get the uploaed files as a hash of name=>values pairs + # Get the uploaded files as a hash of name=>values pairs attr_reader :files # Set all the parameters. Index: lib/shell/process-controller.rb =================================================================== --- lib/shell/process-controller.rb (revision 26985) +++ lib/shell/process-controller.rb (revision 26986) @@ -191,7 +191,7 @@ @active_jobs.delete command ProcessController.inactivate(self) if @active_jobs.empty? - command.notify("start_jon in ierminate_jon(%id)", Shell::debug?) + command.notify("start_job in terminate_job(%id)", Shell::debug?) start_job end end @@ -281,13 +281,13 @@ command.notify("job(%id) start to waiting finish.", @shell.debug?) _pid = Process.waitpid(pid, nil) rescue Errno::ECHILD - command.notify "warn: job(%id) was done already waitipd." + command.notify "warn: job(%id) was done already waitpid." _pid = true # rescue # STDERR.puts $! ensure command.notify("Job(%id): Wait to finish when Process finished.", @shell.debug?) - # when the process ends, wait until the command termintes + # when the process ends, wait until the command terminates if USING_AT_EXIT_WHEN_PROCESS_EXIT or _pid else command.notify("notice: Process finishing...", Index: lib/shell/command-processor.rb =================================================================== --- lib/shell/command-processor.rb (revision 26985) +++ lib/shell/command-processor.rb (revision 26986) @@ -35,7 +35,7 @@ install_builtin_commands - # define CommandProccessor#methods to Shell#methods and Filter#methods + # define CommandProcessor#methods to Shell#methods and Filter#methods for m in CommandProcessor.instance_methods(false) - NoDelegateMethods add_delegate_command_to_shell(m) end Index: lib/prime.rb =================================================================== --- lib/prime.rb (revision 26985) +++ lib/prime.rb (revision 26986) @@ -473,7 +473,7 @@ end end - # Provides a +Prime+ object with compatibility to Ruby 1.8 when instanciated via +Prime+.+new+. + # Provides a +Prime+ object with compatibility to Ruby 1.8 when instantiated via +Prime+.+new+. module OldCompatibility # Returns the next prime number and forwards internal pointer. def succ Index: lib/net/https.rb =================================================================== --- lib/net/https.rb (revision 26985) +++ lib/net/https.rb (revision 26986) @@ -71,7 +71,7 @@ : verify_mode, verify_mode=((|mode|)) Sets the flags for server the certification verification at - begining of SSL/TLS session. + beginning of SSL/TLS session. OpenSSL::SSL::VERIFY_NONE or OpenSSL::SSL::VERIFY_PEER is acceptable. : verify_callback, verify_callback=((|proc|)) Index: lib/net/smtp.rb =================================================================== --- lib/net/smtp.rb (revision 26985) +++ lib/net/smtp.rb (revision 26986) @@ -118,7 +118,7 @@ # Net::SMTP.start('your.smtp.server', 25) do |smtp| # smtp.send_message msgstr, # 'your@m...', - # 'his_addess@e...' + # 'his_address@e...' # end # # === Closing the Session Index: ruby_1_8/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 26985) +++ ruby_1_8/ChangeLog (revision 26986) @@ -1,3 +1,7 @@ +Sat Mar 20 12:30:54 2010 Nobuyoshi Nakada <nobu@r...> + + * lib: fixed typo. a patch by Sho Hashimoto in [ruby-dev:40716]. + Fri Mar 19 17:12:34 2010 Nobuyoshi Nakada <nobu@r...> * ruby.h (RSTRING_*, RARRAY_*, RREGEXP_*, RSTRUCT_*, RBIGNUM_*): Index: ruby_1_8/version.h =================================================================== --- ruby_1_8/version.h (revision 26985) +++ ruby_1_8/version.h (revision 26986) @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.8" -#define RUBY_RELEASE_DATE "2010-03-19" +#define RUBY_RELEASE_DATE "2010-03-20" #define RUBY_VERSION_CODE 188 -#define RUBY_RELEASE_CODE 20100319 +#define RUBY_RELEASE_CODE 20100320 #define RUBY_PATCHLEVEL -1 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 8 #define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 19 +#define RUBY_RELEASE_DAY 20 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; Index: ruby_1_8/lib/xmlrpc/server.rb =================================================================== --- ruby_1_8/lib/xmlrpc/server.rb (revision 26985) +++ ruby_1_8/lib/xmlrpc/server.rb (revision 26986) @@ -132,8 +132,8 @@ server.set_service_hook {|obj, *args| begin ret = obj.call(*args) # call the original service-method - # could convert the return value - resuce + # could convert the return value + rescue # rescue exceptions end } Index: ruby_1_8/lib/rexml/entity.rb =================================================================== --- ruby_1_8/lib/rexml/entity.rb (revision 26985) +++ ruby_1_8/lib/rexml/entity.rb (revision 26986) @@ -25,7 +25,7 @@ # Create a new entity. Simple entities can be constructed by passing a # name, value to the constructor; this creates a generic, plain entity # reference. For anything more complicated, you have to pass a Source to - # the constructor with the entity definiton, or use the accessor methods. + # the constructor with the entity definition, or use the accessor methods. # +WARNING+: There is no validation of entity state except when the entity # is read from a stream. If you start poking around with the accessors, # you can easily create a non-conformant Entity. The best thing to do is Index: ruby_1_8/lib/thwait.rb =================================================================== --- ruby_1_8/lib/thwait.rb (revision 26985) +++ ruby_1_8/lib/thwait.rb (revision 26986) @@ -3,7 +3,7 @@ # $Release Version: 0.9 $ # $Revision: 1.3 $ # $Date: 1998/06/26 03:19:34 $ -# by Keiju ISHITSUKA(Nihpon Rational Software Co.,Ltd.) +# by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd.) # # -- # feature: Index: ruby_1_8/lib/cgi.rb =================================================================== --- ruby_1_8/lib/cgi.rb (revision 26985) +++ ruby_1_8/lib/cgi.rb (revision 26986) @@ -1690,7 +1690,7 @@ # image_button("url", "name", "string") # # <INPUT TYPE="image" SRC="url" NAME="name" ALT="string"> # - # image_button("SRC" => "url", "ATL" => "strng") + # image_button("SRC" => "url", "ATL" => "string") # # <INPUT TYPE="image" SRC="url" ALT="string"> def image_button(src = "", name = nil, alt = nil) attributes = if src.kind_of?(String) Index: ruby_1_8/lib/ipaddr.rb =================================================================== --- ruby_1_8/lib/ipaddr.rb (revision 26985) +++ ruby_1_8/lib/ipaddr.rb (revision 26986) @@ -434,7 +434,7 @@ # automatically from a specified string, you can specify one # explicitly by the optional second argument. # - # Otherwise an IP addess is generated from a packed in_addr value + # Otherwise an IP address is generated from a packed in_addr value # and an address family. # # The IPAddr class defines many methods and operators, and some of @@ -462,7 +462,7 @@ #Socket.getaddrinfo(left, nil, Socket::AF_INET6, Socket::SOCK_STREAM, nil, # Socket::AI_NUMERICHOST) begin - IPSocket.getaddress(prefix) # test if address is vaild + IPSocket.getaddress(prefix) # test if address is valid rescue raise ArgumentError, "invalid address" end Index: ruby_1_8/lib/irb/output-method.rb =================================================================== --- ruby_1_8/lib/irb/output-method.rb (revision 26985) +++ ruby_1_8/lib/irb/output-method.rb (revision 26986) @@ -1,5 +1,5 @@ # -# output-method.rb - optput methods used by irb +# output-method.rb - output methods used by irb # $Release Version: 0.9.5$ # $Revision$ # $Date$ Index: ruby_1_8/lib/irb/notifier.rb =================================================================== --- ruby_1_8/lib/irb/notifier.rb (revision 26985) +++ ruby_1_8/lib/irb/notifier.rb (revision 26986) @@ -26,7 +26,7 @@ end module_function :def_notifier - class AbstructNotifier + class AbstractNotifier def initialize(prefix, base_notifier) @prefix = prefix @base_notifier = base_notifier @@ -73,7 +73,7 @@ end end - class CompositeNotifier<AbstructNotifier + class CompositeNotifier<AbstractNotifier def initialize(prefix, base_notifier) super @@ -94,7 +94,7 @@ def level_notifier=(value) case value - when AbstructNotifier + when AbstractNotifier @level_notifier = value when Integer l = @notifiers[value] @@ -108,7 +108,7 @@ alias level= level_notifier= end - class LeveledNotifier<AbstructNotifier + class LeveledNotifier<AbstractNotifier include Comparable def initialize(base, level, prefix) @@ -141,5 +141,14 @@ end D_NOMSG = NoMsgNotifier.new + + def self.const_missing(name) + if name == :AbstructNotifier + warn "#{caller[0]}: fix typo: use AbstractNotifier instead of AbstructNotifier" + AbstractNotifier + else + super + end + end end end Index: ruby_1_8/lib/optparse.rb =================================================================== --- ruby_1_8/lib/optparse.rb (revision 26985) +++ ruby_1_8/lib/optparse.rb (revision 26986) @@ -1565,7 +1565,7 @@ yesno = CompletingHash.new %w[- no false].each {|el| yesno[el] = false} %w[+ yes true].each {|el| yesno[el] = true} - yesno['nil'] = false # shoud be nil? + yesno['nil'] = false # should be nil? accept(TrueClass, yesno) {|arg, val| val == nil or val} # # Similar to TrueClass, but defaults to false. Index: ruby_1_8/lib/shell/process-controller.rb =================================================================== --- ruby_1_8/lib/shell/process-controller.rb (revision 26985) +++ ruby_1_8/lib/shell/process-controller.rb (revision 26986) @@ -234,10 +234,10 @@ Thread.critical = false _pid = Process.waitpid(pid, nil) rescue Errno::ECHILD - command.notify "warn: job(%id) was done already waitipd." + command.notify "warn: job(%id) was done already waitpid." _pid = true ensure - # when the process ends, wait until the command termintes + # when the process ends, wait until the command terminates if _pid else command.notify("notice: Process finishing...", Index: ruby_1_8/lib/shell/command-processor.rb =================================================================== --- ruby_1_8/lib/shell/command-processor.rb (revision 26985) +++ ruby_1_8/lib/shell/command-processor.rb (revision 26986) @@ -31,7 +31,7 @@ install_builtin_commands - # define CommandProccessor#methods to Shell#methods and Filter#methods + # define CommandProcessor#methods to Shell#methods and Filter#methods for m in CommandProcessor.instance_methods(false) - NoDelegateMethods add_delegate_command_to_shell(m) end Index: ruby_1_8/lib/net/https.rb =================================================================== --- ruby_1_8/lib/net/https.rb (revision 26985) +++ ruby_1_8/lib/net/https.rb (revision 26986) @@ -81,7 +81,7 @@ : verify_mode, verify_mode=((|mode|)) Sets the flags for server the certification verification at - begining of SSL/TLS session. + beginning of SSL/TLS session. OpenSSL::SSL::VERIFY_NONE or OpenSSL::SSL::VERIFY_PEER is acceptable. : verify_callback, verify_callback=((|proc|)) Index: ruby_1_8/lib/net/smtp.rb =================================================================== --- ruby_1_8/lib/net/smtp.rb (revision 26985) +++ ruby_1_8/lib/net/smtp.rb (revision 26986) @@ -118,7 +118,7 @@ # Net::SMTP.start('your.smtp.server', 25) do |smtp| # smtp.send_message msgstr, # 'your@m...', - # 'his_addess@e...' + # 'his_address@e...' # end # # === Closing the Session -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/