rhomobile-debug 1.0.6 → 1.0.7

data/lib/debugger.rb

@@ -52,7 +52,7 @@ def execute_cmd(cmd, advanced)
   #$_s.write("execute_cmd end\n")
 end
 
-def get_variables(scope)
+def get_variables(scope)  
   #$_s.write("get_variables start\n")
 
   if (scope =~ /^GVARS/)
@@ -214,33 +214,46 @@ def debug_handle_cmd(inline)
 end
 
 $_tracefunc = lambda{|event, file, line, id, bind, classname|
-  return if eval('Thread.current!=Thread.main', bind)
+  return if eval('::Thread.current != ::Thread.main', bind)
   $_binding = bind;
   $_classname = classname;
   $_methodname = id;
   file = file.to_s.gsub('\\', '/')
 
-  if (file[0, $_app_path.length] == $_app_path) || (!(file.index("./").nil?))
+  #$_s.write('[Debugger][1] file = ' + file.to_s + ' line = ' + line.to_s + "\n")
 
-    if event =~ /^line/
+  if (file[0, $_app_path.length] == $_app_path) || (!(file.index("./").nil?)) || (!(file.index("framework").nil?)) || (!(file.index("extensions").nil?))
+
+    #$_s.write('[Debugger][2] file = ' + file.to_s + ' line = ' + line.to_s + "\n")
 
+    if event =~ /^line/
       unhandled = true
       step_stop = ($_step > 0) && (($_step_level < 0) || ($_call_stack <= $_step_level))
 
-      #$_s.write('[Debugger][2] file = ' + file.to_s + ' line = ' + line.to_s + "\n")
+      #$_s.write('[Debugger][3] bp list = ' +  $_breakpoint.to_s + "\n")
 
       if (step_stop || ($_breakpoints_enabled && (!($_breakpoint.empty?))))
         filename = ""
          
         if !(file.index("./").nil?)
           filename = "/" + file[file.index("./") + 2, file.length]
+        elsif !(file.index("framework").nil?)
+          filename = file[file.index("framework"), file.length]
+        elsif !(file.index("extensions").nil?)
+          filename = file[file.index("extensions"), file.length]
         else
           filename = file[$_app_path.length, file.length-$_app_path.length]
         end
 
         ln = line.to_i.to_s
+
+        #$_s.write('[Debugger][3] $_breakpoints_enabled = ' +  $_breakpoints_enabled.to_s + "\n")
+        #$_s.write('[Debugger][3] filename = ' +  filename.to_s + "\n")
+        #$_s.write('[Debugger][3] line = ' +  ln.to_s + "\n")
+        #$_s.write('[Debugger][3] flag = ' +  ($_breakpoint.has_key?(filename + ':' + ln)).to_s + "\n")
+
         if step_stop || ($_breakpoints_enabled && ($_breakpoint.has_key?(filename + ':' + ln)))
-          # $_s.write('[Debugger][3] step = ' + filename.to_s + ' line = ' + line.to_s + "\n")
+          #$_s.write('[Debugger][3] stop on bp ' +  filename + ':' + ln + "\n")
 
           fn = filename.gsub(/:/, '|')
           cl = classname.to_s.gsub(/:/,'#')
@@ -257,7 +270,7 @@ $_tracefunc = lambda{|event, file, line, id, bind, classname|
             while debug_handle_cmd(true) do end
 
             if app_type.eql? "rhodes"
-              if System::get_property('main_window_closed')
+              if Rho::System.main_window_closed
                  $_s.write("QUIT\n") if !($_s.nil?)
                  $_wait = false
               end

metadata

@@ -1,71 +1,50 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rhomobile-debug
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 6
-  version: 1.0.6
+version: !ruby/object:Gem::Version
+  version: 1.0.7
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Rhomobile
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-27 00:00:00 -08:00
-default_executable: 
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies: []
-
 description: Rhomobile debugger extension
 email: dev@rhomobile.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - LICENSE
-files: 
+files:
 - README.md
 - LICENSE
 - lib/debugger.rb
 - CHANGELOG
-has_rdoc: true
 homepage: http://rhomobile.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Rhomobile debugger extension for RhoStudio
 test_files: []
-