rhodes 3.2.0.beta.8 → 3.2.0.beta.9

data/Manifest.txt

@@ -4736,6 +4736,7 @@ res/icons/rhosim.png
 res/icons/rhosim.psd
 rhobuild.yml.example
 rhodes.gemspec
+rhomobile-debug-1.0.4.gem
 rhomobile-debug.gemspec
 spec/framework_spec/app/application.rb
 spec/framework_spec/app/index.erb

data/lib/extensions/debugger/CHANGELOG

@@ -1,3 +1,6 @@
+## 1.0.4
+* Debugger low level messages excluded from application log
+
 ## 1.0.3
 * Fix working with Ruby 1.9.2
 

data/lib/extensions/debugger/debugger.rb

@@ -4,6 +4,21 @@ require 'timeout'
 DEBUGGER_STEP_TYPE = ['STEP','STOVER','STRET','SUSP']
 DEBUGGER_STEP_COMMENT = ['Stepped into','Stepped over','Stepped return','Suspended']
 
+DEBUGGER_LOG_LEVEL_DEBUG  = 0
+DEBUGGER_LOG_LEVEL_INFO  = 1
+DEBUGGER_LOG_LEVEL_WARN  = 2
+DEBUGGER_LOG_LEVEL_ERROR = 3
+
+def debugger_log(level, msg)
+  if (level >= DEBUGGER_LOG_LEVEL_WARN)
+    puts "[Debugger] #{msg}"
+  end
+end
+
+def log_command(cmd)
+  debugger_log(DEBUGGER_LOG_LEVEL_DEBUG, "Received command: #{cmd}")
+end
+
 def debug_read_cmd(io,wait)
   begin
     if wait
@@ -13,8 +28,7 @@ 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")
+    # $_s.write("get data from front end" + $_cmd.to_s + "\n")
   rescue
     # puts $!.inspect
   end
@@ -23,7 +37,7 @@ end
 def execute_cmd(cmd, advanced)
   #$_s.write("execute_cmd start\n")
   cmd = URI.unescape(cmd.gsub(/\+/,' ')) if advanced
-  puts "[Debugger] Executing: #{cmd.inspect}"
+  debugger_log(DEBUGGER_LOG_LEVEL_DEBUG, "Executing: #{cmd.inspect}")
   result = ""
   error = '0';
   begin
@@ -83,10 +97,6 @@ def get_variables(scope)
   end
 end
 
-def log_command(cmd)
-  # puts "[Debugger] Received command: #{cmd}"
-end
-
 def debug_handle_cmd(inline)
   #$_s.write("start of debug_handle_cmd wait=" + inline.to_s + "\n")
 
@@ -97,7 +107,7 @@ def debug_handle_cmd(inline)
   if cmd != ""
     if cmd =~/^CONNECTED/
       log_command(cmd)
-      puts "[Debugger] Connected to debugger"
+      debugger_log(DEBUGGER_LOG_LEVEL_INFO, "Connected to debugger")
       processed = true
     elsif cmd =~/^(BP|RM):/
       log_command(cmd)
@@ -105,26 +115,26 @@ def debug_handle_cmd(inline)
       bp = ary[1].gsub(/\|/,':') + ':' + ary[2].chomp
       if (cmd =~/^RM:/)
         $_breakpoint.delete(bp)
-        puts "[Debugger] Breakpoint removed: #{bp}"
+        debugger_log(DEBUGGER_LOG_LEVEL_DEBUG, "Breakpoint removed: #{bp}")
       else
         $_breakpoint.store(bp,1)
-        puts "[Debugger] Breakpoint added: #{bp}"
+        debugger_log(DEBUGGER_LOG_LEVEL_DEBUG, "Breakpoint added: #{bp}")
       end
       processed = true
     elsif cmd =~ /^RMALL/
       log_command(cmd)
       $_breakpoint.clear
-      puts "[Debugger] All breakpoints removed"
+      debugger_log(DEBUGGER_LOG_LEVEL_DEBUG, "All breakpoints removed")
       processed = true
     elsif cmd =~ /^ENABLE/
       log_command(cmd)
       $_breakpoints_enabled = true
-      puts "[Debugger] Breakpoints enabled"
+      debugger_log(DEBUGGER_LOG_LEVEL_DEBUG, "Breakpoints enabled")
       processed = true
     elsif cmd =~ /^DISABLE/
       log_command(cmd)
       $_breakpoints_enabled = false
-      puts "[Debugger] Breakpoints disabled"
+      debugger_log(DEBUGGER_LOG_LEVEL_DEBUG, "Breakpoints disabled")
       processed = true
     elsif inline and (cmd =~ /^STEPOVER/)
       $_s.write("STEPOVER start\n")
@@ -133,7 +143,7 @@ def debug_handle_cmd(inline)
       $_step_level = $_call_stack
       $_resumed = true
       wait = false
-      puts "[Debugger] Step over"
+      debugger_log(DEBUGGER_LOG_LEVEL_DEBUG, "Step over")
       processed = true
     elsif inline and (cmd =~ /^STEPRET/)
       log_command(cmd)
@@ -147,7 +157,7 @@ def debug_handle_cmd(inline)
       end
       $_resumed = true
       wait = false
-      puts "[Debugger] Step return" + comment
+      debugger_log(DEBUGGER_LOG_LEVEL_DEBUG, "Step return" + comment)
       processed = true
     elsif inline and (cmd =~ /^STEP/)
       log_command(cmd)
@@ -155,40 +165,40 @@ def debug_handle_cmd(inline)
       $_step_level = -1
       $_resumed = true
       wait = false
-      puts "[Debugger] Step into"
+      debugger_log(DEBUGGER_LOG_LEVEL_DEBUG, "Step into")
       processed = true
     elsif inline and (cmd =~ /^CONT/)
       log_command(cmd)
       wait = false
       $_step = 0
       $_resumed = true
-      puts "[Debugger] Resuming"
+      debugger_log(DEBUGGER_LOG_LEVEL_DEBUG, "Resuming")
       processed = true
     elsif cmd =~ /^SUSP/
       log_command(cmd)
       $_step = 4
       $_step_level = -1
       wait = true
-      puts "[Debugger] Suspend"
+      debugger_log(DEBUGGER_LOG_LEVEL_DEBUG, "Suspend")
       processed = true
     elsif cmd =~ /^KILL/
       log_command(cmd)
-      puts "[Debugger] Terminating..."
+      debugger_log(DEBUGGER_LOG_LEVEL_DEBUG, "Terminating...")
       processed = true
       System.exit
     elsif inline and (cmd =~ /^EVL?:/)
       log_command(cmd)
       processed = true
-      puts "[Debugger] Calc evaluation..."
+      debugger_log(DEBUGGER_LOG_LEVEL_DEBUG, "Calc evaluation...")
       execute_cmd cmd.sub(/^EVL?:/,""), (cmd =~ /^EVL:/ ? true : false)
     elsif  inline and (cmd =~ /^[GLCI]VARS/)
       log_command(cmd)
-      puts "[Debugger] Get variables..."
+      debugger_log(DEBUGGER_LOG_LEVEL_DEBUG, "Get variables...")
       get_variables cmd
       processed = true
     elsif inline
       log_command(cmd)
-      puts "[Debugger] Unknown command"
+      debugger_log(DEBUGGER_LOG_LEVEL_WARN, "Unknown command")
       processed = true
     end
   end
