arcadia 0.1.1 → 0.1.2

data/ext/ae-output-event/ae-output-event.conf

@@ -7,8 +7,8 @@ class=Output
 MsgContract.channel=CH1
 
 
-font=courier 7
-font.bold=courier 9 bold
+font=courier 10
+font.bold=courier 10 bold
 i386-freebsd6::font=courier 10
 i386-freebsd6::font.bold=courier 12 bold
 i386-mswin32::font={Courier New} 9

data/ext/ae-output/ae-output.conf

@@ -6,8 +6,8 @@ require=ext/ae-output/ae-output
 class=Output
 MsgContract.channel=0
 
-font=courier 7
-font.bold=courier 9 bold
+font=courier 10
+font.bold=courier 10 bold
 i386-freebsd6::font=courier 12
 i386-freebsd6::font.bold=courier 12 bold
 i386-mswin32::font={Courier New} 9

data/ext/ae-output/ae-output.rb

@@ -1,178 +1,173 @@
-#
-#   ae-output.rb - Arcadia Ruby ide
-#   by Antonio Galeone <antonio-galeone@rubyforge.org>
-#
-
-require "tk"
-require "base/a-utils"
-
-class OutputView
-  attr_reader :text
-  def initialize(parent=nil)
-    
-    left_frame = TkFrame.new(parent.frame).place('x' => '0','y' => '0','relheight' => '1','width' => '25')
-
-    @button_u = Tk::BWidget::Button.new(left_frame){
-      image  TkPhotoImage.new('dat' => CLEAR_GIF)
-      helptext 'Clear'
-      foreground 'blue'
-      command proc{parent.main_frame.text.delete('1.0','end')}
-      relief 'groove'
-      pack('side' =>'top', 'anchor'=>'n',:padx=>0, :pady=>0)
-    }
-
-    
-    #@splitted_frame = AGTkVSplittedFrames.new(parent.frame,20)
-    @text = TkText.new(parent.frame,
-      'wrap'=>  'none',
-      'relief' =>  'sunken',
-      'font' => parent.conf('font')
-    ){|j|
-      TkScrollbar.new(j){|s|
-        command proc{|*args| j.yview(*args)}
-        j.yscrollcommand proc{|first,last| s.set first,last}
-      }.pack('side'=>'right', 'fill'=>'y')
-    }.place('relwidth' => '1','x' => '25','y' => '0','relheight' => '1', 'width' => '-25')
-    @text.tag_configure('simple_msg',
-       'background' => '#d9d994',
-       'borderwidth'=>1,
-       'relief'=> 'flat'
-    )
-    @text.tag_configure('debug_msg',
-       'background' => '#f6c9f6',
-       'foreground' => '#000000',
-       'borderwidth'=>1,
-       'relief'=> 'flat'
-    )
-    @text.tag_configure('error_msg',
-       'background' => '#f6c9f6',
-       'foreground' => 'red',
-       'borderwidth'=>1,
-       'relief'=> 'flat'
-    )
-
-    @text.tag_configure('bord_msg',
-       #'foreground' => '#b9b8b9'
-       'foreground' => '#7c9b10'
-    )
-
-  end
-end
-
-class Output < ArcadiaExt
-  attr_reader :main_frame
-
-	def before_build
-    ArcadiaContractListener.new(self, MsgContract, :do_msg_event)
-    #_frame = @arcadia.layout.register_panel('_rome_',@name, 'Output')
-    @main_frame = OutputView.new(self)
-    @run_threads = Array.new
-    @main_frame.text.tag_configure('error','foreground' => 'red')
-	end
-
-
-  def build
-    #@ae_file_contract = @arcadia.retrieve_contract(self, EditorActionContract, :file_state)
-  end
-
-  def after_build
-    MainContract.instance.raise_extension(MainContract::TMainObj.new(self, 
-    		'domain'=>@arcadia['conf'][@name+'.frame'],
-    		'extension' =>@name,
-    		'channel'=>conf('MsgContract.channel')
-    		
-    ))
-  end
-
-	def format_time(_time)
-	  _time.strftime("at %a %d-%b-%Y %H:%M:%S")
-	end
-
-	def do_msg_event(_event)
-	   #p _event.context.text.class
-     _txt = "\n+--- "+format_time(_event.time)+" ---+\n"+_event.context.text.strip+"\n"
-     _index_begin = @main_frame.text.index('end')
-     @main_frame.text.insert(_index_begin,_txt)
-     _index_end = @main_frame.text.index('end')
-     if _event.context.type == MsgContract::TYPE_DEBUG
-     		@main_frame.text.tag_remove('simple_msg',_index_begin, _index_end+ '  lineend')
-     		@main_frame.text.tag_remove('error_msg',_index_begin, _index_end+ '  lineend')
-     		@main_frame.text.tag_add('debug_msg',_index_begin, _index_end+ '  lineend')
-     		parse_debug(_index_begin.split('.')[0].to_i) 
-		 elsif _event.context.type == MsgContract::TYPE_ERROR
-     		@main_frame.text.tag_remove('simple_msg',_index_begin, _index_end+ '  lineend')
-     		@main_frame.text.tag_remove('debug_msg',_index_begin, _index_end+ '  lineend')
-     		@main_frame.text.tag_add('error_msg',_index_begin, _index_end+ '  lineend')
-     		parse_debug(_index_begin.split('.')[0].to_i) 
-		 else
-     		@main_frame.text.tag_remove('error_msg',_index_begin, _index_end+ '  lineend')
-     		@main_frame.text.tag_remove('debug_msg',_index_begin, _index_end+ '  lineend')
-     		@main_frame.text.tag_add('simple_msg',_index_begin, _index_end+ '  lineend')
-     end
-   		@main_frame.text.tag_add('bord_msg',_index_begin+' linestart', _index_begin+ '  lineend')
-   		@main_frame.text.tag_add('bord_msg',_index_end+' -1 lines linestart', _index_end+ ' -1 lines  lineend')
-   		@main_frame.text.see(_index_end)
-	end
-	
-	def parse_debug(_from_row=0)
-    _row = 0
-    _cursor = @main_frame.text.cget('cursor')
-    @main_frame.text.value.each{|l|
-      _row = _row+1
-      if _row >= _from_row
-        _end = 0
-        m = /([\.\/]*[\/A-Za-z_\-\.]*[\.\/\w\d]*\.rb):(\d*)/.match(l)
-        while m
-          _txt = m.post_match
-          if m[1] && m[2]
-            _file = m[1]
-            _line = m[2]
-            _ibegin = _row.to_s+'.'+(m.begin(1)+_end).to_s
-            _iend = _row.to_s+'.'+(m.end(2)+_end).to_s
-            _end = m.end(2) + _end
-            @main_frame.text.tag_configure(_row,
-              'foreground' => '#800000',
-              'borderwidth'=>0,
-              'relief'=>'flat',
-              'underline'=>true
-            )
-            @main_frame.text.tag_add(_row,_ibegin,_iend)
-            @main_frame.text.tag_bind(_row,"Double-ButtonPress-1",
-              proc{
-              		_tobj = EditorContract::TEditorObj.new(self)
-              		_tobj.file= _file
-              		_tobj.line= _line
-              		EditorContract.instance.open_file(_tobj)
-              }
-            )
-            @main_frame.text.tag_bind(_row,"Enter",
-              proc{@main_frame.text.configure('cursor'=> 'hand2')}
-            )
-            @main_frame.text.tag_bind(_row,"Leave",
-              proc{@main_frame.text.configure('cursor'=> _cursor)}
-            )
-  
-  
-
-         end
-      	  m = /([A-Za-z]*[\.:]{0,1}[\/\w\d]*\.rb):(\d*)/.match(_txt)
-       end
-     end
-    }
-	end
-
-  def out(_txt=nil, _tag=nil)
-    if @main_frame && _txt
-      if _tag
-        @main_frame.text.insert('end',_txt, _tag)
-      else
-        @main_frame.text.insert('end',_txt)
-      end
-    end
-  end
-
-  def outln(_txt=nil, _tag=nil)
-    self.out(_txt+"\n",_tag)
-  end
-
-end
+#
+#   ae-output.rb - Arcadia Ruby ide
+#   by Antonio Galeone <antonio-galeone@rubyforge.org>
+#
+
+require "tk"
+require "base/a-utils"
+
+class OutputView
+  attr_reader :text
+  def initialize(parent=nil)
+    
+    left_frame = TkFrame.new(parent.frame).place('x' => '0','y' => '0','relheight' => '1','width' => '25')
+
+    @button_u = Tk::BWidget::Button.new(left_frame){
+      image  TkPhotoImage.new('dat' => CLEAR_GIF)
+      helptext 'Clear'
+      foreground 'blue'
+      command proc{parent.main_frame.text.delete('1.0','end')}
+      relief 'groove'
+      pack('side' =>'top', 'anchor'=>'n',:padx=>0, :pady=>0)
+    }
+
+    
+    #@splitted_frame = AGTkVSplittedFrames.new(parent.frame,20)
+    @text = TkText.new(parent.frame,
+      'wrap'=>  'none',
+      'relief' =>  'sunken',
+      'font' => parent.conf('font')
+    ){|j|
+      TkScrollbar.new(j){|s|
+        command proc{|*args| j.yview(*args)}
+        j.yscrollcommand proc{|first,last| s.set first,last}
+      }.pack('side'=>'right', 'fill'=>'y')
+    }.place('relwidth' => '1','x' => '25','y' => '0','relheight' => '1', 'width' => '-25')
+    @text.tag_configure('simple_msg',
+       'background' => '#d9d994',
+       'borderwidth'=>1,
+       'relief'=> 'flat'
+    )
+    @text.tag_configure('debug_msg',
+       'background' => '#f6c9f6',
+       'foreground' => '#000000',
+       'borderwidth'=>1,
+       'relief'=> 'flat'
+    )
+    @text.tag_configure('error_msg',
+       'background' => '#f6c9f6',
+       'foreground' => 'red',
+       'borderwidth'=>1,
+       'relief'=> 'flat'
+    )
+
+    @text.tag_configure('bord_msg',
+       #'foreground' => '#b9b8b9'
+       'foreground' => '#7c9b10'
+    )
+
+  end
+end
+
+class Output < ArcadiaExt
+  attr_reader :main_frame
+
+	def before_build
+    ArcadiaContractListener.new(self, MsgContract, :do_msg_event)
+    #_frame = @arcadia.layout.register_panel('_rome_',@name, 'Output')
+    @main_frame = OutputView.new(self)
+    @run_threads = Array.new
+    @main_frame.text.tag_configure('error','foreground' => 'red')
+	end
+
+
+  def build
+    #@ae_file_contract = @arcadia.retrieve_contract(self, EditorActionContract, :file_state)
+  end
+
+  def after_build
+    MainContract.instance.raise_extension(self, 
+    		'domain'=>@arcadia['conf'][@name+'.frame'],
+    		'extension' =>@name,
+    		'channel'=>conf('MsgContract.channel'))
+  end
+
+	def format_time(_time)
+	  _time.strftime("at %a %d-%b-%Y %H:%M:%S")
+	end
+
+	def do_msg_event(_event)
+	   #p _event.context.text.class
+     _txt = "\n+--- "+format_time(_event.time)+" ---+\n"+_event.context.text.strip+"\n"
+     _index_begin = @main_frame.text.index('end')
+     @main_frame.text.insert(_index_begin,_txt)
+     _index_end = @main_frame.text.index('end')
+     if _event.context.type == MsgContract::TYPE_DEBUG
+     		@main_frame.text.tag_remove('simple_msg',_index_begin, _index_end+ '  lineend')
+     		@main_frame.text.tag_remove('error_msg',_index_begin, _index_end+ '  lineend')
+     		@main_frame.text.tag_add('debug_msg',_index_begin, _index_end+ '  lineend')
+     		parse_debug(_index_begin.split('.')[0].to_i) 
+		 elsif _event.context.type == MsgContract::TYPE_ERROR
+     		@main_frame.text.tag_remove('simple_msg',_index_begin, _index_end+ '  lineend')
+     		@main_frame.text.tag_remove('debug_msg',_index_begin, _index_end+ '  lineend')
+     		@main_frame.text.tag_add('error_msg',_index_begin, _index_end+ '  lineend')
+     		parse_debug(_index_begin.split('.')[0].to_i) 
+		 else
+     		@main_frame.text.tag_remove('error_msg',_index_begin, _index_end+ '  lineend')
+     		@main_frame.text.tag_remove('debug_msg',_index_begin, _index_end+ '  lineend')
+     		@main_frame.text.tag_add('simple_msg',_index_begin, _index_end+ '  lineend')
+     end
+   		@main_frame.text.tag_add('bord_msg',_index_begin+' linestart', _index_begin+ '  lineend')
+   		@main_frame.text.tag_add('bord_msg',_index_end+' -1 lines linestart', _index_end+ ' -1 lines  lineend')
+   		@main_frame.text.see(_index_end)
+	end
+	
+	def parse_debug(_from_row=0)
+    _row = 0
+    _cursor = @main_frame.text.cget('cursor')
+    @main_frame.text.value.each{|l|
+      _row = _row+1
+      if _row >= _from_row
+        _end = 0
+        m = /([\.\/]*[\/A-Za-z_\-\.]*[\.\/\w\d]*\.rb):(\d*)/.match(l)
+        while m
+          _txt = m.post_match
+          if m[1] && m[2]
+            _file = m[1]
+            _line = m[2]
+            _ibegin = _row.to_s+'.'+(m.begin(1)+_end).to_s
+            _iend = _row.to_s+'.'+(m.end(2)+_end).to_s
+            _end = m.end(2) + _end
+            @main_frame.text.tag_configure(_row,
+              'foreground' => '#800000',
+              'borderwidth'=>0,
+              'relief'=>'flat',
+              'underline'=>true
+            )
+            @main_frame.text.tag_add(_row,_ibegin,_iend)
+            @main_frame.text.tag_bind(_row,"Double-ButtonPress-1",
+              proc{
+              		EditorContract.instance.open_file(self, 'file'=>_file, 'line'=>_line)
+              }
+            )
+            @main_frame.text.tag_bind(_row,"Enter",
+              proc{@main_frame.text.configure('cursor'=> 'hand2')}
+            )
+            @main_frame.text.tag_bind(_row,"Leave",
+              proc{@main_frame.text.configure('cursor'=> _cursor)}
+            )
+  
+  
+
+         end
+      	  m = /([A-Za-z]*[\.:]{0,1}[\/\w\d]*\.rb):(\d*)/.match(_txt)
+       end
+     end
+    }
+	end
+
+  def out(_txt=nil, _tag=nil)
+    if @main_frame && _txt
+      if _tag
+        @main_frame.text.insert('end',_txt, _tag)
+      else
+        @main_frame.text.insert('end',_txt)
+      end
+    end
+  end
+
+  def outln(_txt=nil, _tag=nil)
+    self.out(_txt+"\n",_tag)
+  end
+
+end

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

@@ -1,54 +1,54 @@
-#
-#   ae-shell.rb - Arcadia Ruby ide
-#   by Antonio Galeone <antonio-galeone@rubyforge.org>
-#
-
-require "tk"
-require "base/a-utils"
-
-class Shell < ArcadiaExt
-
-  def build
-    #@ae_msg_contract = @arcadia.retrieve_contract(self, MsgContract)
-    @run_threads = Array.new
-  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{
-          @cmd = open("|"+$arcadia['conf']['shell.ruby']+" "+_filename+" 2>&1","r"){
-            |f|
-            MsgContract.instance.out_debug(self, f.read)
-            #@ae_msg_contract.out_debug(f.read)
-          }
-      }
-  		rescue Exception => e
-  			 MsgContract.instance.out_debug(self, e)
-       #@ae_msg_contract.out_debug(e)
-        #@main_frame.text.insert('end', "---> "+e )
-  	  end
-    end
-  end
-
-end
+#
+#   ae-shell.rb - Arcadia Ruby ide
+#   by Antonio Galeone <antonio-galeone@rubyforge.org>
+#
+
+require "tk"
+require "base/a-utils"
+
+class Shell < ArcadiaExt
+
+  def build
+    #@ae_msg_contract = @arcadia.retrieve_contract(self, MsgContract)
+    @run_threads = Array.new
+  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{
+          @cmd = open("|"+$arcadia['conf']['shell.ruby']+" "+_filename+" 2>&1","r"){
+            |f|
+            MsgContract.instance.out_debug(self, f.read)
+            #@ae_msg_contract.out_debug(f.read)
+          }
+      }
+  		rescue Exception => e
+  			 MsgContract.instance.out_debug(self, e)
+       #@ae_msg_contract.out_debug(e)
+        #@main_frame.text.insert('end', "---> "+e )
+  	  end
+    end
+  end
+
+end