rhoconnect 3.4.3 → 3.4.4

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.4.4 (2013-02-27)
+* Updated prod. stack to ruby-1.9.3-p392, redis-2.6.10, and nginx-1.3.13. 
+
 ## 3.4.3 (2013-02-11)
 * Updated rack gem to latest release with important security fixes. Locked version of 'connection_pool' gem.
 * fixing 'rhoconnect spec' command in production env

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rhoconnect (3.4.3)
+    rhoconnect (3.4.4)
       bundler (~> 1.0)
       connection_pool (= 0.9.2)
       json (~> 1.6.0)
@@ -30,7 +30,7 @@ GEM
       mime-types
       xml-simple
     backports (2.6.2)
-    builder (3.1.4)
+    builder (3.2.0)
     cabin (0.6.0)
     childprocess (0.3.8)
       ffi (~> 1.0, >= 1.0.11)
@@ -38,13 +38,13 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.4.0)
+    coffee-script-source (1.5.0)
     connection_pool (0.9.2)
     crack (0.3.2)
     daemons (1.1.9)
     diff-lcs (1.1.3)
     eventmachine (1.0.0)
-    excon (0.18.3)
+    excon (0.18.5)
     execjs (1.4.0)
       multi_json (~> 1.0)
     extlib (0.9.16)
@@ -128,11 +128,11 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    sinatra (1.3.4)
+    sinatra (1.3.5)
       rack (~> 1.4)
       rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
-    sprockets (2.8.2)
+    sprockets (2.9.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)

data/install.sh

@@ -150,15 +150,6 @@ setPrefixDependantPaths ()
   # Make path to log file absolute and create directory if not already existent
   log="${prefix}/logs/${log}"
   touch $log > /dev/null
-
-  # Add the log file path to the info file
-  `echo $log >> info.dat`
-  #cat info.dat
-
-  # Move info.dat into installation directory if not already there
-  if ! [ -e "${prefix}/info.dat" ]; then
-    mv info.dat "${prefix}/info.dat"
-  fi
 }
 
 setDefaults ()
@@ -174,19 +165,12 @@ setDefaults ()
   fi
 }
 
-logAndPrint ()
-{
-  $1 > $log 2>&1  
-  exitStatus=$?
-}
-
 setRubyVars ()
 {
   if [[ $rubyVersion == "" || $rubyVersion =~ ruby'ee'|'enterprise' ]]; then
-    rubyVersion="ruby-1.9.3-p286"
-    rubyDir="ruby-1.9.3-p286"
+    rubyVersion=${RUBY_VERSION}
+    rubyDir=${RUBY_VERSION}
     rubyTar="${rubyDir}.tar.gz"
-    # http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p286.tar.gz
     rubyURL="http://ftp.ruby-lang.org/pub/ruby/1.9/${rubyTar}"
   elif [$rubyVersion == "ruby187"]; then
     rubyDir="ruby-1.8.7"
@@ -211,44 +195,24 @@ installRuby ()
     echo "tar -xzf ${prefix}/${rubyTar} -C ${prefix}" >> $log
     tar -xzf ${prefix}/${rubyTar} -C ${prefix} > /dev/null 2>&1
   fi
+  
   echo "Installing ruby. This may take some time..." | tee -a $log
-
-  case $rubyVersion in
-#  rubyee)
-#    logAndPrint "${prefix}/${rubyDir}/installer --dont-install-useful-gems --no-dev-docs --auto ${prefix}"
-#    ;;
-  ruby-1.9.3-p286)
-    (
-      echo "cd ${prefix}/${rubyDir}" | tee -a $log
-      cd ${prefix}/${rubyDir}	 
-      echo "./configure --prefix=${prefix} --enable-shared --disable-install-doc" | tee -a $log
-      ./configure --prefix=${prefix} --enable-shared --disable-install-doc >> $log 2>&1
-      echo "make && make install" | tee -a $log
-      make >> $log 2>&1
-      make install >> $log 2>&1
-    )
-    ;;
-  ruby187)
-    logAndPrint "${prefix}/${rubyDir}/configure --prefix=\"${prefix}\""
-    logAndPrint "make && make install"
-    ;;
-  ruby192)
-    logAndPrint "${prefix}/${rubyDir}/configure --prefix=\"${prefix}\""
-    logAndPrint "make && make install"
-    ;;
-  *)
-    logAndPrint "echo \"${rubyVersion} is not a supported ruby version\""
-    exit 1
-    ;;
-  esac
-
-  if [[ $? != 0 ]]; then
+  echo "pushd ${prefix}/${rubyDir}" | tee -a $log
+  pushd ${prefix}/${rubyDir}
+  echo "./configure --prefix=${prefix} --enable-shared --disable-install-doc" | tee -a $log
+  ./configure --prefix=${prefix} --enable-shared --disable-install-doc >> $log 2>&1
+  echo "make && make install" | tee -a $log
+  make >> $log 2>&1
+  make install >> $log 2>&1
+  
+  if (( $? )) ; then
     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 1
   fi
   
+  popd
   echo -e "$rubyDir is successfully installed.\n" | tee -a $log
 }
 
@@ -260,8 +224,8 @@ log=rhoconnect_$(date +$DATEFILE).log
 
 # make sure only run as root
 if [ "$(id -u)" != "0" ]; then
-   echo "This script must be run as root" | tee -a $log
-   exit 1
+  echo "This script must be run as root" | tee -a $log
+  exit 1
 fi
 
 # Check if web server is running on port 80
@@ -272,9 +236,9 @@ if [[ `echo "close" | telnet localhost 80 2>&1 | grep "Connected"` ]]; then
 fi
 
 # Get starting directory
-startDir=`pwd`
-if [[ $startDir = "/opt/rhoconnect/installer" ]]; then #FIXME:
-  INSTALL_DIR="/opt/rhoconnect/installer"
+PWD=`pwd`
+if [[ $PWD = "/opt/rhoconnect/installer" ]]; then
+  INSTALL_DIR=$PWD
 else
   INSTALL_DIR="./installer"
 fi
@@ -293,6 +257,10 @@ webServer=""
 rubyVersion=""
 rubyBinDir=""
 
+# Define ruby vession to be installed ...
+RUBY_PATCH="p392"
+RUBY_VERSION="ruby-1.9.3-${RUBY_PATCH}"
+
 # parse command-line options
 parseOpts "$*"
 
@@ -316,36 +284,19 @@ cleanPrefix
 # Once the prefix path is cleaned up...
 setPrefixDependantPaths
 
-# Install ruby if not already installed
-if ! [ -e "${prefix}/bin/ruby" ]; then
-  installRuby
+if [[ -e ${prefix}/bin/ruby && `${prefix}/bin/ruby -v | awk '{ print $2}'` =~ ${RUBY_PATCH} ]]; then
+  echo "${RUBY_VERSION} already installed" | tee -a $log
 else
-  echo "Ruby already installed" | tee -a $log
+  installRuby
 fi
 
-# Construct the string with which to call the ruby installation script.
-callruby="${prefix}/bin/ruby ${INSTALL_DIR}/unix-like/rhoinstaller.rb ${opts}"
-# Call the ruby script
-$callruby
-rho_status=$?
-
-if [[ $installedSoftware -eq ${#INSTALL_ARRAY[@]} ]]; then
-  rm "${prefix}/info.dat"
-  if [ -e $prefix$rubyTar ]; then
-    mv $prefix/$rubyTar $prefix"/downloads/"$rubyTar
-  fi
-  if [ -e $prefix$rubyDir ]; then
-    mv $prefix$rubyDir $prefix"/downloads/"$rubyDir
-  fi
-  if [ ! -e $prefix"/post-install" ]; then
-    mkdir $prefix"/post-install"
-  fi
-
-  if (( $rho_status )) ; then 
-    echo "Installation failed. For troubleshooting see file $log ..." | tee -a $log
-    exit 1
-  else
-    opts=" -d $dist -l $log"
-    ${prefix}/bin/ruby ${INSTALL_DIR}/unix-like/create_texts.rb ${opts}
-  fi
+# Install redis, sqllite3, nginx, rhoconnect
+opts=" -d $dist -l $log"
+${prefix}/bin/ruby ${INSTALL_DIR}/unix-like/rhoinstaller.rb ${opts}
+if (( $? )) ; then 
+  echo "Installation failed. For troubleshooting see file $log ..." | tee -a $log
+  exit 1
 fi
+
+# Create configuration scripts for redis, nginx, thin.
+${prefix}/bin/ruby ${INSTALL_DIR}/unix-like/create_texts.rb ${opts}

data/installer/unix-like/create_texts.rb

@@ -239,6 +239,15 @@ end
 def create_nginx_init
   nginx_init_script = <<'_NGINX_INIT_SCRIPT_'
 #!/bin/sh
+### BEGIN INIT INFO
+# Provides:          nginx
+# 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: nginx initscript
+# Description:       nginx
+### END INIT INFO
 # Author: Ryan Norbauer http://norbauerinc.com
 # Modified: Geoffrey Grosenbach http://topfunky.com
 # Modified: Clement NEDELCU
@@ -363,15 +372,25 @@ http {
 }
 _NGINX_CONF_
 
-  # create 'nginx' user if it does not exist
-  user_nginx = `cat /etc/passwd | cut -d: -f1 | grep nginx`
-  if user_nginx.empty?
+  # Creating 'nginx' group if it isn't already there
+  `getent group nginx > /dev/null`
+  if $? != 0
+    puts "Creating 'nginx' group ..."
+    if @dist == 'debian'
+      `addgroup --system nginx > /dev/null`
+    else
+      `/usr/sbin/groupadd -r nginx > /dev/null`
+    end
+  end
+  # Creating 'nginx' user if it isn't already there
+  `getent passwd nginx >/dev/null`
+  if $? != 0
     puts "Creating 'nginx' user ..."
     if @dist == 'debian'
       `adduser --system --home /opt/nginx/html --no-create-home --disabled-login --disabled-password --group nginx`
     else
-      `/usr/sbin/useradd -M -r -s /sbin/nologin -d /opt/nginx/html nginx`
-    end   
+      `/usr/sbin/useradd -M -r -s /sbin/nologin -d /opt/nginx/html -g nginx nginx`
+    end
   end
    
   FileUtils.mv("/opt/nginx/conf/nginx.conf", "/opt/nginx/conf/nginx.conf.bak") unless File.exist? "/opt/nginx/conf/nginx.conf.bak"
@@ -539,16 +558,16 @@ To deploy and develop your rhoconnect app on nginx and thin servers:
            # ...
          }
 
-   e) Edit Thin `/etc/thin/rhoapp.yml` configuration file directly 
+   e) Edit thin `/etc/thin/rhoapp.yml` configuration file directly 
          ---
          chdir: /opt/nginx/html/your_rhoconnect_app
          # ...
 
       or as root user generate a new one
-         $ env PATH=/opt/rhoconnect/bin:$PATH thin config -C /etc/thin/your_rhoconnect_app.yml \
-         -c /opt/nginx/html/your_rhoconnect_app/ \
-         --socket /tmp/thin.sock --servers 2 \
-         --user nginx --group nginx \
+         $ env PATH=/opt/rhoconnect/bin:$PATH thin config -C /etc/thin/your_rhoconnect_app.yml
+         -c /opt/nginx/html/your_rhoconnect_app/ 
+         --socket /tmp/thin.sock --servers 2 
+         --user nginx --group nginx 
          --log /var/log/thin/thin.log --pid /var/run/thin/thin.pid -e production`
 
    f) As root user restart Nginx, and Thin servers

data/installer/unix-like/post_install.sh

@@ -1,7 +1,10 @@
 #!/bin/sh
-
-#echo "after_install script is running ..."
 echo "Starting rhoconnect installer ..."
 
 cd /opt/rhoconnect/installer
 ./install.sh
+STATUS=$?
+cd ../
+rm -rf installer/
+
+exit $STATUS

data/installer/unix-like/rho_connect_install_constants.rb

@@ -8,21 +8,20 @@ module Constants
                            "libaprutil1-dev",
                            "dtach"]
 
-  RUBY                    = "ruby-1.9.3-p286"
-  REDIS                   = "redis-2.4.17"
-  SQLITE3                 = "sqlite-autoconf-3071000"
-  NGINX                   = "nginx-1.3.7"
+  RUBY                    = "ruby-1.9.3-p392"
+  REDIS                   = "redis-2.6.10"
+  SQLITE3                 = "sqlite-autoconf-3071502"
+  NGINX                   = "nginx-1.3.13"
   PASSENGER_ROOT          = "/opt/rhoconnect/lib/ruby/gems/1.9.1/gems/passenger"
 
   SOFTWARE                = [ REDIS, SQLITE3, RUBY, NGINX ]
 
   REDIS_URL               = "http://redis.googlecode.com/files/#{REDIS}.tar.gz"
-  SQLITE3_URL             = "http://www.sqlite.org/sqlite-autoconf-3071000.tar.gz"
+  SQLITE3_URL             = "http://www.sqlite.org/#{SQLITE3}.tar.gz"
   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"] # foreman"
-    
+
   SUPPORTED_PKG_MGRS      = ["apt-get", "yum"]
   SUPPORTED_WEB_SERVERS   = ["apache2", "nginx"]
 

data/installer/unix-like/rho_connect_install_installers.rb

@@ -22,21 +22,19 @@ module Installers
       
   def install_all_gems
     @gem_path = "#{@options[:prefix]}/bin/gem"
-
-    # Update the RubyGems system software 
-    cmd "#{@gem_path} update --system"
-    # Install bundler
+    # Update the RubyGems system software
+    # FIXME: => v.2.0.0
+    cmd "#{@gem_path} update --system 1.8.25"
     GEMS.each do |gem|
-      install_gem gem
+      install_gem(gem)
     end
   end
 
-  # install_gem
-  def install_gem(gem)
-    print_header "Installing #{gem} gem ..."
-    cmd "#{@gem_path} install #{gem} --no-ri --no-rdoc" #unless check_gem(gem, @gem_path)
+  def install_gem(gem, options = "--no-ri --no-rdoc")
+    print_header "Installing #{gem} ..."
+    cmd "#{@gem_path} install #{gem} #{options}"
     raise "#{gem} installation failed." if $? != 0
-  end #install_gem
+  end
 
   # install_redis
   # This method installs redis
@@ -74,20 +72,14 @@ module Installers
 
   def install_rhoconnect
     print_header "Building rhoconnect gem ..."
-    Dir.chdir(@options[:start_dir])
+    Dir.chdir("#{@options[:prefix]}/installer")
 
     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"
-    #    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
-
+        "--with-sqlite3-lib=#{@options[:prefix]}/lib" 
     gem_name = (Dir.glob "rhoconnect-*.gem")[0]
     if gem_name && File.exists?(gem_name)
-      install_gem gem_name
+      install_gem(gem_name)
     else
       cmd "#{@options[:prefix]}/bin/bundle install --system --binstubs=/opt/rhoconnect/bin --without=test development"
       cmd "PATH=#{@options[:prefix]}/bin:$PATH rake build"

data/installer/unix-like/rhoinstaller.rb

@@ -59,18 +59,24 @@ optparse = OptionParser.new do|opts|
   opts.on( '-w', '--web-server SERVER', 'Specify apache2 or nginx.  Default is Nginx.' ) do |server|
     options[:web_server] = server
   end #do
+
+  opts.on( '-d', '--dist DISTRO', 'Specify DISTRO as the current distribution.' ) do |dist|
+    options[:dist] = dist
+  end
+  opts.on('-l', '--Logfile file', ' Specify installtion log file') do |file|
+    options[:log_file] = file
+  end
   
   opts.on( '-h', '--help', 'Display this screen.' ) do
     puts opts
     exit
   end #do
 end
-
-options[:start_dir] = `pwd`.strip
  
 optparse.parse!
 
-log = Logger.new(IO.readlines("#{options[:prefix]}/info.dat").last.strip)
+@log_file = options[:log_file]
+log = Logger.new(@log_file)
 log.datetime_format = "%Y-%m-%d %H:%M:%S"  # simplify time output
 options[:log] = log
 

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '3.4.3'
+  VERSION = '3.4.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rhoconnect
 version: !ruby/object:Gem::Version
-  version: 3.4.3
+  version: 3.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -734,7 +734,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4550760957355739491
+      hash: -4478777276868581465
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: