rhoconnect 3.2.0.beta1 → 3.2.0.beta2

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 3.2.0.beta2 (2012-05-02)
+* 28571961 fix jasmine tests
+* #28496779 - remove rhoconnect_api.rb and all of its references
+* #28563163 - bug fix : it should not be allowed to create a User with empty login
+* #28528841 - Ping should process all clients and report cumulative error at the end
+* Empty 'queue_updates' request should trigger processing of the CUD queue
+* #28094895 - Zendesk ticket #2354: Bulk sync not updating sources table (fields 'last_inserted_size' and 'backend_refresh_time' now updated)
+* #28855323 - Bulk Sync Associations from Zendesk ticket #2377
+* #28576723 - dpkg lock error on Ubuntu install
+* #28094895 - Zendesk ticket #2354: Bulk sync not updating sources table (fields 'last_inserted_size' and 'backend_refresh_time' now updated) 
+* #28865579 - Async dependencies are not properly initialized on Windows (need to add :mingw_19 to the list of platforms in Gemfile)
+* Rhoconnect production stack updated to latest stable version of ruby, redis, and nginx: ruby-1.9.3-p194, redis-2.4.12, nginx-1.2.0.
+
 ## 3.2.0.beta1 (2012-04-20)
 * Rhoconnect commands (replacement for rake tasks)
 * Async framework is introduced for rubies 1.9.x (no 1.8.7 or JRuby support)
@@ -7,6 +20,7 @@
 * #28219647 - Schema Change Error from Zendesk ticket #2353
 * #28328057 - Feature Request: Adding a Bulk Data Job after_perform hook from Zendesk ticket #2367
 * #28330213 - Implementing fast_insert/update/delete API
+* #27051649 - Rhoconnect Console is re-worked using Twitter.Bootstrap
 
 ## 3.1.2 (2012-04-02)
 * #19297819 - Refactor server middleware loading to be static

data/Gemfile

@@ -7,7 +7,7 @@ gem 'win32-process', :platforms => [:mswin, :mingw]
 
 # for async framework
 # for Async, Eventful execution
-platforms :ruby_19 do
+platforms :ruby_19, :mingw_19 do
   gem 'eventmachine'
   gem 'rack-fiber_pool'
   gem 'async-rack'
@@ -36,6 +36,7 @@ group :test do
   gem 'simplecov', :require => false, :platforms => [:ruby_19,:jruby]
   gem 'rack-test', '>= 0.5.3', :require => 'rack/test'
   gem 'jasmine'
+  gem 'jasmine-headless-webkit'
 end
 
 group :build do

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rhoconnect (3.2.0.beta1)
+    rhoconnect (3.2.0.beta2)
       bundler (~> 1.0)
       json (~> 1.6.0)
       rake (~> 0.9.2)
@@ -11,6 +11,7 @@ PATH
       rubyzip (~> 0.9.4)
       sinatra (~> 1.3)
       templater (~> 1.0.0)
+      thin (~> 1.3.1)
       thor (~> 0.14.6)
       uuidtools (>= 2.1.1)
 
@@ -18,7 +19,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
-    addressable (2.2.7)
+    addressable (2.2.8)
     arr-pm (0.0.7)
       cabin (> 0)
     async-rack (0.5.1)
@@ -34,10 +35,17 @@ GEM
     childprocess (0.3.2)
       ffi (~> 1.0.6)
     clamp (0.3.1)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.3.1)
     crack (0.3.1)
+    daemons (1.1.8)
     diff-lcs (1.1.3)
     eventmachine (0.12.10)
     excon (0.13.4)
+    execjs (1.3.1)
+      multi_json (~> 1.0)
     extlib (0.9.15)
     ffaker (1.14.0)
     ffi (1.0.11)
@@ -52,24 +60,31 @@ GEM
       nokogiri (~> 1.5.0)
       ruby-hmac
     formatador (0.2.1)
-    fpm (0.4.6)
+    fpm (0.4.9)
       arr-pm (~> 0.0.7)
       backports (= 2.3.0)
       cabin (~> 0.4.3)
-      clamp
-      json
+      clamp (= 0.3.1)
+      json (= 1.6.6)
     highline (1.6.11)
+    hike (1.2.1)
     jasmine (1.1.2)
       jasmine-core (>= 1.1.0)
       rack (>= 1.1)
       rspec (>= 1.3.1)
       selenium-webdriver (>= 0.1.3)
     jasmine-core (1.1.0)
+    jasmine-headless-webkit (0.8.4)
+      coffee-script
+      jasmine-core (~> 1.1)
+      multi_json
+      rainbow
+      sprockets (~> 2)
     json (1.6.6)
     libwebsocket (0.1.3)
       addressable
     mime-types (1.18)
-    multi_json (1.3.2)
+    multi_json (1.3.4)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-ssh (2.3.0)
@@ -80,6 +95,7 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
+    rainbow (1.1.4)
     rake (0.9.2.2)
     rcov (1.0.0)
     redis (2.2.2)
@@ -101,7 +117,7 @@ GEM
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.9.0)
     ruby-hmac (0.4.0)
-    rubyzip (0.9.7)
+    rubyzip (0.9.8)
     selenium-webdriver (2.21.2)
       childprocess (>= 0.2.5)
       ffi (~> 1.0)
@@ -116,11 +132,20 @@ GEM
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
+    sprockets (2.4.1)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.6)
     templater (1.0.0)
       diff-lcs (>= 1.1.2)
       extlib (>= 0.9.5)
       highline (>= 1.4.0)
+    thin (1.3.1)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
     thor (0.14.6)
     tilt (1.3.3)
     uuidtools (2.1.2)
@@ -145,6 +170,7 @@ DEPENDENCIES
   fog (>= 1.1.0)
   fpm (>= 0.4.6)
   jasmine
+  jasmine-headless-webkit
   jdbc-sqlite3 (>= 3.7.2)
   jruby-openssl (>= 0.7.4)
   rack-fiber_pool

data/README.md

@@ -2,6 +2,10 @@ RhoConnect App Integration Server
 -------------------------------------------------------------
 RhoConnect is an app integration server which keeps enterprise data current and available on users’ devices.
 
+Prerequisites
+-------------------------------------------------------------
+You will need to install the Qt libraray <http://qt.nokia.com/downloads> in order to run the specs.
+
 More Info
 -------------------------------------------------------------
   * Intro to Rhodes & RhoConnect: 	<http://docs.rhomobile.com>

data/Rakefile

@@ -11,7 +11,8 @@ $:.unshift File.join(File.dirname(__FILE__),'lib')
 require 'rhoconnect'
 
 include Rake::DSL
-task :default => 'spec:all'
+#task :default => 'spec:all'
+task :default => ["spec:all","jasmine:headless"]
 task :spec => 'spec:spec'
 
 begin
@@ -103,23 +104,23 @@ end
 
 # Debian and RPM package building tasks
 def build_pkg(dist, arch, deps, use_bench_tarball=false)
-  build_dir = "/tmp/rhobuild"
-  version = Rhoconnect::VERSION
-  description = '"Rhoconnect production environment"'
-  prefix = "/opt/rhoconnect/installer"
-  gem_name = "rhoconnect-#{version}.gem"
+  puts start_dir = Dir.pwd
+  build_dir      = "/tmp/rhobuild"
+  version        = Rhoconnect::VERSION
+  description    = '"Rhoconnect production environment"'
+  prefix         = "/opt/rhoconnect/installer"
+  gem_name       = "rhoconnect-#{version}.gem"
 
   before_install_script = "#{build_dir}/unix-like/pre_install.sh"
-  after_install_script = "#{build_dir}/unix-like/post_install.sh"
-  before_remove_script = "#{build_dir}/unix-like/pre_uninstall.sh"
-  after_remove_script = "#{build_dir}/unix-like/post_uninstall.sh"
+  after_install_script  = "#{build_dir}/unix-like/post_install.sh"
+  before_remove_script  = "#{build_dir}/unix-like/pre_uninstall.sh"
+  after_remove_script   = "#{build_dir}/unix-like/post_uninstall.sh"
 
   `rm -rf #{build_dir}` if File.exist?("#{build_dir}")
   Dir.mkdir("#{build_dir}")
   Dir.mkdir("#{build_dir}/unix-like")
 
   # Copy all necessary Files into the build_dir
-  Dir.chdir(File.expand_path(File.dirname(__FILE__))) 
   system("cp install.sh Gemfile Gemfile.lock #{build_dir}")
   system("cp -r installer/unix-like/*.sh #{build_dir}/unix-like")
   system("cp -r installer/unix-like/*.rb #{build_dir}/unix-like")
@@ -145,6 +146,7 @@ def build_pkg(dist, arch, deps, use_bench_tarball=false)
   system(fpm_cmd)
   # Leave no trace...
   system("rm -rf #{build_dir}")
+  Dir.chdir(start_dir)
 end
 
 DEB_DEPS = [
@@ -183,7 +185,7 @@ end
 
 begin
   require 'jasmine'
-  load 'jasmine/tasks/jasmine.rake'
+  load 'tasks/jasmine.rake'
 rescue LoadError
   task :jasmine do
     abort "Jasmine is not available. In order to run jasmine, you must: (sudo) gem install jasmine"

data/commands/commands/rhoconnect/create_user.rb

@@ -13,6 +13,6 @@ Execute.define_task do
       exit
     end
     puts ''
-    RhoconnectApi.create_user($url,$token,login,password)
+    RestClient.post("#{$url}/api/user/create_user", { :api_token => $token, :attributes => {:login => login, :password => password}})
   end #create_user
 end #do

data/commands/commands/rhoconnect/delete_device.rb

@@ -4,6 +4,6 @@ Execute.define_task do
     invoke :config 
     user_id = ask "device's user_id: "
     device_id = ask "device to delete: "
-    RhoconnectApi.delete_client($url,$token,user_id,device_id)
+    RestClient.post("#{$url}/api/client/delete_client", { :api_token => $token, :user_id => user_id, :client_id => device_id})
   end #delete_device
 end #do

data/commands/commands/rhoconnect/delete_user.rb

@@ -3,6 +3,6 @@ desc "delete-user", "Deletes a user from rhoconnect"
   def delete_user
     invoke :config
     login = ask "user to delete: "
-    RhoconnectApi.delete_user($url,$token,login)
+    RestClient.post("#{$url}/api/user/delete_user", { :api_token => $token, :user_id => login })
   end #delete_user
 end #do

data/commands/commands/rhoconnect/get_token.rb

@@ -14,7 +14,7 @@ desc "get-token", "Fetches current api token from rhoconnect"
     end
     puts ''
     begin
-      $token = RhoconnectApi.get_token($url,login,password)
+      $token = RestClient.post("#{$url}/api/admin/login", { :login => login, :password => password})
     rescue
       puts "Login failed."
       exit

data/commands/commands/rhoconnect/reset.rb

@@ -7,7 +7,7 @@ Execute.define_task do
                   " existing devices when they connect! (yes/no):"
 
     if confirm == 'yes'
-      RhoconnectApi.reset($url,$token) 
+      RestClient.post("#{$url}/api/admin/reset", { :api_token => $token })
       puts "Database reset."
     else
       puts "Cancelling."

data/commands/execute.rb

@@ -10,7 +10,6 @@ $:.unshift File.join(File.dirname(__FILE__), '.')
 $:.unshift File.join(File.dirname(__FILE__), '..')
 require 'lib/rhoconnect/utilities'
 require 'lib/rhoconnect'
-require 'lib/rhoconnect/console/rhoconnect_api'
 
 include Utilities
 

data/doc/bulk-sync.txt

@@ -73,6 +73,37 @@ By default, bulk sync data files will be stored in the application's root folder
       :syncserver: http://localhost:9292/application/
       :bulk_sync_poll_interval: 3600
 
+## Bulk Sync Associations
+
+Sometimes your bulk data is not simply a collection of separate sources, but they are linked together through associations. For these purposes 
+RhoConnect uses the notation of `belongs_to` association. The `belongs_to` association is a natural way to express hasOne and hasMany associations. In the case of bulk sync, data `belongs_to` relationship includes a list of all dependent objects for model(s) and helps resolve dependency issues during bulk sync process.
+
+Associations are defined in your RhoConnect application's `settings/settings.yml` file.
+ 
+For example, you can have a list of customers who have purchased a product, and thus you can have them belong to that product:
+
+    :::yaml
+    :sources:
+      :Product:
+        :poll_interval: 600
+        :partition_type: app
+        :sync_type: bulk_sync_only     
+      :Customer:
+        :poll_interval: 300
+        # ...
+        belongs_to:
+          - :product_id: 'Product'
+
+`belongs_to` format is an array of attribute/source_name pairs. It can be polymorphic and define associations across multiple sources:
+
+    :::yaml
+      belongs_to:
+        - :parent_id, 'Product'
+        - :parent_id, 'Cases'
+
+Bulk Sync Associations are similar to [Rhom Sync Associations](/rhodes/rhom#associations) and both should be considered together
+if you are planning to use bulk sync data.
+
 ## Using Bulk Sync with Fixed Schema Models
 
 If your Rhom model is a [fixed schema model](/rhodes/rhom#fixed-schema) and you use bulk sync, you can control the bulk sync schema at runtime in your source adapter by implementing the 'schema' method.  
@@ -99,4 +130,7 @@ An example schema method is as follows:
           'by_price' => 'price'
         }
       }.to_json
-    end
+    end
+    
+**NOTE: Key `version` is mandatory and should be always defined in schema method. You need update `version` value only in the case of schema changes.**
+

data/doc/install.txt

@@ -1,8 +1,10 @@
 # Installing RhoConnect
 
-On Windows and Mac OS, the usual way to install RhoConnect is to install RhoStudio. 
+This section discusses how to install the development environment for RhoConnect. For those who have developed a RhoConnect application, and now wish to deploy that RhoConnect application on a server, refer to the instructions for deploying a RhoConnect application, such as [preparing a RhoConnect app for production](/rhoconnect/preparing-production) and [deploying a RhoConnect application](/rhoconnect/deploying).
 
-On Linux, you install the Rhodes gem from the command line; you can also do this from Windows or Mac OS.
+On Windows and Mac OS, the usual way to install the RhoConnect development environment is to install RhoStudio. 
+
+On Linux, you install the RhoConnect gem from the command line; you can also do this from Windows or Mac OS.
 
 ## Mac OS
 
@@ -22,7 +24,9 @@ You can also install RhoConnect without RhoStudio by [installing Ruby and the Rh
 
 If you're running Windows 32-bit, download the latest [RhoStudio Installer for Windows](http://rhomobile.com/rhostudio-windows). This installs the [Ruby stack](http://www.ruby-lang.org/en/), [Redis](http://redis.io/), [RhoConnect](/rhoconnect/introduction), and [Rhodes](/rhodes/introduction).
 
-If you are running Windows 64-bit, you need to [install Ruby and the RhoConnect gem](/rhoconnect/install#rhoconnect-gem-for-linux-and-non-rhostudio). If you also want RhoStudio, you need to have 64-bit Eclipse, and then you [install RhoStudio as a plugin for Eclipse](/rhodes/rhostudio-eclipse).
+If you are running Windows 64-bit, you need to use 32-bit Java when you run RhoStudio. You can include the 32-bit Java in the PATH, or you can run RhoStudio with a link to 32-bit Java:
+
+	C:\RhoStudio\eclipse\RhoStudio.exe -vm "<32-bit java path>\bin\javaw.exe"
 
 ## Java Development Kit (JDK)
 

data/examples/simple/config.ru

@@ -12,7 +12,7 @@ if ENV['DEBUG'] == 'yes'
 end
 
 require 'rhoconnect/server'
-require 'rhoconnect/console/server'
+require 'rhoconnect/web-console/server'
 require 'resque/server'
 
 # Rhoconnect server flags

data/generators/templates/application/Gemfile

@@ -7,7 +7,7 @@ gem 'SystemTimer', '~> 1.2.3', :platforms => :ruby_18
 gem 'win32-process', :platforms => [:mswin, :mingw]
 
 # for Async, Eventful execution
-platforms :ruby_19 do
+platforms :ruby_19, :mingw_19 do
   gem 'thin'
   gem 'rack-fiber_pool'
   gem 'async-rack'

data/install.sh

@@ -200,10 +200,10 @@ logAndPrint ()
 setRubyVars ()
 {
   if [[ $rubyVersion == "" || $rubyVersion =~ ruby'ee'|'enterprise' ]]; then
-    rubyVersion="ruby-1.9.3-p125"
-    rubyDir="ruby-1.9.3-p125"
+    rubyVersion="ruby-1.9.3-p194"
+    rubyDir="ruby-1.9.3-p194"
     rubyTar="${rubyDir}.tar.gz"
-    # http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p125.tar.gz
+    # http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p194.tar.gz
     rubyURL="http://ftp.ruby-lang.org/pub/ruby/1.9/${rubyTar}"
   elif [$rubyVersion == "ruby187"]; then
     rubyDir="ruby-1.8.7"
@@ -234,7 +234,7 @@ installRuby ()
 #  rubyee)
 #    logAndPrint "${prefix}/${rubyDir}/installer --dont-install-useful-gems --no-dev-docs --auto ${prefix}"
 #    ;;
-  ruby-1.9.3-p125)
+  ruby-1.9.3-p194)
     (
       echo "cd ${prefix}/${rubyDir}" | tee -a $log
       cd ${prefix}/${rubyDir}	 

data/installer/unix-like/create_texts.rb

@@ -373,11 +373,10 @@ _NGINX_CONF_
   Dir.mkdir "/opt/nginx/conf/conf.d" unless File.exist? "/opt/nginx/conf/conf.d"
   rho_vhost_conf = <<_VHOST_CONF_
 upstream thin_cluster {
-  server unix:/tmp/thin.sock;
-  #server unix:/tmp/thin.0.sock;
-  #server unix:/tmp/thin.1.sock;
-  #server unix:/tmp/thin.2.sock;
-  #server unix:/tmp/thin.3.sock;
+  server unix:/tmp/thin.0.sock;
+  server unix:/tmp/thin.1.sock;
+#  server unix:/tmp/thin.2.sock;
+#  server unix:/tmp/thin.3.sock;
 }
 
 server {
@@ -479,15 +478,21 @@ def nginx_readme
    - Nginx start-up script (/etc/init.d/nginx)
    - Nginx logrotate settings (/etc/logrotate.d/nginx)
    - Nginx configuration file (/opt/nginx/conf/nginx.conf) 
-   - passenger configuration file and virtual host template for rhoconnect application 
-     (/opt/nginx/conf/conf.d/passenger.conf and /opt/nginx/conf/conf.d/rhoconnect.conf)
+   - virtual host template for rhoconnect application 
+     (/opt/nginx/conf/conf.d/rhoconnect.conf)
 
-     To complete setup of web server
+     To change default setup of web server
      A) Configure virtual host for rhoconnect application:
         Edit the file /opt/nginx/conf/conf.d/rhoconnect.conf so that it reflects your specifications.
-
      B) As root user start server to pick up the changes:
         /etc/init.d/nginx start
+    
+5) Installer also configured Thin app server with the following configuration files:
+   - Thin start-up script (/etc/init.d/thin)
+   - Thin configuration file (/etc/thin/rhoapp.yml)
+   
+   By default, init script start cluster of 2 servers running on UNIX domain sockets.
+   Nginx connected to cluster via upstream block in nginx config file.  
 _NGINX_README_
   readme
 end
@@ -525,25 +530,20 @@ end
 
 def config_and_install_thin_scripts(rho_path)
   puts "Configuring and installing thin scripts ..."
-  `#{rho_path}/bin/thin install`
-
-  # >> Installing thin service at /etc/rc.d/thin ...
-  # mkdir -p /etc/rc.d
-  # writing /etc/rc.d/thin
-  # chmod +x /etc/rc.d/thin
-  # mkdir -p /etc/thin
-  #
-  # To configure thin to start at system boot:
-  # on RedHat like systems:
-  #   sudo /sbin/chkconfig --level 345 thin on
-  # on Debian-like systems (Ubuntu):
-  #   sudo /usr/sbin/update-rc.d -f thin defaults
-  # on Gentoo:
-  #   sudo rc-update add thin default
-  #
-  # Then put your config files in /etc/thin
-
-  `#{rho_path}/bin/thin config -C /etc/thin/rhoapp.yml -c /opt/nginx/html/rhoapp/ --socket /tmp/thin.sock --log /opt/nginx/logs/thin.log --pid /var/run/thin.pid -e production`
+  `env PATH=#{rho_path}/bin:$PATH thin install`
+  # >> Installing thin service at /etc/rc.d/thin (RedHat) or /etc/init.d/thin (Ubuntu) ...
+
+  thin_conf_file = (File.exists?('/etc/init.d/thin')) ? "/etc/init.d/thin" : "/etc/rc.d/thin"
+  File.open("/tmp/thin", 'w') do |f|
+    File.foreach(thin_conf_file) do |line|
+      f << "export PATH=/opt/rhoconnect/bin:$PATH" << "\n" if line =~ /^DAEMON/
+      f << line
+    end
+  end
+  File.rename("/tmp/thin", thin_conf_file)
+  `chmod +x #{thin_conf_file}`
+
+  `env PATH=#{rho_path}/bin:$PATH thin config -C /etc/thin/rhoapp.yml -c /opt/nginx/html/rhoapp/ --socket /tmp/thin.sock --servers 2 --log /opt/nginx/logs/thin.log --pid /var/run/thin.pid -e production`
   `ln -s /etc/rc.d/thin /etc/init.d/.` if File.directory?('/etc/rc.d')
 end
 
@@ -593,18 +593,18 @@ _IT_SHOULD_BE_DONE_
      /etc/init.d/redis start
      /etc/init.d/nginx start
   B) To verify that application up and running open web console in your browser:
-     http://localhost/console/
+     http://server_ip_address
 
 _NGINX_TO_DO_
     else
       server_todo_list = <<_NGINX_TO_DO_
 2) Try rhoconnect 'rhoapp' application, created in /opt/nginx/html directory
-  A) As root user start redis and nginx servers:
+  A) As root user start redis, nginx and thin servers:
      /etc/init.d/redis start
      /etc/init.d/nginx start
      /etc/init.d/thin start
   B) Open RhoConnect application web console in your browser:
-     http://localhost/console/
+     http://server_ip_address
 
 _NGINX_TO_DO_
     end

data/installer/unix-like/pre_uninstall.sh

@@ -14,12 +14,11 @@ if [ -e "/etc/init.d/redis" ]; then
 fi
 
 #stop thin
-if [ -e "/etc/init.d/thin" ]; then /etc/init.d/thin stop; fi
+[ "$(ps aux | grep '[t]hin')" ] && [ -e "/etc/init.d/thin" ] && /etc/init.d/thin stop
 
 #stop nginx
-if [ -e "/etc/init.d/nginx" ]; then /etc/init.d/nginx stop; fi
+[ "$(ps aux | grep '[n]ginx')" ] && [ -e "/etc/init.d/nginx" ] && /etc/init.d/nginx stop
 
-#/etc/logrotate.d/redis
 rm -f /etc/init.d/redis
 rm -f /etc/logrotate.d/redis
 

data/installer/unix-like/rho_connect_install_constants.rb

@@ -8,10 +8,10 @@ module Constants
                            "libaprutil1-dev",
                            "dtach"]
 
-  RUBY                    = "ruby-1.9.3-p125"
-  REDIS                   = "redis-2.4.10"
+  RUBY                    = "ruby-1.9.3-p194"
+  REDIS                   = "redis-2.4.12"
   SQLITE3                 = "sqlite-autoconf-3071000"
-  NGINX                   = "nginx-1.0.15"
+  NGINX                   = "nginx-1.2.0"
   PASSENGER_ROOT          = "/opt/rhoconnect/lib/ruby/gems/1.9.1/gems/passenger"
 
   SOFTWARE                = [ REDIS, SQLITE3, RUBY, NGINX ]

data/installer/unix-like/rho_connect_install_debian.rb

@@ -9,8 +9,6 @@ class Debian
   def initialize(options)
     @@flavor = "Debian"
     @options = options
-    @options[:pkg_mgr]  = 'apt-get -y'
-    @options[:pkg_chkr] = 'dpkg -l'
   end #initialize
   
   # check_for_installed_software_only
@@ -35,9 +33,6 @@ class Debian
     # Install sqlite3 libs
     install_sqlite
 
-    # Look for sqlite3-dev as it is required by the sqlite3 gem
-    `#{@options[:pkg_mgr]} install libsqlite3-dev` if `#{@options[:pkg_chkr]} | grep libsqlite3-dev`.empty?
-
     #start installing
     install_all_gems
     configure_nginx @options

data/installer/unix-like/rho_connect_install_yum.rb

@@ -9,8 +9,6 @@ class Yum
   def initialize(options)
     @@flavor = "Yum"
     @options = options
-    @options[:pkg_mgr]  = 'yes | yum'
-    @options[:pkg_chkr] = 'rpm -qa'
   end #initialize
 
   # check_for_installed_software_only
@@ -31,7 +29,7 @@ class Yum
     # ruby gems is installed by the REE installer
 #    install_rubygems
     install_redis if @options[:redis]
-    # Cent OS uses obsolete sqlite3 libs, update them the latest ones  
+    # Cent OS 5.x uses obsolete sqlite3 libs, update them the latest ones
     install_sqlite
 
     #start installing

data/installer/utils/constants.rb

@@ -12,14 +12,14 @@ module Constants
   PEM_FILE        = 'jenkinskey.pem'
   SSH_KEY         = "#{HOME_DIR}/.ssh/#{PEM_FILE}"
   ACCESS_KEY_FILE = "#{HOME_DIR}/.ec2"
-  UBUNTU_STACK    = { :image_id  => 'ami-6da8f128',
+  UBUNTU_STACK    = { :image_id  => 'ami-938ed5d6',
                       :flavor_id => 'c1.xlarge',
                       :key_name  => 'jenkinskey',
                       :groups    => 'load-test',
                       :user      => 'ubuntu'}
 
-  CENTOS_STACK    = { :image_id  => 'ami-13346656',
-                      :flavor_id => 'c1.medium',
+  CENTOS_STACK    = { :image_id  => 'ami-178dd652',
+                      :flavor_id => 'c1.xlarge',
                       :key_name  => 'jenkinskey',
                       :groups    => 'load-test',
                       :user      => 'root'}
@@ -41,4 +41,4 @@ module Constants
                       "pcre-devel",
                       "openssl-devel",
                       "readline-devel" ]
-end #Constants
+end #Constants