rhoconnect 3.4.4 → 3.4.5

data/CHANGELOG.md

@@ -1,5 +1,10 @@
+## 3.4.5 (2013-05-14)
+* TK-182435 - Run platform validation in parallel (both nightly tests and release jobs)
+* D-04477 - Rack::Session::Cookie security warning printing on every http request
+* B-106356 - Update nginx package to 1.4.1 (CVE-2013-2028)
+
 ## 3.4.4 (2013-02-27)
-* Updated prod. stack to ruby-1.9.3-p392, redis-2.6.10, and nginx-1.3.13. 
+* 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.

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    rhoconnect (3.4.4)
+    rhoconnect (3.4.5)
       bundler (~> 1.0)
       connection_pool (= 0.9.2)
-      json (~> 1.6.0)
+      json (~> 1.7.7)
       rack (~> 1.5.2)
       rake (~> 0.9.2.2)
       redis (>= 3.0.1)
@@ -20,8 +20,8 @@ GEM
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)
-    addressable (2.3.3)
-    arr-pm (0.0.7)
+    addressable (2.3.4)
+    arr-pm (0.0.8)
       cabin (> 0)
     async-rack (0.5.1)
       rack (~> 1.1)
@@ -29,48 +29,55 @@ GEM
       builder
       mime-types
       xml-simple
-    backports (2.6.2)
+    backports (3.3.0)
     builder (3.2.0)
     cabin (0.6.0)
-    childprocess (0.3.8)
+    childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
-    clamp (0.3.1)
+    clamp (0.6.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.5.0)
+    coffee-script-source (1.6.2)
     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.5)
