arcadia 0.12.1 → 0.12.2

data/README

@@ -1,8 +1,8 @@
 = Arcadia Ide
-version 0.12.1
+version 0.12.2
 
 by Antonio Galeone
-on Dec 18, 2012
+on Apr 28, 2013
 
 
 == About
@@ -16,7 +16,12 @@ Some of Arcadia ide project features include:
 * Debugging support
 * Highly extensibility architecture.
 
+
 == News
+
+[0.12.2]
+ - this release adds support to debugger gem and fixes minor bugs
+  
 [0.12.1] 
  - fixed bug in file-history 
  
@@ -34,6 +39,7 @@ Some of Arcadia ide project features include:
  - bugs fixed and optimizations 
  
 == Dependencies
+
   - rubygems
   - ruby-tk
   - tcl/tk
@@ -43,7 +49,7 @@ Some of Arcadia ide project features include:
   - xdotool (linux, optional)
   - ack (optional)
   - gem coderay (> 1.0)
-  - gem ruby-debug (ruby-debug19 on ruby 1.9)
+  - gem ruby-debug (debugger on ruby 1.9)
   - gem win32-process (only on windows)
   - gem ruby-wmi (only on windows)
   

data/bin/arcadia

@@ -3,6 +3,7 @@
 #   arcadia - Arcadia Ruby ide
 #   by Antonio Galeone <antonio-galeone@rubyforge.org>
 #
+
 if defined?(Encoding) && Encoding.respond_to?(:default_internal)
   Encoding.default_internal='utf-8'
 end

data/conf/LC/en-UK.LANG

@@ -219,18 +219,18 @@ ext.ruby_debug.node.local_var.caption=Local variables
 ext.ruby_debug.node.instance_var.caption=Instance variables
 ext.ruby_debug.node.class_var.caption=Class variables
 ext.ruby_debug.node.global_var.caption=Global variables
-ext.ruby_debug.freeze_at=$0 freeze at $1
+ext.ruby_debug.freeze_at=$0 freezed at $1
 ext.ruby_debug.node.eval_selected=Eval selected
 ext.ruby_debug.server.e.on_start=Error on start server : $0:$1
 ext.ruby_debug.server.e.on_kill=Error on kill : $0:$1
 ext.ruby_debug.client.e.on_command=on command $0:$1
+ext.ruby_debug.client.e.on_command2=Error on command $0: $1:$2
 ext.ruby_debug.client.e.socket_session.1=Erron on socket session : $0
 ext.ruby_debug.client.e.socket_session.2=Error on socket session : $0:$1
 ext.ruby_debug.client.e.close_session=Error on close session : $0:$1
 ext.ruby_debug.client.e.start_session=Error on start_session : $0:$1 $2
 ext.ruby_debug.client.e.stop_session=Error on stop_session : $0:$1
 ext.ruby_debug.client.e.abort_session=Debugger has finished executing: $0:$1
-ext.ruby_debug.client.e.on_command=Error on command $0: $1:$2
 ext.ruby_debug.client.e.raise.on_read.1=Debugged has finished executing
 ext.ruby_debug.client.e.raise.on_read.2=Error: on command '$0' => $1 : $2
 ext.ruby_debug.e.rdebug=Warning: Extension ae-ruby-debug depend upon rdebug command (install it or update system path!)

data/conf/arcadia.conf

@@ -252,7 +252,7 @@ hightlight.6.foreground=#007F7F
 #class_name
 hightlight.7.foreground=#0000FF
 #module_name
-hightlight.8.foreground=#0000FF
+hightlight.8.foreground=#009999
 #instance_variable
 hightlight.9.foreground=#7F7F7F
 #global_variable

data/ext/ae-editor/ae-editor.rb

@@ -1391,8 +1391,6 @@ class AgEditor
               }
               _width = _length*8
               @raised_listbox.select(1)
- #             p "_update_list end-->#{Time.new}"
-
               Tk.event_generate(@raised_listbox, "1") if TkWinfo.mapped?(@raised_listbox)
           }
           
@@ -4596,6 +4594,8 @@ class AgMultiEditor < ArcadiaExtPlus
         if _event.file
           if _event.row
             _index = _event.row.to_s+'.0' 
+          elsif !editor_exist?(_event.file) && _event.last_row
+            _index = _event.last_row.to_s+'.0' 
           end
           if _event.kind_of?(OpenBufferTransientEvent) && conf('close-last-if-not-modified')=="yes"
             if defined?(@last_transient_file) && !@last_transient_file.nil? && @last_transient_file != _event.file
@@ -4610,7 +4610,7 @@ class AgMultiEditor < ArcadiaExtPlus
               @last_transient_file = nil
             end
           end
-          if _event.select_index.nil?
+          if _event.select_index.nil? 
             select_index = true
           else
             select_index = _event.select_index
@@ -5256,7 +5256,7 @@ class AgMultiEditor < ArcadiaExtPlus
     _exist_buffer = @tabs_file[_tab_name] != nil
     if _exist_buffer
       open_buffer(_tab_name)
-      _text_index = nil 
+      # ??? _text_index = nil 
     else
 #      @tabs_file[_tab_name]= _filename
       open_buffer(_tab_name, _basefilename, _filename)

data/ext/ae-file-history/ae-file-history.rb

@@ -240,11 +240,11 @@ class FilesHistrory < ArcadiaExt
 	end
 		
   def on_before_open_buffer(_event)
-    if _event.file && _event.row.nil? &&File.exist?(_event.file)  
+    if _event.file && _event.row.nil? && File.exist?(_event.file)  
       if @h_stack[_event.file]
         r,c = @h_stack[_event.file].split('.')
-        _event.row=r.to_i
-        _event.col=c.to_i
+        _event.last_row=r.to_i
+        _event.last_col=c.to_i
         if _event.select_index.nil?
           _event.select_index=false
         end

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

@@ -10,7 +10,8 @@ class=RubyDebug
 #gems=ruby-debug,whichr
 #1.9:@:gems=ruby-debug19,whichr
 gems=ruby-debug
-1.9:@:gems=ruby-debug19
+1.9:@:gems=debugger
+2:@:gems=debugger
 #========================================
 #========================================
 server.host=localhost

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

@@ -180,7 +180,7 @@ class RubyDebugView
 
   def build_var_panel(_frame)
     _open_proc = proc do |_arg|
-        inspect_node(_arg) if @nodes_to_open.include?(_arg)
+      inspect_node(_arg) if @c_on && @nodes_to_open && @nodes_to_open.include?(_arg)
     end
         
     @tree_var = BWidgetTreePatched.new(_frame, Arcadia.style('treepanel')){
@@ -473,7 +473,7 @@ class RubyDebugView
     tree_process_free
     #break_list_free
   end
-
+  
   
   def rdebug_client_update(_command, _result)
     #Arcadia.console(self,'msg'=>"on command #{_command} => #{_result}", 'level'=>'debug')
@@ -824,25 +824,13 @@ class RubyDebugServer
         end
       else
         @pid = Process.fork do
-#          pid = Process.pid
-#          abort_action = proc{
-#            ArcadiaUtils.unix_child_pids(pid).each {|pid|
-#              Process.kill(9,pid.to_i)
-#            }
-#            Process.kill(9,pid.to_i)
-#          }
-#            
-#          alive_check = proc{
-#            num = `ps -p #{pid}|wc -l`
-#            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
+          #s_event = Arcadia.process_event(RunCmdEvent.new(self, {'cmd'=>commandLine}))
+          #if s_event.flag != Event::FLAG_ERROR
           if Kernel.system(commandLine)
             set_alive(false)
-            #p "alive=#{is_alive?}"
             notify(RDS_QUIET)
             Kernel.system('y')
 
@@ -854,12 +842,7 @@ class RubyDebugServer
           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
         end
       end
     rescue Exception => e
@@ -972,6 +955,16 @@ class RubyDebugClient
     :value_class
   )
   
+  if RUBY_VERSION >= '2'
+    #require "psych"
+    DOMAIN_TYPE_CONSTANT = nil
+  elsif RUBY_VERSION > '1.9.1' && RUBY_VERSION < '2'
+    require "syck"
+    DOMAIN_TYPE_CONSTANT = Object::Syck::DomainType
+  else
+    DOMAIN_TYPE_CONSTANT = YAML::DomainType
+  end
+  
   def initialize(_controller, _server='localhost', _port=8989, _timeout=0)
     @controller = _controller
     @session = nil
@@ -1100,7 +1093,7 @@ class RubyDebugClient
       false
       #raise RubyDebugException.new("Debugged has finished executing")
     rescue Exception => e
-      Arcadia.console(self, 'msg'=>Arcadia.text('ext.ruby_debug.client.e.on_command', [_command, e.class, e.inspect]), 'level'=>'debug')
+      Arcadia.console(self, 'msg'=>Arcadia.text('ext.ruby_debug.client.e.on_command2', [_command, e.class, e.inspect]), 'level'=>'debug')
       false
     end
   end
@@ -1121,7 +1114,6 @@ class RubyDebugClient
     end
     @busy = false
     result
-  
   rescue Errno::ECONNABORTED, Errno::ECONNRESET
     raise RubyDebugException.new(Arcadia.text("ext.ruby_debug.client.e.raise.on_read.1"))
   rescue Exception => e
@@ -1173,8 +1165,12 @@ class RubyDebugClient
 
   def yaml_pseudo_load(_obj)
     just_present =  @valuobjs.include?(_obj)
-    @valuobjs << _obj  
-    if _obj.class == YAML::DomainType
+    @valuobjs << _obj 
+    p  _obj.class
+    if _obj.class == DOMAIN_TYPE_CONSTANT
+      
+      p _obj
+      
       return _obj.type_id if just_present
       ret = Hash.new
       ret['__CLASS__']=_obj.type_id
@@ -1236,7 +1232,8 @@ class RubyDebugClient
 
   
   def debug_dump(_exp)
-    var = nil
+    return '' if _exp.nil? || _exp.strip.length == 0 || _exp.strip.length == 'nil'
+     var = nil
     if @valuobjs.nil?
       @valuobjs = Array.new 
     else
@@ -1244,66 +1241,29 @@ class RubyDebugClient
     end
     begin
       _to_eval = read("eval YAML::dump(#{_exp})")
-      if _to_eval.include?('Exception:')
+      if _to_eval.include?('Exception:') || _to_eval.include?('SyntaxError:')
         _to_eval = read("eval require 'pp';eval #{_exp}.pretty_inspect")
         var = eval(_to_eval)
         #var = "?"
       else
-        _str = eval(_to_eval)
+        _str = "#{eval(_to_eval)}"
         _str.gsub!('!ruby/object:', '!')
-        _obj = YAML::load(_str)
+        begin
+          _obj = YAML::load(_str)
+        rescue Exception => e
+          Arcadia.console(self, 'msg'=>"exception on eval in YAML::load #{_str} :#{e.inspect}")
+        end
         var = yaml_pseudo_load(_obj)
       end  
     rescue Exception => e
       Arcadia.console(self, 'msg'=>"exception on eval #{_exp} :#{e.inspect}")
+      Arcadia.console(self, 'msg'=>"exception on eval #{_exp} : #{_to_eval}")
       #Arcadia.new_msg(self,"exception on eval #{_exp} :#{e.inspect}")
       var = nil
     end
     return var
   end
 
-
-  # returns the instance variables and there values
-  def instance_variables_new(_this='self')
-    command("eval #{_this}.instance_variables")
-    variables = []
-    begin
-      variables = eval(read)
-    rescue Exception
-      variables = []
-    end
-    @consider = Array.new
-    variable_values = Hash.new
-    variables.each do |var|
-       #next if var != '@objs'
-#      command("eval require 'pp';  #{var}.pretty_inspect() + '|||' + #{var}.class.to_s")
-      command("eval YAML::dump(#{var})")
-      _str = eval read
-      #Arcadia.new_msg(self,"value passato 1 ="+_str)
-
-      _str.gsub!('!ruby/object:', '!')
-
-      #Arcadia.new_msg(self,"value passato 2 ="+_str)
-
-      _obj = YAML::load(_str)
-      
-      _xvalue = yaml_pseudo_load(_obj)
-      if _xvalue.class == Hash
-        _xclass = _xvalue['__CLASS__']
-      else
-        _xclass = _xvalue.class.to_s
-      end
-      #_vvv = eval(_value)
-      
-      #Arcadia.new_msg(self,"vvv class="+_vvv.class.to_s)
-      
-      #Arcadia.new_msg(self,"value="+_xvalue.inspect)
-      #Arcadia.new_msg(self,"class="+_xclass)
-      variable_values[var] = Var.new(_xvalue, _xclass)
-    end
-    return variable_values
-  end
-
   # returns the local variables and there values
   def variables(_type)
     begin
@@ -1311,6 +1271,9 @@ class RubyDebugClient
       to_eval = read("eval #{_type}")
       #Arcadia.console(self,'msg'=>"to_eval=#{to_eval.to_s}")
       variables = eval(to_eval)
+      if variables.class != Array
+        variables = []
+      end
       #Arcadia.console(self,'msg'=>"variables=#{variables.to_s}")
     rescue Exception => e
       variables = []
