rhodes 2.0.0.rc2 → 2.0.0

data/README.textile

@@ -20,7 +20,7 @@ Rhodes features an application generator called rhogen that generates  a control
 
   rhogen app appname
 
-This will generate a config.rb and an index.html file.  Currently config.rb is focused on describing what source to sync with.  Modify the URL that you see in this file with whatever your RhoSync server URL and source ID are for this particular "source" or data model.   It is assumed that you've already set up a RhoSync "source adapter" as described by the "RhoSync docs":http://wiki.rhomobile.com/index.php/RhoSync_2.0.
+This will generate a config.rb and an index.html file.  Currently config.rb is focused on describing what source to sync with.  Modify the URL that you see in this file with whatever your RhoSync server URL and source ID are for this particular "source" or data model.   It is assumed that you've already set up a RhoSync "source adapter" as described by the "RhoSync docs":http://wiki.rhomobile.com/index.php/RhoSync.
 
 h3. Generate a Model and Associated Controller and Templates
 
@@ -36,9 +36,9 @@ This will generate a controller as the file controller.rb and several views as a
 
 h2. MORE RESOURCES
 
-There is a "tutorial available":http://rhomobile.com/wiki/index.php/Tutorial2 on the "Rhomobile site":http://www.rhomobile.com.  This includes thorough and current platform by platform build instructions.
+There is a "tutorial available":http://wiki.rhomobile.com/index.php/Tutorial on the "Rhomobile site":http://www.rhomobile.com.  This includes thorough and current platform by platform build instructions.
 
-The "Rhodes spec":http://rhomobile.com/wiki/index.php/Rhodes for full documentation on the Rhodes framework.
+The "Rhodes Developer Reference":http://wiki.rhomobile.com/index.php/Rhodes for full documentation on the Rhodes framework.
 
 For further questions "email us":mailto:info@rhomobile.com or join the "Google Group":http://groups.google.com/group/rhomobile.
 

data/lib/build/jake.rb

@@ -94,7 +94,59 @@ class Jake
     conf
   end
 
-  def self.run2(command, args, options = {})
+  def self.before_run_spec()
+    $total ||= 0
+    $passed ||= 0
+    $failed ||= 0
+    $faillog = []
+    $getdump = false
+  end
+  
+  def self.process_spec_output(line)
+      puts line if line =~ /\| - it/ or line =~ /\| describe/
+
+      if $getdump
+        if line =~ /^I/
+          $getdump = false
+        else
+          $faillog << line
+        end
+      end
+
+      if line =~ /\*\*\*Failed:\s+(.*)/
+        $failed += $1.to_i
+        return false
+      elsif line =~ /\*\*\*Total:\s+(.*)/
+        $total += $1.to_i
+      elsif line =~ /\*\*\*Passed:\s+(.*)/
+        $passed += $1.to_i
+      end
+
+      if line =~ /\| FAIL:/
+        $faillog << line.gsub(/I.*APP\|/,"\n\n***")
+        $getdump = true
+      end
+      
+      return true
+  end
+  
+  def self.process_spec_results(start)
+    finish = Time.now
+  
+    rm_rf $app_path + "/faillog.txt"
+    File.open($app_path + "/faillog.txt", "w") { |io| $faillog.each {|x| io << x }  } if $failed.to_i > 0
+    
+    puts "************************"
+    puts "\n\n"
+    puts "Tests completed in #{finish - start} seconds"
+    puts "Total: #{$total}"
+    puts "Passed: #{$passed}"
+    puts "Failed: #{$failed}"
+    puts "\n"
+    puts "Failures stored in faillog.txt" if $failed.to_i > 0
+  end
+
+  def self.run2(command, args, options = {}, &block)
   	argv = []
   	currentdir = ""
   	retval = ""
@@ -133,8 +185,16 @@ class Jake
       else
         IO.popen(argv) do |f|
           while line = f.gets
-            puts line
-            $stdout.flush
+            if block_given?
+                res = yield(line)
+                if !res
+                    #puts "f.pid : #{f.pid}"
+                    Process.kill( 9, f.pid ) 
+                end    
+            else
+                puts line
+                $stdout.flush
+            end    
           end
         end
       end

data/lib/framework/rho/rhofsconnector.rb

@@ -33,7 +33,12 @@ module Rho
       end
       
       def get_blob_path(relative_path)
-        File.join(__rhoGetCurrentDir(), relative_path)
+        cur_dir = __rhoGetCurrentDir()
+        if cur_dir && cur_dir.length()>0
+            File.join(cur_dir, relative_path)
+        else
+            relative_path
+        end    
       end
       
     end

data/lib/framework/rhom/rhom.rb

@@ -41,7 +41,7 @@ module Rhom
         c_id.nil? ? nil : c_id['client_id']
       end
       
-      def database_full_reset
+      def database_full_reset(reset_client_info=false)
         SyncEngine.stop_sync
         
         ::Rho::RHO.get_user_db().execute_sql("UPDATE client_info SET reset=1")
@@ -51,7 +51,8 @@ module Rhom
         ::Rho::RHO.get_user_db().execute_sql("UPDATE sources SET token=0")
         
         ::Rho::RHO.get_db_partitions().each_value do |db|
-            db.destroy_tables(:exclude => ['sources','client_info'])
+            db.destroy_tables(
+             :exclude => (reset_client_info ? ['sources'] : ['sources','client_info']) )
         end
       
         hash_migrate = {}
@@ -62,6 +63,11 @@ module Rhom
         database_full_reset
         SyncEngine.logout
       end
+
+      def database_fullclient_reset_and_logout
+        database_full_reset(true)
+        SyncEngine.logout
+      end
       
         def search(args)
           searchParams = ""

data/platform/android/Rhodes/jni/include/rhodes.h

@@ -6,6 +6,8 @@
 
 JNIEnv *jnienv();
 
+jclass rho_find_class(JNIEnv *env, const char *c);
+
 namespace details
 {
 

data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_Rhodes.h

@@ -117,6 +117,14 @@ JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_Rhodes_doRequest
 JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_Rhodes_makeLink
   (JNIEnv *, jclass, jstring, jstring);
 
+/*
+ * Class:     com_rhomobile_rhodes_Rhodes
+ * Method:    initClassLoader
+ * Signature: (Ljava/lang/ClassLoader;)V
+ */
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_Rhodes_initClassLoader
+  (JNIEnv *, jobject, jobject);
+
 #ifdef __cplusplus
 }
 #endif

data/platform/android/Rhodes/jni/src/rhodes.cpp

@@ -308,6 +308,25 @@ static bool set_capabilities(JNIEnv *env)
     return true;
 }
 
+static jobject g_classLoader = NULL;
+static jmethodID g_loadClass = NULL;
+
+jclass rho_find_class(JNIEnv *env, const char *c)
+{
+    jstring className = env->NewStringUTF(c);
+    jclass cls = (jclass)env->CallObjectMethod(g_classLoader, g_loadClass, className);
+    env->DeleteLocalRef(className);
+    return cls;
+}
+
+RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_Rhodes_initClassLoader
+  (JNIEnv *env, jobject, jobject cl)
+{
+    g_classLoader = env->NewGlobalRef(cl);
+    jclass javaLangClassLoader = env->FindClass("java/lang/ClassLoader");
+    g_loadClass = env->GetMethodID(javaLangClassLoader, "loadClass", "(Ljava/lang/String;)Ljava/lang/Class;");
+}
+
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_Rhodes_createRhodesApp
   (JNIEnv *env, jobject, jstring path)
 {

data/platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java

@@ -141,6 +141,8 @@ public class Rhodes extends Activity {
 	
 	public native static void makeLink(String src, String dst);
 	
+	private native void initClassLoader(ClassLoader c);
+	
 	private void initRootPath() {
 		Log.d(TAG, "Check if the SD card is mounted...");
 		String state = Environment.getExternalStorageState();
@@ -478,6 +480,8 @@ public class Rhodes extends Activity {
 		uiThreadId = ct.getId();
 
 		RhodesInstance.setInstance(this);
+
+		initClassLoader(this.getClassLoader());
 		
 		initRootPath();
 		try {

data/platform/android/build/android.rake

@@ -931,11 +931,11 @@ namespace "package" do
   end
 end
 
-def get_app_log(appname, device)
+def get_app_log(appname, device, silent = false)
   pkgname = 'com.rhomobile.' + appname.downcase.gsub(/[^A-Za-z_0-9]/, '')
   path = File.join('/sdcard/rhomobile', pkgname, 'RhoLog.txt')
   cc_run($adb, [device ? '-d' : '-e', 'pull', path, $app_path]) or return false
-  puts "RhoLog.txt stored to " + $app_path
+  puts "RhoLog.txt stored to " + $app_path unless silent
   return true
 end
 
@@ -1080,7 +1080,57 @@ end
 
 namespace "run" do
   namespace "android" do
+    
+    task :spec => ["device:android:debug"] do
+        run_emulator
+        do_uninstall('-e')
+        
+        log_name  = $app_path + '/RhoLog.txt'
+        File.delete(log_name) if File.exist?(log_name)
+        
+        load_app_and_run
+
+        Jake.before_run_spec
+        start = Time.now
+
+        puts "wating for log"
+      
+        while !File.exist?(log_name)
+            get_app_log($appname, false, true)
+            sleep(1)
+        end
+
+        puts "start read log"
+        
+        end_spec = false
+        while !end_spec do
+            get_app_log($appname, false, true)
+            io = File.new(log_name, "r")
+        
+            io.each do |line|
+                #puts line
+                
+                end_spec = !Jake.process_spec_output(line)
+                break if end_spec
+            end
+            io.close
+            
+            sleep(5) unless end_spec
+        end
+
+        #TODO: stop app
+        Jake.process_spec_results(start)        
+        
+        $stdout.flush
+        
+    end
+    
     task :emulator => "device:android:debug" do
+        run_emulator
+        load_app_and_run
+    end
+
+    def  run_emulator
       apkfile = Jake.get_absolute $targetdir + "/" + $appname + "-debug.apk"
       puts `"#{$adb}" start-server`
 
@@ -1103,8 +1153,11 @@ namespace "run" do
       puts "Emulator is up and running" if running
       $stdout.flush
       puts `"#{$adb}" -e wait-for-device`
-
+    end
+    
+    def  load_app_and_run
       puts "Loading package into emulator"
+      apkfile = Jake.get_absolute $targetdir + "/" + $appname + "-debug.apk"
       count = 0
       done = false
       while count < 20

data/platform/bb/build/bb.rake

@@ -52,7 +52,7 @@ def stopmds
   Jake.run("cmd.exe",args, mdshome, true, true)
 end 
 
-def startsim
+def startsim(hidden=false)
   sim = $config["env"]["paths"][$bbver]["sim"]
   jde = $config["env"]["paths"][$bbver]["jde"]
     
@@ -68,6 +68,7 @@ def startsim
   args << "/pin=0x2100000A"
   args << "/no-compact-filesystem"
   args << "/JvmDisableBacklightTimeout"
+  args << "/start-hidden" if hidden
   #args << "/keep-lcd-on"
     
   if $bbver !~ /^4\.[012](\..*)?$/
@@ -741,6 +742,47 @@ namespace "run" do
         startmds
         startsim
       end
+      
+      task :spec => ["clean:bb", "run:bb:stopmdsandsim", "package:bb:production_sim"] do
+        jde = $config["env"]["paths"][$bbver]["jde"]
+        cp_r File.join($targetdir,"/."), jde + "/simulator"
+        rm_rf jde + "/simulator/sdcard/Rho"
+        
+        log_name  = Jake.get_absolute($app_config["applog"] )
+        File.delete(log_name) if File.exist?(log_name)
+        
+        startmds
+        startsim(true)
+
+        Jake.before_run_spec
+        start = Time.now
+      
+        while !File.exist?(log_name)
+            sleep(1)
+        end
+        
+        io = File.new(log_name, "r")
+        end_spec = false
+        while !end_spec do
+            io.each do |line|
+                #puts line
+                
+                end_spec = !Jake.process_spec_output(line)
+                break if end_spec
+            end
+            sleep(1) unless end_spec
+        end
+        
+        io.close
+        
+        stopsim  
+        stopmds
+
+        Jake.process_spec_results(start)        
+        
+        $stdout.flush
+        
+      end
   end
   
   desc "Builds everything, loads and starts bb sim and mds"

data/platform/iphone/Classes/RhoAlert.m

@@ -25,7 +25,7 @@ static UIAlertView *currentAlert = nil;
 }
 
 @property (nonatomic,retain) NSString *callback;
-@property (nonatomic,retain) NSArray *buttons;
+@property (nonatomic,retain) NSMutableArray *buttons;
 
 - (id)init;
 - (void)dealloc;

data/platform/shared/rubyJVM/src/com/rho/file/RandomAccessFile.java

@@ -34,8 +34,13 @@ public class RandomAccessFile
     {
     	String name = (file != null ? file.getAbsolutePath() : null);
     	int imode = -1;
-    	if (mode.equals("r"))
+    	if (mode.equals("r") || mode.equals("rb"))
     	    imode = Connector.READ;
+    	else if (mode.equals("w") || mode.equals("wb"))
+    	{
+    	    imode = Connector.WRITE;
+    	    m_bWriteAccess = true;
+    	}
     	else if (mode.startsWith("rw")) {
     	    imode = Connector.READ_WRITE;
     	    m_bWriteAccess = true;

data/platform/shared/rubyJVM/src/com/rho/net/NetRequest.java

@@ -644,7 +644,7 @@ public class NetRequest
 		return strRes;
 	}
 
-	private final String readFully(InputStream in, String strContType) throws Exception 
+	public static final String readFully(InputStream in, String strContType) throws Exception 
 	{
 		String strRes = "";
 		byte[]  byteBuffer = new byte[1024*4];

data/platform/shared/rubyJVM/src/com/xruby/GeneratedMethods/RubyIO_Methods.java

@@ -9,6 +9,11 @@ klass.getSingletonClass().defineMethod( "read", new RubyVarArgMethod(){
 	protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block ){
 		return RubyIO.read(receiver, args, block);}
 });
+klass.getSingletonClass().defineMethod( "binread", new RubyVarArgMethod(){ 
+	protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block ){
+		return RubyIO.binread(receiver, args, block);}
+});
+
 klass.defineMethod( "gets", new RubyVarArgMethod(){ 
 	protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block ){
 		return ((RubyIO)receiver).gets(args);}

data/platform/shared/rubyJVM/src/com/xruby/runtime/builtin/InputStreamExecutor.java

@@ -7,7 +7,7 @@ import com.xruby.runtime.lang.RubyValue;
 import java.io.InputStream;
 import java.io.IOException;
 
-import javolution.io.UTF8StreamReader;
+//import javolution.io.UTF8StreamReader;
 
 public class InputStreamExecutor implements RubyIOExecutor {
 

data/platform/shared/rubyJVM/src/com/xruby/runtime/builtin/RubyFile.java

@@ -5,6 +5,9 @@
 
 package com.xruby.runtime.builtin;
 
+import java.io.InputStream;
+
+import com.rho.RhoRuby;
 import com.xruby.runtime.lang.*;
 //import com.xruby.runtime.lang.annotation.RubyLevelClass;
 //import com.xruby.runtime.lang.annotation.RubyLevelMethod;
@@ -154,6 +157,23 @@ public class RubyFile extends RubyIO {
     //@RubyLevelMethod(name="size", singleton=true)
     public static RubyValue size(RubyValue receiver, RubyValue arg) {
         String fileName = arg.toStr();
+    	InputStream stream = null;
+        
+        if ( fileName.startsWith("/apps"))
+        {
+			try {
+				stream = RhoRuby.loadFile("/" + fileName);
+				if ( stream != null )
+				{
+		        	RubyValue res = ObjectFactory.createInteger(stream.available());
+		        	stream.close();
+		        	return res;
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+        }
+        
         File file = new File(fileName);
         if (!file.isFile() && !file.isDirectory()) {
             throw new RubyException(RubyRuntime.RuntimeErrorClass, "No such file or directory - " + fileName);