+    eventmachine (1.0.3)
+    excon (0.21.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
     extlib (0.9.16)
     ffaker (1.14.0)
-    ffi (1.4.0)
-    fog (1.9.0)
+    ffi (1.8.1)
+    fog (1.11.1)
       builder
-      excon (~> 0.14)
+      excon (~> 0.20)
       formatador (~> 0.2.0)
+      json (~> 1.7)
       mime-types
-      multi_json (~> 1.0)
-      net-scp (~> 1.0.4)
+      net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
       nokogiri (~> 1.5.0)
       ruby-hmac
     formatador (0.2.4)
-    fpm (0.4.29)
-      arr-pm (~> 0.0.7)
-      backports (= 2.6.2)
+    fpm (0.4.35)
+      arr-pm (~> 0.0.8)
+      backports (>= 2.6.2)
       cabin (>= 0.6.0)
-      clamp (= 0.3.1)
-      json (= 1.6.6)
+      clamp (= 0.6.0)
+      ftw (~> 0.0.30)
+      json (~> 1.7.7)
       open4
-    highline (1.6.15)
-    hike (1.2.1)
-    jasmine (1.3.1)
+    ftw (0.0.33)
+      addressable
+      backports (>= 2.6.2)
+      cabin (> 0)
+      http_parser.rb (= 0.5.3)
+    highline (1.6.19)
+    hike (1.2.2)
+    http_parser.rb (0.5.3)
+    jasmine (1.3.2)
       jasmine-core (~> 1.3.1)
       rack (~> 1.0)
       rspec (>= 1.3.1)
@@ -82,29 +89,31 @@ GEM
       multi_json
       rainbow
       sprockets (~> 2)
-    json (1.6.6)
-    mime-types (1.21)
-    multi_json (1.6.1)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-ssh (2.6.5)
-    nokogiri (1.5.6)
+    json (1.7.7)
+    mime-types (1.23)
+    mono_logger (1.0.1)
+    multi_json (1.7.3)
+    net-scp (1.1.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.6.7)
+    nokogiri (1.5.9)
     open4 (1.3.0)
     rack (1.5.2)
-    rack-fiber_pool (0.9.2)
-    rack-protection (1.3.2)
+    rack-fiber_pool (0.9.3)
+    rack-protection (1.5.0)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
     rainbow (1.1.4)
     rake (0.9.2.2)
     rcov (1.0.0)
-    redis (3.0.2)
-    redis-namespace (1.2.1)
+    redis (3.0.4)
+    redis-namespace (1.3.0)
       redis (~> 3.0.0)
-    resque (1.23.0)
+    resque (1.24.1)
+      mono_logger (~> 1.0)
       multi_json (~> 1.0)
-      redis-namespace (~> 1.0)
+      redis-namespace (~> 1.2)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
     rest-client (1.6.7)
@@ -119,7 +128,7 @@ GEM
     rspec-mocks (2.10.1)
     ruby-hmac (0.4.0)
     rubyzip (0.9.9)
-    selenium-webdriver (2.30.0)
+    selenium-webdriver (2.32.1)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
       rubyzip
@@ -128,11 +137,11 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    sinatra (1.3.5)
-      rack (~> 1.4)
-      rack-protection (~> 1.3)
-      tilt (~> 1.3, >= 1.3.3)
-    sprockets (2.9.0)
+    sinatra (1.4.2)
+      rack (~> 1.5, >= 1.5.2)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    sprockets (2.9.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -142,13 +151,13 @@ GEM
       diff-lcs (>= 1.1.2)
       extlib (>= 0.9.5)
       highline (>= 1.4.0)
-    thin (1.5.0)
+    thin (1.5.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     thor (0.15.4)
-    tilt (1.3.3)
-    uuidtools (2.1.3)
+    tilt (1.4.1)
+    uuidtools (2.1.4)
     vegas (0.1.11)
       rack (>= 1.0.0)
     webmock (1.8.11)

data/install.sh

@@ -46,7 +46,7 @@ checkDeps ()
 }
 
 # determinePkgMgr
-# Determines if the system is currently using rpm or 
+# Determines if the system is currently using rpm or
 # debian based pckage management
 determinePkgMgr ()
 {
@@ -195,7 +195,7 @@ 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
   echo "pushd ${prefix}/${rubyDir}" | tee -a $log
   pushd ${prefix}/${rubyDir}
@@ -204,14 +204,14 @@ installRuby ()
   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
 }
@@ -293,7 +293,7 @@ fi
 # Install redis, sqllite3, nginx, rhoconnect
 opts=" -d $dist -l $log"
 ${prefix}/bin/ruby ${INSTALL_DIR}/unix-like/rhoinstaller.rb ${opts}
-if (( $? )) ; then 
+if (( $? )) ; then
   echo "Installation failed. For troubleshooting see file $log ..." | tee -a $log
   exit 1
 fi

data/installer/unix-like/rho_connect_install_constants.rb

@@ -9,9 +9,9 @@ module Constants
                            "dtach"]
 
   RUBY                    = "ruby-1.9.3-p392"
-  REDIS                   = "redis-2.6.10"
+  REDIS                   = "redis-2.6.13"
   SQLITE3                 = "sqlite-autoconf-3071502"
-  NGINX                   = "nginx-1.3.13"
+  NGINX                   = "nginx-1.4.1"
   PASSENGER_ROOT          = "/opt/rhoconnect/lib/ruby/gems/1.9.1/gems/passenger"
 
   SOFTWARE                = [ REDIS, SQLITE3, RUBY, NGINX ]

data/installer/utils/constants.rb

@@ -3,7 +3,6 @@ $:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
 require 'rhoconnect/version'
 
 module Constants
-
   RC_VERSION      = Rhoconnect::VERSION
   REGION          = 'us-west-1'
   SLEEP           = 60
@@ -12,21 +11,26 @@ module Constants
   PEM_FILE        = 'jenkinskey.pem'
   SSH_KEY         = "#{HOME_DIR}/.ssh/#{PEM_FILE}"
   ACCESS_KEY_FILE = "#{HOME_DIR}/.ec2"
-  UBUNTU_STACK    = { :image_id  => 'ami-938ed5d6',
+  UBUNTU_STACK    = { :image_id  => 'ami-02d7f547', # jenkins-ubuntu-12.04-test-image
+                      :tags => {'Name' => 'Ubuntu-12.04'},
                       :flavor_id => 'c1.xlarge',
                       :key_name  => 'jenkinskey',
                       :groups    => 'load-test',
                       :user      => 'ubuntu'}
-
-  CENTOS_STACK    = { :image_id  => 'ami-178dd652',
+  CENTOS5_STACK   = { :image_id  => 'ami-bed9f5fb', # jenkins-centos-5.9-test-image
+                      :tags => {'Name' => 'CentOS-5.9'},
                       :flavor_id => 'c1.xlarge',
                       :key_name  => 'jenkinskey',
                       :groups    => 'load-test',
                       :user      => 'root'}
-
-  STACKS          = [ UBUNTU_STACK,
-                      CENTOS_STACK ]
-
+  CENTOS6_STACK   = { :image_id  => 'ami-02ae8c47', # jenkins-centos-6.3-test-image
+                      :tags => {'Name' => 'CentOS-6.3'},
+                      :flavor_id => 'c1.xlarge',
+                      :key_name  => 'jenkinskey',
+                      :groups    => 'load-test',
+                      :user      => 'root'}
+  STACKS          = [ UBUNTU_STACK, CENTOS5_STACK, CENTOS6_STACK ]
+  STACK_SIZE      = STACKS.size
   DEB_DEPS        = [ "build-essential",
                       "zlib1g-dev",
                       "libssl-dev",
@@ -34,11 +38,10 @@ module Constants
                       "libreadline5-dev",
                       "libsqlite3-0",
                       "libsqlite3-dev" ]
-
   RPM_DEPS        = [ "gcc-c++",
                       "zlib-devel",
                       "curl-devel",
                       "pcre-devel",
                       "openssl-devel",
                       "readline-devel" ]
-end #Constants
+end

data/installer/utils/nix_install_test.rb

@@ -1,35 +1,26 @@
 #!/usr/bin/env ruby
-
 $:.unshift File.expand_path(File.dirname(__FILE__))
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'installer', 'utils'))
 
 require 'rubygems'
+require 'stringio'
+require 'fog'
 require 'net/http'
+
 require 'constants'
-require 'fog'
+include Constants
 
 BUCKET = 'rhoconnect'
 
-# METHODS
-
-# cmd
-# easily issue system commands in a clear way
-def cmd(cmd)
-  puts cmd
-  system(cmd)
-  exit 1 if !$?.to_i == 0
-end #cmd
-
-# ssh_cmd
-# More easily issue commands over the ssh connection.
-def ssh_cmd(cmd)
-  puts cmd
-  puts @ssh.run(cmd)[0].stdout
-  exit_code = @ssh.run('echo $?')[0].stdout
-  exit 1 if exit_code.to_i != 0
-end #ssh_cmd
+def run_on_server(server, cmds)
+  result = server.ssh(cmds)
+  result.each do |r|
+    raise "Command #{r.command} failed.\nStdout: #{r.stdout}\nStderr: #{r.stderr}" if r.status != 0
+    puts "$ #{r.command}" 
+    puts r.stdout
+  end
+end
 
-# build_type
 def build_type
   case ARGV[0]
   when 'test'
@@ -40,44 +31,39 @@ def build_type
     'packages'
   else
     'packages'
-  end #case
-end #build_type
+  end
+end
 
-# compile_stack_info
 # Fills in all necessary information which is stack specific
-def compile_stack_info
+def compile_stack_info(stack)
   # User is stack specific but not to
   # be included in the fog creation hash
-  @user = @stack[:user]
-  @stack.delete :user
+  user = stack[:user]
 
-  # This part of the package name will always be the same
-  local_file = "#{`pwd`.strip}/pkg/"
-  
+  local_file = "#{Dir.pwd}/pkg/"
   # Determine what channel to pull the packages from
   channel = build_type
 
   # Append the rest of the file name according to distribution
-  if @user == 'ubuntu'
-
-    @dist = { :flavor =>        "ubuntu",
+  if user == 'ubuntu'
+    dist = { :flavor =>        "ubuntu",
               :package =>       "rhoconnect_#{Constants::RC_VERSION}_all.deb",
               :local_file =>    "#{local_file}rhoconnect_#{Constants::RC_VERSION}_all.deb",
               :pkg_mgr =>       'dpkg',
               :pkg_type =>      'DEB',
-              :pkg_repo =>      'apt-get',
+              :pkg_cmd =>       'apt-get',
               :deps =>          Constants::DEB_DEPS,
               :repo_src_file => '/etc/apt/sources.list',
               :repo_str =>      '\n' +
                                 '# This is the repository for rhoconnect packages\n' +
                                 "deb http://#{BUCKET}.s3.amazonaws.com/#{channel}/deb rhoconnect main" }
-  elsif @user == 'root'
-    @dist = { :flavor =>        "centos",
+  elsif user == 'root'
+    dist = { :flavor =>        "centos",
               :package =>       "rhoconnect-#{Constants::RC_VERSION}.noarch.rpm",
               :local_file =>    "#{local_file}rhoconnect-#{Constants::RC_VERSION}.noarch.rpm",
               :pkg_mgr =>       'rpm',
               :pkg_type =>      'RPM',
-              :pkg_repo =>      'yum',
+              :pkg_cmd =>       'yum -y',
               :deps =>          Constants::RPM_DEPS,
               :repo_src_file => '/etc/yum.repos.d/rhoconnect.repo',
               :repo_str =>      '[rhoconnect]\n' +
@@ -85,215 +71,199 @@ def compile_stack_info
                                 "baseurl=http://#{BUCKET}.s3.amazonaws.com/#{channel}/rpm" +
                                 '\nenabled=1\n' +
                                 'gpgcheck=0\n' }
+  # else
+  #   raise "Incorrect user name"
+  end
+  [user, dist]
+end
 
-  else
-    puts "Incorrect user name"
-    exit 3
-  end #i
-end #compile_stack_info
-
-# create_ec2_instance
-# Generates the Fog object and creates a new ec2 instance.
-def create_ec2_instance
-   make_fog
-   start_new_instance
-end #create_ec2_instance
-
-# get_access_keys
-# Retrieves the access key and secret access key from the above specified file.
-def get_access_keys
+def connect_to_amazon
   lines = IO.readlines Constants::ACCESS_KEY_FILE
+  access_key        = lines.first.strip.split("=")[1]
+  secret_access_key = lines.last.strip.split("=")[1]
+  
+  Fog::Compute.new(:provider => 'AWS', :region => Constants::REGION,
+    :aws_access_key_id => access_key, 
+    :aws_secret_access_key => secret_access_key)    
+end
 
-  @access_key        = lines.first.strip.split("=")[1]
-  @secret_access_key = lines.last.strip.split("=")[1]
-end #get_access_keys
-
-# make_fog
-# Generates the Fog object used to create the new ec2 instance.
-def make_fog
-  get_access_keys
-  @fog = Fog::Compute.new(
-      :provider => 'AWS',
-      :region => Constants::REGION,
-      :aws_access_key_id => @access_key,
-      :aws_secret_access_key => @secret_access_key
-  )
-end #make_fog
-
-# start_new_instance
 # Creates a new ec2 instance as per the given stack.
-def start_new_instance
+def start_new_instance(connection, params)
   puts "Creating new instance..."
 
-  @server = @fog.servers.create(@stack)
-  @server.wait_for { print "."; STDOUT.flush; ready? }
-  puts
-  if @server.ready?
+  server = connection.servers.create(params)  
+  # Wait for machine to be booted
+  server.wait_for { ready? }
+  # Wait for machine to get an ip-address
+  server.wait_for { !public_ip_address.nil? }  
+  
+  if server.ready?
     # wait for all services to start on remote VM
     puts "Waiting #{Constants::SLEEP} seconds for services to start on remote VM..."
     Constants::SLEEP.times do
       sleep 1
       print "."
       STDOUT.flush
-    end #do
+    end
     puts
-
-    # save important instance information
-    @host = @server.dns_name
-    @server_id = @server.id
   else
-    puts "Server timed out."
-    exit 7
-  end #if
-end #start_new_instance
-
-# establish_ssh_connection
-# Establishes the ssh connection needed to issue commands to the remote machine.
-def establish_ssh_connection
-  @ssh = Fog::SSH.new( @host, @user, :keys => Constants::SSH_KEY )
-end #establish_ssh_connection
+    raise "Server timed out."
+  end
+  server
+end
 
-# destroy_ec2_instance
-# Terminates the current ec2 instance
-def destroy_ec2_instance
-  @server.destroy
-  puts "Terminating Instance."
-end #destroy_ec2_instance
-
-# prepare_sources
-# Prepares the remote machine's repo source list to be able to download rhoconnect
-def prepare_sources
-  puts "preparing sources..."
-
-  ssh_cmd "sudo touch #{@dist[:repo_src_file]}" if @dist[:flavor] == 'centos'
-  filename = @dist[:repo_src_file]
-  src_str = @dist[:repo_str]
+def install_package(server, distro_params)
+  puts "Preparing sources..."
+  run_on_server(server, "sudo touch #{distro_params[:repo_src_file]}") if distro_params[:flavor] == 'centos'
+  filename = distro_params[:repo_src_file]
+  src_str  = distro_params[:repo_str]
 
   # Create file for yum rhoconnect sources
   # Get current permissions of file
-  perms = @ssh.run("stat --format=%a #{filename}")[0].stdout.strip
-  
+  perms = server.ssh("stat --format=%a #{filename}")[0].stdout.strip
   # Change permissions so that it can be edited by "others"
-  ssh_cmd "sudo chmod 0666 #{filename}"
-
-  ssh_cmd "echo -e \"#{src_str}\" >> #{filename}"
-
-  ssh_cmd "sudo chmod 0#{perms} #{filename}"
-
-  ssh_cmd "sudo #{@dist[:pkg_repo]} update" unless @dist[:flavor] == "centos"
-end #prepare_sources
-
-# install_package
-# Issues commands to the remote machine to start the installation
-def install_package
-  prepare_sources
-  puts "Installing rhoconnect package.\n" +
-       "This may take a while...\n\n"
-  ssh_cmd "yes | sudo #{@dist[:pkg_repo]} install rhoconnect"
-end #install_package
-
-# start_servers
-# Attempts to start redis and nginx servers
-def start_servers
-  max_attempts = 10
+  cmds = ["sudo chmod 0666 #{filename}", 
+          "echo -e \"#{src_str}\" >> #{filename}", 
+          "sudo chmod 0#{perms} #{filename}"]
+  cmds << "sudo #{distro_params[:pkg_cmd]} update" unless distro_params[:flavor] == "centos"  
+  run_on_server(server, cmds) 
+
+  puts "Installing rhoconnect package.\nThis may take a while...\n\n"
+  run_on_server(server, "yes | sudo #{distro_params[:pkg_cmd]} install rhoconnect")
+end
+
+def start_services(server)
+  puts  
+  ['redis', 'thin', 'nginx'].each do |program|
+    status = -1
+	  3.times do
+	    res = server.ssh("sudo /etc/init.d/#{program} start")
+      puts "$ #{res[0].command}"
+      puts res[0].stdout
+	    status = server.ssh("pgrep -f #{program}")[0].status
+	    break status == 0
+	    sleep 3
+	  end
+	  raise "Service #{program} failed to start." if status != 0
+  end
   puts
-  
-  ['Redis', 'Nginx', 'thin'].each do |program|
-    attempts = 0
-    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 2
-    end #while
-    if attempts >= max_attempts
-      puts "#{program} failed to start."
-      exit 1
-    else
-      puts "#{program} start took #{attempts} attempts." if attempts > 1
-    end #if
-    puts
-  end #do
-end # start_servers
+end
 
-# check_rc_service
 # Makes an HTTP request to check that the rhoconnect service is working
-def check_rc_service
-  puts "Host: #{@host}"
-
-  puts "Checking RC service."
-  request = nil #Defined outside block as to not limit the scope of request to the do block.
-  2.times do
-    request = Net::HTTP.get_response(@host, '/console/')
-  end #do
-
-  puts "Code: #{request.code} Message: #{request.message}"
-
-  if request.code.to_s < '400'
-    puts "Rhoconnect service up!"
-  else
-    puts "Failed to connect to rhoconnect service."
-    exit 13
-  end #if
-end #check_rc_service
-
-# compute_time
-# General time computation method
-def compute_time(start_time, end_time)
-  time_delta = (end_time - start_time).round 3
-
-  if time_delta >= 60
-    time_delta /= 60
-    time_units = 'minute'
-    if time_delta > 1
-      time_units << 's'
-    end #if
+def check_rhoconnect_status(server)
+  host = server.dns_name
+  puts "Testing rhoconnect server on host #{host}"
+  uri = URI("http://#{host}/console/")
+  response = Net::HTTP.get_response(uri)
+  puts "#{response.code} #{response.message}"
+  resp_code = response.code.to_i
+  if resp_code < 400
+    puts "Rhoconnect server up and running!"; puts
   else
-    time_units = 'seconds'
-  end #if
-
-"\nTest completed in #{time_delta} #{time_units}\n"
-end #compute_time
-
-# SCRIPT
-
-# Test Package installations
-Constants::STACKS.each do |stack|
+    puts "Nginx error log:"
+    puts server.ssh('cat /opt/nginx/logs/error.log')[0].stdout
+    puts "Thin server logs:"
+    puts server.ssh('cat /var/log/thin/thin.0.log')[0].stdout
+    puts server.ssh('cat /var/log/thin/thin.1.log')[0].stdout
+    raise "Failed to connect to rhoconnect service on #{host}" # unless resp_code == 502
+  end
+end
+
+def ping_remote_host(server)
+  status = -1
+  10.times do
+    begin
+      res = server.ssh(['uptime'])
+      status = res[0].status
+      break if status == 0 
+    rescue Exception => e
+      sleep 6
+    end
+  end
+  status
+end
+
+def test_package(connection, stack)
   start_time = Time.now
 
-  begin
-    @stack = stack
-    compile_stack_info
-
-    puts "\n" +
-    "================================================\n" +
-    "Now starting test of #{@dist[:pkg_type]} package\n" +
-    "================================================\n" +
-    "\n\n"
-
-    create_ec2_instance
- 
-    # Establish connections
-    establish_ssh_connection
-    @dist[:remote_home] = @ssh.run("echo ~")[0].stdout.strip
-
-    install_package
-
-    # Start the redis and nginx servers on the remote machine
-    start_servers
-
-    # Check the status of the rhoconnect service
-    check_rc_service
-
-    end_time = Time.now
-    puts compute_time(start_time, end_time)
-  rescue => e
-    puts e.inspect
-    puts e.backtrace
-    exit 15
-  ensure
-    if @server != nil
-      destroy_ec2_instance
-    end #if
-  end #begin
-end #do
+  user, distro_params = compile_stack_info(stack)  
+  server = start_new_instance(connection, stack)  
+  host = server.dns_name
+  puts "Remote host #{host} is up and running ..."
+   
+  server.username = user
+  server.private_key_path = Constants::SSH_KEY    
+  puts "Establish ssh connection for \"#{user}@#{host}\" ..."
+  # For a minute trying to reach remote host  
+  raise "Cannot establish ssh connection with #{stack[:tags]['Name']} instance." if ping_remote_host(server) != 0  
+  puts "SSH connection establised!"
+
+  install_package(server, distro_params)
+  # Start the redis and nginx servers on the remote machine
+  start_services(server)
+  # Check the status of the rhoconnect service
+  check_rhoconnect_status(server) 
+
+  elapsed_time = (Time.now - start_time).to_i
+  puts "Test for #{stack[:tags]['Name']} completed in #{elapsed_time/60} min. #{elapsed_time - ((elapsed_time/60)*60)} sec."
+  0
+rescue => e
+  puts e.inspect
+  puts e.backtrace
+  -1
+ensure
+  if server 
+    puts "Terminating #{stack[:tags]['Name']} instance ..."
+    server.destroy
+  end
+end
+
+module ThreadOut
+  # Writes to Thread.current[:stdout] instead of STDOUT if the thread local is set.
+  def self.write(stuff)
+    if Thread.current[:stdout] then
+      Thread.current[:stdout].write stuff 
+    else
+      STDOUT.write stuff
+    end
+  end
+end
+
+# Connect to Amamzon EC2 cloud
+start_at = Time.now
+connection = connect_to_amazon
+
+# Redirect stdout
+$stdout = ThreadOut
+
+# Create logs and threads
+logs = []
+threads = []
+STACK_SIZE.times do |i|
+  logs  << StringIO.new
+  threads << Thread.new(i) do |idx|
+    puts "Starting test for #{STACKS[idx][:tags]['Name']} ... "
+    Thread.current[:stdout] = logs[idx]
+    test_package(connection, STACKS[idx]) 
+  end
+end
+# Wait till threads re finished
+threads.each { |thread| thread.join }
+
+# Output logs and check resluts
+threads.each_with_index do |thread, i|
+  puts "\n#{STACKS[i][:tags]['Name']} installation log:" 
+  puts logs[i].string  
+end
+exit_code = 0
+threads.each_with_index do |thread, i|
+  if thread.value != 0
+    puts "Package for #{STACKS[i][:tags]['Name']} failed to pass test!" 
+    exit_code = -1
+  end  
+end
+
+elapsed_time = (Time.now - start_at).to_i
+puts "Elapsed time: #{elapsed_time/60} min. #{elapsed_time - ((elapsed_time/60)*60)} sec."
+
+exit exit_code

data/lib/rhoconnect/version.rb

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

data/lib/rhoconnect/web-console/server.rb

@@ -3,27 +3,27 @@ require 'erb'
 require 'json'
 require 'rhoconnect/graph_helper'
 
-module RhoconnectConsole  
+module RhoconnectConsole
   class << self
     ROOT_DIR = File.dirname(File.expand_path(__FILE__)) unless defined? ROOT_DIR
     def root_path(*args)
       File.join(ROOT_DIR, *args)
     end
-  end  
+  end
 
   class Server < Sinatra::Base
     set :views,   RhoconnectConsole.root_path('templates')
     set :public_folder, RhoconnectConsole.root_path
-    set :static,        true    
-    use Rack::Session::Cookie
+    set :static,        true
+    use Rack::Session::Cookie, :key => 'rhoconnect.console', :secret => SecureRandom.hex(64)
     HEROKU_NAV = ENV['INSTANCE_ID'] ? RestClient.get('http://nav.heroku.com/v1/providers/header') : nil
     before do
       headers['Expires'] = 'Sun, 19 Nov 1978 05:00:00 GMT'
-      headers['Cache-Control'] = 'no-store, no-cache, must-revalidate'  
+      headers['Cache-Control'] = 'no-store, no-cache, must-revalidate'
       headers['Pragma'] = 'no-cache'
     end
     include GraphHelper
-    
+
     get '/' do
       #if heroku instance single sign will already have logged in a have token in session
       @token = session[:token] if ENV['INSTANCE_ID']
@@ -45,7 +45,7 @@ module RhoconnectConsole
     post '/http_timing' do
       http_timing(params)
     end
-    
+
     post '/http_timing_key' do
       http_timing_key(params)
     end
@@ -53,16 +53,16 @@ module RhoconnectConsole
     post '/device_count' do
       count_graph('timing/devicecount', "Device Count", "Devices", "clients")
     end
-    
+
     get '/get_sources' do
       sources = App.load(APP_NAME).sources
       sources.to_json
     end
-    
+
     get '/get_http_routes' do
       # keys = get_user_count("http:*:*")
       #   sources = get_sources('all')
-      #   
+      #
       #   #loop through arrays and remove any regex matches
       #   keysf = keys.inject([]) do |keys_final, element|
       #     found = true
@@ -72,11 +72,11 @@ module RhoconnectConsole
       #     keys_final << element.strip if found
       #     keys_final
       #   end
-      
+
       keysf = get_http_routes()
-      
+
       keysf.to_json
     end
-    
+
   end
 end

data/rhoconnect.gemspec

@@ -14,9 +14,9 @@ Gem::Specification.new do |s|
   s.description = %q{RhoConnect App Integration Server and related command-line utilities}
 
   s.rubyforge_project = nil
-  
-  s.files        = %w( 
-    CHANGELOG.md CREDITS Gemfile Gemfile.lock install.sh README.md Rakefile LICENSE Rakefile rhoconnect.gemspec 
+
+  s.files        = %w(
+    CHANGELOG.md CREDITS Gemfile Gemfile.lock install.sh README.md Rakefile LICENSE Rakefile rhoconnect.gemspec
   )
   s.files       += Dir.glob("bench/**/*")
   s.files       += Dir.glob("commands/**/*")
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   s.add_dependency("rack", '~> 1.5.2')
   s.add_dependency("sinatra", '~> 1.3')
   s.add_dependency('rake', '~> 0.9.2.2')
-  s.add_dependency('json', '~> 1.6.0')
+  s.add_dependency('json', '~> 1.7.7')
   s.add_dependency('rubyzip', '~> 0.9.4')
   s.add_dependency('uuidtools', '>= 2.1.1')
   # Locked 'connection_pool' version because latest releases (>= 0.9.3) not compatible with MRI 1.8.7

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rhoconnect
 version: !ruby/object:Gem::Version
-  version: 3.4.4
+  version: 3.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.7
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -734,7 +734,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4478777276868581465
+      hash: -3406822103563071743
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: