Upgraded to breakpoint 92

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@721 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

actionpack/lib/action_controller/assertions/action_pack_assertions.rb

@@ -218,8 +218,7 @@ module Test #:nodoc:
         xml, matches = REXML::Document.new(response.body), []
         xml.elements.each(expression) { |e| matches << e.text }
         if matches.empty? then
-          msg = build_message(message, "<?> not found in document",
+          msg = build_message(message, "<?> not found in document", expression)
-                              expression)
           flunk(msg)
           return
         elsif matches.length < 2 then

activesupport/CHANGELOG

@@ -1,3 +1,13 @@
+* Upgraded to breakpoint 92 which fixes:
+
+    * overload IRB.parse_opts(), fixes #443
+      => breakpoints in tests work even when running them via rake
+    * untaint handlers, might fix an issue discussed on the Rails ML
+    * added verbose mode to breakpoint_client
+    * less noise caused by breakpoint_client by default
+    * ignored TerminateLineInput exception in signal handler
+      => quiet exit on Ctrl-C
+
 * Fixed Inflector for words like "news" and "series" that are the same in plural and singular #603 [echion], #615 [marcenuc]
 
 * Added Hash#stringify_keys and Hash#stringify_keys!

activesupport/lib/active_support/breakpoint.rb

@@ -16,12 +16,12 @@
 # license please contact me.
 
 require 'irb'
-require File.dirname(__FILE__) + '/binding_of_caller'
+require 'binding_of_caller'
 require 'drb'
 require 'drb/acl'
 
 module Breakpoint
-  id = %q$Id: breakpoint.rb 41 2005-01-22 20:22:10Z flgr $
+  id = %q$Id: breakpoint.rb 92 2005-02-04 22:35:53Z flgr $
   Version = id.split(" ")[2].to_i
 
   extend self
@@ -122,6 +122,7 @@ module Breakpoint
     # in the context of the client.
     class Client
       def initialize(eval_handler) # :nodoc:
+        eval_handler.untaint
         @eval_handler = eval_handler
       end
 
@@ -288,6 +289,8 @@ module Breakpoint
     def collision
       sleep(0.5) until @collision_handler
 
+      @collision_handler.untaint
+
       @collision_handler.call
     end
 
@@ -299,6 +302,7 @@ module Breakpoint
 
       sleep(0.5) until @handler
 
+      @handler.untaint
       @handler.call(workspace, message)
     end
 
@@ -456,6 +460,7 @@ module IRB # :nodoc:
       old_CurrentContext
     end
   end
+  def IRB.parse_opts() end
 
   class Context
     alias :old_evaluate :evaluate

railties/CHANGELOG

@@ -1,5 +1,15 @@
 *SVN*
 
+* Upgraded to breakpoint 92 which fixes:
+
+    * overload IRB.parse_opts(), fixes #443
+      => breakpoints in tests work even when running them via rake
+    * untaint handlers, might fix an issue discussed on the Rails ML
+    * added verbose mode to breakpoint_client
+    * less noise caused by breakpoint_client by default
+    * ignored TerminateLineInput exception in signal handler
+      => quiet exit on Ctrl-C
+
 * Added support for independent components residing in /components. Example:
 
     Controller: components/list/items_controller.rb

railties/lib/breakpoint.rb

@@ -21,7 +21,7 @@ require 'drb'
 require 'drb/acl'
 
 module Breakpoint
-  id = %q$Id: breakpoint.rb 41 2005-01-22 20:22:10Z flgr $
+  id = %q$Id: breakpoint.rb 92 2005-02-04 22:35:53Z flgr $
   Version = id.split(" ")[2].to_i
 
   extend self
@@ -122,6 +122,7 @@ module Breakpoint
     # in the context of the client.
     class Client
       def initialize(eval_handler) # :nodoc:
+        eval_handler.untaint
         @eval_handler = eval_handler
       end
 
@@ -288,6 +289,8 @@ module Breakpoint
     def collision
       sleep(0.5) until @collision_handler
 
+      @collision_handler.untaint
+
       @collision_handler.call
     end
 
@@ -299,6 +302,7 @@ module Breakpoint
 
       sleep(0.5) until @handler
 
+      @handler.untaint
       @handler.call(workspace, message)
     end
 
@@ -456,6 +460,7 @@ module IRB # :nodoc:
       old_CurrentContext
     end
   end
+  def IRB.parse_opts() end
 
   class Context
     alias :old_evaluate :evaluate

railties/lib/breakpoint_client.rb

@@ -6,7 +6,7 @@ Options = {
   :ClientURI  => nil,
   :ServerURI  => "druby://localhost:42531",
   :RetryDelay => 3,
-  :Permanent  => true,
+  :Permanent  => false,
   :Verbose    => false
 }
 
@@ -70,7 +70,7 @@ ARGV.options do |opts|
   opts.on("-v", "--version",
     "Display the version information."
   ) do
-    id = %q$Id: breakpoint_client.rb 40 2005-01-22 20:05:00Z flgr $
+    id = %q$Id: breakpoint_client.rb 91 2005-02-04 22:34:08Z flgr $
     puts id.sub("Id: ", "")
     puts "(Breakpoint::Version = #{Breakpoint::Version})"
     exit
@@ -149,9 +149,12 @@ loop do
     service = DRbObject.new(nil, Options[:ServerURI])
 
     begin
-      service.eval_handler = Handlers.method(:eval_handler)
+      ehandler = Handlers.method(:eval_handler)
-      service.collision_handler = Handlers.method(:collision_handler)
+      chandler = Handlers.method(:collision_handler)
-      service.handler = Handlers.method(:breakpoint_handler)
+      handler = Handlers.method(:breakpoint_handler)
+      service.eval_handler = ehandler
+      service.collision_handler = chandler
+      service.handler = handler
 
       reconnecting = false
       if Options[:Verbose] then