arcadia 0.9.3 → 0.10.0

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

@@ -96,7 +96,7 @@ class WrapperContainer < TkFrame
     frame = TkFrame.new(self, Arcadia.style('panel')).pack('side' =>'left', 'anchor'=>'n', :padx=>2, :pady=>2)
 
     @button_u = Tk::BWidget::Button.new(frame, Arcadia.style('toolbarbutton') ){
-      image  TkPhotoImage.new('dat' => CURSOR_GIF)
+      image  Arcadia.image_res(CURSOR_GIF)
       helptext 'Select'
       text 'C'
       #foreground 'blue'
@@ -119,7 +119,7 @@ class WrapperContainer < TkFrame
         _self.new_wrapper if _owner.selected_wrapper.class.is_top
 
       }
-      image  TkPhotoImage.new('dat' => WIDGET_COPY_GIF)
+      image  Arcadia.image_res(WIDGET_COPY_GIF)
       helptext 'Copy current selected'
       text 'C'
       #foreground 'blue'
@@ -231,7 +231,7 @@ class WrapperContainer < TkFrame
         }
         text value.class_wrapped.to_s
         helptext  value.class_wrapped.to_s
-        image TkPhotoImage.new( 'dat' => _image )
+        image Arcadia.image_res(_image)
         #foreground 'blue'
         command _command
         #font $arcadia['conf']['main.component.font']

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

@@ -30,12 +30,12 @@ user_toolbar.contexts=debug
 user_toolbar.debug.context_path=run
 user_toolbar.debug=debugcurr,debuglast,debugquit
 
-user_toolbar.debug.debugcurr.name=debug
+user_toolbar.debug.debugcurr.name=debugcurr
 user_toolbar.debug.debugcurr.hint=Debug current
 user_toolbar.debug.debugcurr.image_data=!DEBUG_CURRENT_GIF
 user_toolbar.debug.debugcurr.event_class=!StartDebugEvent
 
-user_toolbar.debug.debuglast.name=debug
+user_toolbar.debug.debuglast.name=debuglast
 user_toolbar.debug.debuglast.hint=Debug last
 user_toolbar.debug.debuglast.image_data=!DEBUG_LAST_GIF
 user_toolbar.debug.debuglast.event_class=!StartDebugEvent

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

@@ -35,7 +35,7 @@ class RubyDebugView
       'anchor' => 'nw',
       'command'=>proc{self.debug_send(:step_over)},
       'helptext'=>'step over',
-      'image'=> TkPhotoImage.new('dat' => D_NEXT_GIF),
+      'image'=> Arcadia.image_res(D_NEXT_GIF),
       'relief'=> _relief })
     )
     @debug_button_box.add(Arcadia.style('toolbarbutton').update({
@@ -44,7 +44,7 @@ class RubyDebugView
       'anchor' => 'nw',
       'command'=>proc{self.debug_send(:step_into)},
       'helptext'=>'step into',
-      'image'=> TkPhotoImage.new('dat' => D_STEP_INTO_GIF),
+      'image'=> Arcadia.image_res(D_STEP_INTO_GIF),
       'relief'=>_relief })
     )
     @debug_button_box.add(Arcadia.style('toolbarbutton').update({
@@ -53,7 +53,7 @@ class RubyDebugView
       'anchor' => 'nw',
       'helptext'=>'step out',
       'command'=>proc{self.debug_send(:step_out)},
-      'image'=> TkPhotoImage.new('dat' => D_STEP_OUT_GIF),
+      'image'=> Arcadia.image_res(D_STEP_OUT_GIF),
       'relief'=>_relief })
     )
     @debug_button_box.add(Arcadia.style('toolbarbutton').update({
@@ -61,7 +61,7 @@ class RubyDebugView
     #  'background' => 'white',
       'anchor' => 'nw',
       'helptext'=>'resume',
-      'image'=> TkPhotoImage.new('dat' => D_RESUME_GIF),
+      'image'=> Arcadia.image_res(D_RESUME_GIF),
       'command'=>proc{self.debug_send(:resume)},
       'relief'=>_relief })
     )
@@ -71,7 +71,7 @@ class RubyDebugView
     #  'background' => 'white',
       'anchor' => 'nw',
       'helptext'=>'quit',
-      'image'=> TkPhotoImage.new('dat' => D_QUIT_GIF),
+      'image'=> Arcadia.image_res(D_QUIT_GIF),
       'command'=>proc{self.debug_send(:quit)},
       'relief'=>_relief })
     )
@@ -92,6 +92,7 @@ class RubyDebugView
       state 'disabled'
       background Arcadia.conf('panel.background')
     }.place('height'=> _y)
