arcadia 0.9.2 → 0.9.3

data/ext/ae-ruby-debug/ae-ruby-debug.conf

@@ -7,8 +7,10 @@ frames.names=ruby_debug_inspector,ruby_debug_server
 active=yes
 require=ext/ae-ruby-debug/ae-ruby-debug
 class=RubyDebug
-gems=ruby-debug,whichr
-1.9:@:gems=ruby-debug19,whichr
+#gems=ruby-debug,whichr
+#1.9:@:gems=ruby-debug19,whichr
+gems=ruby-debug
+1.9:@:gems=ruby-debug19
 #========================================
 #========================================
 server.host=localhost

data/ext/ae-ruby-debug/ae-ruby-debug.rb

@@ -3,7 +3,7 @@
 #   by Antonio Galeone <antonio-galeone@rubyforge.org>
 #
 
-require 'whichr'
+#require 'whichr'
 
 class RubyDebugView
   include TkUtil
@@ -125,17 +125,18 @@ class RubyDebugView
   end
 
   def build_process_panel(_frame)
-    @tree_process = Tk::BWidget::Tree.new(_frame, Arcadia.style('treepanel')){
+    @tree_process = BWidgetTreePatched.new(_frame, Arcadia.style('treepanel')){
       showlines false
       deltay 15
       place('relwidth' => 1,'relheight' => '1')
     }
     @tree_process.textbind("Double-ButtonPress-1", proc{
-      _selected = @tree_process.selection_get[0]
+      #_selected = @tree_process.selection_get[0]
+      _selected = @tree_process.selected
       if @tree_process.parent(_selected)=='client'
         _text = @tree_process.itemcget(_selected, 'text')
         pos = match_position_from_stack(_text)
-        if pos.length >0 
+        if pos && pos.length >0 
     	     Arcadia.process_event(OpenBufferEvent.new(self,'file'=>pos[0], 'row'=>pos[1]))
           #EditorContract.instance.open_file(self, 'file'=>pos[0], 'line'=>pos[1])
         end
@@ -181,7 +182,7 @@ class RubyDebugView
         inspect_node(_arg) if @nodes_to_open.include?(_arg)
     end
         
-    @tree_var = Tk::BWidget::Tree.new(_frame, Arcadia.style('treepanel')){
+    @tree_var = BWidgetTreePatched.new(_frame, Arcadia.style('treepanel')){
       showlines false
       deltay 15
       opencmd _open_proc
@@ -200,7 +201,8 @@ class RubyDebugView
 #    @tree_var.yscrollcommand proc{|first,last| _scrollbar.set(first,last)}
 
     @tree_var.textbind("Double-ButtonPress-1", proc{
-      _selected = @tree_var.selection_get[0]
+      #_selected = @tree_var.selection_get[0]
+      _selected = @tree_var.selected
       _msg = @tree_var.itemcget(_selected, 'text')
       Arcadia.dialog(self, 'type'=>'ok','title' => 'Value', 'msg' => _msg, 'level'=>'info')
     })
@@ -493,14 +495,16 @@ class RubyDebugView
       elsif _command == 'cont' && !_result.downcase.include?('breakpoint')
         @controller.rdc.kill
         clear
-      elsif _command != 'where' && _command != 'quit_yes'  
+      elsif _command != 'where' && _command != 'quit_yes'  && @controller.rdc.is_alive?
         begin
           update_position
-          update_variables('local_var', @controller.rdc.variables('local_variables')) if @local_state == B_STATE_ON
-          update_variables('instance_var', @controller.rdc.variables('instance_variables')) if @instance_state == B_STATE_ON
-          update_variables('class_var', @controller.rdc.variables('self.class.class_variables')) if @class_state == B_STATE_ON
-          #Arcadia.new_debug_msg(self,"on command #{_command}:global_variables")
-          update_variables('global_var', @controller.rdc.variables('global_variables')) if @global_state == B_STATE_ON
+          if @controller.rdc.is_alive?
+            update_variables('local_var', @controller.rdc.variables('local_variables')) if @local_state == B_STATE_ON
+            update_variables('instance_var', @controller.rdc.variables('instance_variables')) if @instance_state == B_STATE_ON
+            update_variables('class_var', @controller.rdc.variables('self.class.class_variables')) if @class_state == B_STATE_ON
+            #Arcadia.new_debug_msg(self,"on command #{_command}:global_variables")
+            update_variables('global_var', @controller.rdc.variables('global_variables')) if @global_state == B_STATE_ON
+          end
         ensure
           command_enabled(true) if !@controller.rdc.nil? && @controller.rdc.is_debugging_ready? && (!_command.include?('quit') || _command.include?('quit_no')) 
         end
@@ -514,7 +518,8 @@ class RubyDebugView
   def match_position_from_stack(_line)
     #Arcadia.new_error_msg(self, "match on #{_line}")
     ret = Array.new
-    matchline = _line.match(/#*([0-9]*)[\s\w\W]*\s(.*):([0-9]*)(.*)/)
+    #matchline = _line.match(/#*([0-9]*)[\s\w\W]*\s([\w\:]*[\.\/]*[\/A-Za-z_\-\.]*[\.\/\w\d]*):(\d*)/)
+    matchline = _line.match(/#*([0-9]*)[\s\w\W]*line\s(.*):([0-9]*)(.*)/)
     if !matchline.nil? && matchline.length==5
       #Arcadia.new_error_msg(self, "matchline[2]=#{matchline[2]}")
       #Arcadia.new_error_msg(self, "matchline[3]=#{matchline[3]}")
@@ -538,9 +543,8 @@ class RubyDebugView
       elsif !stack[0].nil?
         pos = match_position_from_stack(stack[0])
       end
-      if pos.length > 0
+      if pos && pos.length > 0
         _file = pos[0]
-        #p "_file=#{_file}"
         _file = File.expand_path(pos[0]) if !File.exist?(_file)
         Arcadia.broadcast_event(DebugStepInfoEvent.new(self,'file'=> _file, 'row'=>pos[1]))
         #DebugContract.instance.debug_step(self, 'file'=> _file, 'line'=>pos[1])
@@ -674,7 +678,11 @@ class RubyDebugView
   def var_name(_node)
     #_parent = @tree_var.parent(_node)
     #return _node.sub("#{_parent}_", '') 
-    return _node.split('@@@')[-1].gsub('__S__','$').gsub('__E__','&').gsub('__D__',':').gsub('__A__','!')
+    to_split= _node
+    if _node.instance_of?(Array) && _node.length > 0
+      to_split=_node[0].to_s
+    end
+    return to_split.split('@@@')[-1].gsub('__S__','$').gsub('__E__','&').gsub('__D__',':').gsub('__A__','!')
   end
   
   def command_enabled(_value)
@@ -772,17 +780,19 @@ class RubyDebugServer
   end
 
   def start_session_new(_filename, _host='localhost', _remote_port='8989')
-    if is_windows?
-      if RubyWhich.new.which("rdebug.bat") != []
+    if Arcadia.is_windows?
+      #if RubyWhich.new.which("rdebug.bat") != []
+      if Arcadia.which("rdebug.bat")
         rdebug_cmd = "rdebug.bat" 
-      elsif RubyWhich.new.which("rdebug.cmd") != []
+      #elsif RubyWhich.new.which("rdebug.cmd") != []
+      elsif Arcadia.which("rdebug.cmd")
         rdebug_cmd = "rdebug.cmd"
       else
         rdebug_cmd = "rdebug"
       end
       commandLine = "#{rdebug_cmd} --host #{_host} --port #{_remote_port} -sw #{_filename}"
     else
-       commandLine = "rdebug --host #{_host} --port #{_remote_port} -sw #{_filename}"
+      commandLine = "rdebug --host #{_host} --port #{_remote_port} -sw #{_filename}"
     end
     #Arcadia.process_event(SystemExecEvent.new(self, 'command'=>commandLine))
     Arcadia.process_event(RunCmdEvent.new(self, 'cmd'=>commandLine, 'file'=>_filename))
@@ -796,22 +806,25 @@ class RubyDebugServer
     @alive = _value
   end
   
-  def start_session(_filename, _host='localhost', _remote_port='8989')
-    if is_windows?
-      if RubyWhich.new.which("rdebug.bat") != []
+  def start_session(_debug_event, _host='localhost', _remote_port='8989')
+    _filename = _debug_event.file
+    if Arcadia.is_windows?
+      #if RubyWhich.new.which("rdebug.bat") != []
+      if Arcadia.which("rdebug.bat")
         rdebug_cmd = "rdebug.bat" 
-      elsif RubyWhich.new.which("rdebug.cmd") != []
+      #elsif RubyWhich.new.which("rdebug.cmd") != []
+      elsif Arcadia.which("rdebug.cmd")
         rdebug_cmd = "rdebug.cmd"
       else
         rdebug_cmd = "rdebug"
       end
-      commandLine = "#{rdebug_cmd} --port #{_remote_port} -sw #{_filename}"
+      commandLine = "#{rdebug_cmd} --host #{_host} --port #{_remote_port} -sw '#{_filename}'"
     else
       commandLine = "rdebug --host #{_host} --port #{_remote_port} -sw #{_filename}"
     end
     begin
       @alive = true
-      if is_windows?
+      if Arcadia.is_windows?
         @tid = Thread.new do
           if Kernel.system(commandLine)
               Kernel.system('y')
@@ -827,6 +840,10 @@ class RubyDebugServer
           end
           set_alive(false)
           notify(RDS_QUIET)
+          if _debug_event.persistent == false && _debug_event.file[-2..-1] == '~~'
+             File.delete(_debug_event.file) if File.exist?(_debug_event.file)
+          end
+
         end
       else
         @pid = Process.fork do
@@ -848,12 +865,18 @@ class RubyDebugServer
             #p "alive=#{is_alive?}"
             notify(RDS_QUIET)
             Kernel.system('y')
+
+            if _debug_event.persistent == false && _debug_event.file[-2..-1] == '~~'
+               File.delete(_debug_event.file) if File.exist?(_debug_event.file)
+            end
+
             Kernel.exit!
           else
             Kernel.exit!
             Arcadia.console(self, 'msg'=>"#{$?.inspect}", 'level'=>'debug')
             #Arcadia.new_debug_msg(self,"#{$?.inspect}")    
           end
+
           #p "@alive=#{@alive}"
           #notify(RDS_QUIET)
           #Process.wait
@@ -867,7 +890,7 @@ class RubyDebugServer
   
   def kill
     begin
-      if is_windows?
+      if Arcadia.is_windows?
         @tid.join(2)
         @tid.kill!
       else
@@ -880,10 +903,6 @@ class RubyDebugServer
     end
   end
   
-  def is_windows?
-    !(RUBY_PLATFORM =~ /(win|w)32$/).nil?
-  end
-
   def notify(_state)
      #p "----- notify ----- #{_state}"
      changed
@@ -1092,7 +1111,7 @@ class RubyDebugClient
       end
       #_command !="cont"
       true 
-    rescue Errno::ECONNABORTED => e
+    rescue Errno::ECONNABORTED,Errno::ECONNRESET, Errno::EPIPE => e
       notify("quit_yes")
       #DebugContract.instance.debug_end(self)
       Arcadia.console(self, 'msg'=>"Debugger has finished executing:\n #{e.class}:#{e.inspect}", 'level'=>'debug')
@@ -1110,7 +1129,8 @@ class RubyDebugClient
   private :command
 
   def read(_command=nil)
-    return nil if _command && !command(_command) 
+    return nil if _command && !command(_command)
+    #return nil if _command.nil? || (_command && !command(_command)) 
     result = ""
     if socket_session
       @session.flush
@@ -1334,10 +1354,18 @@ class RubyDebugClient
   end
 
   def debug_eval(_exp)
-    command("eval #{res=_exp}.to_s + '|||' + #{res}.class.to_s")
-    _str = eval(read)
-    _value, _class = _str.split('|||')
-    return Var.new(_value, _class)
+    if command("eval #{res=_exp}.to_s + '|||' + #{res}.class.to_s")
+      begin
+        _str = eval(read)
+        _value, _class = _str.split('|||')
+      rescue Exception => e
+        _value = "?"
+        _class = "?"
+      end
+      return Var.new(_value, _class)
+    else
+      return Var.new("?", "?")
+    end
   end
   
   # returns the local variables and there values
@@ -1381,13 +1409,14 @@ class RubyDebugClient
   def set_breakpoint(_file, _line)
     #_line = _line + 1
     text = read("break #{_file}:#{_line}")
+    return if text.nil?
     #p text
     breakpoint_no = -1
     #matches = text.match(/Set breakpoint ([0-9]*)?/)
     matches = text.downcase.match(/breakpoint ([0-9]*)?/)
     #Arcadia.new_error_msg(self, "text=#{text}")
     #Arcadia.new_error_msg(self, "matches[1]=#{matches[1]}")
-    breakpoint_no = matches[1].to_i if (matches.length == 2)
+    breakpoint_no = matches[1].to_i if matches && (matches.length == 2)
     return breakpoint_no
   end
 
@@ -1397,11 +1426,11 @@ class RubyDebugClient
 end
 
 class RubyDebug < ArcadiaExt
-  include Autils
   attr_reader :rds
   attr_reader :rdc
   def on_before_build(_event)
-    if RubyWhich.new.which("rdebug") != []
+    #if RubyWhich.new.which("rdebug") != []
+    if Arcadia.which("rdebug") || ((Arcadia.which("rdebug.bat") || Arcadia.which("rdebug.cmd"))&& Arcadia.is_windows?)
       @breakpoints = Hash.new
       @static_breakpoints = Array.new
       Arcadia.attach_listener(self, BufferEvent)
@@ -1426,10 +1455,11 @@ class RubyDebug < ArcadiaExt
   def on_debug(_event)
     case _event
       when StartDebugEvent
+        return if _event.file.nil?
         _filename = _event.file
         _filename = @arcadia['pers']['run.file.last'] if _filename == "*LAST"
-        if File.exist?(_filename)
-          debug(_filename)
+        if _filename && File.exist?(_filename)
+          do_debug(_event)
         else
           Arcadia.dialog(self,
             'type'=>'ok',
@@ -1447,8 +1477,13 @@ class RubyDebug < ArcadiaExt
         #p "on_debug --> @rdc.is_alive?=#{@rdc.is_alive?}"
         #p "on_debug --> @rds.is_alive?=#{@rds.is_alive?}"
       when SetBreakpointEvent
-        self.breakpoint_add(File.expand_path(_event.file), _event.row)
+        if _event.file
+          self.breakpoint_add(File.expand_path(_event.file), _event.row)
+        elsif _event.id
+          self.breakpoint_add(_event.id, _event.row)
+        end
       when UnsetBreakpointEvent
+        return if _event.file.nil?
         self.breakpoint_del(File.expand_path(_event.file), _event.row)
       when EvalExpressionEvent
         eval_expression(_event.expression)
@@ -1520,6 +1555,15 @@ class RubyDebug < ArcadiaExt
     @static_breakpoints << {:file=>_file,:line=>_line}
   end
   #private :breakpoint_add
+  def static_breakpoints_of_file(_filename)
+    ret = Array.new
+    @static_breakpoints.each{|b|
+      if b[:file]==_filename
+        ret << b
+      end
+    }
+    ret
+  end
 
   def breakpoint_del(_file,_line)
     breakpoint_del_live(_file,_line)
@@ -1562,13 +1606,14 @@ class RubyDebug < ArcadiaExt
     #DebugContract.instance.debug_begin(self)
   end
 
-  def debug(_filename=nil)
+  def do_debug(_event)
+    _filename = _event.file
     if _filename && !debugging?
       begin
         self.debug_begin
-        @arcadia['pers']['run.file.last']=_filename
+        @arcadia['pers']['run.file.last']=_filename if _event.persistent
         @rds = RubyDebugServer.new(self,@arcadia) if @rds.nil?
-        @rds.start_session(_filename, conf('server.host'), conf('server.port'))
+        @rds.start_session(_event, conf('server.host'), conf('server.port'))
         #Arcadia.new_msg(self,@rds.to_s)
         
         @rdc = RubyDebugClient.new(self, conf('server.host'), conf('server.port'), conf('server.timeout')) if @rdc.nil?
@@ -1577,10 +1622,13 @@ class RubyDebug < ArcadiaExt
         @rdv.start_process(_filename)
         if @rdc.start_session
           @static_breakpoints.each{|_b|
+            if !_event.persistent && _b[:file]==_event.id
+              _b[:file]=_filename
+            end
             #Arcadia.console(self,'msg'=>" breakpoint_add #{_b[:file]}:#{_b[:line]}")
             breakpoint_add_live(_b[:file], _b[:line])
           }
-          if @static_breakpoints.length > 0 && conf("auto_resume_break_on_first_line")!='no'
+          if static_breakpoints_of_file(_filename).length > 0 && conf("auto_resume_break_on_first_line")!='no'
             @rdv.debug_send(:resume)
           end
         end

data/ext/ae-search-in-files/ae-search-in-files.rb

@@ -37,7 +37,8 @@ class SearchInFilesListener
     @find = FindFrame.new(@service.arcadia.layout.root)
     @find.on_close=proc{@find.hide}
     @find.hide
-    @find.b_go.bind('1', proc{Thread.new{update_all_combo;do_find}}) # add trigger to button    
+    @find.b_go.bind('1', proc{update_all_combo;do_find}) # add trigger to button    
+    #@find.b_go.bind('1', proc{Thread.new{update_all_combo;do_find}}) # add trigger to button    
     
     enter_proc = proc {|e|
       case e.keysym
@@ -91,37 +92,37 @@ class SearchInFilesListener
       @search_output = SearchOutput.new(@service)
     end
     @service.frame.show_anyway
-    begin
-    
-      MonitorLastUsedDir.set_last @find.e_dir.text # save it away TODO make it into a message
-      
-      _search_title = 'search result for : "'+@find.e_what.text+'" in :"'+@find.e_dir.text+'"'+' ['+@find.e_filter.text+']'
-      _filter = @find.e_dir.text+'/**/'+@find.e_filter.text
-      _files = Dir[_filter]
-      _node = @search_output.new_result(_search_title, _files.length)
-      progress_stop=false
-      @progress_bar = TkProgressframe.new(@service.arcadia.layout.root, _files.length)		  
-      @progress_bar.title('Searching')
-      @progress_bar.on_cancel=proc{progress_stop=true}
-      #@progress_bar.on_cancel=proc{cancel}
-      pattern = Regexp.new(@find.e_what.text)
-      _files.each do |_filename|
-          File.open(_filename) do |file|
-            file.grep(pattern) do |line|
-              @search_output.add_result(_node, _filename, file.lineno.to_s, line)
-              break if progress_stop
+    Thread.new do
+      begin    
+        MonitorLastUsedDir.set_last @find.e_dir.text # save it away TODO make it into a message
+        
+        _search_title = 'search result for : "'+@find.e_what.text+'" in :"'+@find.e_dir.text+'"'+' ['+@find.e_filter.text+']'
+        _filter = @find.e_dir.text+'/**/'+@find.e_filter.text
+        _files = Dir[_filter]
+        _node = @search_output.new_result(_search_title, _files.length)
+        progress_stop=false
+        progress_bar = TkProgressframe.new(@service.arcadia.layout.root, _files.length)		  
+        progress_bar.title('Searching')
+        progress_bar.on_cancel=proc{progress_stop=true}
+        #@progress_bar.on_cancel=proc{cancel}
+        pattern = Regexp.new(@find.e_what.text)
+        _files.each do |_filename|
+            File.open(_filename) do |file|
+              file.grep(pattern) do |line|
+                @search_output.add_result(_node, _filename, file.lineno.to_s, line)
+                break if progress_stop
+              end
             end
-          end
-          @progress_bar.progress
-          break if progress_stop
+            progress_bar.progress
+            break if progress_stop
+        end
+      rescue Exception => e
+        Arcadia.console(self, 'msg'=>e.message, 'level'=>'error')
+        #Arcadia.new_error_msg(self, e.message)
+      ensure
+        progress_bar.destroy if progress_bar
       end
-    rescue Exception => e
-      Arcadia.console(self, 'msg'=>e.message, 'level'=>'error')
-      #Arcadia.new_error_msg(self, e.message)
-    ensure
-      @progress_bar.destroy if @progress_bar
     end
-
   end
   
   
@@ -132,22 +133,16 @@ class SearchOutput
     @sequence = 0
     @ext = _ext
     left_frame = TkFrame.new(@ext.frame.hinner_frame, Arcadia.style('panel')).place('x' => '0','y' => '0','relheight' => '1','width' => '25')
-    #right_frame = TkFrame.new(@ext.frame).place('x' => '25','y' => '0','relwidth' => '1', 'relheight' => '1', 'width' => '-25')
+    #right_frame = TkFrame.new(@ext.frame.hinner_frame, Arcadia.style('panel')).place('x' => '25','y' => '0','relwidth' => '1', 'relheight' => '1', 'width' => '-25')
     @results = {}
     _open_file = proc do |tree, sel|
       n_parent, n = sel.split('@@@')
       Arcadia.process_event(OpenBufferTransientEvent.new(self,'file'=>@results[n_parent][n][0], 'row'=>@results[n_parent][n][1]))  if n && @results[n_parent][n]
-      #EditorContract.instance.open_file(self, 'file'=>@results[n_parent][n][0], 'line'=>@results[n_parent][n][1]) if n && @results[n_parent][n]
     end
-    @tree = Tk::BWidget::Tree.new(@ext.frame.hinner_frame, Arcadia.style('treepanel')){
-      #background '#FFFFFF'
-      #relief 'flat'
-      #showlines true
-      #linesfill '#e7de8f'
+    @tree = BWidgetTreePatched.new(@ext.frame.hinner_frame, Arcadia.style('treepanel')){
       selectcommand(_open_file)
       deltay 15
     }
-    #.place('x' => '25','y' => '0','relwidth' => '1', 'relheight' => '1', 'width' => '-40', 'height'=>'-15')
     @tree.extend(TkScrollableWidget).show(25,0)
     
     _proc_clear = proc{clear_tree}