ruby-debug-ide 0.4.16 → 0.4.17.beta3

data/Rakefile

@@ -43,7 +43,7 @@ EOF
   spec.executables = ["rdebug-ide"]
   spec.files = FILES.to_a
 
-  spec.extensions << "ext/mkrf_conf.rb"
+  spec.extensions << "ext/mkrf_conf.rb" unless ENV['NO_EXT']
   spec.add_dependency("rake", ">= 0.8.1")
 
   spec.required_ruby_version = '>= 1.8.2'

data/ext/mkrf_conf.rb

@@ -2,6 +2,7 @@ jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENG
 unless jruby
   require 'rubygems'
   require 'rubygems/command.rb'
+  require 'rubygems/dependency.rb'
   require 'rubygems/dependency_installer.rb'
 
   begin
@@ -9,15 +10,24 @@ unless jruby
     rescue NoMethodError
   end
 
+  if RUBY_VERSION < "1.9"
+    dep = Gem::Dependency.new("ruby-debug-base", '>=0.10.4')
+  else
+    dep = Gem::Dependency.new("ruby-debug-base19x", '>=0.11.24')
+  end
+
   inst = Gem::DependencyInstaller.new
   begin
-    if RUBY_VERSION < "1.9"
-      inst.install "ruby-debug-base", '>=0.10.4'
-    else
-      inst.install "ruby-debug-base19", '>=0.11.24'
-    end
-    rescue
+    inst.install dep
+  rescue
+    inst = Gem::DependencyInstaller.new(:prerelease => true)
+    begin
+      inst.install dep
+    rescue Exception => e
+      puts e
+      puts e.backtrace.join "\n  "
       exit(1)
+    end
   end
 end
 

data/lib/ruby-debug/event_processor.rb

@@ -11,6 +11,7 @@ end
     
      def initialize(interface)
        @printer = XmlPrinter.new(interface)
+       @interface = interface
        @line = nil
        @file = nil
        @last_breakpoint = nil
@@ -57,9 +58,7 @@ end
        raise "DebuggerThread are not supposed to be traced (#{context.thread})" if context.thread.is_a?(Debugger::DebugThread)
        @printer.print_debug("Stopping Thread %s", context.thread.to_s)
        @printer.print_debug("Threads equal: %s", Thread.current == context.thread)
-       # will be resumed by commands like `step', `next', `continue', `finish'
-       # from `control thread'
-       Thread.stop
+       CommandProcessor.new(@interface).process_commands
        @printer.print_debug("Resumed Thread %s", context.thread.to_s)
        @line = nil
        @file = nil

data/lib/ruby-debug/interface.rb

@@ -12,11 +12,15 @@ class TCPSocket
 end
 
 module Debugger  
+  class Interface
+  end
 
-  class RemoteInterface # :nodoc:
+  class RemoteInterface < Interface # :nodoc:
+    attr_accessor :command_queue
 
     def initialize(socket)
       @socket = socket
+      @command_queue = []
     end
     
     def read_command

data/lib/ruby-debug/processor.rb

@@ -7,50 +7,17 @@ else
 end
 
 module Debugger
-  # this class is added to resolve problems, with ruby-debug gem incompatibility see
-  # http://rubyforge.org/tracker/index.php?func=detail&aid=27055&group_id=3085&atid=11903
   class CommandProcessor
-  end
-    
-  class ControlCommandProcessor # :nodoc:
-    def initialize(interface)
+    def initialize(interface = nil)
       @interface = interface
       @printer = XmlPrinter.new(@interface)
     end
-    
+
     def print(*args)
       @interface.print(*args)
     end
-    
+
     def process_commands
-      @printer.print_debug("Starting command read loop")
-      ctrl_cmd_classes = Command.commands.select{|cmd| cmd.control}
-      state = ControlState.new(@interface)
-      ctrl_cmds = ctrl_cmd_classes.map{|cmd| cmd.new(state, @printer)}
-      
-      while input = @interface.read_command
-        # escape % since print_debug might use printf
-        @printer.print_debug "Processing: #{input.gsub('%', '%%')}"
-        # sleep 0.3
-        catch(:debug_error) do
-          if cmd = ctrl_cmds.find{|c| c.match(input) }
-            cmd.execute
-          else
-            process_context_commands(input)
-          end
-        end
-      end
-    rescue IOError, Errno::EPIPE
-      @printer.print_error "INTERNAL ERROR!!! #{$!}\n" rescue nil
-      @printer.print_error $!.backtrace.map{|l| "\t#{l}"}.join("\n") rescue nil
-    rescue Exception
-      @printer.print_error "INTERNAL ERROR!!! #{$!}\n" rescue nil
-      @printer.print_error $!.backtrace.map{|l| "\t#{l}"}.join("\n") rescue nil
-    ensure
-      @interface.close
-    end
-    
-    def process_context_commands(input)
       unless Debugger.event_processor.at_line?
         @printer.print_error "There is no thread suspended at the time and therefore no context to execute '#{input.gsub('%', '%%')}'"
         return
@@ -58,7 +25,6 @@ module Debugger
       context = Debugger.event_processor.context
       file = Debugger.event_processor.file
       line = Debugger.event_processor.line
-      event_cmds_classes = Command.commands.select{|cmd| cmd.event}
       state = State.new do |s|
         s.context = context
         s.file    = file
@@ -66,28 +32,39 @@ module Debugger
         s.binding = context.frame_binding(0)
         s.interface = @interface
       end
-      event_cmds = event_cmds_classes.map{|cmd| cmd.new(state, @printer) }
-      catch(:debug_error) do
-        splitter[input].each do |input|
-          # escape % since print_debug might use printf
-          @printer.print_debug "Processing context: #{input.gsub('%', '%%')}"
-          if cmd = event_cmds.find{ |c| c.match(input) }
-            if context.dead? && cmd.class.need_context
-              @printer.print_msg "Command is unavailable\n"
+      event_cmds = Command.commands.map{|cmd| cmd.new(state, @printer) }
+      while !state.proceed? do
+        input = @interface.command_queue.empty? ? nil : @interface.command_queue.shift
+        unless input
+          sleep 0.1
+          next
+        end
+        catch(:debug_error) do
+          splitter[input].each do |input|
+            # escape % since print_debug might use printf
+            @printer.print_debug "Processing in context: #{input.gsub('%', '%%')}"
+            if cmd = event_cmds.find { |c| c.match(input) }
+              if context.dead? && cmd.class.need_context
+                @printer.print_msg "Command is unavailable\n"
+              else
+                cmd.execute
+              end
             else
-              cmd.execute
+              @printer.print_msg "Unknown command: #{input}"
             end
-          else
-            @printer.print_msg "Unknown command: #{input}"
           end
         end
       end
-      
-      context.thread.run if state.proceed?
+    rescue IOError, Errno::EPIPE
+      @printer.print_error "INTERNAL ERROR!!! #{$!}\n" rescue nil
+      @printer.print_error $!.backtrace.map{|l| "\t#{l}"}.join("\n") rescue nil
+    rescue Exception
+      @printer.print_error "INTERNAL ERROR!!! #{$!}\n" rescue nil
+      @printer.print_error $!.backtrace.map{|l| "\t#{l}"}.join("\n") rescue nil
     end
-    
+
     def splitter
-      return lambda do |str|
+      lambda do |str|
         str.split(/;/).inject([]) do |m, v|
           if m.empty?
             m << v
@@ -102,6 +79,36 @@ module Debugger
           m
         end
       end
+    end    
+  end
+    
+  class ControlCommandProcessor < CommandProcessor# :nodoc:
+    def process_commands
+      @printer.print_debug("Starting control thread")
+      ctrl_cmd_classes = Command.commands.select{|cmd| cmd.control}
+      state = ControlState.new(@interface)
+      ctrl_cmds = ctrl_cmd_classes.map{|cmd| cmd.new(state, @printer)}
+      
+      while input = @interface.read_command
+        # escape % since print_debug might use printf
+        # sleep 0.3
+        catch(:debug_error) do
+          if cmd = ctrl_cmds.find{|c| c.match(input) }
+            @printer.print_debug "Processing in control: #{input.gsub('%', '%%')}"
+            cmd.execute
+          else
+            @interface.command_queue << input
+          end
+        end
+      end
+    rescue IOError, Errno::EPIPE
+      @printer.print_error "INTERNAL ERROR!!! #{$!}\n" rescue nil
+      @printer.print_error $!.backtrace.map{|l| "\t#{l}"}.join("\n") rescue nil
+    rescue Exception
+      @printer.print_error "INTERNAL ERROR!!! #{$!}\n" rescue nil
+      @printer.print_error $!.backtrace.map{|l| "\t#{l}"}.join("\n") rescue nil
+    ensure
+      @interface.close
     end
   end
 

data/lib/ruby-debug/version.rb

@@ -1,3 +1,3 @@
 module Debugger
-  IDE_VERSION='0.4.16'
+  IDE_VERSION='0.4.17.beta3'
 end

data/lib/ruby-debug/xml_printer.rb

@@ -1,9 +1,51 @@
 require 'cgi'
 require 'yaml'
+require 'monitor'
 
 module Debugger
 
   class XmlPrinter # :nodoc:
+    class ExceptionProxy
+      instance_methods.each { |m| undef_method m unless m =~ /(^__|^send$|^object_id$|^instance_variables$|^instance_eval$)/ }
+
+      def initialize(exception)
+        @exception = exception
+        @message = exception.message
+        @backtrace = cleanup_backtrace(exception.backtrace)
+      end
+
+      private 
+      def method_missing(called, *args, &block) 
+        @exception.__send__(called, *args, &block) 
+      end
+
+      def cleanup_backtrace(backtrace)
+        cleared = []
+        return cleared unless backtrace
+        backtrace.each do |line|
+          if line.index(File.expand_path(File.dirname(__FILE__))) == 0
+            break
+          end
+          cleared << line
+        end
+        cleared
+      end
+    end
+
+    def self.protect(mname)
+      return if instance_methods.include?("__#{mname}")
+      alias_method "__#{mname}", mname
+      class_eval %{
+        def #{mname}(*args, &block)
+          @@monitor.synchronize do
+            return unless @interface
+            __#{mname}(*args, &block)
+          end
+        end
+      }
+    end    
+
+    @@monitor = Monitor.new
     attr_accessor :interface
     
     def initialize(interface)
@@ -229,6 +271,10 @@ module Debugger
     end
     
     def print_exception(exception, binding)
+      print_variables(%w(error), 'exception') do |var|
+        ExceptionProxy.new(exception)
+      end
+    rescue
       print "<processingException type=\"%s\" message=\"%s\"/>", 
         exception.class, CGI.escapeHTML(exception.to_s)
     end
@@ -262,6 +308,12 @@ module Debugger
       Debugger::print_debug(*params)
       @interface.print(*params)
     end
+
+    instance_methods.each do |m|
+      if m.to_s.index('print_') == 0
+        protect m
+      end
+    end
     
   end
 

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-debug-ide
 version: !ruby/object:Gem::Version 
-  hash: 47
-  prerelease: false
+  hash: 299253551
+  prerelease: true
   segments: 
   - 0
   - 4
-  - 16
-  version: 0.4.16
+  - 17
+  - beta3
+  version: 0.4.17.beta3
 platform: ruby
 authors: 
 - Markus Barchfeld, Martin Krauskopf, Mark Moseley, JetBrains RubyMine Team
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-29 00:00:00 +03:00
+date: 2011-02-14 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,30 +49,30 @@ files:
 - MIT-LICENSE
 - Rakefile
 - bin/rdebug-ide
-- lib/ruby-debug/command.rb
-- lib/ruby-debug/commands/breakpoints.rb
+- lib/ruby-debug-ide.rb
+- lib/ruby-debug/printers.rb
+- lib/ruby-debug/helper.rb
 - lib/ruby-debug/commands/catchpoint.rb
-- lib/ruby-debug/commands/condition.rb
-- lib/ruby-debug/commands/control.rb
-- lib/ruby-debug/commands/enable.rb
-- lib/ruby-debug/commands/eval.rb
 - lib/ruby-debug/commands/frame.rb
 - lib/ruby-debug/commands/inspect.rb
-- lib/ruby-debug/commands/jump.rb
+- lib/ruby-debug/commands/condition.rb
+- lib/ruby-debug/commands/variables.rb
 - lib/ruby-debug/commands/load.rb
-- lib/ruby-debug/commands/pause.rb
 - lib/ruby-debug/commands/set_type.rb
+- lib/ruby-debug/commands/enable.rb
+- lib/ruby-debug/commands/control.rb
+- lib/ruby-debug/commands/jump.rb
 - lib/ruby-debug/commands/stepping.rb
+- lib/ruby-debug/commands/pause.rb
 - lib/ruby-debug/commands/threads.rb
-- lib/ruby-debug/commands/variables.rb
+- lib/ruby-debug/commands/breakpoints.rb
+- lib/ruby-debug/commands/eval.rb
+- lib/ruby-debug/command.rb
+- lib/ruby-debug/xml_printer.rb
 - lib/ruby-debug/event_processor.rb
-- lib/ruby-debug/helper.rb
 - lib/ruby-debug/interface.rb
-- lib/ruby-debug/printers.rb
-- lib/ruby-debug/processor.rb
 - lib/ruby-debug/version.rb
-- lib/ruby-debug/xml_printer.rb
-- lib/ruby-debug-ide.rb
+- lib/ruby-debug/processor.rb
 - ext/mkrf_conf.rb
 has_rdoc: true
 homepage: http://rubyforge.org/projects/debug-commons/
@@ -96,12 +97,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: debug-commons