arcadia 0.8.1 → 0.9.0

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

@@ -89,9 +89,8 @@ class SearchInFilesListener
     @find.hide
     if !defined?(@search_output)
       @search_output = SearchOutput.new(@service)
-    else
-      @service.frame.show
     end
+    @service.frame.show_anyway
     begin
     
       MonitorLastUsedDir.set_last @find.e_dir.text # save it away TODO make it into a message
@@ -149,21 +148,7 @@ class SearchOutput
       selectcommand _open_file 
       deltay 15
     }.place('x' => '25','y' => '0','relwidth' => '1', 'relheight' => '1', 'width' => '-40', 'height'=>'-15')
-    #---- y scrollbar
-    _yscrollcommand = proc{|*args| @tree.yview(*args)}
-    _yscrollbar = TkScrollbar.new(@ext.frame.hinner_frame, Arcadia.style('scrollbar')){|s|
-      #width 8
-      command _yscrollcommand
-    }.pack('side'=>'right', 'fill'=>'y')
-    @tree.yscrollcommand proc{|first,last| _yscrollbar.set(first,last)}
-    #---- x scrollbar
-    _xscrollcommand = proc{|*args| @tree.xview(*args)}
-    _xscrollbar = TkScrollbar.new(@ext.frame.hinner_frame, Arcadia.style('scrollbar')){|s|
-      #width 8
-      orient 'horizontal'
-      command _xscrollcommand
-    }.pack('side'=>'bottom', 'fill'=>'x')
-    @tree.xscrollcommand proc{|first,last| _xscrollbar.set(first,last)}
+    @tree.extend(TkScrollableWidget).show
     
     _proc_clear = proc{clear_tree}
     

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

@@ -2,13 +2,14 @@ name=shell
 active=yes
 require=ext/ae-shell/ae-shell
 class=Shell
-
+stdout_blocking=no
+stderr_blocking=yes
 win32::gems=win32-process,ruby-wmi
 
 #:::::::::::::::: output  ::::::::::::::::::::::<begin>
-ruby=ruby
-freebsd::ruby=ruby
-win32::ruby=ruby
-win32::rubyw=rubyw
-rubyw=rubyw
+#ruby=ruby
+#freebsd::ruby=ruby
+#win32::ruby=ruby
+#win32::rubyw=rubyw
+#rubyw=rubyw
 #:::::::::::::::: output  ::::::::::::::::::::::<end>

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

@@ -6,26 +6,23 @@
 require "tk"
 #require "base/a-utils"
 
+
 class Shell < ArcadiaExt
 
   def on_before_build(_event)
     Arcadia.attach_listener(self, SystemExecEvent)
-    Arcadia.attach_listener(self, RunRubyFileEvent)
+    #Arcadia.attach_listener(self, RunRubyFileEvent)
+    Arcadia.attach_listener(self, RunCmdEvent)
   end
 
   def on_build(_event)
     @run_threads = Array.new
+    @stdout_blocking = self.conf('stdout_blocking') == 'yes' 
+    @stderr_blocking = self.conf('stderr_blocking') == 'yes' 
   end
 
   def on_system_exec(_event)
     begin
-      #    _cmd_ = "|ruby #{File.dirname(__FILE__)}/sh.rb #{_event.command} 2>&1"
-      #    p _cmd_
-      #    Thread.new do
-      #      open(_cmd_,"r"){|f|
-      #          Arcadia.new_debug_msg(self, f.read)
-      #      }
-      #    end
       _cmd_ = "#{_event.command}"
       if is_windows?
         io = IO.popen(_cmd_)
@@ -34,47 +31,141 @@ class Shell < ArcadiaExt
         Process.fork{
           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
 
+#  @@next_number = 0
+#  def on_run_ruby_file(_event)
+#    _filename = _event.file
+#    _filename = @arcadia['pers']['run.file.last'] if _filename == "*LAST"
+#    if _filename && File.exists?(_filename)
+#      begin
+#        Arcadia.console(self,'msg'=>"Running #{_filename}...", 'level'=>'debug') # info?
+#        start_time = Time.now
+#        @arcadia['pers']['run.file.last']=_filename if _event.persistent
+#        executable = @arcadia['conf']['shell.ruby']
+#        executable = @arcadia['conf']['shell.rubyw'] if is_windows?
+#        _cmd_ = "#{executable} -C'#{File.dirname(_filename)}' '#{_filename}'"
+#        
+#        if 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'
+#          output_file_name = "out_#{@@next_number += 1}_#{Process.pid}.txt"
+#          output = File.open(output_file_name, 'wb')
+#          child = Process.create :command_line => _cmd_,  :startup_info => {:stdout => output, :stderr => output}
+#          #----
+#          abort_action = proc{
+#            Process.kill(9,child.process_id)
+#          }
+#          alive_check = proc{
+#            WMI::Win32_Process.find(:first, :conditions => {:ProcessId => child.process_id})
+#          }
+#          Arcadia.process_event(SubProcessEvent.new(self,'name'=>_filename,'abort_action'=>abort_action, 'alive_check'=>alive_check))
+#          #----
+#          timer=nil
+#          procy = proc {
+#            still_alive = WMI::Win32_Process.find(:first, :conditions => {:ProcessId => child.process_id})
+#            if !still_alive #&& File.exists?(output_file_name)
+#              output.close
+#              timer.stop
+#              File.open(output_file_name, 'r') do |f|
+#                _readed = f.read
+#                _readed.strip!
+#                _readed += "\n" + "Done with #{_filename} in #{Time.now - start_time}s"
+#                Arcadia.console(self,'msg'=>_readed, 'level'=>'debug')
+#                _event.add_result(self, 'output'=>_readed)
+#              end
+#              File.delete output_file_name
+#            end
+#          }
+#
+#          timer=TkAfter.new(1000,-1,procy) # -1 = repeating every 1000ms...
+#          timer.start
+#        else
+#          _cmd_ = "|#{_cmd_} 2>&1"
+#          Thread.new {
+#            begin
+#              th = Thread.current
+#              fi = nil
+#              fi_pid = nil
+#              abort_action = proc{
+#                unix_child_pids(fi_pid).each {|pid|
+#                  Process.kill(9,pid.to_i)
+#                }
+#                #Kernel.system("kill -9 #{unix_child_pids(fi_pid).join(' ')} #{fi_pid}") if fi
+#              }
+#                
+#              alive_check = proc{
+#                num = `ps -p #{fi_pid}|wc -l`
+#                num.to_i > 1
+#              }
+#              
+#              #Arcadia.console(self,'msg'=>"#{th}", 'level'=>'debug', 'abort_action'=>abort_action)
+#              open(_cmd_, "r"){|f|
+#                fi = f
+#                fi_pid = fi.pid
+#    	           Arcadia.process_event(SubProcessEvent.new(self,'name'=>_filename,'abort_action'=>abort_action, 'alive_check'=>alive_check))
+#                _readed = f.read
+#                output_dump="End running #{_filename}:\n#{_readed}"
+#                Arcadia.console(self,'msg'=>output_dump, 'level'=>'debug')
+#                _event.add_result(self, 'output'=>_readed)
+#              }
+#              if _event.persistent == false && _filename[-2..-1] == '~~'
+#                File.delete(_filename) if File.exist?(_filename)
+#              end
+#            rescue Exception => e
+#              Arcadia.console(self,'msg'=>e.to_s, 'level'=>'debug')
+#            end
+#          }
+#        end
+#      rescue Exception => e
+#        Arcadia.console(self,'msg'=>e.to_s, 'level'=>'debug')
+#      end
+#    end
+#  end
+
+
   @@next_number = 0
-  def on_run_ruby_file(_event)
-    _filename = _event.file
-    _filename = @arcadia['pers']['run.file.last'] if _filename == "*LAST"
-    if _filename && File.exists?(_filename)
+  def on_run_cmd(_event)
+    if _event.cmd
       begin
-        Arcadia.console(self,'msg'=>"Running #{_filename}...", 'level'=>'debug') # info?
+        output_mark = Arcadia.console(self,'msg'=>"Running #{_event.title}...", 'level'=>'debug') # info?
         start_time = Time.now
-        @arcadia['pers']['run.file.last']=_filename if _event.persistent
-        executable = @arcadia['conf']['shell.ruby']
-        executable = @arcadia['conf']['shell.rubyw'] if is_windows?
-        _cmd_ = "#{executable} -C'#{File.dirname(_filename)}' '#{_filename}'"
-        
+        @arcadia['pers']['run.file.last']=_event.file if _event.persistent
+        @arcadia['pers']['run.cmd.last']=_event.cmd if _event.persistent
         if 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'
           output_file_name = "out_#{@@next_number += 1}_#{Process.pid}.txt"
           output = File.open(output_file_name, 'wb')
-          child = Process.create :command_line => _cmd_,  :startup_info => {:stdout => output, :stderr => output}
+          child = Process.create :command_line => _event.cmd,  :startup_info => {:stdout => output, :stderr => output}
+          #----
+          abort_action = proc{
+            Process.kill(9,child.process_id)
+          }
+          alive_check = proc{
+            WMI::Win32_Process.find(:first, :conditions => {:ProcessId => child.process_id})
+          }
+          Arcadia.process_event(SubProcessEvent.new(self,'pid'=>child.process_id, 'name'=>_event.file,'abort_action'=>abort_action, 'alive_check'=>alive_check))
+          #----
           timer=nil
           procy = proc {
             still_alive = WMI::Win32_Process.find(:first, :conditions => {:ProcessId => child.process_id})
-            if(!still_alive)
+            if !still_alive #&& File.exists?(output_file_name)
               output.close
               timer.stop
               File.open(output_file_name, 'r') do |f|
                 _readed = f.read
                 _readed.strip!
-                _readed += "\n" + "Done with #{_filename} in #{Time.now - start_time}s"
-                Arcadia.console(self,'msg'=>_readed, 'level'=>'debug')
+                _readed += "\n" + "Done with #{_event.title} in #{Time.now - start_time}s"
+                output_mark = Arcadia.console(self,'msg'=>_readed, 'level'=>'debug', 'mark'=>output_mark)
                 _event.add_result(self, 'output'=>_readed)
               end
               File.delete output_file_name
@@ -84,25 +175,113 @@ class Shell < ArcadiaExt
           timer=TkAfter.new(1000,-1,procy) # -1 = repeating every 1000ms...
           timer.start
         else
-          _cmd_ = "|#{_cmd_} 2>&1"
+          require "open3"
+          #_cmd_ = "|#{_event.cmd} 2>&1"
+          _cmd_ = _event.cmd
           Thread.new {
+            Thread.current.abort_on_exception = true
             begin
-              open(_cmd_, "r"){|f|
-                _readed = f.read
-                Arcadia.console(self,'msg'=>_readed, 'level'=>'debug')
-                _event.add_result(self, 'output'=>_readed)
+#              th = Thread.current
+              fi = nil
+              fi_pid = nil
+              abort_action = proc{
+                ArcadiaUtils.unix_child_pids(fi_pid).each {|pid|
+                  Process.kill(9,pid.to_i)
+                }
+                Process.kill(9,fi_pid.to_i)
+                #Kernel.system("kill -9 #{unix_child_pids(fi_pid).join(' ')} #{fi_pid}") if fi
               }
+                
+              alive_check = proc{
+                num = `ps -p #{fi_pid}|wc -l`
+                num.to_i > 1
+              }
+              
+
+              #Arcadia.console(self,'msg'=>"#{th}", 'level'=>'debug', 'abort_action'=>abort_action)
+
+              Open3.popen3(_cmd_){|stdin, stdout, stderr, th|
+                fi_pid = th.pid
+                output_mark = Arcadia.console(self,'msg'=>" [pid #{fi_pid}]", 'level'=>'debug', 'mark'=>output_mark, 'append'=>true)
+    	           Arcadia.process_event(SubProcessEvent.new(self, 'pid'=>fi_pid, 'name'=>_event.file,'abort_action'=>abort_action, 'alive_check'=>alive_check))
+                
+                if stdout  
+                  if @stdout_blocking
+                    output_dump = stdout.read
+                    if output_dump && output_dump.length > 0 
+                      output_mark = Arcadia.console(self,'msg'=>output_dump, 'level'=>'error', 'mark'=>output_mark)
+                      _event.add_result(self, 'output'=>output_dump)
+                    end
+                  else
+                    stdout.each do |output_dump|
+                      output_mark = Arcadia.console(self,'msg'=>output_dump, 'level'=>'debug', 'mark'=>output_mark)
+                      _event.add_result(self, 'output'=>output_dump)
+                    end
+                  end
+                end
+                
+                if stderr
+                  if @stderr_blocking
+                    output_dump = stderr.read
+                    if output_dump && output_dump.length > 0 
+                      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|
+                      output_mark = Arcadia.console(self,'msg'=>output_dump, 'level'=>'error', 'mark'=>output_mark)
+                      _event.add_result(self, 'output'=>output_dump)
+                    end
+                  end
+                end
+              }
+              output_mark = Arcadia.console(self,'msg'=>"\nEnd running #{_event.title}:", 'level'=>'debug', 'mark'=>output_mark)
+
+
+#              open(_cmd_, "r"){|f|
+#                fi = f
+#                fi_pid = fi.pid
+#    	           Arcadia.process_event(SubProcessEvent.new(self,'name'=>_event.file,'abort_action'=>abort_action, 'alive_check'=>alive_check))
+#                _readed = f.read
+#                
+#                #f.each{|line|
+#                #  output_mark = Arcadia.console(self,'msg'=>line, 'level'=>'debug', 'mark'=>output_mark)
+#                #}
+#                #output_mark = Arcadia.console(self,'msg'=>"\nEnd running #{_event.file}:", 'level'=>'debug', 'mark'=>output_mark)
+#                
+#                output_dump="#{_readed}\nEnd running #{_event.file}:"
+#                output_mark = Arcadia.console(self,'msg'=>output_dump, 'level'=>'debug', 'mark'=>output_mark)
+#                _event.add_result(self, 'output'=>_readed)
+#              }
+              if _event.persistent == false && _event.file[-2..-1] == '~~'
+                File.delete(_event.file) if File.exist?(_event.file)
+              end
             rescue Exception => e
-              Arcadia.console(self,'msg'=>e.to_s, 'level'=>'debug')
+              output_mark = Arcadia.console(self,'msg'=>e.to_s, 'level'=>'debug', 'mark'=>output_mark)
             end
           }
         end
       rescue Exception => e
-        Arcadia.console(self,'msg'=>e.to_s, 'level'=>'debug')
+        output_mark = Arcadia.console(self,'msg'=>e.to_s, 'level'=>'debug', 'mark'=>output_mark)
       end
     end
   end
-
+  
+#  def unix_child_pids(_ppid)
+#    ret = Array.new
+#    readed = ''
+#    open("|ps -o pid,ppid ax | grep #{_ppid}", "r"){|f|  readed = f.read  }
+#    apids = readed.split
+#    apids.each_with_index do |v,i|
+#      ret << v if i % 2 == 0 && v != _ppid.to_s
+#    end
+#    subpids = Array.new
+#    ret.each{|ccp|
+#      subpids.concat(unix_child_pids(ccp))
+#    }
+#    ret.concat(subpids)
+#  end
+  
   def on_system_exec_bo(_event)
     command = "#{_event.command} 2>&1"
     (RUBY_PLATFORM.include?('mswin32'))?_cmd="cmd":_cmd='sh'

data/ext/ae-subprocess-inspector/ae-subprocess-inspector.conf

@@ -0,0 +1,11 @@
+#========================================
+#========================================
+name=subprocess-inspector
+frames=0.0
+frames.labels=Ps
+frames.names=subprocess_inspector
+active=yes
+require=ext/ae-subprocess-inspector/ae-subprocess-inspector
+class=SubProcessInspector
+#========================================
+#========================================

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

@@ -0,0 +1,109 @@
+class SubProcessInspector < ArcadiaExt
+	attr_reader :processs
+	def on_before_build(_event)
+    @processs = [] 
+    Arcadia.attach_listener(self, SubProcessEvent)
+  end
+  
+  def on_sub_process(_event)
+    self.frame.show_anyway
+    @processs << SubProcessWidget.new(self, _event)
+  end
+  
+  def on_exit_query(_event)
+    _event.can_exit=true
+    @processs.each{|pr|
+      if !pr.nil? 
+        message = "Some sub process are running! Exit anyware?"
+        r=Arcadia.dialog(self,
+            'type'=>'yes_no', 
+            'level'=>'warning',
+            'title'=> 'Confirm exit', 
+            'msg'=>message)
+        if r=="no"
+          _event.can_exit=false
+          _event.break
+        end
+        break   
+      end
+    }
+  end
+  
+  def on_finalize(_event)
+    @processs.each{|pr|
+      pr.event.abort_action.call if !pr.nil?
+    }
+  end
+      
+end
+
+class SubProcessWidget < TkFrame
+  attr_reader :event
+  def initialize(_parent=nil, _event=nil, *args)
+    super(_parent.frame.hinner_frame, Arcadia.style('panel'))
+    @parent = _parent
+    @event = _event
+    @progress  = TkVariable.new
+    @pb = Tk::BWidget::ProgressBar.new(
+      self, Arcadia.style('progress').update({
+        :variable=>@progress, 
+        :type=>'infinite', 
+        :maximum=>500})).place('width'=>-30,'relwidth' => '1','x' => 0,'y' => 2,'height' => 18)
+      #.pack('side' =>'left','fill'=>'x')
+
+      icon_button = TkButton.new(@pb){
+        background Arcadia.style('panel')['background']
+        relief 'flat'
+        image Arcadia.file_icon(_event.name)
+      }.pack
+      
+      b_command = proc{
+        message = "Really kill pid #{_event.pid} #{_event.name} ?"
+        r=Arcadia.dialog(self,
+            'type'=>'yes_no', 
+            'level'=>'warning',
+            'title'=> 'Confirm kill', 
+            'msg'=>message)
+        if r=="yes"
+          _event.abort_action.call
+        end
+      }
+      
+      
+    _b = Tk::BWidget::Button.new(self, 
+    #_b = TkButton.new(self, 
+         'command'=>b_command,
+         'borderwidth'=>0,
+         'background'=>Arcadia.conf('background'),
+         'helptext'=>"#{_event.name} [pid #{_event.pid}]",
+         'image'=> TkPhotoImage.new('data' => PROCESS_KILL_GIF),
+         'relief'=>'flat').pack('side' =>'right','padx'=>0)
+         #.pack('side' =>'left','padx'=>5)
+         #.place('x' => 2, 'width'=>20)
+    pack('side' =>'top','anchor'=>'nw','fill'=>'x','padx'=>5, 'pady'=>5)
+      #place('relwidth' => '1')
+    start_check  
+  end
+  
+  def start_check
+    @progress.numeric=0
+    if @event.timecheck
+      timecheck = @event.timecheck
+    else
+      timecheck = 1000
+    end
+    @timer = TkAfter.new
+    proc_check = proc{
+      alive = @event.alive_check.call
+      #p "ALIVE=#{alive}"
+      if !alive
+        @timer.stop
+        @parent.processs.delete(self)
+        self.destroy
+      end
+      @progress.numeric += 1
+    }
+    @timer.set_procs(timecheck,-1,proc_check)
+    @timer.start
+  end  
+end