rhodes 1.5.0 → 1.5.1

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 1.5.1
+* Fix issue #2924952 - BB Sim doesn't launch on windows 7
+* Fix issue #2931788 - iPhone: wrong refresh
+* Fix AsyncHttp 'cancel request'
+
 == 1.5.0
 * native screen resolution for iPad
 * native tab bar for android

data/bin/rhogen

@@ -21,10 +21,10 @@ class String
     return self
   end
   def encoding
-    if Encoding.responds_to?('new')
-      Encoding.new()
+    if RUBY_VERSION =~ /1\.8/ and Encoding.responds_to?('new')
+      Encoding.new
     else
-      Encoding.default_external()
+      Encoding.default_external
     end
   end
 end

data/lib/build/jake.rb

@@ -93,53 +93,62 @@ class Jake
 
     conf
   end
-  
-  def self.run(command, args, wd=nil,system = false, hideerrors = false)
-    argv = []
-    currentdir = ""
-    retval = ""
-    argv << command
-    argv += args
-    argv.map! { |x| x.to_s }.map! { |x| x =~ /^".*"$/ ? x[1..-2] : x }
 
-    if not wd.nil?
+  def self.run2(command, args, options = {})
+  	argv = []
+  	currentdir = ""
+  	retval = ""
+  	argv << command
+  	argv += args
+  	argv.map! { |x| x.to_s }.map! { |x| x =~ /^".*"$/ ? x[1..-2] : x }
+
+  	wd = options[:directory]
+  	if not wd.nil?
       currentdir = pwd()
-      chdir wd  
+      chdir wd
     end
-    
+
     cmdstr = argv.map { |x| x =~ / |\|/ ? '"' + x + '"' : x }.join(' ')
 
     puts "PWD: " + pwd
     puts "CMD: " + cmdstr
     $stdout.flush
-    
+
+    hideerrors = options[:hideerrors]
     if hideerrors
       if RUBY_PLATFORM =~ /(win|w)32$/
         nul = "nul"
       else
         nul = "/dev/null"
       end
-      argv << "2>" + nul
     end
-    #retval =  `#{command} #{argstr}`
-    #retval = %x[#{command}]
-    if system
+
+    if options[:system]
       system(cmdstr)
       retval = ""
     else
       argv = cmdstr if RUBY_VERSION =~ /^1\.8/
-      IO.popen(argv) { |f|
-        while line = f.gets
-          puts line
+      if options[:nowait]
+        IO.popen(argv)
+      else
+        IO.popen(argv) do |f|
+          while line = f.gets
+            puts line
+            $stdout.flush
+          end
         end
-      }
+      end
     end
+
     if not wd.nil?
       chdir currentdir
     end
-    
-    return retval
+
+    retval
+  end
   
+  def self.run(command, args, wd=nil,system = false, hideerrors = false)
+    self.run2(command, args, {:directory => wd, :system => system, :hiderrors => hideerrors})
   end
   
   def self.unjar(src,targetdir)

data/lib/framework/rhodes.rb

@@ -1,9 +1,9 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '1.5.0'
+    VERSION = '1.5.1'
   end
   unless defined? Rhodes::DBVERSION
-    DBVERSION = '1.5.0'
+    DBVERSION = '1.5.1'
   end
   
 end

data/lib/framework/version.rb

@@ -1,8 +1,8 @@
 module RhodesFramework
   unless defined? RhodesFramework::VERSION
-    VERSION = '1.5.0'
+    VERSION = '1.5.1'
   end
   unless defined? RhodesFramework::DBVERSION
-    DBVERSION = '1.5.0'
+    DBVERSION = '1.5.1'
   end
 end

data/lib/rhodes.rb

@@ -1,9 +1,9 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '1.5.0'
+    VERSION = '1.5.1'
   end
   unless defined? Rhodes::DBVERSION
-    DBVERSION = '1.5.0'
+    DBVERSION = '1.5.1'
   end
   
 end

data/platform/android/Rhodes/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.rhomobile.rhodes"
-      android:versionCode="19"
-      android:versionName="1.5.0">
+      android:versionCode="20"
+      android:versionName="1.5.1">
     <uses-sdk android:minSdkVersion="3" />
     <application android:icon="@drawable/icon"
           android:multiprocess="true"

data/platform/bb/build/bb.rake

@@ -58,15 +58,7 @@ def startsim
         
   args << "/app-param=JvmDebugFile:"+Jake.get_absolute($app_config["applog"])
 
-  # Wait until thread will start
-  rd, wr = IO.pipe
-  Thread.new {
-    wr.putc 0
-  	Jake.run(command,args,jde + "/simulator",true)
-  	$stdout.flush
-  }
-  rd.getc
-  sleep 1
+  Jake.run2 command, args, {:directory => jde + "/simulator", :nowait => true}
 end
 
 def stopsim
@@ -77,19 +69,8 @@ def stopsim
   args = []
   args << "/session="+sim
   args << "/execute=Exit(true)"
-  #Jake.run(command,args, jde + "/simulator")
-  #Thread.new { Jake.run(command,args, nil, true,true) }  
-  
-  # Wait until thread will start
-  rd, wr = IO.pipe
-  Thread.new {
-    wr.putc 0
-  	Jake.run(command,args, nil, true,true)
-  	$stdout.flush
-  }
-  rd.getc
-  sleep 1
   
+  Jake.run2 command, args, {:directory => jde + "/simulator", :nowait => true}
 end
 
 def manualsign

data/platform/bb/rhodes/src/rhomobile/RhodesApplication.java

@@ -1715,6 +1715,9 @@ final public class RhodesApplication extends UiApplication implements RenderingA
     			}catch(IOException exc)
     			{
     				LOG.ERROR("Callback failed: " + _url, exc);
+    				
+    				if ( m_netCallback != null )
+    					m_netCallback.setResponse( new NetResponse("", 500) );
     			}
     		}
     		else

data/platform/iphone/Classes/WebViewController.m

@@ -35,6 +35,8 @@ char* get_current_location() {
 	//UNLOCK(current_location);
 }*/
 
+extern int webview_active_tab();
+
 @interface UIBarButtonItemAction : NSObject
 {
     WebViewController *wc;
@@ -379,9 +381,9 @@ char* get_current_location() {
 }
 
 -(void)refresh {
-	[webView reload];
-	//const char* url = rho_rhodesapp_getcurrenturl();
-	//[self navigateRedirect:[NSString stringWithCString:url encoding:[NSString defaultCStringEncoding]]];
+    //[webView reload];
+    const char *appUrl = rho_rhodesapp_getcurrenturl(webview_active_tab());
+    [self navigate:[NSString stringWithUTF8String:appUrl]];
 }
 
 -(void)onRefresh:(id)sender {

data/platform/iphone/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.5.0</string>
+	<string>1.5.1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 </dict>

data/platform/shared/common/RhoStd.h

@@ -114,6 +114,11 @@ public:
         }
     }
 
+    void removeElementAt(int nItem)
+    {
+        delete Vector<Type>::at(nItem);
+        Vector<Type>::erase( Vector<Type>::begin() + nItem );
+    }
 };
 
 template<class Type>

data/platform/shared/common/RhodesApp.cpp

@@ -156,7 +156,7 @@ void CRhodesApp::stopApp()
         stop(2000);
     }
 
-    rho_asynchttp_cancel("*");
+    rho_asynchttp_destroy();
 }
 
 class CRhoCallbackCall :  public common::CRhoThread
@@ -559,8 +559,9 @@ menu_iter(const char* szLabel, const char* szLink, void* pThis)
 
 void CRhodesApp::setViewMenu(unsigned long valMenu)
 {
-    synchronized(m_mxViewMenuItems)
     {
+        synchronized(m_mxViewMenuItems)
+
         m_hashViewMenuItems.clear();
         m_strAppBackUrl="";
     }
@@ -878,7 +879,7 @@ const char* rho_ruby_getMessageText(const char* szName)
 
 int rho_rhodesapp_isrubycompiler()
 {
-    return 1;
+    return 0;
 }
 
 int rho_conf_send_log()

data/platform/shared/net/AsyncHttp.cpp

@@ -13,7 +13,7 @@ namespace net
 IMPLEMENT_LOGCLASS(CAsyncHttp, "AsyncHttp");
 boolean CAsyncHttp::m_bNoThreaded = false;
 common::CMutex CAsyncHttp::m_mxInstances;
-Vector<CAsyncHttp*> CAsyncHttp::m_arInstances;
+VectorPtr<CAsyncHttp*> CAsyncHttp::m_arInstances;
 
 extern "C" void header_iter(const char* szName, const char* szValue, void* pHash)
 {
@@ -23,6 +23,7 @@ extern "C" void header_iter(const char* szName, const char* szValue, void* pHash
 CAsyncHttp::CAsyncHttp(common::IRhoClassFactory* factory, EHttpCommands eCmd,
     const char* url, unsigned long headers, const char* body, const char* callback, const char* callback_params) :  CRhoThread(factory)
 {
+    m_bFinished = false;
     m_ptrFactory = factory;
     m_strUrl = url != null ? url : "";
     m_strBody = body != null ? body : "";
@@ -32,10 +33,7 @@ CAsyncHttp::CAsyncHttp(common::IRhoClassFactory* factory, EHttpCommands eCmd,
 
     rho_ruby_enum_strhash(headers, &header_iter, &m_mapHeaders);
 
-    {
-	    synchronized(m_mxInstances);
-        m_arInstances.addElement(this);
-    }
+    addNewObject(this);
 
     if (m_bNoThreaded)
         run();
@@ -43,24 +41,46 @@ CAsyncHttp::CAsyncHttp(common::IRhoClassFactory* factory, EHttpCommands eCmd,
         start(epLow);
 }
 
-CAsyncHttp::~CAsyncHttp()
+void CAsyncHttp::cancel(boolean bWait)
 {
-	synchronized(m_mxInstances)
     {		
-        m_arInstances.removeElement(this);
+    	synchronized(m_mxRequest)
+
+        if (m_pNetRequest!=null && !m_pNetRequest->isCancelled() )
+            m_pNetRequest->cancel();
     }
+
+    if ( bWait )
+        stop(-1);
 }
 
-void CAsyncHttp::cancel()
+/*static*/ void CAsyncHttp::addNewObject(CAsyncHttp* pObj)
 {
-    if (m_pNetRequest!=null)
-        m_pNetRequest->cancel();
+	synchronized(m_mxInstances)
+    {
+        while(1)
+        {
+            int nToDelete = -1;
+            for (int i = 0; i < (int)m_arInstances.size(); i++ )
+            {
+                if ( m_arInstances.elementAt(i)->m_bFinished )
+                {
+                    nToDelete = i;
+                    break;
+                }
+            }
+
+            if (nToDelete==-1)
+                break;
 
-    stop(1000);
-    delete this;
+            m_arInstances.removeElementAt(nToDelete);
+        }
+
+        m_arInstances.addElement(pObj);
+    }
 }
 
-/*static*/ void CAsyncHttp::cancelRequest(const char* szCallback)
+/*static*/ void CAsyncHttp::cancelRequest(const char* szCallback, boolean bWait)
 {
     if (!szCallback || !*szCallback )
     {
@@ -73,13 +93,13 @@ void CAsyncHttp::cancel()
         if ( *szCallback == '*')
         {
             for (int i = 0; i < (int)m_arInstances.size(); i++ )
-                m_arInstances.elementAt(i)->cancel();
+                m_arInstances.elementAt(i)->cancel(bWait);
         }else
         {
             for (int i = 0; i < (int)m_arInstances.size(); i++ )
             {
                 if ( m_arInstances.elementAt(i)->m_strCallback.compare(szCallback) == 0 )
-                    m_arInstances.elementAt(i)->cancel();    
+                    m_arInstances.elementAt(i)->cancel(bWait);    
             }
         }
     }
@@ -89,7 +109,10 @@ void CAsyncHttp::run()
 {
 	LOG(INFO) + "RhoHttp thread start.";
 
-    m_pNetRequest = m_ptrFactory->createNetRequest();
+    {		
+    	synchronized(m_mxRequest)
+        m_pNetRequest = m_ptrFactory->createNetRequest();
+    }
 
     switch( m_eCmd )
     {
@@ -117,8 +140,7 @@ void CAsyncHttp::run()
 
 	LOG(INFO) + "RhoHttp thread end.";
 
-    if ( !m_pNetRequest->isCancelled() )
-        delete this;
+    m_bFinished = true;
 }
 
 String CAsyncHttp::makeHeadersString()
@@ -211,10 +233,13 @@ void CAsyncHttp::callNotify(rho::net::INetResponse& resp, int nError )
         rho_ruby_set_const( strName.c_str(), strBody.c_str());
     }else
     {
-        m_pNetRequest = m_ptrFactory->createNetRequest();
-
-        String strFullUrl = m_pNetRequest->resolveUrl(m_strCallback);
-        NetResponse(resp1,m_pNetRequest->pushData( strFullUrl, strBody, null ));
+//        {
+//            synchronized(m_mxRequest)
+//            m_pNetRequest = m_ptrFactory->createNetRequest();
+//        }
+        common::CAutoPtr<INetRequest> pNetRequest = m_ptrFactory->createNetRequest();
+        String strFullUrl = pNetRequest->resolveUrl(m_strCallback);
+        NetResponse(resp1,pNetRequest->pushData( strFullUrl, strBody, null ));
         if ( !resp1.isOK() )
             LOG(ERROR) + "AsyncHttp notification failed. Code: " + resp1.getRespCode() + "; Error body: " + resp1.getCharData();
     }
@@ -251,7 +276,12 @@ void rho_asynchttp_uploadfile(const char* url, unsigned long headers, const char
 
 void rho_asynchttp_cancel(const char* cancel_callback)
 {
-    CAsyncHttp::cancelRequest(cancel_callback);
+    CAsyncHttp::cancelRequest(cancel_callback, false);
+}
+
+void rho_asynchttp_destroy()
+{
+    CAsyncHttp::cancelRequest("*", true);
 }
 
 void rho_asynchttp_set_threaded_mode(int b)

data/platform/shared/net/AsyncHttp.h

@@ -17,14 +17,16 @@ class CAsyncHttp : public common::CRhoThread, rho::ICallbackObject
     DEFINE_LOGCLASS;
 
     static common::CMutex m_mxInstances;
-    static Vector<CAsyncHttp*> m_arInstances;
+    static VectorPtr<CAsyncHttp*> m_arInstances;
     common::CAutoPtr<common::IRhoClassFactory> m_ptrFactory;
+    common::CMutex m_mxRequest;
 
     common::CAutoPtr<INetRequest> m_pNetRequest;
     common::CAutoPtr<INetResponse> m_pNetResponse;
     Hashtable<String,String> m_mapHeaders;
 
     String m_strUrl, m_strBody, m_strCallback, m_strCallbackParams;
+    boolean m_bFinished;
 public:
     enum EHttpCommands{ hcGet = 0, hcPost, hcDownload, hcUpload };
 private:
@@ -35,11 +37,10 @@ public:
 
     CAsyncHttp(common::IRhoClassFactory* factory, EHttpCommands eCmd,
         const char* url, unsigned long headers, const char* body, const char* callback, const char* callback_params);
-    ~CAsyncHttp();
 
-    void cancel();
+    void cancel(boolean bWait);
 
-    static void cancelRequest(const char* szCallback);
+    static void cancelRequest(const char* szCallback, boolean bWait);
 
     //rho::ICallbackObject
     virtual unsigned long getObjectValue();
@@ -50,7 +51,7 @@ private:
     void callNotify(INetResponse& resp, int nError );
 
     String makeHeadersString();
-
+    static void addNewObject(CAsyncHttp* pObj);
 };
 
 } // namespace net
@@ -67,6 +68,7 @@ void rho_asynchttp_post(const char* url, unsigned long headers, const char* body
 void rho_asynchttp_downloadfile(const char* url, unsigned long headers, const char* filename, const char* callback, const char* callback_params);
 void rho_asynchttp_uploadfile(const char* url, unsigned long headers, const char* filename, const char* callback, const char* callback_params);
 void rho_asynchttp_cancel(const char* cancel_callback);
+void rho_asynchttp_destroy();
 void rho_asynchttp_set_threaded_mode(int b);
 
 #ifdef __cplusplus

data/platform/shared/ruby/wince/io_wce.c

@@ -202,7 +202,7 @@ int _open(const char *path, int oflag, va_list arg)
 
     fNumber = get_NewFileNumber();
     if ( fNumber == 0 )
-        return -6;
+        return -1;
 
     wfile = wce_mbtowc(path);
     if ( (osfh = CreateFileW( wfile,
@@ -235,7 +235,7 @@ int _open(const char *path, int oflag, va_list arg)
         return fNumber;
     }
 
-    return -6;
+    return -1;
 }
 /*
 	wchar_t *wfile;

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

@@ -20,12 +20,15 @@ public class AsyncHttp extends RhoThread
 	private static Object m_mxInstances = new Object();
 	private static Vector/*<CAsyncHttp*>*/ m_arInstances = new Vector();
 	private RhoClassFactory m_ptrFactory;
-
+	private Object m_mxRequest = new Object();
+	
 	private NetRequest m_pNetRequest;
 	private NetResponse m_pNetResponse;
 	private Hashtable/*<String,String>*/ m_mapHeaders = new Hashtable();
 
 	private String m_strUrl, m_strBody, m_strCallback, m_strCallbackParams;
+    boolean m_bFinished = false;
+    
 	private RubyValue m_valBody;
 	public final static int  hcGet = 0, hcPost=1, hcDownload=2, hcUpload =3;
 	private int m_eCmd;
@@ -47,10 +50,7 @@ public class AsyncHttp extends RhoThread
 
 	    m_mapHeaders = RhoRuby.enum_strhash(headers);
 
-	    synchronized(m_mxInstances)
-	    {
-	        m_arInstances.addElement(this);
-	    }
+	    addNewObject(this);	    
 
 	    if (m_bNoThreaded)
 	        run();
@@ -58,16 +58,46 @@ public class AsyncHttp extends RhoThread
 	        start(epLow);
 	}
 
-	void cancel()
+	void cancel(boolean bWait)
 	{
-	    if (m_pNetRequest!=null)
-	        m_pNetRequest.cancel();
-
-	    stop(1000);
+		synchronized(m_mxRequest)
+		{		
+		    if (m_pNetRequest!=null && !m_pNetRequest.isCancelled())
+		        m_pNetRequest.cancel();
+		}
+		
+		if ( bWait )
+			stop(10000);
 	    //delete this;
 	}
 
-	static void cancelRequest(String szCallback)
+	static void addNewObject(AsyncHttp pObj)
+	{
+	    synchronized(m_mxInstances)
+	    {
+	        while(true)
+	        {
+	            int nToDelete = -1;
+	            for (int i = 0; i < (int)m_arInstances.size(); i++ )
+	            {
+	                if ( ((AsyncHttp)m_arInstances.elementAt(i)).m_bFinished )
+	                {
+	                    nToDelete = i;
+	                    break;
+	                }
+	            }
+
+	            if (nToDelete==-1)
+	                break;
+
+	            m_arInstances.removeElementAt(nToDelete);
+	        }
+	    	
+	        m_arInstances.addElement(pObj);
+	    }
+	}
+	
+	static void cancelRequest(String szCallback, boolean bWait)
 	{
 	    if (szCallback == null|| szCallback.length() ==0 )
 	    {
@@ -80,13 +110,13 @@ public class AsyncHttp extends RhoThread
 	        if ( szCallback.compareTo("*") ==0 )
 	        {
 	            for (int i = 0; i < (int)m_arInstances.size(); i++ )
-	                ((AsyncHttp)m_arInstances.elementAt(i)).cancel();
+	                ((AsyncHttp)m_arInstances.elementAt(i)).cancel(bWait);
 	        }else
 	        {
 	            for (int i = 0; i < (int)m_arInstances.size(); i++ )
 	            {
 	                if ( ((AsyncHttp)m_arInstances.elementAt(i)).m_strCallback.compareTo(szCallback) == 0 )
-	                	((AsyncHttp)m_arInstances.elementAt(i)).cancel();    
+	                	((AsyncHttp)m_arInstances.elementAt(i)).cancel(bWait);    
 	            }
 	        }
 	    }
@@ -96,8 +126,11 @@ public class AsyncHttp extends RhoThread
 	{
 		LOG.INFO("RhoHttp thread start.");
 
-	    m_pNetRequest = m_ptrFactory.createNetRequest();
-
+		synchronized(m_mxRequest)
+		{		
+			m_pNetRequest = m_ptrFactory.createNetRequest();
+		}
+		
 	    try{
 		    switch( m_eCmd )
 		    {
@@ -135,10 +168,8 @@ public class AsyncHttp extends RhoThread
 	    }finally
 	    {
 			LOG.INFO("RhoHttp thread end.");
+			m_bFinished = true;			
 	    }
-
-	    //if ( !m_pNetRequest.isCancelled() )
-	    //    delete this;
 	}
 
 	String makeHeadersString()
@@ -338,7 +369,7 @@ public class AsyncHttp extends RhoThread
 			{
 				try {
 					String cancel_callback = arg.toStr();
-					AsyncHttp.cancelRequest(cancel_callback);
+					AsyncHttp.cancelRequest(cancel_callback, false);
 				} catch(Exception e) {
 					LOG.ERROR("cancel failed", e);
 					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));

data/platform/shared/sync/SyncNotify.cpp

@@ -319,8 +319,9 @@ void CSyncNotify::fireInitialSyncNotification( boolean bFinish, int nErrCode )
 	
     boolean bRemoveAfterFire = bFinish;
     String strBody = "", strUrl;
-	synchronized(m_mxSyncNotifications)
 	{
+    	synchronized(m_mxSyncNotifications)
+
         if ( m_initialSyncNotify.m_strUrl.length() == 0 )
             return;
         

data/platform/wm/rhodes/rho/net/NetRequestImpl.cpp

@@ -392,6 +392,17 @@ CNetResponseImpl* CNetRequestImpl::sendStream(common::InputStream* bodyStream)
 void CNetRequestImpl::cancel()
 {
     m_bCancel = true;
+
+	if ( hRequest ) 
+        InternetCloseHandle(hRequest);
+/*	if ( hConnection ) 
+        InternetCloseHandle(hConnection);
+	if ( hInet ) 
+        InternetCloseHandle(hInet); */
+/*
+    hRequest = 0;
+    hConnection = 0;
+    hInet = 0;*/
 }
 
 void CNetRequestImpl::close()

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  version: 1.5.0
+  prerelease: false
+  segments: 
+  - 1
+  - 5
+  - 1
+  version: 1.5.1
 platform: ruby
 authors: 
 - Rhomobile
@@ -14,54 +19,74 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: templater
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 0
         version: 0.5.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 8
+        - 7
         version: 0.8.7
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 5
         version: 2.3.5
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rdoc
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 4
+        - 3
         version: 2.4.3
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: diff-lcs
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 2
         version: 1.1.2
-    version: 
+  type: :runtime
+  version_requirements: *id005
 description: Rhodes mobile framework
 email: dev@rhomobile.com
 executables: 
@@ -5285,18 +5310,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rhodes
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
 summary: The Rhodes framework is the easiest way to develop NATIVE apps with full device capabilities (GPS, PIM, camera, etc.) for any smartphone.