@@ -1321,10 +1284,6 @@ class RubyDebugClient
     variable_values = Hash.new
     variables.each do |var|
       next if var.to_s=='$;'
-#      command("eval #{var}.to_s + '|||' + #{var}.class.to_s")
-#      _str = eval(read)
-#      _value, _class = _str.split('|||')
-#      variable_values[var] = Var.new(_value, _class)
       variable_values[var.to_s] = debug_eval(var.to_s)
     end
     return variable_values
@@ -1333,7 +1292,7 @@ class RubyDebugClient
   def debug_eval(_exp)
     if command("eval #{res=_exp}.to_s + '|||' + #{res}.class.to_s")
       begin
-        _str = eval(read)
+        _str = eval(read).to_s
         _value, _class = _str.split('|||')
       rescue Exception => e
         _value = "?"
@@ -1344,44 +1303,6 @@ class RubyDebugClient
       return Var.new("?", "?")
     end
   end
-  
-  # returns the local variables and there values
-  def local_variables
-    command("eval local_variables")
-    variables = []
-    begin
-      variables = eval(read)
-    rescue Exception
-      variables = []
-    end
-    variable_values = Hash.new
-    variables.each do |var|
-      command("eval #{var}.to_s + '|||' + #{var}.class.to_s")
-      _str = eval(read)
-      _value, _class = _str.split('|||')
-      variable_values[var] = Var.new(_value, eval(_class))
-    end
-    return variable_values
-  end
-
-
-  # returns the global variables and there values
-  def global_variables
-    command("eval global_variables")
-    variables = []
-    begin
-      variables = eval(read)
-    rescue Exception
-      variables = []
-    end
-    variable_values = Hash.new
-    variables.each do |var|
-      command("eval #{var}.to_s")
-      variable_values[var] = read
-    end
-    return variable_values
-  end
-
 
   def set_breakpoint(_file, _line)
     #_line = _line + 1

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

@@ -271,6 +271,9 @@ class Shell < ArcadiaExt
                     while (line = terr.gets)
                       output_mark = Arcadia.console(self,'msg'=>line, 'level'=>'error', 'mark'=>output_mark)
                       _event.add_result(self, 'output'=>line)
+                      if line && line.length > 0
+                        _event.flag = Event::FLAG_ERROR
+                      end
                     end
                   rescue Exception => e
                     output_mark = Arcadia.console(self,'msg'=>e.to_s, 'level'=>'debug', 'mark'=>output_mark)

data/lib/a-commons.rb

@@ -598,11 +598,15 @@ class Event
   attr_accessor :parent
   attr_reader :channel
   attr_reader :time
+  attr_accessor :flag #is used to give a state to event
   attr_reader :results
+  FLAG_ERROR = 'E'
+  FLAG_DEFAULT = '0'
   def initialize(_sender, _args=nil)
     @breaked = false
     @sender = _sender
     @channel = '0'
+    @flag= FLAG_DEFAULT
     if _args
       _args.each do |key, value|
         #self.send(key, value)

data/lib/a-contracts.rb

@@ -103,7 +103,7 @@ end
 #  +---------------------------------------------+
 
 class BufferEvent < ArcadiaEvent # Abstract
-  attr_accessor :file, :title, :text, :row, :col, :lang 
+  attr_accessor :file, :title, :text, :row, :col, :lang, :last_row, :last_col 
   # if file==nil && title==nil buffer=current buffer
 end
 

data/lib/a-core.rb

@@ -24,7 +24,7 @@ class Arcadia < TkApplication
     super(
       ApplicationParams.new(
         'arcadia',
-        '0.12.1',
+        '0.12.2',
         'conf/arcadia.conf',
         'conf/arcadia.pers'
       )
@@ -57,7 +57,6 @@ class Arcadia < TkApplication
       withdraw
       protocol( "WM_DELETE_WINDOW", proc{Arcadia.process_event(QuitEvent.new(self))})
       iconphoto(Arcadia.image_res(ARCADIA_RING_GIF)) if Arcadia.instance.tcltk_info.level >= '8.4.9'
-
     }
     @on_event = Hash.new
 
@@ -1809,7 +1808,7 @@ class ArcadiaAboutSplash < TkToplevel
       place('x' => 100,'y' => 65,'height' => 19)
     }
     @tkLabel21 = TkLabel.new(self){
-      text  Arcadia.text("main.about.by", ['Antonio Galeone - 2004/2012'])
+      text  Arcadia.text("main.about.by", ['Antonio Galeone - 2004/2013'])
       background  _bgcolor
       foreground  '#ffffff'
       font Arcadia.instance['conf']['splash.credits.font']
@@ -3254,6 +3253,25 @@ class ArcadiaLayout
     end
     index
   end
+  
+  def menu_item_exist?(_menu, _name)
+    exist = false
+    i_end = _menu.index('end')
+    if i_end
+      0.upto(i_end){|j|
+        type = _menu.menutype(j)
+        if type != 'separator'
+          value = _menu.entrycget(j,'label').to_s
+          if value == _name
+            exist = true
+            break
+          end
+        end
+      }
+    end
+    exist
+  end
+  
 
   def process_frame(_ffw)
     #p "processo frame #{_ffw.title}"
@@ -3262,14 +3280,16 @@ class ArcadiaLayout
         titledFrame = @panels[dom]['root']
         if titledFrame.instance_of?(TkTitledFrameAdapter)
           menu = @panels[dom]['root'].menu_button('ext').cget('menu')
-          ind = sorted_menu_index(menu, _ffw.title)
-          menu.insert(ind,:command,
-          :label=>_ffw.title,
-          :image=>Arcadia.image_res(ARROW_LEFT_GIF),
-          :compound=>'left',
-          :command=>proc{change_domain(dom, _ffw.name)},
-          :hidemargin => true
-          )
+          if !menu_item_exist?(menu, _ffw.title)
+            ind = sorted_menu_index(menu, _ffw.title)
+              menu.insert(ind,:command,
+              :label=>_ffw.title,
+              :image=>Arcadia.image_res(ARROW_LEFT_GIF),
+              :compound=>'left',
+              :command=>proc{change_domain(dom, _ffw.name)},
+              :hidemargin => true
+            )
+          end
         end
       end
     }
@@ -3286,35 +3306,40 @@ class ArcadiaLayout
         if i >= 0
           index = i.to_s
         end
+        clabel = "close \"#{_ffw.title}\"" 
         if @tabbed
-          mymenu.insert(index,:command,
-          :label=>"close \"#{_ffw.title}\"",
-          :image=>Arcadia.image_res(CLOSE_FRAME_GIF),
-          :compound=>'left',
-          :command=>proc{unregister_panel(_ffw, false, true)},
-          :hidemargin => true
-          )
-        else
-          #          if @panels[_ffw.domain][:raised_name] == _ffw.name
-          if raised_name(_ffw.domain) == _ffw.name
+          if !menu_item_exist?(mymenu, clabel)
             mymenu.insert(index,:command,
-            :label=>"close \"#{_ffw.title}\"",
+            :label=> clabel,
             :image=>Arcadia.image_res(CLOSE_FRAME_GIF),
             :compound=>'left',
             :command=>proc{unregister_panel(_ffw, false, true)},
-            #:command=>proc{raise_panel(_ffw.domain, _ffw.name)},
-            :hidemargin => true
-            )
-          else
-            ind = sorted_menu_index(mymenu, _ffw.title)
-            mymenu.insert(ind,:command,
-            :label=>_ffw.title,
-            :image=>Arcadia.image_res(ARROW_LEFT_GIF),
-            :compound=>'left',
-            :command=>proc{change_domain(_ffw.domain, _ffw.name)},
             :hidemargin => true
             )
           end
+        else
+#          if raised_name(_ffw.domain) == _ffw.name
+           if !menu_item_exist?(mymenu, clabel)
+             mymenu.insert(index,:command,
+               :label=> clabel,
+               :image=>Arcadia.image_res(CLOSE_FRAME_GIF),
+               :compound=>'left',
+               :command=>proc{unregister_panel(_ffw, false, true)},
+               :hidemargin => true
+             )
+           end
+#          else
+            if !menu_item_exist?(mymenu, _ffw.title)
+              ind = sorted_menu_index(mymenu, _ffw.title)
+              mymenu.insert(ind,:command,
+                :label=>_ffw.title,
+                :image=>Arcadia.image_res(ARROW_LEFT_GIF),
+                :compound=>'left',
+                :command=>proc{change_domain(_ffw.domain, _ffw.name)},
+                :hidemargin => true
+              )
+            end
+#          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arcadia
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-18 00:00:00.000000000 Z
+date: 2013-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &16094480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *16094480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.3
 description: Arcadia Ide
 email: antonio-galeone@rubyforge.org
 executables:
@@ -263,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: arcadia
-rubygems_version: 1.8.11
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Light Editor Ide written in Ruby using the classic tcl/tk GUI toolkit.