rhoconnect 3.1.0 → 3.1.1

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.1.1 (2012-02-07)
+* Fix Zendesk issue: Rack 1.4.1 and Sinatra 1.3.2 produce 502 error with Heroku deployment (tickets 2147, 2155, 2153)
+
 ## 3.1.0 (2012-01-31)
 * #23977723 - Bug fix (Rspec examples fails for both Ruby 1.8.7 and  ree-2011.12 (p357))
 * #23982399 - Add to RhoConnect installer support for ree 2012.01

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    rhoconnect (3.1.0)
+    rhoconnect (3.1.1)
       bundler (~> 1.0)
       json (~> 1.6.0)
-      rack (~> 1.4.1)
+      rack (~> 1.3.6)
       rake (~> 0.9.2)
       redis (>= 2.2.0)
       resque (~> 1.19.0)
@@ -49,7 +49,7 @@ GEM
       json
     highline (1.6.11)
     jdbc-sqlite3 (3.7.2)
-    jruby-jars (1.6.5.1)
+    jruby-jars (1.6.6)
     jruby-openssl (0.7.5)
       bouncy-castle-java (>= 1.5.0146.1)
     jruby-rack (1.1.3)
@@ -62,7 +62,7 @@ GEM
     net-ssh (2.3.0)
     nokogiri (1.5.0)
     nokogiri (1.5.0-java)
-    rack (1.4.1)
+    rack (1.3.6)
     rack-protection (1.2.0)
       rack
     rack-test (0.6.1)

data/bench/bench_runner.rb

@@ -1,10 +1,11 @@
 #!/usr/bin/env ruby
-
-#LOG_FILE = '/var/log/bench_runner.log'
-# orig_stdout = $stdout # redirect stdout to LOG_FILE
-# $stdout = File.new(LOG_FILE, 'a')
-
+#
 RHOCONNECT_PATH = ARGV[0]
+LOG_FILE = ARGV[1]
+orig_stdout = $stdout # redirect stdout to LOG_FILE
+orig_stderr = $sdterr
+$stdout = $sdterr = File.new(LOG_FILE, 'a')
+
 puts "Script #{$0} is started at #{Time.now.to_s}"
 
 begin
@@ -32,7 +33,7 @@ begin
   
   puts "Starting bench application ..."
   t = Thread.new do
-    log = `bundle exec rackup -D -P /tmp/benchapp.pid -s thin config.ru`
+    log = `bundle exec rackup -D -P /tmp/benchapp.pid -s thin config.ru 2>&1`
     puts log
   end
   t.join
@@ -55,19 +56,27 @@ begin
   end
 =end
 
-  sleep 5
-  raise "Error: Bench application failed to start. File /tmp/benchapp.pid does not exist." unless File.exist? '/tmp/benchapp.pid' 
+  count = 0
+  unless File.exist? '/tmp/benchapp.pid'
+    sleep 1
+    count += 1
+    # Throw exception after waiting at least 20 sec.
+    raise "Error: Bench application failed to start. File /tmp/benchapp.pid does not exist." if count >= 10
+  end
 
   pid = `cat /tmp/benchapp.pid`
   puts "Bench application is up and running with pid #{pid}"
   puts
   
+#  puts `echo 'yes' | rake rhoconnect:reset 2>&1`
+#  puts
+
   Dir.chdir "../"
   bench_errors = {}
   puts "Running bench scripts ..."
   %w[ cud_script  query_only_script  query_script  query_md_script ].each do |script|
     puts "Script #{script} ..."
-    log  = `"./run_#{script}.sh"`
+    log  = `"./run_#{script}.sh" 2>&1`
 
     count = 0
     stats_found = nil 
@@ -95,18 +104,21 @@ begin
       puts "#{script}:"
       errors.each { |err| puts "  #{err}" }
     end
+    exit -1
   end
-  
+
 rescue Exception => e
   puts e.message
+  exit -1
 ensure 
   if File.exist? '/tmp/benchapp.pid' 
     pid = `cat /tmp/benchapp.pid`
     res = `kill -9 #{pid}` if pid.to_i > 0   # `kill -s SIGINT #{pid}`
     File.delete '/tmp/benchapp.pid'
+    puts "Bench application killed ..."
   end
+  puts "Script #{$0} is finished at #{Time.now.to_s}"
+  puts ""
+  $stdout = orig_stdout #restore stdout
+  $sdterr = orig_stderr #restore stderr
 end
-
-puts "Script #{$0} is finished at #{Time.now.to_s}"
-puts ""
-# $stdout = orig_stdout #restore stdout

data/bench/benchapp/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rhoconnect', '~> 3.1.0.beta' #FIXME: replace by '~> 3.1.0'
+gem 'rhoconnect', '~> 3.1.0'
 
 # Helps with some of the limitations of green threads, not needed in ruby 1.9.x
 gem 'SystemTimer', '~> 1.2.3', :platforms => :ruby_18

data/bench/benchapp/Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
-    daemons (1.1.6)
+    daemons (1.1.8)
     diff-lcs (1.1.3)
     eventmachine (0.12.10)
     extlib (0.9.15)
@@ -10,7 +10,7 @@ GEM
     json (1.6.5)
     mime-types (1.17.2)
     multi_json (1.0.4)
-    rack (1.4.1)
+    rack (1.3.6)
     rack-protection (1.2.0)
       rack
     rack-test (0.6.1)
@@ -26,10 +26,10 @@ GEM
       vegas (~> 0.1.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rhoconnect (3.1.0.beta2)
+    rhoconnect (3.1.1)
       bundler (~> 1.0)
       json (~> 1.6.0)
-      rack (~> 1.4.1)
+      rack (~> 1.3.6)
       rake (~> 0.9.2)
       redis (>= 2.2.0)
       resque (~> 1.19.0)
@@ -48,9 +48,9 @@ GEM
     rspec-mocks (2.6.0)
     rubyzip (0.9.5)
     sinatra (1.3.2)
-      rack (>= 1.3.6, ~> 1.3)
+      rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
-      tilt (>= 1.3.3, ~> 1.3)
+      tilt (~> 1.3, >= 1.3.3)
     sqlite3 (1.3.5)
     templater (1.0.0)
       diff-lcs (>= 1.1.2)
@@ -75,7 +75,7 @@ DEPENDENCIES
   jdbc-sqlite3 (>= 3.7.2)
   jruby-openssl (>= 0.7.4)
   rack-test (>= 0.5.3)
-  rhoconnect (~> 3.1.0.beta)
+  rhoconnect (~> 3.1.0)
   rspec (~> 2.6.0)
   sqlite3 (>= 1.3.3)
   thin

data/bench/run_bench.sh

@@ -1,5 +1,4 @@
-#!/bin/sh
-
+#!/bin/bash
 # 
 # Add the following line to crontab to execute benchmarks as a cron job on workdays at 1AM
 #
@@ -29,15 +28,20 @@ git reset --hard HEAD | tee -a /tmp/bench.log 2>&1
 git pull origin master | tee -a /tmp/bench.log 2>&1
 echo '' | tee -a /tmp/bench.log
 
+echo 'Flush Redis DB' | tee -a /tmp/bench.log
+redis-cli flushdb > /dev/null
+
 # Run benchmarks for ruby 1.8.7, ree, 1.9.2, and 1.9.3
 #  TODO: 'jruby'
-for ruby in '1.9.3' '1.9.2' '1.8.7' 'ree'
+for ruby in '1.9.3' '1.8.7' 'ree'
 do
   rvm use $ruby > /dev/null
   ruby_version=$(rvm current)
   echo "Running benchmarks for $ruby_version ..." | tee -a /tmp/bench.log
   echo "" | tee -a /tmp/bench.log
-  ruby ./bench/bench_runner.rb $RHOCONNECT_HOME 2>&1 | tee -a /tmp/bench.log
+
+  ruby ./bench/bench_runner.rb $RHOCONNECT_HOME /tmp/bench.log
+  if (($?)) ; then echo "Benchmarks for $ruby_version failed"; exit 1; fi
 done
 
 

data/installer/unix-like/create_texts.rb

@@ -394,7 +394,8 @@ end
 def generate_common_info
 
   readme = <<_README_
-Thank you for choosing Rhomobile for your cross-platform app needs!
+
+Thank you for choosing Rhoconnect for your mobile app sync needs!
 To finish this setup, please complete the following...
 
 1) Add necessary bins to the path(s) of the users who will

data/installer/utils/constants.rb

@@ -13,13 +13,13 @@ module Constants
   SSH_KEY         = "#{HOME_DIR}/.ssh/#{PEM_FILE}"
   ACCESS_KEY_FILE = "#{HOME_DIR}/.ec2"
   UBUNTU_STACK    = { :image_id  => 'ami-3d491a78',
-                      :flavor_id => 'm1.small',
+                      :flavor_id => 'c1.medium',
                       :key_name  => 'alexdevkey',
                       :groups    => 'load-test',
                       :user      => 'ubuntu'}
                 
   CENTOS_STACK    = { :image_id  => 'ami-13346656',
-                      :flavor_id => 'm1.small',
+                      :flavor_id => 'c1.medium',
                       :key_name  => 'alexdevkey',
                       :groups    => 'load-test',
                       :user      => 'root'}

data/installer/utils/nix_install_test.rb

@@ -3,6 +3,7 @@
 $:.unshift File.expand_path(File.dirname(__FILE__))
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'installer', 'utils'))
 
+require 'rhoconnect'
 require 'rubygems'
 require 'fog'
 require 'net/http'
@@ -16,23 +17,24 @@ require 'readline'
 def cmd(cmd)
   puts cmd
   system(cmd)
-  # Return the exit status
-  $?
+  exit 1 if !$?.to_i == 0
 end #cmd
 
-# nightly_build?
-# Return whether or not
-def nightly_build?
-  ARGV.include? 'nightly'
-end #nightly_build?
-
 # 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
 
+# nightly_build?
+# Return whether or not
+def nightly_build?
+  ARGV.include? 'nightly'
+end #nightly_build?
+
 # compile_stack_info
 # Fills in all necessary information which is stack specific
 def compile_stack_info
@@ -43,10 +45,15 @@ def compile_stack_info
 
   # This part of the package name will always be the same
   local_file = "#{`pwd`.strip}/pkg/"
+  
+  # Determine whether or not the build is a nightly build.
+  bucket = nightly_build? ? 'rhoconnect' : 'rhoconnect-test'
+
+  # Determine which folder in the bucket to grab files from
+  packages = Rhoconnect::VERSION.include?('beta') ? 'beta-packages' : 'packages'
 
   # Append the rest of the file name according to distribution
   if @user == 'ubuntu'
-    nightly_build? ? packages = 'beta-packages' : packages = 'packages'
 
     @dist = { :flavor        => "ubuntu",
               :package       => "rhoconnect_#{Constants::RC_VERSION}_all.deb",
@@ -58,7 +65,7 @@ def compile_stack_info
               :repo_src_file => '/etc/apt/sources.list',
               :repo_str      => '\n' + 
                                 '# This is the repository for rhoconnect packages\n' + 
-                                "deb http://rhoconnect.s3.amazonaws.com/#{packages}/deb rhoconnect main" }
+                                "deb http://#{bucket}.s3.amazonaws.com/#{packages}/deb rhoconnect main" }
   elsif @user == 'root'
     @dist = { :flavor        => "centos",
               :package       => "rhoconnect-#{Constants::RC_VERSION}.noarch.rpm",
@@ -70,7 +77,7 @@ def compile_stack_info
               :repo_src_file => '/etc/yum.repos.d/rhoconnect.repo',
               :repo_str      => '[rhoconnect]\n' + 
                                 'name=Rhoconnect\n' + 
-                                "baseurl=http://rhoconnect.s3.amazonaws.com/#{packages}/rpm" +
+                                "baseurl=http://#{bucket}.s3.amazonaws.com/#{packages}/rpm" +
                                 '\nenabled=1\n' +
                                 'gpgcheck=0\n' }
 
@@ -183,12 +190,6 @@ end #install_package
 # Attempts to start redis and nginx servers
 def start_servers
   max_attempts = 100
-  puts "Waiting #{Constants::SLEEP} seconds for services to initialize."
-  Constants::SLEEP.times do |sec|
-    print '.'
-    STDOUT.flush
-    sleep 1
-  end #do
   puts
   
   ['Redis', 'Nginx'].each do |program|
@@ -201,8 +202,9 @@ def start_servers
     end #while
     if attempts >= max_attempts
       puts "#{program} failed to start."
+      exit 1
     else
-      puts "#{program} start took #{attempts} attempts."
+      puts "#{program} start took #{attempts} attempts." if attempts > 1
     end #if
     puts
   end #do
@@ -225,7 +227,7 @@ end #check_rc_service
 # compute_time
 # General time computation method
 def compute_time(start_time, end_time)
-  time_delta = (end_time - start_time)
+  time_delta = (end_time - start_time).round 3
 
   if time_delta >= 60
     time_delta /= 60
@@ -245,6 +247,9 @@ end #compute_time
 # Test Package installations
 Constants::STACKS.each do |stack|
   start_time = Time.now
+  
+  
+
   begin
     @stack = stack 
     compile_stack_info

data/installer/utils/package_upload/repos.rake

@@ -1,5 +1,15 @@
+require 'rake'
+
 desc 'Creates and uploads apt and rpm repos.'
-task "build:repos" => ['build:deb', 'build:rpm'] do
+task "build:repos", :build_type do |t, args|
+  # Run dependent rake jobs first
+  Rake::Task['build:deb'].invoke
+  Rake::Task['build:rpm'].invoke
+  args.with_defaults :build_type => 'nightly-build'
+  puts args
+  # Exit if args are not valid args 
+  exit 1 if !args[:build_type].eql? "nightly-build" and !args[:build_type].eql? "release-build"
+
   require 'find'
   require 'fileutils'
 
@@ -7,7 +17,7 @@ task "build:repos" => ['build:deb', 'build:rpm'] do
 
   PKG_DIR = '/packages'
   BETA_PKG_DIR = '/beta-packages'
-  BUCKET = 'rhoconnect'
+  BUCKET = args[:build_type].eql?('release-build') ? 'rhoconnect-test' : 'rhoconnect'
 
   def cmd(cmd)
     puts cmd unless @raked
@@ -58,7 +68,6 @@ task "build:repos" => ['build:deb', 'build:rpm'] do
   def copy_files
     # Copy the packages to their respective directory
     Find.find('./pkg') do |file|
-      puts "File: #{file}"
       if !FileTest.directory?(file)
         dest_dir = File.extname(file)
         dest_dir[0] = ''                                 #get rid of '.' before extension name
@@ -85,19 +94,19 @@ task "build:repos" => ['build:deb', 'build:rpm'] do
 
   # Call S3 upload script
   ['deb', 'rpm'].each do |dir|
-    beta = 0
+    beta = false
     pkg_dir = PKG_DIR
     Find.find("#{PKG_DIR}/#{dir}") do |file|
       if File.extname(file) =~ /deb|rpm/
-        file =~ /.*beta.*/ ? beta += 1 : beta = beta
-        pkg_dir = BETA_PKG_DIR
+        beta = file.include?('beta') ? true : false
+        pkg_dir = BETA_PKG_DIR if beta
         cmd "sudo mkdir #{BETA_PKG_DIR}" unless File.directory? BETA_PKG_DIR
         cmd "sudo chmod 777 #{BETA_PKG_DIR}"
         # If one beta pkg is found, break. 
-        break
+        break if beta
       end #if
     end #do
-    cmd "sudo cp -rf #{PKG_DIR}/#{dir} #{BETA_PKG_DIR}/#{dir}"
+    cmd "sudo cp -rf #{PKG_DIR}/#{dir} #{BETA_PKG_DIR}/#{dir}" if pkg_dir == BETA_PKG_DIR
     cmd "sudo ruby ./installer/utils/package_upload/s3_upload.rb #{pkg_dir}/#{dir} #{BUCKET} #{@raked}" 
   end #do
 end #build:repos

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '3.1.0'
+  VERSION = '3.1.1'
 end

data/rhoconnect.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   ]
 
   s.add_dependency('bundler', '~> 1.0')  
-  s.add_dependency("rack", '~> 1.4.1')
+  s.add_dependency("rack", '~> 1.3.6')
   s.add_dependency("sinatra", '~> 1.3')
   s.add_dependency('rake', '~> 0.9.2')
   s.add_dependency('json', '~> 1.6.0')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhoconnect
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 3
   - 1
-  - 0
-  version: 3.1.0
+  - 1
+  version: 3.1.1
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-31 00:00:00 Z
+date: 2012-02-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -38,12 +38,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 23
         segments: 
         - 1
-        - 4
-        - 1
-        version: 1.4.1
+        - 3
+        - 6
+        version: 1.3.6
   requirement: *id002
   type: :runtime
   prerelease: false