rhoconnect 3.2.0.beta3 → 3.2.0.beta4

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 3.2.0.beta4 (2012-05-10)
+* #29112553 - adding 'bundle exec' to shelled-out ruby commands
+* #29050981 - replaced 'sh' to 'system' in rhoconnect commands to avoid Rake::DSL warnings
+* #29411157 - removed custom eventmachine gem dependency
+* #29413841 - removing 'thin' from JRuby config
+
 ## 3.2.0.beta3 (2012-05-04)
 * #28922571 - loading feedback msg console
 * #28923039 - add pre tags around json values (console)

data/Gemfile

@@ -5,13 +5,12 @@ gemspec
 
 gem 'win32-process', :platforms => [:mswin, :mingw]
 
-# FIXME: At this moment (05/04/2012) 'eventmachine' doesn't work on Windows ruby1.9.3-p194
-# FIXME: there is a reported issue - for now, we're using our own forked version with the suggested patch
-# FIXME: See https://github.com/eventmachine/eventmachine/issues/319
-gem "eventmachine", :git => 'https://github.com/rhomobile/eventmachine.git'
-
-# using thin by default
-gem 'thin'
+# use thin and eventmachine everywhere except JRuby
+platforms :ruby, :ruby_19, :mingw, :mingw_19 do
+	gem "eventmachine", "~> 1.0.0.beta"
+	# using thin by default
+	gem 'thin'
+end
 
 # for async framework
 # for Async, Eventful execution

data/Gemfile.lock

@@ -1,13 +1,7 @@
-GIT
-  remote: https://github.com/rhomobile/eventmachine.git
-  revision: 6858b3b6b6b43fe970d5443117f2ae642ac929d8
-  specs:
-    eventmachine (1.0.0.beta.4)
-
 PATH
   remote: .
   specs:
-    rhoconnect (3.2.0.beta3)
+    rhoconnect (3.2.0.beta4)
       bundler (~> 1.0)
       json (~> 1.6.0)
       rake (~> 0.9.2)
@@ -47,8 +41,9 @@ GEM
     crack (0.3.1)
     daemons (1.1.8)
     diff-lcs (1.1.3)
+    eventmachine (1.0.0.beta.4)
     excon (0.13.4)
-    execjs (1.3.1)
+    execjs (1.3.2)
       multi_json (~> 1.0)
     extlib (0.9.15)
     ffaker (1.14.0)
@@ -70,7 +65,7 @@ GEM
       cabin (~> 0.4.3)
       clamp (= 0.3.1)
       json (= 1.6.6)
-    highline (1.6.11)
+    highline (1.6.12)
     hike (1.2.1)
     jasmine (1.1.2)
       jasmine-core (>= 1.1.0)
@@ -128,15 +123,15 @@ GEM
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
-    simplecov (0.6.2)
-      multi_json (~> 1.3)
+    simplecov (0.6.4)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
     sinatra (1.3.2)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
-    sprockets (2.4.1)
+    sprockets (2.4.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -169,7 +164,7 @@ DEPENDENCIES
   aws-s3 (>= 0.6.2)
   dbd-jdbc (>= 0.1.4)
   dbi (>= 0.4.5)
-  eventmachine!
+  eventmachine (~> 1.0.0.beta)
   ffaker (~> 1.14.0)
   fog (>= 1.1.0)
   fpm (>= 0.4.6)

data/Rakefile

@@ -103,8 +103,8 @@ task :archive do
 end
 
 # Debian and RPM package building tasks
-def build_pkg(dist, arch, deps, use_bench_tarball=false)
-  puts start_dir = Dir.pwd
+def build_pkg(dist, arch, deps)
+  start_dir = Dir.pwd
   build_dir      = "/tmp/rhobuild"
   version        = Rhoconnect::VERSION
   description    = '"Rhoconnect production environment"'
@@ -126,22 +126,26 @@ def build_pkg(dist, arch, deps, use_bench_tarball=false)
   system("cp -r installer/unix-like/*.rb #{build_dir}/unix-like")
   system("cp pkg/#{gem_name} #{build_dir}")
 
-  # Create bench tarball
-  `git archive --format=tar --prefix=bench/ HEAD:bench | gzip > #{build_dir}/bench.tar.gz` if use_bench_tarball
+  system("cp CHANGELOG.md CREDITS README.md LICENSE #{build_dir}/")
+  system("cp rhoconnect.gemspec Rakefile #{build_dir}/")
+  system("cp -r bin/ #{build_dir}/")
+  system("cp -r commands/ #{build_dir}/")
+  system("cp -r lib/ #{build_dir}/")
+  system("cp -r generators/ #{build_dir}/")
+  system("cp -r tasks/ #{build_dir}/")
+  system("cp -r installer/ #{build_dir}")
 
   # cd into the pkg dir so that fpm will create the package into the pkg dir.
-  Dir.chdir("./pkg")
-
+  Dir.chdir("./pkg") # it created by build task and should already exist
+   
   # Construct fpm command
   fpm_cmd = "fpm -s dir -t #{dist} -n rhoconnect -v #{version} -a #{arch} -C #{build_dir} " +
     "--before-install #{before_install_script} --after-install #{after_install_script} " +
     "--before-remove #{before_remove_script} --after-remove #{after_remove_script} " +
     "--prefix #{prefix} --description #{description}"
-
   # Add the list of dependencies to the fpm call
   deps.each { |dep| fpm_cmd << " -d '#{dep}'" }
   fpm_cmd << " './'"
-
   # Create the package
   system(fpm_cmd)
   # Leave no trace...
@@ -158,11 +162,11 @@ DEB_DEPS = [
   "libcurl4-openssl-dev (>= 0)",
   "libreadline6 (>= 0)", "libreadline6-dev (>= 0)",
   "libyaml-dev (>= 0)", "libxml2-dev (>= 0)",
-  "libpcre3 (>=0)", "libpcre3-dev (>=0)"
+  "libpcre3 (>=0)", "libpcre3-dev (>=0)", "git (>= 0)"
 ]
 
 desc "Build Debian DEB rhoconnect-#{Rhoconnect::VERSION}_all.deb package into the pkg directory"
-task "build:deb" => :build do
+task "build:deb"  => :build do
   build_pkg "deb", "all", DEB_DEPS
 end
 
@@ -175,7 +179,7 @@ RPM_DEPS = [
   "openssl >= 0.9.8e", "openssl-devel >= 0.9.8e",
   "readline >= 5.1", "readline-devel >= 5.1",
   "libyaml >= 0.0", "libyaml-devel >= 0.0",
-  "libffi >= 0", "libffi-devel >= 0"
+  "libffi >= 0", "libffi-devel >= 0", "git >= 0.0"
 ]
 
 desc "Build Red Hat RPM rhoconnect-#{Rhoconnect::VERSION}.noarch.rpm package into the pkg directory"

data/commands/commands/redis_commands/redis_download.rb

@@ -25,9 +25,9 @@ Execute.define_task do
     	FileUtils.rm_rf File.join(redis_home, '64bit')
     	FileUtils.rm_f $redis_zip
     else
-      sh 'rm -rf /tmp/redis/' if File.exists?("#{RedisRunner.redisdir}")
-      sh 'git clone git://github.com/antirez/redis.git /tmp/redis -n'
-      sh "cd #{RedisRunner.redisdir} && git reset --hard && git checkout #{REDIS_RELEASE}"
+      system 'rm -rf /tmp/redis/' if File.exists?("#{RedisRunner.redisdir}")
+      system 'git clone git://github.com/antirez/redis.git /tmp/redis -n'
+      system "cd #{RedisRunner.redisdir} && git reset --hard && git checkout #{REDIS_RELEASE}"
     end #if
   end #redis_download
 end #do

data/commands/commands/redis_commands/redis_install.rb

@@ -10,15 +10,15 @@ desc "redis-install", 'Install the latest verison of Redis from Github (requires
         mk_bin_dir(bin_dir)
         
         %w(redis-benchmark redis-cli redis-server).each do |bin|
-          sh "cp /tmp/redis/src/#{bin} #{bin_dir}"
+          system "cp /tmp/redis/src/#{bin} #{bin_dir}"
         end #do
     
         puts "Installed redis-benchmark, redis-cli and redis-server to #{bin_dir}"
     
         ENV['PREFIX'] and conf_dir = "#{ENV['PREFIX']}/etc" or conf_dir = "#{RedisRunner.prefix}etc"
         unless File.exists?("#{conf_dir}/redis.conf")
-          sh "mkdir #{conf_dir}" unless File.exists?("#{conf_dir}")
-          sh "cp /tmp/redis/redis.conf #{conf_dir}/redis.conf"
+          system "mkdir #{conf_dir}" unless File.exists?("#{conf_dir}")
+          system "cp /tmp/redis/redis.conf #{conf_dir}/redis.conf"
           puts "Installed redis.conf to #{conf_dir} \n You should look at this file!"
         end #unless
     end #unless

data/commands/commands/redis_commands/redis_make.rb

@@ -2,8 +2,8 @@ Execute.define_task do
   desc "redis-make", "Alias for make clean && make", :hide => true
   def redis_make
     unless windows?
-      sh "cd #{RedisRunner.redisdir} && make clean"
-      sh "cd #{RedisRunner.redisdir} && make"
+      system "cd #{RedisRunner.redisdir} && make clean"
+      system "cd #{RedisRunner.redisdir} && make"
     end #unless
   end #redis_make
 end #do

data/commands/commands/redis_commands/redis_runner.rb

@@ -31,16 +31,16 @@ class RedisRunner
   def self.start
   	if windows?
   		puts "Starting redis in a new window..."
-  		sh "start #{File.join(redis_home,'redis-server')} #{File.join(redis_home,'redis.conf')}" rescue
+  		system "start #{File.join(redis_home,'redis-server')} #{File.join(redis_home,'redis.conf')}" rescue
   			"redis-server not installed on your path, please run 'rhoconnect redis-install' first."
     elsif defined?(JRUBY_VERSION)
       puts "Starting redis ..."
-      sh "redis-server #{redisconfdir}"
+      system "redis-server #{redisconfdir}"
     else
       puts 'Detach with Ctrl+\  Re-attach with rhoconnect redis-attach'
       sleep 1
       command = "dtach -A #{dtach_socket} redis-server #{redisconfdir}"
-      sh command
+      system command
     end
   end
   
@@ -48,16 +48,16 @@ class RedisRunner
   def self.startbg
   	if windows?
   		puts "Starting redis in a new window..."
-  		sh "start #{File.join(redis_home,'redis-server')} #{File.join(redis_home,'redis.conf')}" rescue
+  		system "start #{File.join(redis_home,'redis-server')} #{File.join(redis_home,'redis.conf')}" rescue
   			"redis-server not installed on your path, please run 'rhoconnect redis-install' first."
     else
       puts "Starting redis ..."
-      system("redis-server #{redisconfdir} &")
+      system "redis-server #{redisconfdir} &"
     end
   end
 
   def self.attach
-    exec "dtach -a #{dtach_socket}"
+    system "dtach -a #{dtach_socket}"
   end
 
   def self.stop

data/commands/commands/rhoconnect/attach.rb

@@ -1,7 +1,8 @@
+
 Execute.define_task do
   desc "attach", "Attach to rhoconnect console"
   def attach
     invoke :dtach_installed
-    sh "dtach -a #{rhoconnect_socket}" unless windows?
+    system "dtach -a #{rhoconnect_socket}" unless windows?
   end #attach
 end #do

data/commands/commands/rhoconnect/start.rb

@@ -5,10 +5,10 @@ Execute.define_task do
     command = (jruby?) ? trinidad? : (thin? || mongrel? || report_missing_server)
     if windows?
       puts 'Starting rhoconnect...'
-      system("#{command} config.ru -P #{rhoconnect_pid}")
+      system "#{command} config.ru -P #{rhoconnect_pid}"
     elsif jruby?
       puts 'Starting rhoconnect in jruby environment...'
-      system("#{command}")
+      system "#{command}"
     else
       puts 'Detach with Ctrl+\  Re-attach with rhoconnect attach'
       sleep 2

data/commands/commands/rhoconnect/startbg.rb

@@ -14,12 +14,12 @@ Execute.define_task do
     p1 = Process.fork {  
       if windows?
         puts 'Starting rhoconnect ...'
-        system("#{cmd} config.ru -P #{rhoconnect_pid}")
+        system "#{cmd} config.ru -P #{rhoconnect_pid}"
       elsif jruby?
         puts 'Starting rhoconnect in jruby environment...'
-        system("#{cmd}")
+        system "#{cmd}"
       else
-        system("bundle exec #{cmd} config.ru -P #{rhoconnect_pid}")
+        system "#{cmd} config.ru -P #{rhoconnect_pid}"
       end
     }
     Process.detach(p1)

data/commands/commands/rhoconnect/startdebug.rb

@@ -15,12 +15,12 @@ Execute.define_task do
     p1 = Process.fork {  
       if windows?
         puts 'Starting rhoconnect ...'
-        system("#{cmd} config.ru -P #{rhoconnect_pid}")
+        system "#{cmd} config.ru -P #{rhoconnect_pid}"
       elsif jruby?
         puts 'Starting rhoconnect in jruby environment...'
-        system("#{cmd}")
+        system "#{cmd}"
       else
-        system("bundle exec #{cmd} config.ru -P #{rhoconnect_pid}")
+        system "#{cmd} config.ru -P #{rhoconnect_pid}"
       end
     }
     Process.detach(p1)

data/commands/commands/rhoconnect/war.rb

@@ -24,7 +24,7 @@ Execute.define_task do
       end #if
       # build the executable WAR using the config/warble.rb file
       ENV['BUNDLE_WITHOUT'] = ['development','test'].join(':')
-      sh 'warble executable war'
+      system 'bundle exec warble executable war'
     else
       puts "Cannot build WAR files outside of JRuby environment!"
     end #if

data/commands/commands/rhoconnect/web.rb

@@ -2,6 +2,6 @@ Execute.define_task do
   desc "web", "Launch the web console in a browser - uses :syncserver: in settings.yml"
   def web
   	invoke :config
-    windows? ? sh("start #{$url}") : sh("open #{$url}")
+    windows? ? system("start #{$url}") : system("open #{$url}")
   end #web
 end #do

data/doc/install.txt

@@ -8,19 +8,21 @@ On Linux, you install the RhoConnect gem from the command line; you can also do
 
 ## Mac OS
 
-If you're running Mac OS, download the latest [RhoStudio Installer for Macintosh](http://rhomobile.com/rhostudio-mac). This contains the [Ruby stack](http://www.ruby-lang.org/en/), [Redis](http://redis.io/), [RhoConnect](/rhoconnect/introduction) and [Rhodes](/rhodes/introduction).
+If you're running Mac OS, download the latest [Motorola RhoMobile Suite Installer for Macintosh](http://rhomobile.com/rhostudio-mac). This contains [Redis](http://redis.io/), [RhoConnect](/rhoconnect/introduction) and [Rhodes](/rhodes/introduction).
+
+Mac OS has [Ruby](http://www.ruby-lang.org/en/) installed. It is recommended that you install [Ruby Version Manager](https://rvm.io//) and install Ruby version 1.9.3, latest patch.
 
 Click on the RhoStudioInstaller for Mac download file to open it. You will get a window similar to this:
 
 <img src="http://rhodocs.s3.amazonaws.com/rhodes-devel/rhostudio-mac-install.png" alt="RhoStudioInstaller Mac" />
 
-Run the install gems script appropriate for you. You can run "Install gems." If you have Ruby Version Manager, you can run "Install gems on rvm." A terminal window will open; wait for the gems install process to complete.
+Run the install gems script appropriate for you. If you have Ruby Version Manager, you can run "Install gems on rvm." A terminal window will open; wait for the gems install process to complete.
 
 Then drag RhoStudio to the Applications folder. 
 
 ## Windows
 
-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're running Windows, download the latest [Motorola RhoMobile Suite Installer for Windows](http://rhomobile.com/rhostudio-windows) and run it. 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 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:
 
@@ -48,22 +50,20 @@ For Linux and for RhoConnect installs from the command line, set the JDK path in
 
 To install RhoConnect on Linux, and to install RhoConnect on Windows or Mac OS using the command line (this does not install RhoStudio), you need to install the Rhodes gem. Download and install:
 
-1. [Ruby v1.9.3](http://www.ruby-lang.org/en/downloads/) (On Windows, [RubyInstaller](http://rubyinstaller.org) is a convenient way to install Ruby.)
+1. [Ruby v1.9.3](http://www.ruby-lang.org/en/downloads/) (On Windows, [RubyInstaller](http://rubyinstaller.org) is a convenient way to install Ruby; you should check "Add Ruby executables to your PATH" and "Associate .rb and .rbw files with this Ruby installation".)
 
 2. Ruby Web Server - We tested 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.
 
 3. [Redis](http://redis.io/) - RhoConnect includes a simple [rake task](/rhoconnect/command-line#rake-tasks) `redis:install` to install redis, covered in the [Rake Tasks section](rhoconnect/command-line#rake-tasks). Alternatively, you can [install redis directly](http://redis.io/download).
 
-4. Install the RhoConnect Gem.
-
-Run this command to install.
+4. Install the RhoConnect Gem. Run this command to install.
 
 	:::term
 	$ [sudo] gem install rhoconnect
 
 NOTE: If you get any `no such file to load -- something` messages while running the rake tasks or rhodes commands, this can usually be resolved by putting "sudo" in front of the command, as in `sudo gem install something`.
 
-NOTE: Windows doesn't come with the necessary build tools to install gems ('make', for example). There are various ways to get these tools, but the GnuWin32 project at http://gnuwin32.sourceforge.net/ provides the tools, and can be conveniently installed via the GetGnuWin32 installer at http://sourceforge.net/projects/getgnuwin32/files/.
+NOTE: Windows doesn't come with the necessary build tools to install gems ('make', for example). There are various ways to get these tools, but the GnuWin32 project at http://gnuwin32.sourceforge.net/ provides the tools, and can be conveniently installed via the GetGnuWin32 installer at http://sourceforge.net/projects/getgnuwin32/files/. You should follow the GetGnuWin32 instructions carefully.
 
 You can [install RhoStudio as a plugin for Eclipse](rhostudio-eclipse).
 

data/generators/templates/application/Gemfile

@@ -6,13 +6,12 @@ gem 'rhoconnect', '<%=gem_version%>'
 gem 'SystemTimer', '~> 1.2.3', :platforms => :ruby_18
 gem 'win32-process', :platforms => [:mswin, :mingw]
 
-# FIXME: At this moment (05/04/2012) 'eventmachine' doesn't work on Windows ruby1.9.3-p194
-# FIXME: there is a reported issue - for now, we're using our own forked version with the suggested patch
-# FIXME: See https://github.com/eventmachine/eventmachine/issues/319
-gem "eventmachine", :git => 'https://github.com/rhomobile/eventmachine.git'
-
-# using thin by default
-gem 'thin'
+# use thin and eventmachine everywhere except JRuby
+platforms :ruby, :ruby_19, :mingw, :mingw_19 do
+	gem "eventmachine", "~> 1.0.0.beta"
+	# using thin by default
+	gem 'thin'
+end
 
 # for async framework
 # for Async, Eventful execution

data/installer/unix-like/create_texts.rb

@@ -499,15 +499,16 @@ end
 
 def generate_rhoapp(rho_path)
   puts "Generating rhoconnect application: /opt/nginx/html/rhoapp ..."
+
   Dir.chdir "/opt/nginx/html"
-  unless File.directory? "/opt/nginx/html/rhoapp"
-    `#{rho_path}/bin/rhoconnect app rhoapp`
-    Dir.chdir "rhoapp"
-    log = `#{rho_path}/bin/bundle install --without=test development`
-    raise "Generatiion of rhoconnect application failured:\n#{log}" if $? != 0
-    Dir.chdir "../"
-    `chown -R nginx:nginx rhoapp/`
-  end
+  `rm -rf rhoapp` if File.directory? "/opt/nginx/html/rhoapp"
+
+  `#{rho_path}/bin/rhoconnect app rhoapp`
+  Dir.chdir "rhoapp"
+  log = `#{rho_path}/bin/bundle install --without=test development 2>&1`
+  raise "Generatiion of rhoconnect application failured:\n#{log}" if $? != 0
+  Dir.chdir "../"
+  `chown -R nginx:nginx rhoapp/`
 end
 
 def copy_benchapp(rho_path)
@@ -530,27 +531,55 @@ end
 
 def config_and_install_thin_scripts(rho_path)
   puts "Configuring and installing thin scripts ..."
-  `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|
-      if line =~ /^DAEMON/
-        f << "export PATH=/opt/rhoconnect/bin:$PATH" << "\n"
-        f << "DAEMON=\"bundle exec thin\"" << "\n"
-      elsif line =~ /[ -x "$DAEMON" ] || exit 0/
-        # do nothing
-      else
-        f << line
-      end     
-    end
-  end
-  File.rename("/tmp/thin", thin_conf_file)
-  `chmod +x #{thin_conf_file}`
+  #`env PATH=#{rho_path}/bin:$PATH thin install`
+  thin_script = <<'_THIN_INIT_'
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          thin
+# Required-Start:    $local_fs $remote_fs
+# Required-Stop:     $local_fs $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      S 0 1 6
+# Short-Description: thin initscript
+# Description:       thin
+### END INIT INFO
+
+# Original author: Forrest Robertson
+
+# Do NOT "set -e"
+
+export PATH=/opt/rhoconnect/bin:$PATH
+DAEMON=/opt/rhoconnect/bin/thin
+SCRIPT_NAME=/etc/init.d/thin
+CONFIG_PATH=/etc/thin
+
+# Exit if the package is not installed
+#[ -x "$DAEMON" ] || exit 0
 
+case "$1" in
+  start)
+        $DAEMON start --all $CONFIG_PATH
+        ;;
+  stop)
+        $DAEMON stop --all $CONFIG_PATH
+        ;;
+  restart)
+        $DAEMON restart --all $CONFIG_PATH
+        ;;
+  *)
+        echo "Usage: $SCRIPT_NAME {start|stop|restart}" >&2
+        exit 3
+        ;;
+esac
+
+:
+_THIN_INIT_
+  thin_init_script="/etc/init.d/thin"
+  File.open(thin_init_script, 'w') { |f| f << thin_script }
+  `chmod +x #{thin_init_script}`
+  Dir.mkdir "/etc/thin" unless File.exist? "/etc/thin"
   `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')
+  raise "Thin failed to configure rhoconnect application" if $? != 0
 end
 
 def create_texts
@@ -563,14 +592,9 @@ def create_texts
     create_nginx_init
     create_nginx_logrotate
 
-    @use_bench_app = File.exist? "#{@prefix}/installer/bench.tar.gz"
-    if @use_bench_app
-      create_nginx_conf_files "benchapp"
-      copy_benchapp @prefix
-    else
-      create_nginx_conf_files "rhoapp"
-      generate_rhoapp @prefix
-    end
+    create_nginx_conf_files "rhoapp"
+    generate_rhoapp @prefix
+
     config_and_install_thin_scripts(@prefix)
     distro_info = nginx_readme
   end
@@ -610,7 +634,7 @@ _NGINX_TO_DO_
      /etc/init.d/nginx start
      /etc/init.d/thin start
   B) Open RhoConnect application web console in your browser:
-     http://server_ip_address
+     http://servername
 
 _NGINX_TO_DO_
     end
@@ -619,6 +643,13 @@ _NGINX_TO_DO_
   afterwords << "For more details see #{@prefix}/README file."
   puts afterwords
   File.open("#{@log_file}", 'a') { |f| f << afterwords } if @log_file
+
+ensure
+  if File.directory? "#{@prefix}/installer"
+    Dir.chdir "#{@prefix}/installer"
+    `rm -rf bin/ commands/ installer/ pkg/ tasks/ .bundle/ unix-like/`
+    `rm -f Rakefile`
+  end
 end
 
 create_texts

data/installer/unix-like/rho_connect_install_constants.rb

@@ -16,10 +16,12 @@ module Constants
 
   SOFTWARE                = [ REDIS, SQLITE3, RUBY, NGINX ]
 
-  REDIS_URL               = "http://redis.googlecode.com/files/#{ REDIS }.tar.gz"
+  REDIS_URL               = "http://redis.googlecode.com/files/#{REDIS}.tar.gz"
   SQLITE3_URL             = "http://www.sqlite.org/sqlite-autoconf-3071000.tar.gz"
-  URLS                    = [ REDIS_URL, SQLITE3_URL ]
-  GEMS                    = ["bundler", "thin", "foreman"]
+  NGINX_URL               = "http://nginx.org/download/#{NGINX}.tar.gz"
+  EVENTMACHINE_URL        = "https://github.com/rhomobile/eventmachine/tarball/master"
+  URLS                    = [ REDIS_URL, SQLITE3_URL, NGINX_URL]
+  GEMS                    = ["bundler", "thin"] #, foreman"
     
   SUPPORTED_PKG_MGRS      = ["apt-get", "yum"]
   SUPPORTED_WEB_SERVERS   = ["apache2", "nginx"]

data/installer/unix-like/rho_connect_install_debian.rb

@@ -2,6 +2,7 @@ require 'rho_connect_install_utilities'
 require 'rho_connect_install_constants'
 
 include Utilities
+include Constants
 
 class Debian
   attr_accessor :options
@@ -23,21 +24,13 @@ class Debian
     #start logging
     set_log_file @options[:log]
     
-    #gather necessary files
-    #download_and_decompress(@options[:prefix], [Constants::REDIS_URL])
-    download_and_decompress(@options[:prefix], [Constants::REDIS_URL, Constants::SQLITE3_URL])
+    download_and_decompress(@options[:prefix], [REDIS_URL, SQLITE3_URL, NGINX_URL])
     
-    # ruby gems is installed by the REE installer
-    #install_rubygems
     install_redis if @options[:redis]
-    # Install sqlite3 libs
     install_sqlite
+    configure_nginx @options
 
-    #start installing
     install_all_gems
-    configure_nginx @options
-    
-    #install rhoconnect
     install_rhoconnect
     
     #remove downloaded tarballs

data/installer/unix-like/rho_connect_install_dnd.rb

@@ -4,18 +4,14 @@ module DownloadAndDocompress
   # download_and_decompress
   # Delegates the download and decompression duties
   def download_and_decompress(prefix, tarballs)
-    #print_header "Downloading ..."
-    downloads = 0
     tarballs.each do |url|
-      if !File.exists?("#{ get_tarball_name url }") ||
-         !File.exists?("#{ get_version 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
-  end #download_and_decompress
+      end
+    end
+  end
 
   # wget_download
   # Takes a URL and the name of a tarball and issues a wget command on said 
@@ -24,8 +20,8 @@ module DownloadAndDocompress
     if !File.exists?("#{ prefix }/#{ get_tarball_name url }") &&
        !File.directory?("#{ prefix }/#{ get_version url }")
        cmd "wget -P #{prefix} #{url} -o /dev/null"
-    end #if
-  end #wget_download
+    end
+  end
 
   # decompress
   # Decompress downloaded files unless already decompressed directory

data/installer/unix-like/rho_connect_install_installers.rb

@@ -1,19 +1,17 @@
+#require 'tempfile'
 require 'rho_connect_install_constants'
 require 'rho_connect_install_checkers'
 
 include Checkers
+include Constants
 
 module Installers
   def configure_nginx(options)
     raise "Please stop the web server and then reinstall the package." if check_web_server_running
     @options=options
     if @options[:web_server] && @options[:web_server] == "nginx"
-      nginx_version = Constants::NGINX
-      print_header "Downloading http://nginx.org/download/#{nginx_version}.tar.gz ..."
-      cmd "cd #{@options[:prefix]}; wget http://nginx.org/download/#{nginx_version}.tar.gz -o /dev/null; tar -xzvf #{nginx_version}.tar.gz"        
-      print_header "Configuring and compiling Nginx web server ..."
-
-      Dir.chdir("#{@options[:prefix]}/#{nginx_version}")
+      print_header "Installing Nginx web server ..."
+      Dir.chdir("#{@options[:prefix]}/#{NGINX}")
       cmd "./configure --prefix=/opt/nginx --with-http_ssl_module --with-http_gzip_static_module --user=nginx --group=nginx"
       cmd "make 2>&1; make install"
     else
@@ -22,52 +20,45 @@ module Installers
     raise "Nginx installation failed." if $? != 0
   end
       
-  # install_all_gems
-  # This method installs all gems specified in the GEMS list defined in the
-  # Constants file
   def install_all_gems
     @gem_path = "#{@options[:prefix]}/bin/gem"
 
     # Update the RubyGems system software 
     cmd "#{@gem_path} update --system"
-
-    # FIXME:
-    #install eventmachine 1.0.0.0.beta4 
-    `wget https://github.com/rhomobile/eventmachine/tarball/master`
-    `tar xzfv master`
-    `cd rhomobile-eventmachine-6858b3b`
-    `/opt/rhoconnect/bin/gem build eventmachine.gemspec`
-    `/opt/rhoconnect/bin/gem install eventmachine-1.0.0.beta.4.gem --no-ri --no-rdoc`    
-    `cd ../;rm -rf master rhomobile-eventmachine-6858b3b`
-    
-    Constants::GEMS.each do |gem|
+    #install_gem 'bundler'
+    #install_gem 'foreman'
+=begin
+    print_header "Installing eventmachine 1.0.0.beta.4 gem ..."
+    Dir.chdir("#{@options[:prefix]}")
+    `wget #{EVENTMACHINE_URL} -o /dev/null;tar xzfv master;rm -rf master`
+    Dir.chdir("#{@options[:prefix]}/rhomobile-eventmachine-6858b3b/")
+    cmd("#{@options[:prefix]}/bin/bundle install")
+    cmd("#{@options[:prefix]}/bin/gem build eventmachine.gemspec 2> /dev/null")
+    cmd("#{@options[:prefix]}/bin/gem install --local eventmachine-1.0.0.beta.4.gem --no-ri --no-rdoc")
+    res =$?
+    Dir.chdir("#{@options[:prefix]}")
+    cmd("rm -rf master rhomobile-eventmachine-6858b3b")
+    raise "eventmachine 1.0.0.0.beta4 installation failed." if res != 0
+=end
+    # Install bundler, thin, ...
+    GEMS.each do |gem|
       install_gem gem
     end
   end
 
   # install_gem
-  # This method installs the given gem unless it is already installed
   def install_gem(gem)
-    cmd "#{@gem_path} install #{gem} --no-ri --no-rdoc" unless check_gem(gem, @gem_path)
+    print_header "Installing #{gem} gem ..."
+    cmd "#{@gem_path} install #{gem} --no-ri --no-rdoc" #unless check_gem(gem, @gem_path)
     raise "#{gem} installation failed." if $? != 0
   end #install_gem
 
-  # install_rubygems
-  # This method installs rubygems which was downloaded and untarred earlier
-  def install_rubygems
-    print_header "Installing rubygems ..."
-    Dir.chdir("#{@options[:prefix]}/#{Constants::RUBYGEMS}")
-    cmd "#{@options[:prefix]}/bin/ruby setup.rb --prefix=#{@options[:prefix]}/#{Constants::RUBYGEMS}"
-    @gem_path = "#{@options[:prefix]}/bin/gem"
-    cmd "sed -n '1 c\#!/opt/rhoconnect/bin/ruby' #{@options[:prefix]}/bin/gem"
-  end #install_rubygems
-
   # install_redis
   # This method installs redis
   def install_redis
     print_header "Installing redis ..."
 
-    Dir.chdir("#{@options[:prefix]}/#{Constants::REDIS}/src")
+    Dir.chdir("#{@options[:prefix]}/#{REDIS}/src")
     cmd "make 2>&1; make PREFIX=#{@options[:prefix]} install"
     raise "Redis installation failed." if $? != 0
 
@@ -86,39 +77,37 @@ module Installers
       end
     end
     redis_conf_file.close
-  end #install_redis
+  end
 
-  # install_sqlite
-  # This method instaqll sqlite
   def install_sqlite
     print_header "Installing sqlite3 ..."
-    Dir.chdir("#{@options[:prefix]}/#{Constants::SQLITE3}")
+    Dir.chdir("#{@options[:prefix]}/#{SQLITE3}")
     cmd "./configure --prefix=#{@options[:prefix]}"
     cmd "make 2>&1; make install"
     raise "Installation of sqlite3 libraries failed." if $? != 0
-  end #install_sqlite
+  end
 
-  # install_rhoconnect
-  # This method installs rhoconnect
   def install_rhoconnect
-    print_header "\nInstalling rhoconnect ..."
+    print_header "Building rhoconnect gem ..."
     Dir.chdir(@options[:start_dir])
 
     cmd "#{@options[:prefix]}/bin/bundle config build.sqlite3 " +
         "--with-sqlite3-include=#{@options[:prefix]}/include " +
-        "--with-sqlite3-lib=#{@options[:prefix]}/lib"
-    #if @options[:pkg_mgr]  =~ /yum/ # CentOS
+        "--with-sqlite3-lib=#{@options[:prefix]}/lib" #if @options[:pkg_mgr] =~ /yum/ # CentOS
+ 
+    #    cmd "#{@options[:prefix]}/bin/bundle install --system --binstubs=/opt/rhoconnect/bin"
+    #    cmd "PATH=#{@options[:prefix]}/bin:$PATH rake build"
+    #    cmd "#{@gem_path} install pkg/rhoconnect-*.gem --no-ri --no-rdoc"
+    #    raise "Gem installation failed." if $? != 0
 
     gem_name = (Dir.glob "rhoconnect-*.gem")[0]
     if gem_name && File.exists?(gem_name)
       install_gem gem_name
     else
       cmd "#{@options[:prefix]}/bin/bundle install --system --binstubs=/opt/rhoconnect/bin --without=test development"
-      # PATH=/opt/rhoconnect/bin:$PATH rake build
       cmd "PATH=#{@options[:prefix]}/bin:$PATH rake build"
       cmd "#{@gem_path} install pkg/rhoconnect-*.gem --no-ri --no-rdoc"
       raise "Gem installation failed." if $? != 0
-      #`rm -f pkg/rhoconnect-*.gem`
     end
   end
 end

data/installer/unix-like/rho_connect_install_utilities.rb

@@ -41,7 +41,7 @@ module Utilities
   # This method moves all compressed files from the installation directory
   # that were downloaded by this installation process
   def cleanup(prefix)
-    print_header "Cleaning up ..."
+    #print_header "Cleaning up ..."
     Constants::SOFTWARE.each do |sw|
       cmd "rm #{prefix}/#{sw}.tar.gz; rm -rf #{prefix}/#{sw}" if File.exist? "#{prefix}/#{sw}.tar.gz"
     end

data/installer/unix-like/rho_connect_install_yum.rb

@@ -2,6 +2,7 @@ require 'rho_connect_install_utilities'
 require 'rho_connect_install_constants'
 
 include Utilities
+include Constants
 
 class Yum
   attr_accessor :options
@@ -23,20 +24,13 @@ class Yum
     #start logging
     set_log_file @options[:log]
 
-    #gather necessary files
-    download_and_decompress(@options[:prefix], [Constants::REDIS_URL, Constants::SQLITE3_URL])
+    download_and_decompress(@options[:prefix], [REDIS_URL, SQLITE3_URL, NGINX_URL])
 
-    # ruby gems is installed by the REE installer
-#    install_rubygems
     install_redis if @options[:redis]
-    # Cent OS 5.x uses obsolete sqlite3 libs, update them the latest ones
-    install_sqlite
+    install_sqlite # Cent OS 5.x uses obsolete sqlite3 libs, update them the latest ones
+    configure_nginx @options
 
-    #start installing
     install_all_gems
-    configure_nginx @options
-    
-    #install rhoconnect
     install_rhoconnect
 
     #remove downloaded tarballs

data/installer/utils/nix_install_test.rb

@@ -195,16 +195,16 @@ end #install_package
 # start_servers
 # Attempts to start redis and nginx servers
 def start_servers
-  max_attempts = 100
+  max_attempts = 10
   puts
   
   ['Redis', 'Nginx', 'thin'].each do |program|
     attempts = 0
-    while @ssh.run("pgrep #{program.downcase}")[0].stdout.strip == "" and
+    while @ssh.run("pgrep -f #{program.downcase}")[0].stdout.strip == "" and
           attempts < max_attempts
       ssh_cmd "sudo /etc/init.d/#{program.downcase} start"
       attempts += 1
-      sleep 1
+      sleep 2
     end #while
     if attempts >= max_attempts
       puts "#{program} failed to start."

data/installer/utils/package_upload/repos.rake

@@ -71,6 +71,7 @@ task "build:repos", :build_type, :build_number do |t, args|
 
   end #prepare_destination
 
+  
   def copy_files
     # Move back into rhoconnect repo root first
     Dir.chdir RHOCONNECT_ROOT
@@ -80,36 +81,56 @@ task "build:repos", :build_type, :build_number do |t, args|
         dest_dir = File.extname(file)
         # Get rid of '.' before extension name
         dest_dir[0] = ''
+        puts "=========================\n" +
+             " dest_dir:\t#{dest_dir}  \n" +
+             "=========================\n"
         if dest_dir == 'deb' || dest_dir == 'rpm'
           if dest_dir == 'deb'
             @deb_pkg = File.basename(file)
+            puts "==========================\n" + 
+                 "= @deb_pkg:\t#{@deb_pkg} =\n" +
+                 "==========================\n"
           end #if
           file_path = File.expand_path(file)
+          puts "\n\n\nfile: #{file}\n\n"
           cmd "sudo cp -r #{file_path} #{PKG_DIR}/#{dest_dir}"
         end #if
       end #if
     end #do
   end #copy_files
 
+  # SCRIPT
+
   prepare_destination
   
   copy_files
   
  if !build_number.empty?
    # Change name of packages to include build number
-   ['deb', 'rpm'].each do |arch|
-     Find.find("#{PKG_DIR}") do |file|
-       if !File.directory?(file) and file =~ /#{arch}$/
-         file_to_rename = File.open(file, 'r')
-         old_name = File.expand_path(file)
-         new_name = old_name.gsub(/(#{arch})$/, "#{build_number}.\\1" )
-         File.rename(old_name, new_name)
-       end #if
-     end #do
-   end #do
+  ['deb', 'rpm'].each do |arch|
+    Find.find("#{PKG_DIR}") do |file|
+      if !File.directory?(file) and file =~ /#{arch}$/
+        file_to_rename = File.open(file, 'r')
+        old_name = File.expand_path(file)
+        new_name = old_name.gsub(/(#{arch})$/, "#{build_number}.\\1" )
+        File.rename(old_name, new_name)
+        @deb_pkg = File.basename(new_name) if arch == 'deb'
+        puts "==================================\n" + 
+             "= renamed @deb_pkg:\t#{@deb_pkg} =\n" +
+             "==================================\n"
+      end #if
+    end #do
+  end #do
  end #if
 
   # REPOIFY!
+  puts "=======================\n" +
+       "ls -la #{PKG_DIR}/deb  \n" + 
+       "#{`ls -la #{PKG_DIR}/deb`}\n" +
+       "=======================\n"
+  puts "Abort job now..."
+  STDIN.gets
+
   cmd "sudo reprepro -b #{PKG_DIR}/deb includedeb rhoconnect #{PKG_DIR}/deb/#{@deb_pkg}"
   cmd "sudo createrepo #{PKG_DIR}/rpm"
   

data/lib/rhoconnect/utilities.rb

@@ -4,7 +4,7 @@ module Utilities
   # Prints the command to be issued and then issues it to system
   def cmd(cmd)
     puts cmd
-    system cmd
+    system "#{cmd}"
   end #cmd
 
   def redis_home
@@ -82,7 +82,7 @@ module Utilities
   def thin?
     begin
       require 'thin'
-      'rackup -s thin'
+      'bundle exec rackup -s thin'
     rescue LoadError
       nil
     end
@@ -91,7 +91,7 @@ module Utilities
   def mongrel?
     begin
       require 'mongrel'
-      'rackup -s mongrel'
+      'bundle exec rackup -s mongrel'
     rescue LoadError
       nil
     end
@@ -113,6 +113,6 @@ EOF
 #    end
 
   def trinidad?
-    'jruby -S trinidad -p 9292 -r config.ru'
+    'bundle exec jruby -S trinidad -p 9292 -r config.ru'
   end
 end #Utilities

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '3.2.0.beta3'
+  VERSION = '3.2.0.beta4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rhoconnect
 version: !ruby/object:Gem::Version
-  version: 3.2.0.beta3
+  version: 3.2.0.beta4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2012-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -367,9 +367,7 @@ files:
 - doc/web-console.txt
 - examples/simple/application.rb
 - examples/simple/config.ru
-- examples/simple/dump.rdb
 - examples/simple/Gemfile
-- examples/simple/Gemfile.lock
 - examples/simple/Rakefile
 - examples/simple/settings/license.key
 - examples/simple/settings/settings.yml
@@ -680,7 +678,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3889587113784485006
+      hash: -1593873168020566673
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/examples/simple/Gemfile.lock

@@ -1,97 +0,0 @@
-PATH
-  remote: ../../
-  specs:
-    rhoconnect (3.2.0.beta1)
-      bundler (~> 1.0)
-      json (~> 1.6.0)
-      rake (~> 0.9.2)
-      redis (>= 2.2.0)
-      resque (~> 1.20.0)
-      rest-client (~> 1.6.1)
-      rubyzip (~> 0.9.4)
-      sinatra (~> 1.3)
-      templater (~> 1.0.0)
-      thor (~> 0.14.6)
-      uuidtools (>= 2.1.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    SystemTimer (1.2.3)
-    async-rack (0.5.1)
-      rack (~> 1.1)
-    daemons (1.1.8)
-    diff-lcs (1.1.3)
-    eventmachine (0.12.10)
-    extlib (0.9.15)
-    highline (1.6.11)
-    json (1.6.6)
-    mime-types (1.18)
-    multi_json (1.3.2)
-    rack (1.4.1)
-    rack-fiber_pool (0.9.2)
-    rack-protection (1.2.0)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rake (0.9.2.2)
-    redis (2.2.2)
-    redis-namespace (1.0.3)
-      redis (< 3.0.0)
-    resque (1.20.0)
-      multi_json (~> 1.0)
-      redis-namespace (~> 1.0.2)
-      sinatra (>= 0.9.2)
-      vegas (~> 0.1.2)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rhomobile-debug (1.0.6)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    rubyzip (0.9.7)
-    sinatra (1.3.2)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    sqlite3 (1.3.5)
-    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)
-    vegas (0.1.11)
-      rack (>= 1.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  SystemTimer (~> 1.2.3)
-  async-rack
-  dbd-jdbc (>= 0.1.4)
-  dbi (>= 0.4.5)
-  eventmachine (~> 1.0.0.beta)
-  jdbc-sqlite3 (>= 3.7.2)
-  jruby-openssl (>= 0.7.4)
-  rack-fiber_pool
-  rack-test (>= 0.5.3)
-  rhoconnect!
-  rhomobile-debug (>= 1.0.2)
-  rspec (~> 2.6.0)
-  sqlite3 (>= 1.3.3)
-  thin
-  trinidad
-  warbler
-  win32-process