+    TkWinfo.parent(@debug_button_box).configure(:background => Arcadia.conf('panel.background'))
     
 #    @debug_frame = TkFrame.new(@frame, Arcadia.style('panel')){ 
 #        border  2
@@ -213,9 +214,9 @@ class RubyDebugView
     @class_state = B_STATE_ON
     @global_state = B_STATE_OFF
     
-    _i_on = TkPhotoImage.new('dat' => ON_GIF)
-    _i_off = TkPhotoImage.new('dat' => OFF_GIF)
-    _i_freeze = TkPhotoImage.new('dat' => FREEZE_GIF)
+    _i_on = Arcadia.image_res(ON_GIF)
+    _i_off = Arcadia.image_res(OFF_GIF)
+    _i_freeze = Arcadia.image_res(FREEZE_GIF)
 
     _b_relief = 'groove'
     #------------------ loacal variables -------------------
@@ -606,7 +607,7 @@ class RubyDebugView
     if _hash['__CLASS__']=='Array'
      _sorted_keys = _hash.keys.collect!{|x| x.to_i}.sort.collect!{|x| x.to_s}
     else
-     _sorted_keys = _hash.keys.sort
+     _sorted_keys = _hash.keys.collect!{|x| x.to_s}.sort
     end
     _sorted_keys.each{|k|
     #_hash.keys.sort.each{|k|
@@ -775,25 +776,13 @@ class RubyDebugServer
       ObserverCallback.new(self,_caller,:rdebug_server_update)
     end
     @arcadia = _arcadia
+    @rdebug_file = _caller.rdebug_file
     @quit_confirm_request = false
     @alive = false
   end
 
   def start_session_new(_filename, _host='localhost', _remote_port='8989')
-    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 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}"
-    end
+    commandLine = "#{@rdebug_file} --host #{_host} --port #{_remote_port} -sw #{_filename}"
     #Arcadia.process_event(SystemExecEvent.new(self, 'command'=>commandLine))
     Arcadia.process_event(RunCmdEvent.new(self, 'cmd'=>commandLine, 'file'=>_filename))
   end
@@ -808,20 +797,8 @@ class RubyDebugServer
   
   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 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}"
-    end
+    commandLine = "#{Arcadia.ruby} #{@rdebug_file} --host #{_host} --port #{_remote_port} -sw '#{_filename}'"
+    #p commandLine
     begin
       @alive = true
       if Arcadia.is_windows?
@@ -840,7 +817,7 @@ class RubyDebugServer
           end
           set_alive(false)
           notify(RDS_QUIET)
-          if _debug_event.persistent == false && _debug_event.file[-2..-1] == '~~'
+          if _debug_event.persistent == false && File.basename(_debug_event.file)[0..1] == '~~'
              File.delete(_debug_event.file) if File.exist?(_debug_event.file)
           end
 
@@ -860,13 +837,16 @@ class RubyDebugServer
 #            num.to_i > 1
 #          }
 #          Arcadia.process_event(SubProcessEvent.new(self,'pid'=>pid, 'name'=>"debugging :#{_filename}",'abort_action'=>abort_action, 'alive_check'=>alive_check))
+          if File.basename(Arcadia.ruby) != 'ruby'
+            commandLine="export PATH=#{Arcadia.instance.local_dir}/bin:$PATH && #{commandLine}"
+          end
           if Kernel.system(commandLine)
             set_alive(false)
             #p "alive=#{is_alive?}"
             notify(RDS_QUIET)
             Kernel.system('y')
 
-            if _debug_event.persistent == false && _debug_event.file[-2..-1] == '~~'
+            if _debug_event.persistent == false && File.basename(_debug_event.file)[0..1] == '~~'
                File.delete(_debug_event.file) if File.exist?(_debug_event.file)
             end
 
@@ -1428,11 +1408,25 @@ end
 class RubyDebug < ArcadiaExt
   attr_reader :rds
   attr_reader :rdc
+  attr_reader :rdebug_file
   def on_before_build(_event)
     #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
+    @breakpoints = Hash.new
+    @static_breakpoints = Array.new
+    if Arcadia.is_windows?
+      @rdebug_file = Arcadia.which("rdebug.bat")
+      if !@rdebug_file
+        @rdebug_file = Arcadia.which("rdebug.cmd")
+      end
+      if !@rdebug_file
+        @rdebug_file = Arcadia.which("rdebug")
+      end      
+    else
+      @rdebug_file = Arcadia.which("rdebug")    
+    end
+    
+    
+    if @rdebug_file
       Arcadia.attach_listener(self, BufferEvent)
     else
       Arcadia.console(self, 'msg'=>"Warning: Extension ae-ruby-debug depend upon rdebug command (install it or update system path!)", 'level'=>'error')
@@ -1449,6 +1443,8 @@ class RubyDebug < ArcadiaExt
     case _event
       when BufferRaisedEvent
         @raised_file=_event.file
+        debugcurr = Arcadia.toolbar_item('debugcurr')
+        debugcurr.enable=_event.lang=='ruby' if debugcurr
     end
   end
 

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

@@ -12,5 +12,5 @@ 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
+win|mingw::font={Courier New} 9
+win|mingw::font.bold={Courier New} 9 bold

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

@@ -107,20 +107,29 @@ class SearchInFilesListener
         #@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
+            next if File.ftype(_filename) != 'file'
+            begin
+              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
+            rescue ArgumentError => e
+              # bynary file probably
+            rescue Exception => e
+              Arcadia.console(self, 'msg'=>"#{_filename} :#{e.class}: #{e.message}", 'level'=>'error')
+            ensure
+              progress_bar.progress
+              break if progress_stop
             end
-            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
+        @service.frame.show_anyway
       end
     end
   end
@@ -148,7 +157,7 @@ class SearchOutput
     _proc_clear = proc{clear_tree}
     
     @button_u = Tk::BWidget::Button.new(left_frame, Arcadia.style('toolbarbutton')){
-      image  TkPhotoImage.new('dat' => CLEAR_GIF)
+      image  Arcadia.image_res(CLEAR_GIF)
       helptext 'Clear'
       foreground 'blue'
       command _proc_clear
@@ -249,7 +258,8 @@ class FindFrame < TkFloatTitledFrame
     }
     @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))})
+    #@e_what_entry.bind_append("1",proc{Arcadia.process_event(InputEnterEvent.new(self,'receiver'=>@e_what_entry))})
+    @e_what_entry.extend(TkInputThrow)
     
     y0 = y0 + d
     TkLabel.new(self.frame, Arcadia.style('label')){
@@ -268,7 +278,8 @@ class FindFrame < TkFloatTitledFrame
       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_entry.bind_append("1",proc{Arcadia.process_event(InputEnterEvent.new(self,'receiver'=>@e_filter_entry))})
+    @e_filter_entry.extend(TkInputThrow)
 
     @e_filter.insert('end', '*.*')
     @e_filter.insert('end', '*.rb')

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

@@ -11,5 +11,5 @@ 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
+win|mingw::font={Courier New} 9
+win|mingw::font.bold={Courier New} 9 bold

data/ext/ae-shell/ae-shell.conf

@@ -4,7 +4,7 @@ require=ext/ae-shell/ae-shell
 class=Shell
 stdout_blocking=no
 stderr_blocking=yes
-win32::gems=win32-process,ruby-wmi
+win|mingw::gems=win32-process,ruby-wmi
 
 #:::::::::::::::: output  ::::::::::::::::::::::<begin>
 #ruby=ruby

data/ext/ae-shell/ae-shell.rb

@@ -24,7 +24,7 @@ class Shell < ArcadiaExt
   def on_system_exec(_event)
     begin
       _cmd_ = "#{_event.command}"
-      if is_windows?
+      if Arcadia.is_windows?
         io = IO.popen(_cmd_)
         Arcadia.console(self,'msg'=>io.read, 'level'=>'debug')
       else
@@ -134,12 +134,13 @@ class Shell < ArcadiaExt
   @@next_number = 0
   def on_run_cmd(_event)
     if _event.cmd
+      #p "_event.cmd = #{_event.cmd}"
       begin
-        output_mark = Arcadia.console(self,'msg'=>"Running #{_event.title}...", 'level'=>'debug') # info?
+        output_mark = Arcadia.console(self,'msg'=>"Running #{_event.title} as #{_event.lang}...", 'level'=>'debug') # info?
         start_time = Time.now
         @arcadia['pers']['run.file.last']=_event.file if _event.persistent
         @arcadia['pers']['run.cmd.last']=_event.cmd if _event.persistent
-        if is_windows?
+        if Arcadia.is_windows?
           # use win32-process gem to startup a child process [not sure if linux needs something like this, too]
           require 'win32/process'
           require 'ruby-wmi'
@@ -222,13 +223,20 @@ class Shell < ArcadiaExt
                 
                 if stderr
                   if @stderr_blocking
+                    current_buffer = '<<current buffer>>'
                     output_dump = stderr.read
                     if output_dump && output_dump.length > 0 
+                      if !_event.persistent
+                        output_dump.gsub!(_event.file, current_buffer)
+                      end
                       output_mark = Arcadia.console(self,'msg'=>output_dump, 'level'=>'error', 'mark'=>output_mark)
                       _event.add_result(self, 'output'=>output_dump)
                     end
                   else
                     stderr.each do |output_dump|
+                      if !_event.persistent
+                        output_dump.gsub!(_event.file, current_buffer)
+                      end
                       output_mark = Arcadia.console(self,'msg'=>output_dump, 'level'=>'error', 'mark'=>output_mark)
                       _event.add_result(self, 'output'=>output_dump)
                     end
@@ -254,8 +262,15 @@ class Shell < ArcadiaExt
 #                _event.add_result(self, 'output'=>_readed)
 #              }
               #p "da cancellare #{ _event.file } #{_event.file[-2..-1] == '~~'} #{_event.persistent == false}  #{File.exist?(_event.file)}"
-              if _event.persistent == false && _event.file[-2..-1] == '~~'
-                File.delete(_event.file) if File.exist?(_event.file)
+              if _event.persistent == false && File.exist?(_event.file) 
+                if File.basename(_event.file)[0..1] == '~~'
+                  File.delete(_event.file)
+                elsif File.basename(File.dirname(_event.file))[0..1] == '~~'
+                  Dir["#{File.dirname(_event.file)}/*"].each{|file|
+                    File.delete(file)
+                  }
+                  Dir.delete(File.dirname(_event.file))
+                end
               end
             rescue Exception => e
               output_mark = Arcadia.console(self,'msg'=>e.to_s, 'level'=>'debug', 'mark'=>output_mark)
@@ -286,7 +301,7 @@ class Shell < ArcadiaExt
   def on_system_exec_bo(_event)
     command = "#{_event.command} 2>&1"
     (RUBY_PLATFORM.include?('mswin32'))?_cmd="cmd":_cmd='sh'
-    if is_windows?
+    if Arcadia.is_windows?
       Thread.new{
         Arcadia.console(self,'msg'=>'begin', 'level'=>'debug')
         #Arcadia.new_debug_msg(self, 'inizio')
@@ -310,45 +325,41 @@ class Shell < ArcadiaExt
     end
   end
 
-  def is_windows?
-    RUBY_PLATFORM =~ /mingw|mswin/
-  end
-
-  def run_last
-    run($arcadia['pers']['run.file.last'])
-  end
-
-  def run_current
-    current_editor = $arcadia['editor'].raised
-    run(current_editor.file) if current_editor
-  end
-
-  def stop
-    @run_threads.each{|t|
-      if t.alive?
-        t.kill
-      end
-    }
-    debug_quit if @adw
-  end
-
-  def run(_filename=nil)
-    if _filename
-      begin
-        @arcadia['pers']['run.file.last']=_filename
-        @run_threads << Thread.new do
-          _cmd_ = "|"+$arcadia['conf']['shell.ruby']+" "+_filename+" 2>&1"
-          #  Arcadia.new_debug_msg(self, _cmd_)
-          @cmd = open(_cmd_,"r"){|f|
-            Arcadia.console(self, 'msg'=>f.read ,'level'=>'debug')
-            #Arcadia.new_debug_msg(self, f.read)
-          }
-        end
-      rescue Exception => e
-        Arcadia.console(self, 'msg'=>e ,'level'=>'debug')
-        #Arcadia.new_debug_msg(self, e)
-      end
-    end
-  end
+#  def run_last
+#    run($arcadia['pers']['run.file.last'])
+#  end
+#
+#  def run_current
+#    current_editor = $arcadia['editor'].raised
+#    run(current_editor.file) if current_editor
+#  end
+#
+#  def stop
+#    @run_threads.each{|t|
+#      if t.alive?
+#        t.kill
+#      end
+#    }
+#    debug_quit if @adw
+#  end
+#
+#  def run(_filename=nil)
+#    if _filename
+#      begin
+#        @arcadia['pers']['run.file.last']=_filename
+#        @run_threads << Thread.new do
+#          _cmd_ = "|"+$arcadia['conf']['shell.ruby']+" "+_filename+" 2>&1"
+#          #  Arcadia.new_debug_msg(self, _cmd_)
+#          @cmd = open(_cmd_,"r"){|f|
+#            Arcadia.console(self, 'msg'=>f.read ,'level'=>'debug')
+#            #Arcadia.new_debug_msg(self, f.read)
+#          }
+#        end
+#      rescue Exception => e
+#        Arcadia.console(self, 'msg'=>e ,'level'=>'debug')
+#        #Arcadia.new_debug_msg(self, e)
+#      end
+#    end
+#  end
 
 end