rhoconnect 4.0.0.beta.24 → 4.0.0

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 4.0.0 (2013-09-05)
+* Final v4.0.0 stable release based on beta.63
+
+## 4.0.0.beta.63 (2013-08-19)
+* B-98911 - Fully removed BlackBerry support
+* D-05224 - Fixed stdout for node process.  `console.log()` now works
+* B-105930 - Add support for push_objects and push_deletes in js adapters
+* B-92759 - Completely remove C2DM code
+* Add check for ruby download status in rhoconnect installer
+
+## 4.0.0.beta.46 - 4.0.0.beta.51 (skipped for RMS version parity)
+
+## 4.0.0.beta.45 (2013-07-30)
+* Fixed issue w/ securerandom loading for app-less start command
+* D-05431 - Remove refs. to blackberry clients in push docs
+* Update production stack to ruby-1.9.3-p448, redis-2.6.14, node v0.10.15, and nginx-1.4.2.
+* Don't generate code referencing RHO_ENV. Use RACK_ENV.
+
+## 4.0.0.beta.25 - 4.0.0.beta.44 (skipped for RMS version parity)
+
 ## 4.0.0.beta.24 (2013-06-07)
 * Add /system/rps_login route to handle application credentials for push server
 * Update doc for 'rhoconnect-push' config.json advanced options

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rhoconnect (4.0.0.beta.24)
+    rhoconnect (4.0.0)
       bundler (~> 1.0)
       connection_pool (~> 1.0.0)
       json (~> 1.7.7)
@@ -19,7 +19,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.4)
+    addressable (2.3.5)
     arr-pm (0.0.8)
       cabin (> 0)
     async-rack (0.5.1)
@@ -28,28 +28,27 @@ GEM
       builder
       mime-types
       xml-simple
-    backports (3.3.1)
+    backports (3.3.3)
     builder (3.2.2)
-    cabin (0.6.0)
+    cabin (0.6.1)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
     clamp (0.6.1)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.2)
+    coffee-script-source (1.6.3)
     connection_pool (1.0.0)
-    crack (0.4.0)
+    crack (0.4.1)
       safe_yaml (~> 0.9.0)
     daemons (1.1.9)
     diff-lcs (1.1.3)
     eventmachine (1.0.3)
     excon (0.22.1)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
+    execjs (2.0.1)
     extlib (0.9.16)
     ffaker (1.14.0)
-    ffi (1.8.1)
+    ffi (1.9.0)
     fog (1.11.1)
       builder
       excon (~> 0.20)
@@ -61,14 +60,14 @@ GEM
       nokogiri (~> 1.5.0)
       ruby-hmac
     formatador (0.2.4)
-    fpm (0.4.37)
+    fpm (0.4.42)
       arr-pm (~> 0.0.8)
       backports (>= 2.6.2)
       cabin (>= 0.6.0)
       childprocess
       clamp (~> 0.6)
       ftw (~> 0.0.30)
-      json (~> 1.7.7)
+      json (>= 1.7.7)
     ftw (0.0.34)
       addressable
       backports (>= 2.6.2)
@@ -90,13 +89,13 @@ GEM
       rainbow
       sprockets (~> 2)
     json (1.7.7)
-    mime-types (1.23)
+    mime-types (1.25)
     mono_logger (1.1.0)
-    multi_json (1.7.6)
-    net-scp (1.1.1)
+    multi_json (1.7.9)
+    net-scp (1.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.7)
-    nokogiri (1.5.9)
+    net-ssh (2.6.8)
+    nokogiri (1.5.10)
     rack (1.5.2)
     rack-fiber_pool (0.9.3)
     rack-protection (1.5.0)
@@ -106,7 +105,7 @@ GEM
     rainbow (1.1.4)
     rake (10.0.4)
     redis (3.0.4)
-    redis-namespace (1.3.0)
+    redis-namespace (1.3.1)
       redis (~> 3.0.0)
     resque (1.24.1)
       mono_logger (~> 1.0)
@@ -126,11 +125,11 @@ GEM
     rspec-mocks (2.10.1)
     ruby-hmac (0.4.0)
     rubyzip (0.9.9)
-    safe_yaml (0.9.3)
-    selenium-webdriver (2.33.0)
+    safe_yaml (0.9.5)
+    selenium-webdriver (2.35.1)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
-      rubyzip
+      rubyzip (< 1.0.0)
       websocket (~> 1.0.4)
     simplecov (0.7.1)
       multi_json (~> 1.0)
@@ -138,8 +137,8 @@ GEM
     simplecov-html (0.7.1)
     simplecov-rcov (0.2.3)
       simplecov (>= 0.4.1)
-    sinatra (1.4.2)
-      rack (~> 1.5, >= 1.5.2)
+    sinatra (1.4.3)
+      rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
     sprockets (2.10.0)
@@ -147,7 +146,7 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
+    sqlite3 (1.3.8)
     templater (1.0.0)
       diff-lcs (>= 1.1.2)
       extlib (>= 0.9.5)

data/README.md

@@ -10,8 +10,6 @@ You will need to install the following in order to run the RhoConnect specs.
 * RVM: <https://rvm.io/> or RB-env: <https://github.com/sstephenson/rbenv> with Ruby 1.9.3p194+ installed
 * Bundler: <http://gembundler.com/>
 * Redis: <http://redis.io>
-* Java JDK 1.6+: <http://www.oracle.com/technetwork/java/javase/downloads/index.html>
-* hsqldata.jar: <https://github.com/rhomobile/hsqldata/downloads> - put this in a directory called vendor/
 
 Running Tests
 -------------------------------------------------------------

data/bench/benchapp/spec/spec_helper.rb

@@ -1,9 +1,9 @@
 require 'rubygems'
 
 # Set environment to test
-ENV['RHO_ENV'] = 'test'
+ENV['RACK_ENV'] = 'test'
 ROOT_PATH = File.expand_path(File.join(File.dirname(__FILE__),'..'))
-Bundler.require(:default, ENV['RHO_ENV'].to_sym)
+Bundler.require(:default, ENV['RACK_ENV'].to_sym)
 
 # Try to load vendor-ed rhoconnect, otherwise load the gem
 begin

data/bench/blobapp/spec/spec_helper.rb

@@ -1,9 +1,9 @@
 require 'rubygems'
 
 # Set environment to test
-ENV['RHO_ENV'] = 'test'
+ENV['RACK_ENV'] = 'test'
 ROOT_PATH = File.expand_path(File.join(File.dirname(__FILE__),'..'))
-Bundler.require(:default, ENV['RHO_ENV'].to_sym)
+Bundler.require(:default, ENV['RACK_ENV'].to_sym)
 
 # Try to load vendor-ed rhoconnect, otherwise load the gem
 begin

data/commands/rhoconnect/start.rb

@@ -44,7 +44,14 @@ Execute.define_task do
         options = { :syncserver => "http://localhost:#{port}", :redis => redis_url,
             :push_server => push_server, :api_token => token }
         options[:licensefile] = licensefile if licensefile
-        options[:secret] = SecureRandom.hex(64)
+        begin
+          require 'securerandom'
+          options[:secret] = SecureRandom.hex(64)
+        rescue LoadError => e
+          puts "Secure random generator is missing"
+          puts e.inspect
+          exit
+        end
         conf_hash = { :development => options, :test => options, :production => options }
         File.open(File.join(ENV['HOME'], '.rhoconnect.yml'), 'w') { |f| f.write(conf_hash.to_yaml) }
       end

data/doc/bulk-sync.txt

@@ -10,7 +10,7 @@ If and when the Rhodes application issues a request to get bulk data, the RhoCon
 
 * Execute the ['login,'query','logoff' methods](/rhoconnect/source-adapters#source-adapter-api) of all source adapter models matching the [requested data partition](/rhoconnect/source-adapters#data-partitioning) to get latest set of objects from the backend service
 
-* Generate appropriate database files for the device - hsqldb for Blackberry and sqlite for the rest of them. RhoConnect will generate sqlite files for iOS, Android, and Windows Mobile clients and hsqldb files for Blackberry (if enabled).
+* Generate appropriate database files for the device. RhoConnect will generate sqlite files for iOS, Android, and Windows Mobile clients (if enabled).
  
 * The Rhodes application will poll RhoConnect for the bulk sync job to finish. Once the job is finished, the files are generated and Rhodes will download and install them to the device. 
 
@@ -53,28 +53,6 @@ After application executed bulk sync it will set `bulksync_state` to 1 and next
 	:::ruby
 	Rho::RhoConfig.bulksync_state = '0'
 
-### Enabling BlackBerry Bulk Sync
-If your application will be performing bulk sync for BlackBerry devices, you will need to install the open source Rhomobile HSQLDB tool [hsqldata.jar](http://github.com/rhomobile/hsqldata) in your RhoConnect application.
-  
-1. Download [hsqldata](http://github.com/rhomobile/hsqldata/zipball/0.0.2).
-
-2. Build and install hsqldata.jar into your RhoConnect application:
-  		
-		:::term
-		$ cd hsqldata
-		$ ant
-	  	$ mkdir <path-to-rhoconnect-app>/vendor
-	  	$ cp bin/hsqldata.jar <path-to-rhoconnect-app>/vendor/
-
-3. Next set the `:blackberry_bulk_sync:` flag in settings/settings.yml:
-
-		:::yaml
-		:development:
-  		  :licensefile: settings/license.key
-  		  :redis: localhost:6379
-  		  :syncserver: http://localhost:9292/application/
-  		  :blackberry_bulk_sync: true
-
 ## Data Files
 
 By default, bulk sync data files will be stored in the application's root folder, under a 'data' directory.  When bulk data is requested by the Rhodes application, RhoConnect will return a link to the file if the `bulk_sync_poll_interval` has not expired.  If the file is expired, RhoConnect will return a wait command to Rhodes and enqueue another [resque job](http://github.com/defunkt/resque) to generate new bulk data files.  By default, the `bulk_sync_poll_interval` is set to 1 hour (3600) seconds and is configurable in `settings.yml`:

data/doc/push-client-setup-ios.txt

@@ -40,9 +40,9 @@ In case of iOS, regardless of the operation, the user will be presented with the
 
 ### Setup Push Certificate
 The first step to setting up your environment is to create an APNS push certificate. To create the SSL certificate, follow the "Creating the SSL Certificate and Keys" section on the
-[developer site](https://developer.apple.com/iphone/library/documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/ProvisioningDevelopment/ProvisioningDevelopment.html#//apple_ref/doc/uid/TP40008194-CH104-SW4).
+[developer site](https://developer.apple.com/library/ios/#documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/Chapters/ProvisioningDevelopment.html#//apple_ref/doc/uid/TP40008194-CH104-SW1).
 
-Once you have the certificate, you will need to export it to a .pem format using [these instructions](https://developer.apple.com/iphone/library/documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/ProvisioningDevelopment/ProvisioningDevelopment.html#//apple_ref/doc/uid/TP40008194-CH104-SW6). Make sure to name the output file 'apple_push_cert.pem' file from these instructions, since this is what we configured in our RhoConnect application.
+Once you have the certificate, you will need to export it to a .pem format using [these instructions](https://developer.apple.com/library/ios/#documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/Chapters/ProvisioningDevelopment.html#//apple_ref/doc/uid/TP40008194-CH104-SW6). Make sure to name the output file 'apple_push_cert.pem' file from these instructions, since this is what we configured in our RhoConnect application.
 
 Once you have this file, copy it to your RhoConnect application directory under the settings folder:
 
@@ -53,7 +53,7 @@ Once you have this file, copy it to your RhoConnect application directory under
 Now your RhoConnect application is ready to send APNS messages.
 
 ### Setup Provisioning Profile
-Next, you can setup your Apple Push Provisioning Profile using Apple's [developer site instructions](https://developer.apple.com/iphone/library/documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/ProvisioningDevelopment/ProvisioningDevelopment.html#//apple_ref/doc/uid/TP40008194-CH104-SW5).  Once you have the profile installed in XCode and on your test device, you are ready to test push.
+Next, you can setup your Apple Push Provisioning Profile using Apple's [developer site instructions](https://developer.apple.com/library/ios/#documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/Chapters/ProvisioningDevelopment.html#//apple_ref/doc/uid/TP40008194-CH104-SW6). Once you have the profile installed in XCode and on your test device, you are ready to test push.
 
 ### Setup iOS Device
 Setting up the device is the same process as [building any normal Rhodes application](build#building-a-rhodes-application-for-iphoneipad). When you start the application, make sure to also open the console window (cmd-shift-R). When the application starts, you should see some output in the console that shows the device token (towards the top):

data/doc/push-client-setup-rps.txt

@@ -177,17 +177,17 @@ To set up your Rhodes client application for RhoConnect Push Service, you config
 
 In your client application `rhoconfig.txt` file, set the following options to configure your RhoConnect Push Service.
 
-    syncserver = 'http://<hostname>:<port>/application'
-    rhoconnect_push_server = 'http://<hostname>:<port>'
-    rhoconnect_push_appname = 'someappname'
+    syncserver = 'http://<hostname>:<port>'
+    Push.rhoconnect.pushServer = 'http://<hostname>:<port>'
+    Push.rhoconnect.pushAppName = 'someappname'
 
 Next, your RhoConnect application should be running on a network that is accessible to your device. For example, you might have your RhoConnect application running on a LAN with IP 192.168.1.10, PORT 9292. Then make sure your device is connected to the same LAN.
 
-Here is an example of setting `rhoconfig.txt` for the RhoConnect Push Service. The URLs used for the RhoConnect Push Service (rhoconnect_push_server) and the RhoConnect server are running on the same host.
+Here is an example of setting `rhoconfig.txt` for the RhoConnect Push Service. The URLs used for the RhoConnect Push Service (Push.rhoconnect.pushServer) and the RhoConnect server are running on the same host.
 
-    syncserver = 'http://192.168.1.10:9292/application'
-  	rhoconnect_push_server = 'http://192.168.1.10:8675'
-  	rhoconnect_push_appname = 'someappname'
+    syncserver = 'http://192.168.1.10:9292'
+    Push.rhoconnect.pushServer = 'http://192.168.1.10:8675'
+    Push.rhoconnect.pushAppName = 'someappname'
 
 ### Configuring build.yml
 

data/doc/push-client-setup.txt

@@ -5,7 +5,6 @@ This chapter contains the final steps for setting up your Rhodes application for
 
  * [Setup for RhoConnect Push Service on client and server](/rhoconnect/push-client-setup-rps).
  * [Setup for RhoConnect Push on client and server for Rhodes Android Client](/rhoconnect/push-client-setup-android).
- * [Setup for RhoConnect Push on client and server for Rhodes Blackberry Client](/rhoconnect/push-client-setup-bb).
  * [Setup for RhoConnect Push on client and server for Rhodes iOS Client](/rhoconnect/push-client-setup-ios).
 
 ## Configuring a Rhodes Application for RhoConnect Push
@@ -18,29 +17,31 @@ If you want your device to vibrate when it receives a push message, enable vibra
 
 Set up your application [rhoconfig.txt](/rhodes/configuration#run-time-configuration) syncserver to point to your RhoConnect server:
 
-	syncserver = 'http://<rhoconnect_server_url>/application'
+	syncserver = 'http://<rhoconnect_server_url>'
 
 ## Registering a Push Callback in the Rhodes Application
 
-To handle a push message from a Rhodes application, you must register push callback with the System `set_push_notification` method.
+To handle a push message from a Rhodes application, you must register push callback with the Rho::Push `startNotifications` method.
 
     :::ruby
     class AppApplication < Rho::RhoApplication
       def initialize
         super
-        System.set_push_notification "/app/Push/push_callback", ""
+        Rho::Push.startNotifications '/app/Settings/push_callback'
       end
     end
 
-Push callback is set up in the form of a local application URL and called as callback whether or not rho_callback=1 is specified in its parameters list.
+Push callback is set up in the form of a local application URL and called when application receives server initiated push messages.
 
-The parameters trigger certain operations in the Rhodes client when the callback returns "rho_push". (When the callback returns an empty string, this automatic handling is not performed.) The operations are to show an alert, vibrate the device, play a sound, and perform a sync.
+The callback push message parameters are presented in the form of a hash. This hash contains parameters and values for the operations to perform. The operations are to show an alert, vibrate the device, play a sound, and perform a sync for a list of sources.
 
 To have your Rhodes app automatically perform the operations listed in the push message, you can write the callback as follows.
 
     :::ruby
     def push_callback
-      "rho_push"
+      # Variable @params is a hash of operations to perform
+      # Show 'alert' popup window
+      Rho::Notification.showPopup({'message' => @params['alert'], 'buttons' =>['OK']})
     end
 
 To get push messages from RhoConnect server, the user must be logged into the RhoConnect server.
@@ -49,7 +50,7 @@ In application.rb:
 
   	:::ruby
     if SyncEngine::logged_in > 0
-      System.set_push_notification("/app/Settings/your_rhoconnect_callback",'')
+      Rho::Push.startNotifications '/app/Settings/push_callback'
     end
 
 ## Understanding the Rhodes Push Message Payload
@@ -63,16 +64,16 @@ The hash payload may include the parameters of alert, do_sync, sound, and vibrat
 
 To sync all the sources with do_sync, the source name list would be specified as 'all' in the ping call, instead of 'product,customer' as in this example.
 
-The Rhodes push payload allows more than one operation in a single message. 
- 
+The Rhodes push payload allows more than one operation in a single message.
+
 There are no required operations. There are default operations - if operation is not specified, no default operation will be performed.
 
 Payload may include following operations which client will perform when it receives the PUSH message:
 
-do_sync - do sync on spec specified sync source; use "all" to sync all sources  
+do_sync - do sync on spec specified sync source; use "all" to sync all sources
 	:::ruby
 	# one or more sources, or "all" can be specified
-	do_sync = "Product,Customer" 
+	do_sync = "Product,Customer"
 
 alert - bring app upfront and show specified message
 	:::ruby
@@ -84,9 +85,9 @@ To enable vibrate in your rhodes application in build.yml:
 
 	capabilities:
 	 - vibrate
-    	  
+
 Example of vibrate call:
-     
+
 	vibrate = 2000 #=> duration in milliseconds
 
 sound - play specified file if media type supported by the phone. iPhone will ignore media-type parameter.
@@ -99,30 +100,17 @@ Media type should be either specified explicitly or may be recognized from file
 
 ## Handling Push Notifications from a non-RhoConnect Application
 
-Rhodes applications can also handle PUSH notifications that didn't come from a RhoConnect application. 
+Rhodes applications can also handle PUSH notifications that didn't come from a RhoConnect application.
 
 In this example, we will get the device ID so we can register the device with some push server:
 	:::ruby
-	System.get_property('device_id')
+    Rho::Push.getDeviceId url_for(:action => 'registration_callback')
 
 Application can set push callback to process any commands from server:
 	:::ruby
-	System.set_push_notification("/app/Settings/push_notify", '')
+    Rho::Push.startNotifications '/app/Settings/push_callback'
 
 Callback parameters:
 
 * since Rhodes 2.0.4 : contain push message parameters as hash
 * rhodes  < 2.0.4 : message - contain server push message body
-
-Callback return:
-
-* empty string - do not run Rhodes push command processing
-* "rho_push" - to run rhodes push command processing (for alerts, sounds, etc...)
-
-Example:
-	:::ruby
-	def push_notify
-	  puts 'push_notify: ' + @params.inspect  
-	  "rho_push"
-	end
-

data/doc/push-server-setup.txt

@@ -25,20 +25,6 @@ This is for running your application in development mode; for production, you wi
 	:::yaml
   	:iphoneserver: gateway.push.apple.com
 
-## Setting up RhoConnect Server Push for Blackberry
-
-To set up your RhoConnect application for pushing to a BlackBerry client, you will need to update `settings/settings.yml` to include the following:
-
-	:::yaml
-	:development:
-	  :redis: localhost:6379
-	  :mdsserver: 192.168.1.110
-	  :mdsserverport: 8080
-	  :syncserver: http://localhost:9292/application/
-	  :licensefile: settings/license.key
-
-Replace `:mdsserver:` and `:mdsserverport:` with the hostname/IP and port of your machine (default port is 8080).
-
 ## Setting up RhoConnect Server Push for Android (GCM)
 
 To set up your RhoConnect application for Android Google Cloud Messaging (GCM), you need to obtain a GCM API key.

data/doc/push.txt

@@ -11,11 +11,9 @@ The following sections show how to use the RhoConnect application to deliver pus
 
 You will need to perform one of the following set of instructions on the RhoConnect server and your mobile device for your specific platform.
 
-* [Set up RhoConnect Push Service on client and server](/rhoconnect/push-client-setup-rps).
-* [Set up RhoConnect Push on client and server for Rhodes Android Client](/rhoconnect/push-client-setup-android).
-* [Set up RhoConnect Push on client and server for Rhodes Blackberry Client](/rhoconnect/push-client-setup-bb).
-* [Set up RhoConnect Push on client and server for Rhodes iOS Client](/rhoconnect/push-client-setup-ios).
-
+* [Set up RhoConnect Push Service on client and server for Rhodes Android and Windows Mobile/CE Devices](/rhoconnect/push-client-setup-rps).
+* [Set up Google Cloud Messaging on client and server for Rhodes Android Device](/rhoconnect/push-client-setup-android).
+* [Set up Apple Push Notification Service on client and server for Rhodes iOS Device](/rhoconnect/push-client-setup-ios).
 Then you will need to [perform the final set up on your client](/rhoconnect/push-client-setup).
 
 ## Executing a Ping Call

data/doc/source-adapters.txt

@@ -131,10 +131,11 @@ During generation of the model, the `settings/settings.yml` file will be updated
 You can use the following methods and techniques inside of your source adapter controller.
 
 * [register Rhoconnect::EndPoint](/rhoconnectapi/source-adapter-controller-api-ruby#register Rhoconnect::EndPoint) - adds Controller into the application's URL Map.
-* [resgiter Rhoconnect::Handler::Sync](/rhoconnectapi/source-adapter-controller-api-ruby#register Rhoconnect::Handler::Sync) - adds SYNC routes to your Controller.
+* [register Rhoconnect::Handler::Sync](/rhoconnectapi/source-adapter-controller-api-ruby#register Rhoconnect::Handler::Sync) - adds SYNC routes to your Controller.
+* [pre-defined conditions](/rhoconnectapi/source-adapter-controller-api-ruby#pre-defined-conditions) - adds common helpers and conditions to your routes.
 * [@model](/rhoconnectapi/source-adapter-controller-api-ruby#@model) - Access to the source adapter's model instance.
 * [params,request,response](/rhoconnectapi/source-adapter-controller-api-ruby#sinatra-context) - Allows to use any standard Sinatra context objects.
-* [Sinatra framework](/rhoconnectapi/source-adapter-controller-api-ruby#sinatra-features) - Allows to use any standard Sinatra features.
+* [Sinatra framework](/rhoconnectapi/source-adapter-controller-api-ruby#sinatra-framework) - Allows to use any standard Sinatra features.
 
 ### Source Adapter Model API (Ruby)
 

data/doc/supported-platforms.txt

@@ -16,15 +16,15 @@ RhoConnect gem is available on the following platforms:
   <tr>
     <td class='cap'>Linux</td>
     <td> CentOS / RHEL 5.x & 6.x,<br/>Ubuntu 12.04 </td>
-    <td> ruby-1.9.3-p392 </td>
+    <td> ruby-1.9.3-p448 </td>
     <td class='tbd'> TBD </td>
-    <td class='tbd'> jruby-1.7.3 </td>
+    <td class='tbd'> jruby-1.7.4 </td>
     <td>Development &<br/>Production</td>
   </tr>
   <tr>
     <td class='cap'>Mac OS </td>
     <td> Mac OS X 10.7/10.8 </td>
-    <td> ruby-1.9.3-p392 </td>
+    <td> ruby-1.9.3-p448 </td>
     <td class='tbd'> TBD </td>
     <td class='tbd'> jruby-1.7.3 </td>
     <td> Development </td>
@@ -32,9 +32,9 @@ RhoConnect gem is available on the following platforms:
   <tr>
     <td class='cap'>Windows</td>
     <td> Windows 7 </td>
-    <td> ruby-1.9.3-p392 </td>
+    <td> ruby-1.9.3-p448 </td>
     <td class='tbd'> TBD </td>
-    <td class='tbd'> jruby-1.7.3 </td>
+    <td class='tbd'> jruby-1.7.4 </td>
     <td>Development</td>
   </tr>
 </table>
@@ -58,7 +58,7 @@ RhoConnect Mac OS X is supported in development environment.
 The components you should have for this environment are:
 
 * Ruby 1.9.3
-* Nginx HTTP server (1.3.x)
+* Nginx HTTP server (1.4.x)
 * Redis data store (2.6.x)
 * Thin application server
 * RhoConnect gem with all required dependencies

data/generators/templates/application/spec/spec_helper.rb

@@ -1,9 +1,9 @@
 require 'rubygems'
 
 # Set environment to test
-ENV['RHO_ENV'] = 'test'
+ENV['RACK_ENV'] = 'test'
 ROOT_PATH = File.expand_path(File.join(File.dirname(__FILE__),'..'))
-Bundler.require(:default, ENV['RHO_ENV'].to_sym)
+Bundler.require(:default, ENV['RACK_ENV'].to_sym)
 
 # Try to load vendor-ed rhoconnect, otherwise load the gem
 begin

data/install.sh

@@ -192,6 +192,11 @@ installRuby ()
     echo "Downloading ${rubyURL} ..." | tee -a $log
     echo "wget -P ${prefix} ${rubyURL}" >> $log
     wget -P ${prefix} ${rubyURL} -o /dev/null
+    if (($?)) ; then
+      echo "Failed to download ruby tarball: ${rubyURL}\n" | tee -a $log
+      echo "Installation terminated. For troubleshooting see file $log ..." | tee -a $log
+      exit 1
+    fi
     echo "tar -xzf ${prefix}/${rubyTar} -C ${prefix}" >> $log
     tar -xzf ${prefix}/${rubyTar} -C ${prefix} > /dev/null 2>&1
   fi
@@ -258,10 +263,10 @@ rubyVersion=""
 rubyBinDir=""
 
 # Define ruby and nodejs versions to be installed ...
-RUBY_PATCH="p429"
+RUBY_PATCH="p448"
 RUBY_VERSION="ruby-1.9.3-${RUBY_PATCH}"
 
-NODE_VERSION=v0.10.5
+NODE_VERSION=v0.10.15
 NODE_URL=http://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}.tar.gz
 ARCH=$([[ `uname -m` == x86_64 ]] && echo "x64" || echo "x86")
 NODE_BIN_URL=http://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-linux-${ARCH}.tar.gz

data/installer/unix-like/rho_connect_install_constants.rb

@@ -8,10 +8,10 @@ module Constants
                            "libaprutil1-dev",
                            "dtach"]
 
-  RUBY                    = "ruby-1.9.3-p429"
-  REDIS                   = "redis-2.6.13"
+  RUBY                    = "ruby-1.9.3-p448"
+  REDIS                   = "redis-2.6.14"
   SQLITE3                 = "sqlite-autoconf-3071502"
-  NGINX                   = "nginx-1.4.1"
+  NGINX                   = "nginx-1.4.2"
   PASSENGER_ROOT          = "/opt/rhoconnect/lib/ruby/gems/1.9.1/gems/passenger"
 
   SOFTWARE                = [ REDIS, SQLITE3, RUBY, NGINX ]

data/installer/utils/nix_install_test.rb

@@ -145,6 +145,7 @@ def start_services(server)
 	    sleep 3
 	  end
 	  raise "Service #{program} failed to start." if status != 0
+	  sleep 10 if program == 'thin'
   end
   puts
 end
@@ -154,9 +155,16 @@ def check_rhoconnect_status(server)
   host = server.dns_name
   puts "Testing rhoconnect server on host #{host}"
   uri = URI("http://#{host}/console/")
-  response = Net::HTTP.get_response(uri)
-  puts "#{response.code} #{response.message}"
-  resp_code = response.code.to_i
+
+  resp_code = 200
+  3.times do |i|
+  	response = Net::HTTP.get_response(uri)
+  	resp_code = response.code.to_i
+  	puts "#{i}: #{response.code} #{response.message}"
+  	break if resp_code < 400
+  	sleep 10
+  end
+
   if resp_code < 400
     puts "Rhoconnect server up and running!"; puts
   else
@@ -165,7 +173,7 @@ def check_rhoconnect_status(server)
     puts "Thin server logs:"
     puts server.ssh('cat /var/log/thin/thin.0.log')[0].stdout
     puts server.ssh('cat /var/log/thin/thin.1.log')[0].stdout
-    raise "Failed to connect to rhoconnect service on #{host}" # unless resp_code == 502
+    raise "Failed to connect to rhoconnect service on #{host}"
   end
 end
 

data/js-adapters/node.rb

@@ -27,7 +27,7 @@ module Rhoconnect
           sub_env = { "NODE_PATH" => "#{node_modules}#{File::PATH_SEPARATOR}#{pwd}#{File::PATH_SEPARATOR}#{dir}" }
           file = File.join(dir,"server.js")
           args = [sub_env, "node", file, "#{$$}", Rhoconnect.environment.to_s]
-          @pipe = IO.popen(args)
+          @pipe = IO.popen(args, "w")
           log "Starting Node.js process: #{@pipe.pid}"
           @pipe
         rescue Exception=>e

data/lib/rhoconnect/bulk_data/bulk_data.rb

@@ -47,11 +47,6 @@ module Rhoconnect
     
     def dbfiles_exist?
       files = [dbfile,dbfile+'.rzip']
-      if Rhoconnect.blackberry_bulk_sync
-        files << dbfile+'.hsqldb.data'
-        files << dbfile+'.hsqldb.script'
-        files << dbfile+'.hsqldb.properties'
-      end
       files.each do |file|
         return false unless File.exist?(file)
       end

data/lib/rhoconnect/controller/js_base.rb

@@ -11,6 +11,7 @@ module Rhoconnect
       Rhoconnect::DefaultServer.helpers Rhoconnect::Controller::JsBaseHelpers
 
       helpers Rhoconnect::Controller::JsBaseHelpers
+      register Rhoconnect::Handler::PluginCallbacks
 
       # source name is available inherently from controller
       before do