rhoconnect 3.0.0.beta1 → 3.0.0.beta3

data/installer/unix-like/rho_connect_install_get_params.rb

@@ -10,7 +10,7 @@ module GetParams
   def get_flavor(options)
   get_cmd = ''
     Constants::SUPPORTED_PKG_MGRS.each do |mgr|
-      if `which #{ mgr }` != ""
+      if `which #{ mgr } 2> /dev/null` != ""
         get_cmd = mgr
       end #if
     end #do

data/installer/unix-like/rho_connect_install_installers.rb

@@ -8,29 +8,34 @@ module Installers
   @options=''
 
   # configure_passenger
-  # This method installs items that were retrieved via wget as well as
-  # passenger
+  # This method installs items that were retrieved via wget as well as passenger
   def configure_passenger(options)
     @options=options
-    installs = 0
     print_header "Configuring Passenger"
     if @options[:web_server] && !check_web_server_running
       if @options[:web_server] == "apache2"
         print_header "Configuring Apache2 to work with Passenger"
+        cmd "yes | #{@options[:prefix]}/bin/passenger-install-#{ @options[:web_server] }-module"
       elsif @options[:web_server] == "nginx"
-        print_header "Configuring Nginx to work with Passenger"
+        print_header "Configuring and Compiling Nginx to work with Passenger"
+        nginx_version = Constants::Nginx
+        cmd "cd #{@options[:prefix]}; wget http://nginx.org/download/#{nginx_version}.tar.gz; tar -xzvf #{nginx_version}.tar.gz"        
+        cmd "#{@options[:prefix]}/bin/passenger-install-nginx-module --auto --prefix=/opt/nginx \
+        --nginx-source-dir=#{@options[:prefix]}/#{nginx_version} \
+        --extra-configure-flags='--with-http_ssl_module --with-http_gzip_static_module --user=nginx --group=nginx'"
       else
         log_print "That web server is not yet supported.  Sorry..."
+        exit
       end #if
     end #if
-    cmd "yes | #{@options[:prefix]}bin/passenger-install-#{ @options[:web_server] }-module"
     
     if $? != 0
       log_print "Some dependencies are not installed.\nPlease install them and re-run this script..."
       exit
-    else
-      cmd "echo passenger >> #{@options[:prefix]}installchecklist"
     end #if
+    # FIXME:
+    cmd "rm -rf #{@options[:prefix]}/#{nginx_version}; rm #{@options[:prefix]}/#{nginx_version}.tar.gz" if File.exist? "#{@options[:prefix]}/#{nginx_version}.tar.gz"
+
   end #configure_passenger
   
   # install_all_packages
@@ -59,44 +64,37 @@ module Installers
   # 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"
+    @gem_path = "#{@options[:prefix]}/bin/gem"
     Constants::GEMS.each do |gem|
-      install_gem gem, gem_path
+      install_gem gem
     end #do
   end #install_all_gems
 
   # install_gem
   # This method installs the given gem unless it is already installed
-  def install_gem(gem, gem_path)
-    if gem =~ /sqlite3/ && @options[:pkg_mgr]  =~ /yum/ # CentOS
-      sqlite3_cmd= "export LD_LIBRARY_PATH=#{@options[:prefix]}lib; #{@options[:prefix]}bin/gem install sqlite3 --no-ri --no-rdoc -- --with-sqlite3-include=#{@options[:prefix]}include"
-      cmd sqlite3_cmd 
-    else   
-      cmd "#{@gem_path} install #{ gem } --no-ri --no-rdoc"  unless check_gem gem, @gem_path
-    end 
+  def install_gem(gem)
+    cmd "#{@gem_path} install #{ gem } --no-ri --no-rdoc"  unless check_gem gem, @gem_path
   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"
-    @gem="#{@options[:prefix]}bin/gem"
-    cmd "echo rubygems >> #{@options[:prefix]}installchecklist"
+    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
-    Dir.chdir("#{@options[:prefix]}#{Constants::REDIS}/src")
+    Dir.chdir("#{@options[:prefix]}/#{Constants::REDIS}/src")
     cmd "make; make PREFIX=#{@options[:prefix]} install"
-    cmd "mkdir #{@options[:prefix]}etc" unless File.exist? "#{@options[:prefix]}etc"
+    cmd "mkdir #{@options[:prefix]}/etc" unless File.exist? "#{@options[:prefix]}/etc"
 
     #cmd "cp ../redis.conf #{@options[:prefix]}etc"
-    redis_conf_file = File.new("#{@options[:prefix]}etc/redis.conf", 'w')
+    redis_conf_file = File.new("#{@options[:prefix]}/etc/redis.conf", 'w')
     File.foreach("../redis.conf") do |line|
       # daemonize no   --> daemonize yes
       # logfile stdout --> logfile /var/log/redis.log
@@ -109,17 +107,14 @@ module Installers
       end
     end
     redis_conf_file.close
-
-    cmd "echo redis >> #{@options[:prefix]}installchecklist"
   end #install_redis
 
   # install_sqlite
   # This method instaqll sqlite
   def install_sqlite
-    Dir.chdir("#{@options[:prefix]}#{Constants::SQLITE3}")
+    Dir.chdir("#{@options[:prefix]}/#{Constants::SQLITE3}")
     cmd "./configure --prefix=#{@options[:prefix]}"
     cmd "make; make install"
-    cmd "echo sqlite >> #{@options[:prefix]}installchecklist"
   end #install_sqlite
 
   # install_rhoconnect
@@ -127,16 +122,22 @@ module Installers
   def install_rhoconnect
     # start installations
     # store current gem_path
-    orig_gem_path = `which gem`
+    # orig_gem_path = `which gem`
     print_header "Installing Rhoconnect"
+    path_to_rc_gem = "/tmp/installdir/rhoconnect-#{@options[:version]}/rhoconnect-#{@options[:version]}.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"
-    cmd "#{@options[:prefix]}bin/bundle install" +
-        " --without=test development" +
-        " --path=#{@options[:prefix]}"
-    cmd "export PATH=#{@options[:prefix]}bin:$PATH; rake install"
-    cmd "echo rhoconnect >> #{@options[:prefix]}installchecklist"
+    if File.exists?(path_to_rc_gem)
+      install_gem path_to_rc_gem
+    else
+      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
+      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"
+      `rm -f pkg/rhoconnect-*.gem`
+    end #if
   end #install_rhoconnect
 end #Installers

data/installer/unix-like/rho_connect_install_utilities.rb

@@ -47,7 +47,7 @@ module Utilities
   # This method issues the given system command and calls log_print for output
   def cmd(cmd)
     log_print cmd
-    log_print `#{ cmd }`
+    log_print `#{cmd}`
   end #cmd
 
   #set_log_file
@@ -71,15 +71,14 @@ module Utilities
   # cleanup
   # This method moves all compressed files from the installation directory
   # that were downloaded by this installation process
-  def cleanup(prefix, options)
+  def cleanup(prefix)
     print_header "Cleaning up"
-    Dir.mkdir("#{prefix}downloads") unless File.directory?("#{prefix}downloads")
-    Constants::URLS.each do |url|
-      file = get_version url
-      if File.exists?("#{prefix}#{file}")
-        cmd "rm -rf #{prefix}downloads/#{file}"
-        cmd "mv #{prefix}#{file}* #{prefix}downloads"
-      end #if
-    end # do
+    Constants::SOFTWARE.each do |sw|
+      if File.exist? "#{prefix}/#{sw}.tar.gz"
+        cmd "rm #{prefix}/#{sw}.tar.gz"
+        cmd "rm -rf #{prefix}/#{sw}"
+      end
+    end
   end #cleanup
+
 end #Utilities

data/installer/unix-like/rho_connect_install_yum.rb

@@ -26,12 +26,13 @@ class Yum
     set_log_file @options[:log]
 
     #gather necessary files
-    download_and_decompress @options[:prefix]
+    download_and_decompress(@options[:prefix], [Constants::REDIS_URL, Constants::SQLITE3_URL])
 
-    #install ruby gems
-    install_rubygems
+    # ruby gems is installed by the REE installer
+#    install_rubygems
     install_redis if @options[:redis]
-    install_sqlite    
+    # Cent OS uses obsolete sqlite3 libs, update them the latest ones  
+    install_sqlite
 
     #start installing
     install_all_gems
@@ -41,7 +42,7 @@ class Yum
     install_rhoconnect
 
     #remove downloaded tarballs
-    cleanup options[:prefix], @options
+    cleanup options[:prefix]
   end #execute_installation 
  
   # to_s

data/installer/unix-like/rhoinstaller.rb

@@ -54,9 +54,14 @@ optparse = OptionParser.new do|opts|
   opts.on( '-s', '--silent', 'Perform installation with minimal output' ) do
     options[:silent] = true
   end #do
+
+  options[:version] = nil
+  opts.on( '-v', '--version VERSION', 'Specify VERSION as the rhoconect version' ) do |ver|
+    options[:version] = ver
+  end #do
   
-  options[:web_server] = "apache2"
-  opts.on( '-w', '--web-server SERVER', 'Specify apache2 or nginx.  Default is Apache2.' ) do |server|
+  options[:web_server] = "nginx"
+  opts.on( '-w', '--web-server SERVER', 'Specify apache2 or nginx.  Default is Nginx.' ) do |server|
     options[:web_server] = server
   end #do
   
@@ -69,7 +74,7 @@ end #do
 options[:start_dir] = `pwd`.strip
  
 optparse.parse!
-log = Logger.new(IO.readlines("#{options[:prefix]}info.dat").last.strip)
+log = Logger.new(IO.readlines("#{options[:prefix]}/info.dat").last.strip)
 log.datetime_format = "%Y-%m-%d %H:%M:%S"  # simplify time output
 options[:log] = log