rhodes 3.4.2 → 3.5.1.12

data/platform/android/build/android_tools.rb

@@ -205,40 +205,208 @@ def is_device_running
 end
 module_function :is_device_running
 
-def run_application (target_flag)
+def  run_emulator(options = {})
+  system("\"#{$adb}\" start-server")
+
+  rm_f $applog_path if !$applog_path.nil?
+  logcat_process()
+  
+  unless is_emulator_running
+    puts "Need to start emulator" if USE_TRACES
+
+    if $appavdname
+      $avdname = $appavdname
+    else
+      $avdname = "rhoAndroid" + $emuversion.gsub(/[^0-9]/, "")
+      $avdname += "google" if $use_google_addon_api
+      $avdname += "motosol" if $use_motosol_api
+    end
+    
+    targetid = $androidtargets[get_api_level($emuversion)]
+    
+    unless File.directory?( File.join(ENV['HOME'], ".android", "avd", "#{$avdname}.avd" ) )
+      if USE_TRACES
+        puts "AVD name: #{$avdname}, emulator version: #{$emuversion}, target id: #{targetid}"
+      end
+      raise "Unable to create AVD image. No appropriate target API for SDK version: #{$emuversion}" unless targetid
+      createavd = "\"#{$androidbin}\" create avd --name #{$avdname} --target #{targetid} --sdcard 128M"
+      puts "Creating AVD image: #{$avdname}"
+      IO.popen(createavd, 'r+') do |io|
+        io.puts "\n"
+        while line = io.gets
+          puts line
+        end
+      end
+      
+    else
+      raise "Unable to run Android emulator. No appropriate target API for SDK version: #{$emuversion}" unless targetid
+    end
+
+    # Start the emulator, check on it every 5 seconds until it's running
+    cmd = "\"#{$emulator}\" -cpu-delay 0"
+    cmd << " -no-window" if options[:hidden]
+    cmd << " -avd #{$avdname}"
+    Thread.new { system(cmd) }
+
+    puts "Waiting for emulator..."
+    res = 'error'        
+    while res =~ /error/ do
+      sleep 5
+      res = Jake.run $adb, ['-e', 'wait-for-device']
+      puts res
+    end
+
+    puts "Waiting up to 600 seconds for emulator..."
+    startedWaiting = Time.now
+    adbRestarts = 1
+    while (Time.now - startedWaiting < 600 )
+        sleep 5
+        now = Time.now
+        started = false
+        booted = true
+        Jake.run2 $adb, ["-e", "shell", "ps"], :system => false, :hideerrors => false do |line|
+            #puts line
+            booted = false if line =~ /bootanimation/
+            started = true if line =~ /android\.process\.acore/
+            true
+        end
+        #puts "started: #{started}, booted: #{booted}"
+        unless started and booted
+            printf("%.2fs: ",(now - startedWaiting))
+            if (now - startedWaiting) > (180 * adbRestarts)
+              # Restart the adb server every 60 seconds to prevent eternal waiting
+              puts "Appears hung, restarting adb server"
+              restart_adb
+              Jake.run($adb, ['start-server'], nil, true)
+              adbRestarts += 1
+
+              rm_f $applog_path if !$applog_path.nil?
+              logcat_process()
+            else
+              puts "Still waiting..."
+            end
+        else
+            puts "Success"
+            puts "Device is ready after " + (Time.now - startedWaiting).to_s + " seconds"
+            break
+        end
+    end
+    raise "Emulator still isn't up and running, giving up" unless is_emulator_running
+  end
+
+  puts "Emulator is up and running"
+  $stdout.flush
+end
+module_function :run_emulator
+
+def run_application (device_flag, pkgname)
+  puts "Starting application.."
   args = []
-  args << target_flag
+  args << device_flag
   args << "shell"
   args << "am"
   args << "start"
   args << "-a"
   args << "android.intent.action.MAIN"
   args << "-n"
-  args << $app_package_name + "/#{JAVA_PACKAGE_NAME}.RhodesActivity"
+  args << pkgname + "/#{JAVA_PACKAGE_NAME}.RhodesActivity"
   Jake.run($adb, args)
 end
 module_function :run_application
 
-def application_running(flag, pkgname)
+def application_running(device_flag, pkgname)
   pkg = pkgname.gsub(/\./, '\.')
   system("\"#{$adb}\" start-server")
-  `"#{$adb}" #{flag} shell ps`.split.each do |line|
+  `"#{$adb}" #{device_flag} shell ps`.split.each do |line|
     return true if line =~ /#{pkg}/
   end
   false
 end
 module_function :application_running
 
-def  kill_adb
-    # stop app
-    if RUBY_PLATFORM =~ /(win|w)32$/
-        # Windows
-        `taskkill /F /IM adb.exe`
-    else
-        `killall -9 adb`
+def load_app_and_run(device_flag, apkfile, pkgname)
+  device = 'started emulator'
+  if device_flag == '-d'
+    device = 'connected device'
+  end
+
+  puts "Loading package..."
+
+  argv = [$adb, device_flag, "install", "-r", apkfile]
+  cmd = ""
+  argv.each { |arg| cmd << "#{arg} "}
+  argv = cmd if RUBY_VERSION =~ /^1\.8/
+  #cmd = "#{$adb} #{device_flag} install -r #{apkfile}"
+  #puts "CMD: #{cmd}" 
+
+  count = 0
+  done = false
+  child = nil
+  while count < 20
+    theoutput = ""
+    begin
+      status = Timeout::timeout(30) do
+        puts "CMD: #{cmd}"
+        IO.popen(argv) do |pipe|
+          child = pipe.pid
+          while line = pipe.gets
+            theoutput << line
+            puts "RET: #{line}"
+          end
+        end
+      end
+    rescue Timeout::Error
+      Process.kill 9, child if child
+      if theoutput == ""
+        puts "Timeout reached while empty output: killing adb server and retrying..."
+        `#{$adb} kill-server`
+        count += 1
+        sleep 1
+        next
+      else
+        puts "Timeout reached: try to run application"
+        done = true
+        break
+      end
+    end
+
+    if theoutput.to_s.match(/Success/)
+      done = true
+      break
+    end
+    
+    if theoutput.to_s.match(/INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES/)
+      raise "Inconsistent sertificates: please, uninstall application signed with another sertificate from #{device} first"
+    end
+    if theoutput.to_s.match(/INSTALL_FAILED_MISSING_SHARED_LIBRARY/)
+      raise "Missing shared library: application is not compatible with #{device} due to lack of required libraries"
     end
+    
+    puts "Failed to load (possibly because emulator/device is still offline) - retrying"
+    $stdout.flush
+    sleep 1
+    count += 1
+  end
+
+  run_application(device_flag, pkgname) if done
+end
+module_function :load_app_and_run
+
+def restart_adb
+  puts 'Killing adb server'
+  system("#{$adb} kill-server")
+  #if RUBY_PLATFORM =~ /(win|w)32$/
+  #  # Windows
+  #  system ('taskkill /F /IM adb.exe')
+  #else
+  #  system ('killall -9 adb')
+  #end
+  sleep 3
+  puts 'Starting adb server again'
+  system("#{$adb} start-server")
+  sleep 3
 end
-module_function :kill_adb
+module_function :restart_adb
 
 def kill_adb_and_emulator
   if RUBY_PLATFORM =~ /windows|cygwin|mingw/

data/platform/bb/Hsqldb/src/org/hsqldb/CompiledStatementExecutor.java

@@ -108,14 +108,14 @@ final class CompiledStatementExecutor {
         			bReportNonUnique )
         	{}
         	else
-        		LOG.ERROR("execute statement failed.", e);
+        		LOG.ERROR("execute statement failed: " + cs.describe(this.session) + ";", e);
         	
             result = new Result(e, cs.sql);
         } catch (Exception e) {
-        	LOG.ERROR("execute statement failed.", e);
+        	LOG.ERROR("execute statement failed: " + cs.describe(this.session) + ";", e);
             result = new Result(e, cs.sql);
         } catch (Throwable t) {
-        	LOG.ERROR("execute statement failed.", t);
+        	LOG.ERROR("execute statement failed: " + cs.describe(this.session) + ";", t);
             result = new Result(t, cs.sql);
         }
 

data/platform/bb/Hsqldb/src/org/hsqldb/Expression.java

@@ -1670,9 +1670,11 @@ public class Expression {
                     TableFilter filter     = (TableFilter) filters.get(j);
                     String      filterName = filter.getName();
 
-                    if (tableName == null || filterName.equals(tableName)) {
+                    if (tableName == null || filterName.equalsIgnoreCase(tableName)) {
                         Table table = filter.getTable();
                         int   i     = table.findColumn(columnName);
+                        if (i == -1)
+                        	i = table.findColumn(columnNameOrig);
 
                         if (i != -1) {
                             if (tableName == null) {
@@ -1957,7 +1959,7 @@ public class Expression {
 
                 String filterName = f.getName();
 
-                if (tableName == null || tableName.equals(filterName)) {
+                if (tableName == null || tableName.equalsIgnoreCase(filterName)) {
                     Table table = f.getTable();
                     int   i     = table.findColumn(columnName);
                     if (i == -1)

data/platform/bb/RubyVM/src/com/rho/IRhoRubyHelper.java

@@ -61,4 +61,6 @@ public interface IRhoRubyHelper {
 	public void app_exit();
 	
 	public void unzip_file(String strPath)throws Exception;
+	
+	public void webview_execute_js(String strScript);
 }

data/platform/bb/RubyVM/src/com/rho/RhoRuby.java

@@ -137,6 +137,12 @@ public class RhoRuby {
 		return receiver!= null && receiver != RubyConstant.QNIL;
 	}
 	
+	public static void rho_ruby_callmethod(String strMethod)
+	{
+		RubyID methodID = RubyID.intern(strMethod);
+		RubyAPI.callGlobalNoArgMethod(null, methodID);
+	}
+	
 	public static boolean isMainRubyThread()
 	{
 		return RubyThread.isMainThread();

data/platform/bb/RubyVM/src/com/rho/ThreadQueue.java

@@ -177,13 +177,13 @@ public abstract class ThreadQueue extends RhoThread
 	                LOG.INFO("ThreadQueue blocked for " + nWait + " seconds...");
 	                wait(nWait);
 	                
-	                if ( isNoCommands() )
+	                if ( !m_bNoThreaded && !isStopping() && isNoCommands() )
 	                	onTimeout();
 	            }
             }
             nLastPollInterval = 0;
 
-            if ( !isStopping() )
+            if ( !m_bNoThreaded && !isStopping() )
             {
 	        	try{
 	        		processCommands();
@@ -213,12 +213,17 @@ public abstract class ThreadQueue extends RhoThread
 	    while(!isStopping() && !isNoCommands())
 	    {
 		    IQueueCommand pCmd = null;
-		    synchronized(m_mxStackCommands)
-		    {
-    		    pCmd = (IQueueCommand)m_stackCommands.removeFirst();
-    	    }
-    		
-		    processCommandBase(pCmd);
+	    	try
+	    	{
+			    synchronized(m_mxStackCommands)
+			    {
+	    		    pCmd = (IQueueCommand)m_stackCommands.removeFirst();
+	    	    }
+	    	}catch(Exception exc){}
+	    	
+	    	if ( pCmd != null )
+	    		processCommandBase(pCmd);
+	    	
 	    }
     }
 

data/platform/bb/RubyVM/src/com/rho/db/DBAdapter.java

@@ -152,6 +152,11 @@ public class DBAdapter extends RubyBasic
 		Object[] values = { new Integer(arg1), new Integer(arg2)};
 		return executeSQL(strStatement,values);
 	}
+
+	public IDBResult executeSQL(String strStatement, int arg1, Object arg2)throws DBException{
+		Object[] values = { new Integer(arg1), arg2};
+		return executeSQL(strStatement,values);
+	}
 	
 	public IDBResult executeSQL(String strStatement, long arg1)throws DBException{
 		Object[] values = { new Long(arg1)};
@@ -909,6 +914,103 @@ public class DBAdapter extends RubyBasic
         endTransaction();
     }
     
+    public void updateFullUpdateChanges(Integer nSrcID)throws DBException
+    {
+        IDBResult res = executeSQL("SELECT object, source_id, update_type, attrib FROM changed_values where source_id=? and update_type=? and sent=0", nSrcID, "update");
+        if ( res.isEnd() )
+            return;
+
+        startTransaction();
+
+        Vector/*<String>*/ arObj = new Vector(), arUpdateType = new Vector(), arAttribs = new Vector();
+        Vector/*<int>*/ arSrcID = new Vector();
+        for( ; !res.isEnd(); res.next() )
+        {
+            arObj.addElement(res.getStringByIdx(0));
+            arSrcID.addElement(new Integer(res.getIntByIdx(1)));
+            arUpdateType.addElement(res.getStringByIdx(2));
+            arAttribs.addElement(res.getStringByIdx(3));
+        }
+
+        Hashtable/*<String, int>*/ hashObjs = new Hashtable();
+        for( int i = 0; i < (int)arObj.size(); i++ )
+        {
+            if (hashObjs.containsKey(arObj.elementAt(i)))
+                continue;
+            hashObjs.put(arObj.elementAt(i), new Integer(1));
+
+            IDBResult resSrc = executeSQL("SELECT name, schema FROM sources where source_id=?", arSrcID.elementAt(i) );
+            boolean bSchemaSource = false;
+            String strTableName = "object_values";
+            if ( !resSrc.isEnd() )
+            {
+                bSchemaSource = resSrc.getStringByIdx(1).length() > 0;
+                if ( bSchemaSource )
+                    strTableName = resSrc.getStringByIdx(0);
+            }
+
+            if (bSchemaSource)
+            {
+                IDBResult res2 = executeSQL( "SELECT * FROM " + strTableName + " where object=?", arObj.elementAt(i) );
+                for( int j = 0; j < res2.getColCount(); j ++)
+                {
+                    if ( res2.isNullByIdx(j) )
+                        continue;
+
+                    String strAttrib = res2.getColName(j);
+                    String value = res2.getStringByIdx(j);
+                    String attribType = getAttrMgr().isBlobAttr( (Integer)arSrcID.elementAt(i), strAttrib) ? "blob.file" : "";
+
+                    boolean bDuplicate = false;
+                    for( int k = i; k < (int)arObj.size(); k++ )
+                    {
+                        if ( arObj.elementAt(k) == arObj.elementAt(i) && strAttrib == arAttribs.elementAt(k) )
+                        {
+                            bDuplicate = true;
+                            break;
+                        }
+                    }
+                    if ( bDuplicate )
+                        continue;
+
+                    executeSQLReportNonUnique("INSERT INTO changed_values (source_id,object,attrib,value,update_type,attrib_type,sent) VALUES(?,?,?,?,?,?,?)", 
+                        arSrcID.elementAt(i), arObj.elementAt(i), strAttrib, value, arUpdateType.elementAt(i), attribType, new Integer(0) );
+                }
+            }else
+            {
+                IDBResult res2 = executeSQL( "SELECT attrib, value FROM " + strTableName + " where object=? and source_id=?", 
+                    arObj.elementAt(i), arSrcID.elementAt(i) );
+
+                for( ; !res2.isEnd(); res2.next() )
+                {
+                    if ( res2.isNullByIdx(1) )
+                        continue;
+
+                    String strAttrib = res2.getStringByIdx(0);
+                    String value = res2.getStringByIdx(1);
+                    String attribType = getAttrMgr().isBlobAttr( (Integer)arSrcID.elementAt(i), strAttrib ) ? "blob.file" : "";
+
+                    boolean bDuplicate = false;
+                    for( int k = i; k < (int)arObj.size(); k++ )
+                    {
+                        if ( arObj.elementAt(k) == arObj.elementAt(i) && strAttrib == arAttribs.elementAt(k) )
+                        {
+                            bDuplicate = true;
+                            break;
+                        }
+                    }
+                    if ( bDuplicate )
+                        continue;
+
+                    executeSQLReportNonUnique("INSERT INTO changed_values (source_id,object,attrib,value,update_type,attrib_type,sent) VALUES(?,?,?,?,?,?,?)", 
+                        arSrcID.elementAt(i), arObj.elementAt(i), strAttrib, value, arUpdateType.elementAt(i), attribType, new Integer(0) );
+                }
+            }
+        }
+
+        endTransaction();
+    }
+    
     void copyChangedValues(DBAdapter db)throws DBException
     {
     	updateAllAttribChanges();    	
@@ -1116,7 +1218,7 @@ public class DBAdapter extends RubyBasic
 		}catch(Exception e)
 		{
     		LOG.ERROR("execute failed.", e);
-			throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
+			throw (e instanceof RubyException ? (RubyException)e : new RubyException(RubyRuntime.ArgumentErrorClass, e.getMessage()));
 		}
     	
         return res;

data/platform/bb/RubyVM/src/com/rho/db/DBAttrManager.java

@@ -32,6 +32,7 @@ import com.rho.Mutex;
 import com.rho.Tokenizer;
 import com.xruby.runtime.lang.RubyValue;
 import com.rho.RhoRuby;
+import java.util.Vector;
 
 public class DBAttrManager {
     //private Mutex m_mxSrcAttrs = new Mutex();
@@ -48,6 +49,23 @@ public class DBAttrManager {
         return false;
     }
 
+    public Vector/*<String>*/ getBlobAttrs(Integer nSrcID) 
+    {
+    	Vector/*<String>*/ blobAttrs = new Vector();
+    	
+    	Hashtable/*<String,int>* */ mapAttr = (Hashtable)m_mapBlobAttrs.get( nSrcID );
+    	if ( mapAttr != null )
+    	{
+        	Enumeration enumAttrs = mapAttr.keys();
+    		while (enumAttrs.hasMoreElements()) 
+    		{
+    			blobAttrs.addElement(enumAttrs.nextElement());
+    		}
+    	}
+    	
+    	return blobAttrs;
+    }
+    
     public boolean hasBlobAttrs()
     {
     	return m_mapBlobAttrs.size() > 0;