ruby-debug-ide 0.1.3 → 0.1.4

data/lib/ruby-debug/command.rb

@@ -18,7 +18,7 @@ module Debugger
         end
         commands << klass
       end
-
+      
       def load_commands
         dir = File.dirname(__FILE__)
         Dir[File.join(dir, 'commands', '*')].each do |file|
@@ -42,15 +42,15 @@ module Debugger
         @options ||= {}
       end
     end
-
+    
     def initialize(state, printer)
       @state, @printer = state, printer
     end
-
+    
     def match(input)
       @match = regexp.match(input)
     end
-
+    
     protected
     
     def method_missing(meth, *args, &block)
@@ -60,24 +60,46 @@ module Debugger
         super
       end
     end
-
+    
     def print(*args)
       @state.print(*args)
     end
-
+    
     def confirm(msg)
       @state.confirm(msg) == 'y'
     end
-
+    
+    # see Timeout::timeout, the difference is that we must use a DebugThread
+    # because every other thread would be halted when the event hook is reached
+    # in ruby-debug.c
+    def timeout(sec)
+      return yield if sec == nil or sec.zero?
+      raise ThreadError, "timeout within critical session" if Thread.critical
+      begin
+        x = Thread.current
+        y = DebugThread.start {
+          sleep sec
+          x.raise StandardError, "Timeout: evaluation took longer than #{sec} seconds." if x.alive?
+        }
+        yield sec
+      ensure
+        y.kill if y and y.alive?
+      end
+    end
+    
     def debug_eval(str, b = get_binding)
       begin
-        val = eval(str, b)
+        max_time = 10
+        @printer.print_debug("Evaluating with timeout after %i sec", max_time)
+        timeout(max_time) do
+          eval(str, b)
+        end
       rescue StandardError, ScriptError => e
         @printer.print_exception(e, @state.binding) 
         throw :debug_error
       end
     end
-
+    
     def debug_silent_eval(str)
       begin
         eval(str, get_binding)
@@ -85,7 +107,7 @@ module Debugger
         nil
       end
     end
-
+    
     def hbinding(hash)
       code = hash.keys.map{|k| "#{k} = hash['#{k}']"}.join(';') + ';binding'
       if obj = @state.context.frame_self(@state.frame_pos)
@@ -95,16 +117,16 @@ module Debugger
       end
     end
     private :hbinding
- 
+    
     def get_binding
       binding = @state.context.frame_binding(@state.frame_pos)
       binding || hbinding(@state.context.frame_locals(@state.frame_pos))
     end
-
+    
     def line_at(file, line)
       Debugger.line_at(file, line)
     end
-
+    
     def get_context(thnum)
       Debugger.contexts.find{|c| c.thnum == thnum}
     end

data/lib/ruby-debug/commands/control.rb

@@ -7,10 +7,8 @@ module Debugger
     end
 
     def execute
-      if confirm("Really quit? (y/n) ")
-        Debugger.save_history if Debugger.respond_to? :save_history
-        exit! # exit -> exit!: No graceful way to stop threads...
-      end
+      @printer.print_debug("Exiting debugger.")
+      exit! # exit -> exit!: No graceful way to stop threads...
     end
 
     class << self

data/lib/ruby-debug/processor.rb

@@ -27,7 +27,6 @@ module Debugger
             cmd.execute
           else
             process_context_commands(input)
-            #@printer.print_msg "Unknown command"
           end
         end
       end
@@ -53,7 +52,6 @@ module Debugger
         s.file    = file
         s.line    = line
         s.binding = context.frame_binding(0)
-        s.display = display
         s.interface = @interface
         s.commands = event_cmds
       end
@@ -98,7 +96,7 @@ module Debugger
   end    
   class State # :nodoc:
     attr_accessor :context, :file, :line, :binding
-    attr_accessor :frame_pos, :previous_line, :display
+    attr_accessor :frame_pos, :previous_line
     attr_accessor :interface, :commands
     
     def initialize

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ruby-debug-ide
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
-date: 2007-04-30 13:24:43 +02:00
+  version: 0.1.4
+date: 2007-05-01 14:07:48 +02:00
 summary: IDE interface for ruby-debug.
 require_paths: 
 - lib
@@ -35,11 +35,11 @@ files:
 - lib/ruby-debug.rb
 - lib/ruby-debug/commands
 - lib/ruby-debug/command.rb
-- lib/ruby-debug/processor.rb
 - lib/ruby-debug/event_processor.rb
 - lib/ruby-debug/interface.rb
 - lib/ruby-debug/xml_printer.rb
 - lib/ruby-debug/printers.rb
+- lib/ruby-debug/processor.rb
 - lib/ruby-debug/commands/load.rb
 - lib/ruby-debug/commands/control.rb
 - lib/ruby-debug/commands/breakpoints.rb
@@ -70,5 +70,5 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: 0.9.3
     version: