arcadia 0.7.0 → 0.8.0

data/ext/ae-rad/ae-rad-inspector.rb

@@ -1030,7 +1030,7 @@ class TkMenuButtonObjBoard < ObjBoard
       _space = _space + '  ' 
     end
     if _agobj.ag_parent != nil 
-      _result = _space + '¦'+_result 
+      _result = _space + '|'+_result 
     end
     return _result
   end

data/ext/ae-rad/ae-rad-libs.rb

@@ -218,12 +218,16 @@ class AGRenderer
         code = code, value.renderer.obj_code(_ind+1),"\n"
       end
     }
-    return code.to_s
+    if code.kind_of?(Array)
+      code.flatten.join
+    else  
+      code
+    end
   end
   
   def class_end(_ind=0)
     code = code, "\n", INDENT_UNIT*(_ind+1),"end\n",INDENT_UNIT*(_ind),"end"
-    return code.to_s
+    return code.flatten.join
   end
   
   def obj_code(_ind=0)
@@ -317,7 +321,7 @@ class AGRenderer
         return nil
       end
 
-      _prop['def_string'] != nil && !_prop['def_string'] ? is_string = false: is_string = true
+      _prop['def_string'] != nil && !_prop['def_string'] ? is_string = false : is_string = true
 
       if _val.kind_of?(String) && is_string
         _val = "'",_val,"'"
@@ -325,17 +329,21 @@ class AGRenderer
         _val = _val.to_s
       end
       #Tk.messageBox('message'=>_val)
-      return _val
+      if _val.kind_of?(Array)
+        _val.flatten.join
+      else
+        _val
+      end
 	end  
 
 	def render_value_default(_prop, _family)
       return nil if _prop == nil
       _val = _prop['value']
-      _prop['def_string'] != nil && !_prop['def_string'] ? is_string = false: is_string = true
+      _prop['def_string'] != nil && !_prop['def_string'] ? is_string = false : is_string = true
       if _val.kind_of?(String) && is_string
         _val = "'",_val,"'"
       elsif _val != nil
-        _val = _val.to_s
+        _val = _val.flatten.join
       end
       return _val
 	end  
@@ -1115,4 +1123,4 @@ end
 #	end
 #	def update(_tobj)
 #	end
-#end
+#end

data/ext/ae-rad/ae-rad.conf

@@ -13,9 +13,9 @@ user_toolbar.contexts=tkrad
 user_toolbar.tkrad = show
 user_toolbar.tkrad.show.name=show_rad
 user_toolbar.tkrad.show.hint=Show Rad Palette
-user_toolbar.tkrad.show.image_data=AGTKTOPLEVEL_GIF
-user_toolbar.tkrad.show.event_class=ActionEvent
-user_toolbar.tkrad.show.event_args={'receiver'=>self, 'action' =>'show_rad'}
+user_toolbar.tkrad.show.image_data=!AGTKTOPLEVEL_GIF
+user_toolbar.tkrad.show.event_class=!ActionEvent
+user_toolbar.tkrad.show.event_args=!{'receiver'=>self, 'action' =>'show_rad'}
 #:::::::::::::::: user toolbar :::::::::::::::::::::::::<end>
 
 #:::::::::::::::: Libraries group ::::::::::::::::::::::<begin>
@@ -71,4 +71,4 @@ libraries.tkArcadia.action=
 libraries.tkArcadia.require=tk
 
 
-#:::::::::::::::: Libraries group ::::::::::::::::::::::<end>
+#:::::::::::::::: Libraries group ::::::::::::::::::::::<end>

data/ext/ae-rad/lib/tk/al-tk.rb

@@ -2379,14 +2379,15 @@ class AGTkToplevel < AGTkContainer
   
   def form2code
     _title = @i_name+'.rb'
-    _text = @renderer.class_code.to_s
+    _text = @renderer.class_code.flatten.join
+    
     Arcadia.process_event(OpenBufferEvent.new(self,'title'=>_title, 'text'=>_text))
     meditor = $arcadia['editor']
     if meditor
       _editor = meditor.raised
       code2form = proc{
         Revparsel.new(_editor.text_value)
-        meditor.close_editor(_editor, false)
+        meditor.close_editor(_editor, true)
         InspectorContract.instance.raise_last_widget(meditor)
       }
       _editor.insert_popup_menu_item('end',
@@ -2992,4 +2993,4 @@ class ArcadiaLibTk < ArcadiaLib
     self.add_class(AGTkMenu)
     self.add_class(AGTkMenuButton)
   end
-end
+end

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

@@ -7,11 +7,14 @@ 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
 #========================================
 #========================================
 server.host=localhost
 server.port=8989
 server.timeout=10
+auto_resume_break_on_first_line=yes
 #font=courier 10
 #font.bold=courier 10 bold
 #color.background=#ffffff
@@ -20,5 +23,4 @@ server.timeout=10
 #freebsd::font.bold=courier 10 bold
 #win::font={Courier New} 8
 #win::font.bold={Courier New} 8 bold
-#========================================
-
+#========================================

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

@@ -3,6 +3,7 @@
 #   by Antonio Galeone <antonio-galeone@rubyforge.org>
 #
 
+require 'whichr'
 
 class RubyDebugView
   include TkUtil
@@ -474,8 +475,8 @@ class RubyDebugView
     begin
       if _command == 'quit'
         msg = "Really quit debug ? (y/n)"
-        ans = Tk.messageBox('icon' => 'question', 'type' => 'yesno',
-        'title' => '(Arcadia) Debug', 'message' => msg)
+        ans = 'yes'#Tk.messageBox('icon' => 'question', 'type' => 'yesno',
+#        'title' => '(Arcadia) Debug', 'message' => msg)
         if  ans == 'yes'
           debug_send(:quit_yes)
           clear
@@ -559,7 +560,7 @@ class RubyDebugView
   end
 
   def is_simple_class?(_var)
-    ['Numeric','Fixnum','String','FalseClass','TrueClass','NilClass'].include?(_var.value_class) && !_var.value.to_s.strip.include?("\n")
+    ['Numeric','Fixnum','String','FalseClass','TrueClass','NilClass','Float','BigDecimal','Bignum','Symbol'].include?(_var.value_class) && !_var.value.to_s.strip.include?("\n")
   end
   
   def show_expression(_exp, _hash)
@@ -664,7 +665,7 @@ class RubyDebugView
   end
   
   def node_name(_node, _parent)
-    return "#{_parent}@@@#{_node.gsub('$','__S__').gsub('&','__E__').gsub(':','__D__').gsub('!','__A__')}" 
+    return "#{_parent}@@@#{_node.to_s.gsub('$','__S__').gsub('&','__E__').gsub(':','__D__').gsub('!','__A__')}" 
   end
 
   def var_name(_node)
@@ -744,7 +745,7 @@ class RubyDebugView
         end
         #@controller.rdc.send(_command)
       rescue Exception => e
-        Arcadia.console(self, 'msg'=>"---> "+e.to_s, 'level'=>'debug')
+        Arcadia.console(self, 'msg'=>"---> "+e.to_s + ' ' + e.backtrace[0], 'level'=>'debug')
         #Arcadia.new_debug_msg(self,"---> "+e.to_s)
       end
     end
@@ -769,7 +770,14 @@ class RubyDebugServer
 
   def start_session_new(_filename, _host='localhost', _remote_port='8989')
     if is_windows?
-       commandLine = "rdebug.cmd --host #{_host} --port #{_remote_port} -sw #{_filename}"
+      if RubyWhich.new.which("rdebug.bat") != []
+        rdebug_cmd = "rdebug.bat" 
+      elsif RubyWhich.new.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}"
     end
@@ -786,7 +794,14 @@ class RubyDebugServer
   
   def start_session(_filename, _host='localhost', _remote_port='8989')
     if is_windows?
-      commandLine = "rdebug.cmd --port #{_remote_port} -sw #{_filename}"
+      if RubyWhich.new.which("rdebug.bat") != []
+        rdebug_cmd = "rdebug.bat" 
+      elsif RubyWhich.new.which("rdebug.cmd") != []
+        rdebug_cmd = "rdebug.cmd"
+      else
+        rdebug_cmd = "rdebug"
+      end
+      commandLine = "#{rdebug_cmd} --port #{_remote_port} -sw #{_filename}"
     else
       commandLine = "rdebug --host #{_host} --port #{_remote_port} -sw #{_filename}"
     end
@@ -875,7 +890,7 @@ end
 #    * undisp[lay][ nnn]
 #      delete one particular or all display expressions if no expression number given
 #    * del[ete][ nnn]
-#      delete some or all breakpoints (get the number using “break”)
+#      delete some or all breakpoints (get the number using break)
 #    * c[ont]
 #      run until program ends or hit breakpoint
 #    * r[un]
@@ -1032,7 +1047,7 @@ class RubyDebugClient
       end
       return @session
     rescue Exception => e
-      Arcadia.console(self, 'msg'=>"Error on start_session : #{e.class}:#{e.message}", 'level'=>'debug')
+      Arcadia.console(self, 'msg'=>"Error on start_session : #{e.class}:#{e.message} #{e.backtrace.join('..')}", 'level'=>'debug')
       #Arcadia.new_debug_msg(self,"Error on start_session : #{e.class}:#{e.message}")    
     end
   end
@@ -1369,7 +1384,7 @@ class RubyDebug < ArcadiaExt
   attr_reader :rds
   attr_reader :rdc
   def on_before_build(_event)
-    if !full_in_path_command('rdebug').nil?
+    if RubyWhich.new.which("rdebug") != []
       #ArcadiaContractListener.new(self, EditorContract, :do_editor_event)
       Arcadia.attach_listener(self, BufferEvent)
       @breakpoints = Hash.new
@@ -1397,7 +1412,14 @@ class RubyDebug < ArcadiaExt
       when StartDebugEvent
         _filename = _event.file
         _filename = @arcadia['pers']['run.file.last'] if _filename == "*LAST"
-        debug(_filename)
+        if File.exist?(_filename)
+          debug(_filename)
+        else
+          Arcadia.dialog(self,
+            'type'=>'ok',
+            'title'=>'File not exist',
+            'msg'=>"File #{_filename} not exist!")
+        end
       when StepDebugEvent
         if (_event.command == :quit_yes)
           @rds.quit_confirm_request = true
@@ -1541,10 +1563,13 @@ class RubyDebug < ArcadiaExt
           @static_breakpoints.each{|_b|
             #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'
+            @rdv.debug_send(:resume)
+          end
         end
       rescue Exception => e
-        Arcadia.console(self, 'msg'=>"---> "+e.to_s, 'level'=>'debug')
+        Arcadia.console(self, 'msg'=>"---> "+e.to_s+ ' ' + e.backtrace[0], 'level'=>'debug')
       end
     end
   end
@@ -1581,7 +1606,7 @@ class RubyDebug < ArcadiaExt
         begin
           debug_free
         rescue Exception => e
-          Arcadia.console(self, 'msg'=>"debug_quit:---> "+e.to_s, 'level'=>'debug')
+          Arcadia.console(self, 'msg'=>"debug_quit:---> "+e.to_s+ ' ' + e.backtrace[0], 'level'=>'debug')
           #Arcadia.new_debug_msg(self, "debug_quit:---> "+e.to_s)
           #@arcadia['shell'].outln("debug_quit:---> "+e.to_s )
         end
@@ -1591,4 +1616,4 @@ class RubyDebug < ArcadiaExt
 
 
 
-end
+end

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

@@ -11,15 +11,17 @@ class SearchInFilesService < ArcadiaExt
 
 end
 
-
 class SearchInFilesListener
   def initialize(_service)
     @service = _service
-    create_find
+    create_find 'Search in files'
   end
 
   def on_before_search_in_files(_event)
     if _event.what.nil?
+      if _event.dir
+        @find.e_dir.text(_event.dir)
+      end
       @find.show
     end
   end
@@ -31,21 +33,54 @@ class SearchInFilesListener
   #def on_after_search_in_files(_event)
   #end
   
-  def create_find
+  def create_find title
     @find = FindFrame.new(@service.arcadia.layout.root)
     @find.on_close=proc{@find.hide}
     @find.hide
-    @find.b_go.bind('1', proc{Thread.new{do_find}})
-    @find.e_what_entry.bind_append('KeyRelease'){|e|
+    @find.b_go.bind('1', proc{Thread.new{update_all_combo;do_find}}) # add trigger to button    
+    
+    enter_proc = proc {|e|
       case e.keysym
       when 'Return'
+        update_all_combo    
         do_find
         Tk.callback_break
       end
     }
-    @find.title("Search in files")
+    
+    for method in [:e_what_entry, :e_filter_entry, :e_dir_entry] do
+      @find.send(method).bind_append('KeyRelease') { |*args| enter_proc.call *args } # ltodo why can't we pass it in like &enter_proc?
+    end
+    @find.title(title)
   end
   private :create_find
+
+  def update_what_combo(_txt)
+    values = @find.e_what.cget('values')
+    if (values != nil && !values.include?(_txt))
+      @find.e_what.insert('end', _txt)
+    end
+  end
+
+  def update_filter_combo(_txt)
+    values = @find.e_filter.cget('values')
+    if (values != nil && !values.include?(_txt))
+      @find.e_filter.insert('end', _txt)
+    end
+  end
+
+  def update_dir_combo(_txt)
+    values = @find.e_dir.cget('values')
+    if (values != nil && !values.include?(_txt))
+      @find.e_dir.insert('end', _txt)
+    end
+  end
+  
+  def update_all_combo
+    update_what_combo(@find.e_what.text)
+    update_filter_combo(@find.e_filter.text)
+    update_dir_combo(@find.e_dir.text)
+  end
   
   def do_find
     return if @find.e_what.text.strip.length == 0  || @find.e_filter.text.strip.length == 0  || @find.e_dir.text.strip.length == 0
@@ -56,6 +91,9 @@ class SearchInFilesListener
       @service.frame.show
     end
     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]
@@ -80,7 +118,7 @@ class SearchInFilesListener
       Arcadia.console(self, 'msg'=>e.message, 'level'=>'error')
       #Arcadia.new_error_msg(self, e.message)
     ensure
-      @progress_bar.destroy
+      @progress_bar.destroy if @progress_bar
     end
 
   end
@@ -188,14 +226,27 @@ class SearchOutput
     @results[_node][_node_name]=[_file,_line]
     Tk.update
   end
+
+  def add_result(_node, _file, _line='', _line_text='')
+    @count = @count+1
+    @tree.itemconfigure(_node, 'fill'=>@found_color, 'text'=>@text_result+' { '+@count.to_s+' found }')
+    _text = _file+':'+_line+' : '+_line_text
+    _node_name = new_node_name
+    @tree.insert('end', _node ,_node+'@@@'+_node_name, {
+      'fill'=>@item_color,
+      'anchor'=>'w',
+      'font' => Arcadia.conf('treeitem.font'),
+      'text' =>  _text.strip
+    })
+    @results[_node][_node_name]=[_file,_line]
+    Tk.update
+  end
   
 end
 
 class FindFrame < TkFloatTitledFrame
-  attr_reader :e_what
-  attr_reader :e_what_entry
-  attr_reader :e_filter
-  attr_reader :e_dir
+  attr_reader :e_what, :e_filter, :e_dir
+  attr_reader :e_what_entry, :e_filter_entry, :e_dir_entry
   attr_reader :b_go
   def initialize(_parent)
     super(_parent)
@@ -215,6 +266,7 @@ class FindFrame < TkFloatTitledFrame
       place('relwidth' => 1, 'width'=>-16,'x' => 8,'y' => y0,'height' => 19)
     }
     @e_what_entry = TkWinfo.children(@e_what)[0]
+    # this means "after each key press 
     @e_what_entry.bind_append("1",proc{Arcadia.process_event(InputEnterEvent.new(self,'receiver'=>@e_what_entry))})
     
     y0 = y0 + d
@@ -230,12 +282,14 @@ class FindFrame < TkFloatTitledFrame
       autocomplete 'true'
       expand 'tab'
       takefocus 'true'
-      #pack('padx'=>10, 'fill'=>'x')
+            #pack('padx'=>10, 'fill'=>'x')
       place('relwidth' => 1, 'width'=>-16,'x' => 8,'y' => y0,'height' => 19)
     }
     @e_filter_entry = TkWinfo.children(@e_filter)[0]
     @e_filter_entry.bind_append("1",proc{Arcadia.process_event(InputEnterEvent.new(self,'receiver'=>@e_filter_entry))})
 
+    @e_filter.insert('end', '*.*')
+    @e_filter.insert('end', '*.rb')
     @e_filter.text('*.rb')
     y0 = y0 + d
 
@@ -256,7 +310,9 @@ class FindFrame < TkFloatTitledFrame
       #pack('fill'=>'x')
       #place('relwidth' => 1, 'width'=>-16,'x' => 8,'y' => y0,'height' => 19)
     }
-    @e_dir.text(Dir.pwd)
+    @e_dir.text(MonitorLastUsedDir.get_last_dir)
+    @e_dir_entry = TkWinfo.children(@e_dir)[0]
+
     @b_dir = TkButton.new(@e_dir, Arcadia.style('button') ){
       compound  'none'
       default  'disabled'
@@ -296,4 +352,4 @@ class FindFrame < TkFloatTitledFrame
     @e_what.focus
     @e_what_entry.selection_range(0,'end')
   end
-end
+end

data/ext/ae-search-in-files/ext/ack-in-files/ack-in-files.conf

@@ -0,0 +1,15 @@
+name=ack_in_files
+frames=1.1
+frames.labels=Ack in files
+frames.names=ack_in_files
+active=yes
+require=ext/ae-search-in-files/ext/ack-in-files/ack-in-files
+class=AckInFilesService
+font=courier 10
+font.bold=courier 10 bold
+color.background=#ffffff
+color.foreground=#000000
+freebsd::font=courier 12 italic
+freebsd::font.bold=courier 12 bold
+win::font={Courier New} 9
+win::font.bold={Courier New} 9 bold