@@ -230,7 +240,7 @@ $_tracefunc = lambda{|event, file, line, id, bind, classname|
           fn = filename.gsub(/:/, '|')
           cl = classname.to_s.gsub(/:/,'#')
           $_s.write((step_stop ? DEBUGGER_STEP_TYPE[$_step-1] : "BP") + ":#{fn}:#{ln}:#{cl}:#{id}\n")
-          puts "[Debugger] " + (step_stop ? DEBUGGER_STEP_COMMENT[$_step-1] : "Breakpoint") + " in #{fn} at #{ln}"
+          debugger_log(DEBUGGER_LOG_LEVEL_DEBUG, (step_stop ? DEBUGGER_STEP_COMMENT[$_step-1] : "Breakpoint") + " in #{fn} at #{ln}")
           $_step = 0
           $_step_level = -1
 
@@ -278,7 +288,7 @@ $_tracefunc = lambda{|event, file, line, id, bind, classname|
 $_s = nil
 
 begin
-  puts "[Debugger] Opening connection"
+  debugger_log(DEBUGGER_LOG_LEVEL_INFO, "Opening connection")
   debug_host_env = ENV['RHOHOST']
   debug_port_env = ENV['rho_debug_port']
   debug_path_env = ENV['ROOT_PATH']
@@ -286,13 +296,13 @@ begin
   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
+  debugger_log(DEBUGGER_LOG_LEVEL_INFO, "host=" + debug_host_env.to_s)
+  debugger_log(DEBUGGER_LOG_LEVEL_INFO, "port=" + debug_port_env.to_s)
+  debugger_log(DEBUGGER_LOG_LEVEL_INFO, "path=" + debug_path_env.to_s)
 
   $_s = timeout(30) { TCPSocket.open(debug_host, debug_port) }
 
-  puts "[Debugger] Connected: " + $_s.to_s
+  debugger_log(DEBUGGER_LOG_LEVEL_WARN, "Connected: " + $_s.to_s)
   $_s.write("CONNECT\nHOST=" + debug_host.to_s + "\nPORT=" + debug_port.to_s + "\n")
  
   $_breakpoint = Hash.new
@@ -326,6 +336,6 @@ begin
   }
 
 rescue
-  puts "[Debugger] Unable to open connection to debugger: " + $!.inspect
+  debugger_log(DEBUGGER_LOG_LEVEL_ERROR, "Unable to open connection to debugger: " + $!.inspect)
   $_s = nil
 end

data/lib/extensions/rexml/rexml/parsers/baseparser.rb

@@ -257,7 +257,7 @@ module REXML
             md = @source.match(/\s*/um, true)
             if @source.encoding == "UTF-8"
               if @source.buffer.respond_to? :force_encoding
-                @source.buffer.force_encoding(Encoding::UTF_8)
+                @source.buffer.force_encoding("UTF-8") #Encoding::UTF_8)
               end
             end
           end

data/lib/extensions/rexml/rexml/source.rb

@@ -60,7 +60,7 @@ module REXML
       else
         @to_utf = false
         if @buffer.respond_to? :force_encoding
-          @buffer.force_encoding Encoding::UTF_8
+          @buffer.force_encoding "UTF-8" #Encoding::UTF_8
         end
       end
     end
@@ -166,7 +166,7 @@ module REXML
       if !@to_utf and
           @buffer.respond_to?(:force_encoding) and
           @source.respond_to?(:external_encoding) and
-          @source.external_encoding != ::Encoding::UTF_8
+          @source.external_encoding != "UTF-8" #::Encoding::UTF_8
         @force_utf8 = true
       else
         @force_utf8 = false
@@ -261,7 +261,7 @@ module REXML
       if @to_utf
         decode(str)
       else
-        str.force_encoding(::Encoding::UTF_8) if @force_utf8
+        str.force_encoding("UTF-8") if @force_utf8
         str
       end
     end

data/lib/extensions/rhoxml/rexml/parsers/baseparser.rb

@@ -257,7 +257,7 @@ module REXML
             md = @source.match(/\s*/um, true)
             if @source.encoding == "UTF-8"
               if @source.buffer.respond_to? :force_encoding
-                @source.buffer.force_encoding(Encoding::UTF_8)
+                @source.buffer.force_encoding("UTF-8") #Encoding::UTF_8)
               end
             end
           end

data/lib/extensions/rhoxml/rexml/source.rb

@@ -60,7 +60,7 @@ module REXML
       else
         @to_utf = false
         if @buffer.respond_to? :force_encoding
-          @buffer.force_encoding Encoding::UTF_8
+          @buffer.force_encoding "UTF-8" #Encoding::UTF_8
         end
       end
     end
@@ -197,7 +197,7 @@ module REXML
         str = decode(str) if @to_utf and str 
         @buffer << str
         if not @to_utf and @buffer.respond_to? :force_encoding
-          @buffer.force_encoding Encoding::UTF_8
+          @buffer.force_encoding "UTF-8" #Encoding::UTF_8
         end
       rescue Exception, NameError
         @source = nil

data/lib/extensions/uri/uri/common.rb

@@ -744,13 +744,13 @@ module URI
     end
     str = str.to_s
     if HTML5ASCIIINCOMPAT.include?(str.encoding)
-      str = str.encode(Encoding::UTF_8)
+      str = str.encode("UTF-8") #Encoding::UTF_8)
     else
       str = str.dup
     end
-    str.force_encoding(Encoding::ASCII_8BIT)
+    str.force_encoding("ASCII-8BIT") #Encoding::ASCII_8BIT)
     str.gsub!(/[^*\-.0-9A-Z_a-z]/, TBLENCWWWCOMP_)
-    str.force_encoding(Encoding::US_ASCII)
+    str.force_encoding("US-ASCII") #Encoding::US_ASCII)
   end
 
   # Decode given +str+ of URL-encoded form data.
@@ -758,7 +758,7 @@ module URI
   # This decods + to SP.
   #
   # See URI.encode_www_form_component, URI.decode_www_form
-  def self.decode_www_form_component(str, enc=Encoding::UTF_8)
+  def self.decode_www_form_component(str, enc="UTF-8") #Encoding::UTF_8)
     if TBLDECWWWCOMP_.empty?
       tbl = {}
       256.times do |i|
@@ -833,7 +833,7 @@ module URI
   # p Hash[ary]            # => {"a"=>"2", "b"=>"3"}
   #
   # See URI.decode_www_form_component, URI.encode_www_form
-  def self.decode_www_form(str, enc=Encoding::UTF_8)
+  def self.decode_www_form(str, enc="UTF-8") #Encoding::UTF_8)
     return [] if str.empty?
     unless /\A#{WFKV_}*=#{WFKV_}*(?:[;&]#{WFKV_}*=#{WFKV_}*)*\z/o =~ str
       raise ArgumentError, "invalid data of application/x-www-form-urlencoded (#{str})"

data/platform/iphone/Classes/AppManager/AppManager.m

@@ -217,14 +217,6 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
 
     BOOL restoreSymLinks_only = NO;
 
-    {
-        NSString* testName = [rhoRoot stringByAppendingPathComponent:@"lib"];
-        if (![fileManager fileExistsAtPath:testName]) {
-            restoreSymLinks_only = YES;
-        }
-        restoreSymLinks_only = NO;
-    }
-    
     BOOL contentChanged;
     if (nameChanged)
         contentChanged = YES;

data/res/generators/templates/application/public/css/iphone.css

@@ -787,14 +787,21 @@ h1 {
 .ui-btn-left[data-icon="arrow-l"] {
     margin-top: 2px;
     -webkit-box-shadow: none;
-    -webkit-border-bottom-left-radius: 16px 16px;
-    -webkit-border-bottom-right-radius: 6px 6px;
-    -webkit-border-image: url(../images/backButton.png) 0 5 0 13 stretch stretch;
-    -webkit-border-top-left-radius: 16px 16px;
-    -webkit-border-top-right-radius: 6px 6px;
-    border-width: 0 5px 0 13px;
+/*
+    -webkit-border-bottom-left-radius: 200px 50px;
+    -webkit-border-top-left-radius: 200px 50px;
+*/
+    border-color: transparent;
+    background-color: transparent;
+    background-image: none;
+
+    -webkit-border-bottom-right-radius: 7px 7px;
+    -webkit-border-top-right-radius: 7px 7px;
+    -webkit-border-image: url(../images/backButton.png) 2 7 2 13 stretch stretch;
+    border-width: 1px 5px 2px 13px;
     width: auto;
 }
+
 a.ui-btn-left[data-rel="back"] .ui-icon,
 a.ui-btn-left[data-icon="back"] .ui-icon,
 a.ui-btn-left[data-icon="arrow-l"] .ui-icon {

data/rhomobile-debug.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rhomobile-debug"
-  s.version = "1.0.3"
+  s.version = "1.0.4"
   s.authors = ["Rhomobile"]
   s.date    = Time.now.strftime('%Y-%m-%d')
   s.description = %q{Rhomobile debugger extension}

data/version

@@ -1 +1 @@
-3.2.0.beta.8
+3.2.0.beta.9

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  hash: 62196467
+  hash: 62196465
   prerelease: true
   segments: 
   - 3
   - 2
   - 0
   - beta
-  - 8
-  version: 3.2.0.beta.8
+  - 9
+  version: 3.2.0.beta.9
 platform: ruby
 authors: 
 - Rhomobile
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-19 00:00:00 -07:00
+date: 2011-10-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -4853,6 +4853,7 @@ files:
 - res/icons/rhosim.psd
 - rhobuild.yml.example
 - rhodes.gemspec
+- rhomobile-debug-1.0.4.gem
 - rhomobile-debug.gemspec
 - spec/framework_spec/app/application.rb
 - spec/framework_spec/app/index.erb