ruby-debug-ide 0.4.0 → 0.4.1

data/bin/rdebug-ide

@@ -8,11 +8,12 @@ require 'ruby-debug'
 $stdout.sync=true
 
 options = OpenStruct.new(
+  'frame_bind'  => false,
   'host'        => nil,
+  'load_mode'   => false,
   'port'        => 1234,
-  'tracing'     => false,
-  'frame_bind'  => false,
-  'load_mode'   => false
+  'stop'        => false,
+  'tracing'     => false
 )
 
 opts = OptionParser.new do |opts|
@@ -24,6 +25,7 @@ EOB
   opts.separator "Options:"
   opts.on("-h", "--host HOST", "Host name used for remote debugging") {|options.host|}
   opts.on("-p", "--port PORT", Integer, "Port used for remote debugging") {|options.port|}
+  opts.on('--stop', 'stop when the script is loaded') {options.stop = true}
   opts.on("-x", "--trace", "turn on line tracing") {options.tracing = true}
   opts.on("-l", "--load-mode", "load mode (experimental)") {options.load_mode = true}
   opts.on("-d", "--debug", "Debug self - prints information for debugging ruby-debug itself") do
@@ -75,6 +77,7 @@ trap('INT') { Debugger.interrupt_last }
   
 # set options
 Debugger.keep_frame_binding = options.frame_bind
+Debugger.tracing = options.tracing
 
-Debugger.main(options.host, options.port, options.load_mode)
+Debugger.debug_program(options)
 

data/lib/ruby-debug.rb

@@ -40,7 +40,11 @@ module Debugger
     end
     
     def at_tracing(file, line)
-      event_processor.at_tracing(self, file, line)
+      if event_processor
+        event_processor.at_tracing(self, file, line)
+      else
+        Debugger::print_debug "trace: location=\"%s:%s\", threadId=%d", file, line, self.thnum
+      end
     end
     
     def at_line(file, line)
@@ -77,12 +81,12 @@ module Debugger
       end
     end
     
-    def main(host, port, load_mode)
+    def debug_program(options)
       return if started?
       
       start
       
-      start_control(host, port)
+      start_control(options.host, options.port)
       
       raise "Control thread did not start (#{@control_thread}}" unless @control_thread && @control_thread.alive?
       
@@ -94,7 +98,7 @@ module Debugger
         @proceed.wait(@mutex)
       end
       
-      debug_load(Debugger::PROG_SCRIPT, false, load_mode)
+      debug_load(Debugger::PROG_SCRIPT, options.stop, options.load_mode)
     end
     
     def run_prog_script
@@ -111,7 +115,7 @@ module Debugger
           unless RUBY_PLATFORM =~ /darwin/i # Mac OS X seems to have problem with 'localhost'
             host ||= 'localhost' # nil does not seem to work for IPv6, localhost does
           end
-          $stderr.printf "Fast Debugger (ruby-debug-ide 0.4.0) listens on #{host}:#{port}\n"
+          $stderr.printf "Fast Debugger (ruby-debug-ide 0.4.1) listens on #{host}:#{port}\n"
           server = TCPServer.new(host, port)
           while (session = server.accept)
             begin

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

@@ -46,7 +46,7 @@ module Debugger
       exp = @match.post_match
       out = StringIO.new
       PP.pp(debug_eval(exp), out) rescue out.puts $!.message
-      print_pp exp, out.string
+      print_pp out.string
     end
 
     class << self

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

@@ -1,5 +1,7 @@
 module Debugger
+
   module FrameFunctions # :nodoc:
+
     def adjust_frame(frame_pos, absolute)
       if absolute
         if frame_pos < 0
@@ -25,7 +27,7 @@ module Debugger
       @state.file = @state.context.frame_file(@state.frame_pos)
       @state.line = @state.context.frame_line(@state.frame_pos)
       
-      print_current_frame(@state.context, @state.frame_pos)
+      print_current_frame(@state.frame_pos)
     end
 
   end

data/lib/ruby-debug/xml_printer.rb

@@ -18,6 +18,7 @@ module Debugger
 
     # Sends debug message to the frontend if XML debug logging flag (--xml-debug) is on.
     def print_debug(*args)
+      Debugger.print_debug(*args)
       if Debugger.xml_debug
         msg, *args = args
         xml_message = CGI.escapeHTML(msg % args)
@@ -32,22 +33,23 @@ module Debugger
       end
     end
     
-    def print_frames(context, cur_idx)
+    def print_frames(context, current_frame_id)
       print_element("frames") do
-        (0...context.stack_size).each do |idx|
-          print_frame(context, idx, cur_idx)
+        (0...context.stack_size).each do |id|
+          print_frame(context, id, current_frame_id)
         end
       end
     end
     
-    def print_current_frame(context, frame_pos)
+    def print_current_frame(frame_pos)
       print_debug "Selected frame no #{frame_pos}"
     end
     
-    def print_frame(context, idx, cur_idx)
+    def print_frame(context, frame_id, current_frame_id)
       # idx + 1: one-based numbering as classic-debugger
-      print "<frame no=\"%s\" file=\"%s\" line=\"%s\" #{'current="true" ' if idx == cur_idx}/>",
-        idx + 1, context.frame_file(idx), context.frame_line(idx)
+      file = context.frame_file(frame_id)
+      print "<frame no=\'%s\' file=\'%s\' line=\'%s\' #{"current='true' " if frame_id == current_frame_id}/>",
+        frame_id + 1, File.expand_path(file), context.frame_line(frame_id)
     end
     
     def print_contexts(contexts)
@@ -172,14 +174,13 @@ module Debugger
       print "<eval expression=\"%s\" value=\"%s\" />",  CGI.escapeHTML(exp), value
     end
     
-    def print_pp(exp, value)
+    def print_pp(value)
       print value
     end
     
     def print_list(b, e, file, line)
       print "[%d, %d] in %s\n", b, e, file
       if lines = Debugger.source_for(file)
-        n = 0
         b.upto(e) do |n|
           if n > 0 && lines[n-1]
             if n == line
@@ -216,12 +217,14 @@ module Debugger
     end
     
     def print_trace(context, file, line)
-      print "<trace file=\"%s\" line=\"%s\" threadId=\"%d\" />", file, line, context.thnum
+      Debugger::print_debug "trace: location=\"%s:%s\", threadId=%d", file, line, context.thnum
+      # TBD: do we want to clog fronend with the <trace> elements? There are tons of them.
+      # print "<trace file=\"%s\" line=\"%s\" threadId=\"%d\" />", file, line, context.thnum
     end
     
     def print_at_line(file, line)
-      print "<suspended file=\"%s\" line=\"%s\" threadId=\"%d\" frames=\"%d\"/>",
-      file, line, Debugger.current_context.thnum, Debugger.current_context.stack_size
+      print "<suspended file=\'%s\' line=\'%s\' threadId=\'%d\' frames=\'%d\'/>",
+        File.expand_path(file), line, Debugger.current_context.thnum, Debugger.current_context.stack_size
     end
     
     def print_exception(exception, binding)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-debug-ide
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Markus Barchfeld, Martin Krauskopf
@@ -9,7 +9,7 @@ autorequire: ruby-debug-base
 bindir: bin
 cert_chain: []
 
-date: 2008-10-31 00:00:00 +01:00
+date: 2008-11-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: debug-commons
-rubygems_version: 1.3.0.1904
+rubygems_version: 1.3.1.1918
 signing_key: 
 specification_version: 2
 summary: IDE interface for ruby-debug.