rhomobile-debug 1.0 → 1.0.1

data/CHANGELOG

@@ -1,2 +1,6 @@
-## 1.0
+## 1.0.1
+* Fix issue with Windows 7 and Ruby 1.8.7
+* Add support for RhoSync debug
+
+## 1.0.0
 * RhoStudio customization to support debugger

data/lib/debugger.rb

@@ -13,6 +13,8 @@ def debug_read_cmd(io,wait)
       cmd = io.read_nonblock(4096)
       $_cmd << cmd if cmd !~ /^\s*$/
     end
+
+    #$_s.write("get data from front end" + $_cmd.to_s + "\n")
   rescue
     # puts $!.inspect
   end
@@ -35,6 +37,8 @@ def execute_cmd(cmd, advanced)
 end
 
 def get_variables(scope)
+  #$_s.write("get_variables start\n")
+
   if (scope =~ /^GVARS/)
    cmd = "global_variables"
    prefix = ""
@@ -66,6 +70,7 @@ def get_variables(scope)
         begin
           result = eval(v,$_binding).inspect
         rescue Exception => exc
+          $_s.write("get var exception\n")
           result = "#{$!}".inspect
         end
         $_s.write("V:#{vartype}:#{v}:#{result}\n")
@@ -81,9 +86,12 @@ def log_command(cmd)
 end
 
 def debug_handle_cmd(inline)
+  #$_s.write("start of debug_handle_cmd wait=" + inline.to_s + "\n")
+
   cmd = $_cmd.match(/^([^\n\r]*)([\n\r]+|$)/)[0]
   processed = false
   wait = inline
+
   if cmd != ""
     if cmd =~/^CONNECTED/
       log_command(cmd)
@@ -117,6 +125,7 @@ def debug_handle_cmd(inline)
       puts "[Debugger] Breakpoints disabled"
       processed = true
     elsif inline and (cmd =~ /^STEPOVER/)
+      $_s.write("STEPOVER start\n")
       log_command(cmd)
       $_step = 2
       $_step_level = $_call_stack
@@ -168,9 +177,11 @@ def debug_handle_cmd(inline)
     elsif inline and (cmd =~ /^EVL?:/)
       log_command(cmd)
       processed = true
+      puts "[Debugger] Calc evaluation..."
       execute_cmd cmd.sub(/^EVL?:/,""), (cmd =~ /^EVL:/ ? true : false)
-    elsif inline and (cmd =~ /^[GLCI]VARS/)
+    elsif  inline and (cmd =~ /^[GLCI]VARS/)
       log_command(cmd)
+      puts "[Debugger] Get variables..."
       get_variables cmd
       processed = true
     elsif inline
@@ -179,10 +190,14 @@ def debug_handle_cmd(inline)
       processed = true
     end
   end
+
   if processed
     $_cmd = $_cmd.sub(/^([^\n\r]*)([\n\r]+(.*)|)$/, "\\3")
     $_wait = wait if inline
   end
+
+  #$_s.write("end of debug_handle_cmd wait=" + $_wait.to_s + "cmd=" + cmd + "\n")
+
   processed
 end
 
@@ -192,15 +207,24 @@ $_tracefunc = lambda{|event, file, line, id, bind, classname|
   $_classname = classname;
   $_methodname = id;
   file = file.to_s.gsub('\\', '/')
+
   if file[0, $_app_path.length] == $_app_path
+
     if event =~ /^line/
 
       unhandled = true
       step_stop = ($_step > 0) and (($_step_level < 0) or ($_call_stack <= $_step_level))
+
+      a = step_stop.to_s
+      #$_s.write('[Debugger][2] file = ' + file.to_s + ' step = ' + a.to_s + "\n")
+
       if (step_stop or ($_breakpoints_enabled and (not $_breakpoint.empty?)))
         filename = file[$_app_path.length, file.length-$_app_path.length]
+
         ln = line.to_i.to_s
         if (step_stop or ($_breakpoints_enabled and ($_breakpoint.has_key?(filename + ':' + ln))))
+          #$_s.write('[Debugger][3] step = ' + file.to_s + ' line = ' + line.to_s + "\n")
+
           fn = filename.gsub(/:/, '|')
           cl = classname.to_s.gsub(/:/,'#')
           $_s.write((step_stop ? DEBUGGER_STEP_TYPE[$_step-1] : "BP") + ":#{fn}:#{ln}:#{cl}:#{id}\n")
@@ -208,14 +232,25 @@ $_tracefunc = lambda{|event, file, line, id, bind, classname|
           $_step = 0
           $_step_level = -1
 
+          #$_s.write("start waiting\n")
+
+          puts ">> " + ENV["APP_TYPE"].to_s
+
           $_wait = true
           while $_wait
             while debug_handle_cmd(true) do end
-            if System::get_property('main_window_closed')
-              $_wait = false
+
+            if ENV["APP_TYPE"] == "rhodes"
+              if System::get_property('main_window_closed')
+                 $_wait = false
+              end
             end
-            sleep if $_wait
+
+            sleep(0.1) if $_wait
           end
+
+          #$_s.write("end waiting\n")
+
           unhandled = false
         end
       end
@@ -242,13 +277,22 @@ $_s = nil
 
 begin
   puts "[Debugger] Opening connection"
-  debug_host = (Rho::RhoConfig.debug_host.nil? or Rho::RhoConfig.debug_host == "") ? '127.0.0.1' : Rho::RhoConfig.debug_host
-  debug_port = (Rho::RhoConfig.debug_port.nil? or Rho::RhoConfig.debug_port == "") ? 9000 : Rho::RhoConfig.debug_port
+  debug_host_env = ENV['RHOHOST']
+  debug_port_env = ENV['RHOPORT']
+  debug_path_env = ENV['ROOT_PATH']
+
+  debug_host = (debug_host_env.nil? or debug_host_env == "") ? '127.0.0.1' : debug_host_env 
+  debug_port = (debug_port_env.nil? or debug_port_env == "") ? 9000 : debug_port_env  
+
+  puts "host=" + debug_host_env.to_s
+  puts "port=" + debug_port_env.to_s
+  puts "path=" + debug_path_env.to_s
+
   $_s = timeout(30) { TCPSocket.open(debug_host, debug_port) }
 
   puts "[Debugger] Connected: " + $_s.to_s
-  $_s.write("CONNECT\n")
-
+  $_s.write("CONNECT\nHOST=" + debug_host.to_s + "\nPORT=" + debug_port.to_s + "\n")
+ 
   $_breakpoint = Hash.new
   $_breakpoints_enabled = true
   $_step = 0
@@ -256,7 +300,10 @@ begin
   $_call_stack = 0
   $_resumed = false
   $_cmd = ""
-  $_app_path = File.join(Rho::RhoApplication::get_base_app_path(), 'app/').gsub('\\', '/')
+  $_app_path = ""
+
+  $_app_path = (debug_path_env.nil? or debug_path_env == "") ? "" : debug_path_env  
+  $_s.write("DEBUG PATH=" + $_app_path.to_s + "\n")
 
   at_exit {
     $_s.write("QUIT\n") if (not $_s.nil?)
@@ -269,6 +316,7 @@ begin
       debug_read_cmd($_s,true)
       while debug_handle_cmd(false) do end
       if ($_cmd !~ /^\s*$/) and (Thread.main.stop?)
+        $_s.write("[manage thread] set wait = true\n")
         $_wait = true
         Thread.main.wakeup
       end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhomobile-debug
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 0
-  version: "1.0"
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Rhomobile
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-30 00:00:00 -07:00
+date: 2011-07-04 00:00:00 -07:00
 default_executable: 
 dependencies: []