rhoconnect 3.0.0.beta3 → 3.0.0.rc1

data/CHANGELOG

@@ -1,5 +1,10 @@
-## 3.0.0.beta3 (not released)
+## 3.0.0.rc1 (not released)
+* load sqlite3 gem on demand, fixes issue with generator requiring it
+* #18934311 - create :startbg task for Rhostudio
 
+## 3.0.0.beta3 (2011-09-23)
+* #18672811 - edge case produces race condition which leads to corruption of Store data
+* #18508155 - on failed syncs allow the user to retry it up to pre-defined number of times
 
 ## 3.0.0.beta2 (2011-09-14)
 * #17830175 - moved SystemTimer in application's Gemfile so rhoconnect gem isn't specific
@@ -18,7 +23,7 @@
 * #12105115 - removed unnecessary log4r dependency
 * added bundler to manage gem's dependencies, migrated from rspec1 to rspec2  
 * #5687948 - fixed issue "iPhone push specs failed" 
-* use redis 2.2.13 by default	
+* use redis 2.2.14 by default	
 * added SystemTimer gem dependency (used only on posix systems)					
 * #13616807 - Rake task spec:all fails for enterprise ruby (ree)
 * #13776713 - Rake -v 0.9.0 breaks rhosync rake tasks
@@ -47,8 +52,6 @@
 * #18003071 - enhancing console to support multi-user ping
 * #10313437 - source settings per environment (also applied to dynamic adapters)
 * #18356697 - store lock is never released (bug fix)
-* #18672811 - edge case produces race condition which leads to corruption of Store data
-* #18508155 - on failed syncs allow the user to retry it up to pre-defined number of times
 
 ## 2.1.10 (2011-08-17)
 * #16001227 - raise exceptions on c2dm errors

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rhoconnect (3.0.0.beta3)
+    rhoconnect (3.0.0.rc1)
       bundler (~> 1.0)
       json (~> 1.5.0)
       rake (= 0.9.2)

data/Rakefile

@@ -90,79 +90,75 @@ task :archive do
 end
 
 # Debian and RPM package building tasks
-
-version      = Rhoconnect::VERSION
-
-def create_post_install(version)
-  post_install = "#!/bin/sh
-VERSION=#{version}
-
-cd /tmp/installdir/rhoconnect-$VERSION
-./install.sh -v $VERSION
-
-echo \"Delete tmp files ...\"
-rm -rf /tmp/installdir
-end #create_Post_install"
-
-  post_install
-end #create_post_install
-
 def build_pkg(dist, arch, deps)
-  curr_dir            = `pwd`.strip
-  workspace           = "#{curr_dir}/pkg/workspace" 
-  version             = Rhoconnect::VERSION
-  description         = '"Rhoconnect production environment"'
-  post_install        = "#{workspace}/unix-like/post-install.sh"
-  prefix              = "/tmp/installdir/rhoconnect-#{version}"
-  gem_name            = "rhoconnect-#{version}.gem"
-  post_install        = create_post_install version
-  post_install_script = "#{workspace}/unix-like/post-install.sh" 
+  curr_dir       = `pwd`.strip
+  workspace      = "#{curr_dir}/pkg/workspace" 
+  version        = Rhoconnect::VERSION
+  description    = '"Rhoconnect production environment"'
+  post_install   = "#{workspace}/unix-like/post-install.sh"
+  prefix         = "/opt/rhoconnect/installer"
+  gem_name       = "rhoconnect-#{version}.gem"
+  pre_install    = "#{workspace}/unix-like/pre_install.sh" 
+  post_install   = "#{workspace}/unix-like/post_install.sh" 
+  pre_uninstall  = "#{workspace}/unix-like/pre_uninstall.sh" 
+  post_uninstall = "#{workspace}/unix-like/post_uninstall.sh" 
 
   Dir.mkdir("#{workspace}")
   Dir.mkdir("#{workspace}/unix-like")
   Dir.mkdir("#{workspace}/utils")
 
-  # Turn post_install string into a bash script file and place it in the workspace.
-  post_install_file = File.new("#{post_install_script}", "w")
-  post_install_file.write(post_install)
-  post_install_file.close
-   
   # Copy all necessary Files into the workspace
-  system("cp ./install.sh #{workspace}")
-  system("cp -r ./installer/unix-like/* #{workspace}/unix-like")
-  system("cp -r ./installer/utils/* #{workspace}/utils")
-  system("cp ./pkg/#{gem_name} #{workspace}")
+  system("cp install.sh Gemfile Gemfile.lock #{workspace}")
+  system("cp -r installer/unix-like/* #{workspace}/unix-like")
+  system("cp -r installer/utils/create_texts.rb #{workspace}/utils")
+  system("cp pkg/#{gem_name} #{workspace}")
 
   # cd into the pkg dir so that fpm will create the package into the pkg dir.
   Dir.chdir("./pkg")
 
   # Construct fpm command
-  fpm_cmd = "fpm -s dir -t #{dist} -n rhoconnect -v #{version} -a #{arch} " + 
-            "-C #{workspace} --post-install #{post_install_script} --prefix #{prefix} " +
-            "--description #{description}"
+  fpm_cmd = "fpm -s dir -t #{dist} -n rhoconnect -v #{version} -a #{arch} -C #{workspace} " +
+            "--pre-install #{pre_install} --post-install #{post_install} " + 
+            "--pre-uninstall #{pre_uninstall} --post-uninstall #{post_uninstall} " + 
+            "--prefix #{prefix} --description #{description}"
 
   # Add the list of dependencies to the fpm call
   deps.each do |dep|
-    fpm_cmd << " -d #{dep}"
+    fpm_cmd << " -d '#{dep}'"
   end #do
 
   # Create the package
+  puts fpm_cmd
   system(fpm_cmd)
-
   # Leave no trace...
   system("rm -rf #{workspace}")
 end #build_pkg
 
+desc "Build Debian DEB rhoconnect-#{Rhoconnect::VERSION}_all.deb package into the pkg directory"
 task "build:deb" => :build do
-  deps = ['build-essential', 'zlib1g-dev','libssl-dev', 'libreadline5-dev', 
-          'libcurl4-openssl-dev', 'libsqlite3-0']
+  deps = [
+    "build-essential (>= 0)",
+    "zlib1g-dev (>= 0)",
+    "libssl-dev (>= 0)",
+    "libcurl4-openssl-dev (>= 0)",
+    "libreadline5-dev (>= 0)",
+    "libsqlite3-0 (>= 3.7.4)",
+    "libsqlite3-dev (>= 3.7.4)"
+  ]
 
   build_pkg "deb", "all", deps
 end #build:deb
 
+desc "Build Red Hat RPM rhoconnect-#{Rhoconnect::VERSION}.noarch.rpm package into the pkg directory"
 task "build:rpm" => :build do
-  deps = ['gcc-c++', 'zlib-devel', 'openssl-devel', 'readline-devel', 'curl-devel',
-          'pcre-devel']
+  deps = [
+    "gcc-c++ >= 4.1.2",
+    "zlib-devel >= 1.2.3",
+    "curl-devel >= 7.15.5",
+    "pcre-devel >= 6.6",
+    "openssl-devel >= 0.9.8e",
+    "readline-devel >= 5.1"
+  ]
 
   build_pkg "rpm", "noarch", deps
 end #build:rpm

data/doc/client.txt

@@ -14,6 +14,22 @@ Rhoconnect Client is a library to add sync data capability to your applications.
 
 * Add these libraries to your project: `libstdc++6.dylib, libsqlite3.dylib, libz.dylib, CFNetwork.framework`.
 
+### Features supported
+
+<table>
+<tr><th>Feature</th><th>&nbsp;Ruby&nbsp;</th><th>ObjectiveC</th></tr>
+<tr><td>Property bag model</td><td>yes</td><td>yes</td></tr>
+<tr><td>Fixed schema mode</td><td>yes</td><td>yes</td></tr>
+<tr><td>Model associations</td><td>yes</td><td>yes</td></tr>
+<tr><td>BLOB attributes</td><td>yes</td><td>yes</td></tr>
+<tr><td>Bulk sync</td><td>yes</td><td>yes</td></tr>
+<tr><td>Sync</td><td>yes</td><td>yes</td></tr>
+<tr><td>Notifications</td><td>yes</td><td>yes</td></tr>
+<tr><td>Database reset</td><td>yes</td><td>yes</td></tr>
+<tr><td>Authentication</td><td>yes</td><td>yes</td></tr>
+<tr><td>DB partitioning</td><td>yes</td><td>not yet</td></tr>
+</table>
+
 ### Object Model
 
 #### RhoConnectClient

data/doc/install.txt

@@ -13,11 +13,11 @@ Your RhoConnect application folder will be located in C:\RhoConnect\rhoconnect b
 
 1. [Ruby v1.8.7+](http://www.ruby-lang.org/en/downloads/)
 
-2. [RubyGems v1.3.7+](http://rubygems.org/pages/download) 
+2. [RubyGems v1.8.5+](http://rubygems.org/pages/download) 
 
 3. Ruby Web Server - We test with [thin](http://code.macournoyer.com/thin/), and [passenger](http://www.modrails.com/).  WEBrick, the web server that ships with ruby, is known to cause issues with HTTP headers/cookies and is ***not*** recommended.
 
-4. [Redis 2.2.x](http://redis.io/) - RhoConnect includes a simple [rake task](/rhoconnect/command-line#rake-tasks) `redis:install` to install redis, covered in the next section.  Alternatively, you can [install redis directly](http://redis.io/download).
+4. [Redis 2.2.14+](http://redis.io/) - RhoConnect includes a simple [rake task](/rhoconnect/command-line#rake-tasks) `redis:install` to install redis, covered in the next section.  Alternatively, you can [install redis directly](http://redis.io/download).
 
 ### Installing RhoConnect Gem
 

data/install.sh

@@ -13,35 +13,29 @@ installTime=$timeInitial
 
 # CONSTANTS
 
-RHOCONNECT_VERSION="3.0.0.beta3"
 DEPS=(gcc tar make wget)
 
 # FUNCTIONS
-
-echoLog ()
-{
-  timeStamp="[`date`]: "
-  echo -e $1
-  #end echoLog
-}
-
+# showHelp
+# Prints options to the screen
 showHelp ()
 {
-  echoLog "
-Usage: install.sh [options]\n
-    --no-redis                      Skip the installation of the redis server.\n
-    --offline                       Check that all necessary files are installed in /opt/rhoconnect if no prefix is specified.\n
-    -p, --prefix PREFIX             Specify PREFIX as the installation directory.  Default is /opt/rhoconnect.\n
-    -r, --ruby-version VERSION      Specify version of ruby to install.  Default is Ruby Enterprise.\n
-    -s, --silent                    Perform installation with minimal output.\n
-    --skip-ruby                     Use system ruby instead of ruby installed through this installer.\n
-    -w, --web-server SERVER         Specify that you are using web server SERVER.  Default is Nginx.\n
-    -h, --help                      Display this screen.\n
-"
-# End script after printing help message
-exit
-} #end showHelp
+  cat << _USAGE_
+Usage: install.sh [options]
+    --no-redis                      Skip the installation of the redis server.
+    --offline                       Check that all necessary files are installed in /opt/rhoconnect if no prefix is specified.
+    -p, --prefix PREFIX             Specify PREFIX as the installation directory.  Default is /opt/rhoconnect.
+    -r, --ruby-version VERSION      Specify version of ruby to install.  Default is Ruby Enterprise.
+    -s, --silent                    Perform installation with minimal output.
+    --skip-ruby                     Use system ruby instead of ruby installed through this installer.
+    -w, --web-server SERVER         Specify that you are using web server SERVER.  Default is Nginx.
+    -h, --help                      Display this screen.
+_USAGE_
+  exit
+}
 
+# checkDeps
+# Checks that all common dependencies are present, exits if not
 checkDeps ()
 {
   missingDeps=""
@@ -54,13 +48,16 @@ checkDeps ()
   done
 
   if [[ $missingDeps != "" ]]; then
-    echoLog "Dependencies Missing: " | tee -a $log
-    echoLog "${missingDeps}" | tee -a $log
-    echoLog "These must be installed before setup can continue..." | tee -a $log
+    echo "Dependencies Missing: " | tee -a $log
+    echo "${missingDeps}" | tee -a $log
+    echo "These must be installed before setup can continue..." | tee -a $log
     exit
   fi
 } #end checkDeps
 
+# determinePkgMgr
+# Determines if the system is currently using rpm or 
+# debian based pckage management
 determinePkgMgr ()
 {
   if [[ `which apt-get 2> /dev/null` != "" ]]; then
@@ -70,12 +67,14 @@ determinePkgMgr ()
     pkgMgr="yum -y"
     dist='yum'
   else
-    echoLog "No supported package manager." | tee -a $log
-    echoLog "Please install apt-get or yum to continue..." | tee -a $log
+    echo "No supported package manager." | tee -a $log
+    echo "Please install apt-get or yum to continue..." | tee -a $log
     exit
   fi
 } #end determinePkgMgr
 
+# parseOpts
+# Parses options passed to the install script
 parseOpts ()
 {
   for i in "$*"; do
@@ -92,9 +91,6 @@ parseOpts ()
     "r" )
       rubyVersion=$i
       ;;
-    "v" )
-      rhoconnectVersion=$i
-      ;;
     * )
       ;;
     esac
@@ -120,15 +116,12 @@ parseOpts ()
     --skip-ruby )
       ruby=false
       ;;
-    -v )
-      getVal="v"
-      ;;
     --help | -h )
       showHelp
       ;;
     * )
       #if [ "${i}" ]; then
-      #  echoLog "${i} is not a valid option" | tee -a $log
+      #  echo "${i} is not a valid option" | tee -a $log
       #  exit
       #fi
       ;;
@@ -166,11 +159,11 @@ setPrefixDependantPaths ()
 
   # Make path to log file absolute and create directory if not already existent
   log="${prefix}/logs/${log}"
-  touch $log
+  touch $log > /dev/null
 
   # Add the log file path to the info file
   `echo $log >> info.dat`
-  cat info.dat
+  #cat info.dat
 
   # Move info.dat into installation directory if not already there
   if ! [ -e "${prefix}/info.dat" ]; then
@@ -193,9 +186,8 @@ setDefaults ()
 
 logAndPrint ()
 {
-  $1 > tempout 2>&1  
+  $1 > $log 2>&1  
   exitStatus=$?
-  cat tempout | tee -a $log
 } #end logAndPrint
 
 setRubyVars ()
@@ -214,7 +206,7 @@ setRubyVars ()
     rubyTar="${rubyDir}.tar.gz"
     rubyURL="http://ftp.ruby-lang.org/pub/ruby/1.9/${rubyTar}"
   else
-    echoLog "${rubyVersion} is not a valid ruby version" | tee -a $log
+    echo "${rubyVersion} is not a valid ruby version" | tee -a $log
     exit
   fi
 } #end setRubyVars
@@ -222,13 +214,13 @@ setRubyVars ()
 installRuby ()
 {
   if [[ ! -d "${prefix}${rubyDir}" ]]; then
-    echoLog "Loading ruby tarball ..." | tee -a $log
-    echoLog "wget -P ${prefix} ${rubyURL}"  | tee -a $log
-    wget -P ${prefix} ${rubyURL} 
-    echoLog "tar -xzf ${prefix}/${rubyTar} -C ${prefix}" | tee -a $log
-    tar -xzf ${prefix}/${rubyTar} -C ${prefix}
+    echo "Downloading ${rubyURL} ..." | tee -a $log
+    echo "wget -P ${prefix} ${rubyURL}" >> $log
+    wget -P ${prefix} ${rubyURL} > $log 2>&1
+    echo "tar -xzf ${prefix}/${rubyTar} -C ${prefix}" >> $log
+    tar -xzf ${prefix}/${rubyTar} -C ${prefix} > $log 2>&1
   fi
-  echoLog "Installing ruby. This may take some time..." | tee -a $log
+  echo "Installing ruby. This may take some time..." | tee -a $log
 
   case $rubyVersion in
   rubyee)
@@ -243,18 +235,19 @@ installRuby ()
     logAndPrint "make && make install"
     ;;
   *)
-    logAndPrint "echoLog \"${rubyVersion} is not a supported ruby version\""
+    logAndPrint "echo \"${rubyVersion} is not a supported ruby version\""
     exit
     ;;
   esac
 
   if [[ $exitStatus != 0 ]]; then
-    echoLog "Some dependencies not installed..." | tee -a $log
-    echoLog "Please install them and then re-run the installation script." | tee -a $log
+    echo "Some dependencies not installed..." | tee -a $log
+    echo "Please install them and then re-run the installation script." | tee -a $log
+    echo "For troubleshooting see file $log ..." | tee -a $log
     exit
   fi
-
-  rm tempout
+  
+  echo "Ruby $rubyDir is successfully installed." | tee -a $log
 } #end installRuby
 
 getTime ()
@@ -289,16 +282,15 @@ getTime ()
     fi
   fi
 
-  echoLog "\nInstallation completed in ${timeHour}${timeMin}${timeSec}."
+  echo "\nInstallation completed in ${timeHour}${timeMin}${timeSec}."
 } #end getTime
 
 # SCRIPT
 
 # Get starting directory
 startDir=`pwd`
-
-if [[ $startDir =~ "rhoconnect-${RHOCONNECT_VERSION}" ]]; then
-  INSTALL_DIR="/tmp/installdir/rhoconnect-${RHOCONNECT_VERSION}"
+if [[ $startDir = "/opt/rhoconnect/installer" ]]; then #FIXME:
+  INSTALL_DIR="/opt/rhoconnect/installer"
 else
   INSTALL_DIR="./installer"
 fi
@@ -329,7 +321,7 @@ setDefaults
 
 # Reformat ruby version to fit this scripts format
 # Tolower rubyVersion
-rubyVersion=$(echoLog $rubyVersion | tr '[:upper:]' '[:lower:]')
+rubyVersion=$(echo $rubyVersion | tr '[:upper:]' '[:lower:]')
 # Remove all white space
 rubyVersion=${rubyVersion//[[:space:]]}
 # Remove periods and hyphens such as those present in version numbers
@@ -348,7 +340,7 @@ setPrefixDependantPaths
 if ! [ -e "${prefix}/bin/ruby" ]; then
   installRuby
 else
-  echoLog "Ruby already installed" | tee -a $log
+  echo "Ruby already installed" | tee -a $log
 fi
 
 # Construct the string with which to call the ruby installation script.

data/installer/unix-like/post_install.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd /opt/rhoconnect/installer
+./install.sh

data/installer/unix-like/post_uninstall.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [ -d "/opt/rhoconnect" ]; then
+  rm -rf /opt/rhoconnect
+fi
+
+if [ -d "/opt/nginx" ]; then
+  rm -rf /opt/nginx
+fi

data/installer/unix-like/pre_install.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [ -d "/opt/rhoconnect" ]; then
+  rm -rf /opt.rhoconnect
+fi
+
+#if [ -d "/opt/nginx" ]; then
+#  rm -rf /opt/nginx
+#fi

data/installer/unix-like/pre_uninstall.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# Stop redis
+if [ -e "/etc/init.d/redis" ]; then
+  /etc/init.d/redis stop
+  if [[ `which dpkg 2> /dev/null` != "" ]]; then # Debian
+    update-rc.d -f redis remove
+  elif [[ `which rpm 2> /dev/null` != "" ]]; then   # Red Hat
+    /sbin/chkconfig redis off
+  fi
+fi
+
+#stop nginx
+if [ -e "/etc/init.d/nginx" ]; then
+  /etc/init.d/nginx stop
+fi
+
+# /etc/logrotate.d/redis
+rm -f /etc/init.d/redis
+rm -f /etc/logrotate.d/redis
+
+rm -f /etc/init.d/nginx
+rm -f /etc/logrotate.d/nginx

data/installer/unix-like/rho_connect_install_checkers.rb

@@ -1,9 +1,7 @@
 require 'rho_connect_install_constants'
 
 module Checkers
-  extend self
-
-# check_all_installed
+  # check_all_installed
   # This method runs all tests that check whether or not the software is
   # installed correctly.
   def check_all_installed(options)
@@ -80,7 +78,6 @@ module Checkers
   # This method uses a system call to chack that a gem is installed
   def check_gem(gem, gem_path)
     result = `#{gem_path} query --local | grep #{ gem }`
-    puts "Result:" + result
     if result  == ""
       installed = false
     else

data/installer/unix-like/rho_connect_install_constants.rb

@@ -9,7 +9,7 @@ PACKAGES                = ["zlib1g-dev",
                            "dtach"]
 
 #RUBYGEMS                = "rubygems-1.8.5"
-REDIS                   = "redis-2.2.13"
+REDIS                   = "redis-2.2.14"
 SQLITE3                 = "sqlite-autoconf-3070701"
 RUBY                    = "ruby-enterprise-1.8.7-2011.03"
 Nginx                   = "nginx-1.0.6"

data/installer/unix-like/rho_connect_install_debian.rb

@@ -33,8 +33,8 @@ class Debian
     install_redis if @options[:redis]
 
     # Look for sqlite3-dev as it is required by the sqlite3 gem
-    `apt-get -y install libsqlite3-dev` if `dpkg -l | grep libsqlite3-dev`.empty?
-    
+    `#{@options[:pkg_mgr]} install libsqlite3-dev` if `#{@options[:pkg_chkr]} | grep libsqlite3-dev`.empty?
+
     #start installing
     install_all_gems
     configure_passenger @options

data/installer/unix-like/rho_connect_install_dnd.rb

@@ -1,24 +1,23 @@
 require 'rho_connect_install_constants'
 
 module DownloadAndDocompress
-  extend self
-  
   # download_and_decompress
   # Delegates the download and decompression duties
   def download_and_decompress(prefix, tarballs)
-    print_header "Downloading and Decompressing"
+    #print_header "Downloading ..."
     downloads = 0
     tarballs.each do |url|
       if !File.exists?("#{ get_tarball_name url }") ||
          !File.exists?("#{ get_version url }")
+        puts "Downloading #{url} ..."
         wget_download prefix, url
         decompress prefix, url
         downloads += 1
       end #if
     end #do
-    if downloads == 0
-      log_print "Nothing additional to download"
-    end #if
+#    if downloads == 0
+#      log_print "Nothing additional to download"
+#    end #if
   end #download_and_decompress
 
   # wget_download
@@ -27,7 +26,7 @@ module DownloadAndDocompress
   def wget_download(prefix, url)
     if !File.exists?("#{ prefix }/#{ get_tarball_name url }") &&
        !File.directory?("#{ prefix }/#{ get_version url }")
-        cmd "wget -P #{ prefix } #{ url }"
+        cmd "wget -P #{ prefix } #{ url } "
     end #if
   end #wget_download
 
@@ -37,8 +36,7 @@ module DownloadAndDocompress
   def decompress(prefix, url)
     tarball = get_tarball_name(url)
     dir = get_version(url)
-    cmd "tar -xzf #{ prefix }/#{ tarball } -C #{ prefix }"  unless
-      File.directory? "#{ prefix }/#{ dir }"
+    cmd "tar -xzf #{ prefix }/#{ tarball } -C #{ prefix }" unless File.directory? "#{ prefix }/#{ dir }"
   end #decompress
   
   # get_version

data/installer/unix-like/rho_connect_install_get_params.rb

@@ -3,8 +3,6 @@ require 'rho_connect_install_debian'
 require 'rho_connect_install_yum'
 
 module GetParams
-  extend self
-  
   # get_flavor
   # determine whether running on a debian system or a yum system
   def get_flavor(options)