rhoconnect 3.1.2 → 3.2.0.beta1

data/CHANGELOG.md

@@ -1,7 +1,19 @@
+## 3.2.0.beta1 (2012-04-20)
+* Rhoconnect commands (replacement for rake tasks)
+* Async framework is introduced for rubies 1.9.x (no 1.8.7 or JRuby support)
+* 26384435 - Rhoconnect Linux installer should use ruby-1.9.3-p125 as a default ruby
+* 27612327 - Bulk Sync Not Returning Errors from Zendesk ticket #2336
+* Rhoconnect production stack is updated for full support of async framework (nginx as reverse proxy server, thin app server) 
+* #28219647 - Schema Change Error from Zendesk ticket #2353
+* #28328057 - Feature Request: Adding a Bulk Data Job after_perform hook from Zendesk ticket #2367
+* #28330213 - Implementing fast_insert/update/delete API
+
 ## 3.1.2 (2012-04-02)
-* #19297819  - Refactor server middleware loading to be static
-* #25292219  - Ensure that Store.get_zdata always returns valid array (even if it is empty)
+* #19297819 - Refactor server middleware loading to be static
+* #25292219 - Ensure that Store.get_zdata always returns valid array (even if it is empty)
+* #26310661 - No test_search 
 * #26868157 - bug in install.sh in rhoconnect installer
+* #26384435 - Replace in rhoconnect installer Ruby Enterprise by latest stable Ruby 1.9.3
 * #27184633 - Fixing error with recursive loading of application.rb in ruby-1.8.7 and ree
 * use redis 2.4.10 by default
 

data/CREDITS

@@ -3,25 +3,25 @@ RhoConnect uses following other projects:
  Ruby language 1.8.7 (http://www.ruby-lang.org/en/downloads/)
  License: GPL or Ruby own license (http://www.ruby-lang.org/en/about/license.txt)
 
- Redis 2.2.x (http://redis.io)
+ Redis 2.4.x (http://redis.io)
  License: BSD (https://github.com/antirez/redis/blob/master/COPYING)
 
- Resque 1.13.0 (https://github.com/defunkt/resque)
+ Resque 1.20.0 (https://github.com/defunkt/resque)
  License: MIT-like (https://github.com/defunkt/resque/blob/master/LICENSE)
 
- Sinatra 1.1.3 (http://www.sinatrarb.com/)
+ Sinatra 1.3.x (http://www.sinatrarb.com/)
  License: MIT-like (https://github.com/sinatra/sinatra/blob/master/LICENSE)
 
- sqlite3-ruby 1.2.5 (http://github.com/luislavena/sqlite3-ruby)
+ sqlite3 1.3.5 (http://github.com/luislavena/sqlite3-ruby)
  License: MIT-like (https://github.com/luislavena/sqlite3-ruby/blob/master/LICENSE)
 
  uuidtools 2.1.1 (https://github.com/sporkmonger/uuidtools/)
  License: MIT-like (https://github.com/sporkmonger/uuidtools/blob/master/LICENSE)
 
- rest-client 1.6.1 (https://github.com/archiloque/rest-client)
+ rest-client 1.6.7 (https://github.com/archiloque/rest-client)
  License: MIT (http://www.opensource.org/licenses/mit-license.php)
 
- json 1.4.6 (http://flori.github.com/json/)
+ json 1.6.6 (http://flori.github.com/json/)
  License: GPL2 or Ruby (http://www.ruby-lang.org/en/LICENSE.txt)
 
  templater 1.0.0 (https://github.com/jnicklas/templater)
@@ -30,14 +30,155 @@ RhoConnect uses following other projects:
  Apache 2.2 (http://httpd.apache.org)
  License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
 
- thin 1.2.8 (https://github.com/macournoyer/thin)
+ thin 1.3.1 (https://github.com/macournoyer/thin)
  License: MIT (https://github.com/macournoyer/thin/blob/master/COPYING)
 
- bundler 1.0.10 (http://gembundler.com/)
+ bundler 1.1.3 (http://gembundler.com/)
  License: MIT (http://www.opensource.org/licenses/mit-license.php)
 
- Nginx 1.0.6 (http://www.nginx.org/)
+ Nginx 1.0.14 (http://www.nginx.org/)
  License: 2-clause BSD-like (http://nginx.org/LICENSE)
 
- fpm 0.3.9 (https://github.com/jordansissel/fpm)
+ fpm 0.4.5 (https://github.com/jordansissel/fpm)
  License: MIT (https://github.com/jordansissel/fpm/blob/master/LICENSE)
+
+
+ Ruby Enterprise Edition ree-1.8.7-2012.02 (http://www.rubyenterpriseedition.com/download.html)
+ Ruby language 1.9.2-p318 (http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.2-p318.tar.gz)
+ Ruby language 1.9.3-p125 (http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p125.tar.gz)
+ License: GPL or Ruby own license (http://www.ruby-lang.org/en/about/license.txt)
+
+ Ruby language on JVM JRuby-1.6.7 (http://jruby.org/download)
+ License: A three-way CPL/GPL/LGP license (http://torquebox.org/2x/builds/html-docs/license-jruby.html)
+
+ sqlite 3.7.7.1 (http://www.sqlite.org/download.html)
+ License: Public domain (http://www.sqlite.org/copyright.html)
+ 
+ phusion passenger 3.0.11 (http://www.modrails.com/install.html)
+ License: MIT License (http://en.wikipedia.org/wiki/MIT_License)
+  
+ rake 0.9.2.2 (http://rubygems.org/downloads/rake-0.9.2.2.gem) 
+ License: MIT-style license (http://www.opensource.org/licenses/mit-license.php)
+  
+ rack 1.4.1 (http://github.com/rack/rack)
+ License: MIT License (http://www.opensource.org/licenses/mit-license.php)
+  
+ async-rack 0.5.1 (http://rubygems.org/downloads/async-rack-0.5.1.gem)
+ License: MIT License (https://github.com/rkh/async-rack/blob/master/LICENSE)
+  
+ rack-fiber_pool 0.9.2 (http://rubygems.org/downloads/rack-fiber_pool-0.9.2.gem)
+ License: MIT License (https://github.com/mperham/rack-fiber_pool/blob/master/LICENSE)
+  
+ rack-protection 1.2.0 (http://rubygems.org/downloads/rack-protection-1.2.0.gem)
+ License: MIT License (https://github.com/rkh/rack-protection/blob/master/License)
+ 
+ eventmachine 0.12.10 (http://rubygems.org/downloads/eventmachine-0.12.10.gem)
+ License: GPL or Ruby�s License (https://github.com/eventmachine/eventmachine/blob/master/LICENSE)
+
+ diff-lcs 1.1.3 (http://rubygems.org/downloads/diff-lcs-1.1.3.gem)
+ License: MIT license (https://github.com/halostatue/diff-lcs/blob/master/License.rdoc)
+ 
+ extlib 0.9.15 (http://rubygems.org/downloads/extlib-0.9.15.gem)
+ License: MIT license (https://github.com/datamapper/extlib/blob/master/LICENSE) 
+ 
+ highline 1.6.11 (http://rubygems.org/downloads/highline-1.6.11.gem)
+ License: MIT license (https://github.com/JEG2/highline/blob/master/LICENSE)
+ 
+ mime-types 1.18 (http://rubygems.org/downloads/mime-types-1.18.gem)
+ License: Ruby�s licence, the Perl Artistic licence, or the GNU GPL version 2 (http://www.ruby-lang.org/en/LICENSE.txt)
+ 
+ multi_json 1.2.0 (http://rubygems.org/downloads/multi_json-1.2.0.gem)
+ License: MIT license (https://github.com/intridea/multi_json/blob/master/LICENSE.md)
+ 
+ redis 2.2.2 (http://rubygems.org/downloads/redis-2.2.2.gem)
+ License: MIT license (https://github.com/ezmobius/redis-rb/blob/master/LICENSE)
+ 
+ redis-namespace 1.0.3 (http://rubygems.org/downloads/redis-namespace-1.1.0.gem)
+ License: MIT license (https://github.com/defunkt/redis-namespace/blob/master/LICENSE)
+ 
+ rubyzip 0.9.6.1 (http://rubygems.org/downloads/rubyzip-0.9.6.1.gem)
+ License: Ruby own license (http://www.ruby-lang.org/en/LICENSE.txt)
+ 
+ tilt 1.3.3 (http://rubygems.org/downloads/tilt-1.3.3.gem)
+ License: MIT license (https://github.com/rtomayko/tilt/blob/master/COPYING)
+  
+ vegas 0.1.11 (http://rubygems.org/downloads/vegas-0.1.11.gem)
+ License: MIT license (http://www.opensource.org/licenses/mit-license.php)
+ 
+ rspec 2.9.0 (http://rubygems.org/downloads/rspec-2.9.0.gem)
+ License: MIT license (https://github.com/rspec/rspec/blob/master/License.txt)
+ 
+ simplecov 0.6.1 (http://rubygems.org/downloads/simplecov-0.6.1.gem) 
+ License: MIT license (https://github.com/colszowka/simplecov/blob/master/LICENSE)
+ 
+ webmock 1.8.6 (http://rubygems.org/downloads/webmock-1.8.6.gem)
+ License: MIT license (https://github.com/bblimke/webmock/blob/master/LICENSE)
+  
+ addressable 2.2.7 (http://rubygems.org/downloads/addressable-2.2.7.gem)
+ License: Apache 2.0 (https://github.com/sporkmonger/addressable/blob/master/LICENSE)
+ 
+ arr-pm 0.0.7 (http://rubygems.org/downloads/arr-pm-0.0.7.gem)
+ License: Apache 2.0 (http://www.opensource.org/licenses/mit-license.php)
+ 
+ aws-s3 0.6.2 (http://rubygems.org/downloads/aws-s3-0.6.2.gem)
+ License: MIT license (https://github.com/marcel/aws-s3/blob/master/COPYING)
+ 
+ backports 2.3.0 (http://rubygems.org/downloads/backports-2.5.1.gem)
+ License: MIT license (https://github.com/marcandre/backports/blob/master/LICENSE)
+ 
+ builder 3.0.0 (http://rubygems.org/downloads/builder-3.0.0.gem)
+ License: MIT license (http://www.opensource.org/licenses/mit-license.html)
+ 
+ cabin 0.4.4 (http://rubygems.org/downloads/cabin-0.4.4.gem)
+ License: Apache 2.0 (https://github.com/jordansissel/ruby-cabin/blob/master/LICENSE)
+ 
+ clamp 0.3.1 (http://rubygems.org/downloads/clamp-0.3.1.gem)
+ License: MIT license (https://github.com/mdub/clamp/blob/master/README.markdown)
+ 
+ crack 0.3.1 (http://rubygems.org/downloads/crack-0.3.1.gem)
+ License: MIT license (https://github.com/jnunemaker/crack/blob/master/LICENSE)
+ 
+ excon 0.13.3 (http://rubygems.org/downloads/excon-0.13.3.gem)
+ License: MIT license (http://www.opensource.org/licenses/mit-license.html)
+ 
+ ffaker 1.14.0 (http://rubygems.org/downloads/ffaker-1.14.0.gem)
+ License: MIT license (https://github.com/EmmanuelOga/ffaker/blob/master/LICENSE)
+ 
+ fog 1.3.1 (http://rubygems.org/downloads/fog-1.3.1.gem)
+ License: MIT license (http://www.opensource.org/licenses/mit-license.html)
+ 
+ formatador 0.2.1 (http://rubygems.org/downloads/formatador-0.2.1.gem)
+ License: MIT license (http://www.opensource.org/licenses/mit-license.html)
+  
+ xml-simple 1.1.1 (http://rubygems.org/downloads/xml-simple-1.1.1.gem)
+ License: MIT license (http://www.opensource.org/licenses/mit-license.html)
+  
+ net-scp 1.0.4 (http://rubygems.org/downloads/net-scp-1.0.4.gem)
+ License: MIT license (https://github.com/net-ssh/net-scp/blob/master/README.rdoc)
+ 
+ net-ssh 2.3.0 (http://rubygems.org/downloads/net-ssh-2.3.0.gem)
+ License: MIT license (https://github.com/net-ssh/net-ssh/blob/master/README.rdoc)
+ 
+ nokogiri 1.5.2 (http://rubygems.org/downloads/nokogiri-1.5.2.gem)
+ License: MIT license (https://github.com/tenderlove/nokogiri/blob/master/README.rdoc)
+ 
+ thor 0.14.6 (http://rubygems.org/downloads/thor-0.14.6.gem)
+ License: MIT license (https://github.com/wycats/thor/blob/master/LICENSE.md)
+ 
+ SystemTimer 1.2.3 (http://rubygems.org/downloads/SystemTimer-1.2.3.gem) 
+ License: The Ruby License (http://www.ruby-lang.org/en/about/license.txt)
+ 
+ jdbc-sqlite3 3.7.2 (http://rubygems.org/downloads/jdbc-sqlite3-3.7.2.gem)
+ License: BSD license (http://rubyforge.org/softwaremap/trove_list.php?form_cat=187)
+ 
+ dbi 0.4.5 (http://rubygems.org/downloads/dbi-0.4.5.gem)
+ License: BSD license (http://rubyforge.org/softwaremap/trove_list.php?form_cat=187)
+ 
+ dbd-jdbc 0.1.4 (http://rubygems.org/downloads/dbd-jdbc-0.1.4.gem)
+ License: BSD license (http://rubyforge.org/softwaremap/trove_list.php?form_cat=187)
+ 
+ jruby-openssl 0.7.4 (http://rubygems.org/downloads/jruby-openssl-0.7.6.1.gem)
+ License: the same license as JRuby (https://github.com/jruby/jruby-ossl/blob/master/License.txt)
+ 
+ warbler 1.3.5 (http://rubygems.org/downloads/warbler-1.3.5.gem)
+ License: MIT license (http://caldersphere.rubyforge.org/warbler/LICENSE_txt.html)

data/Gemfile

@@ -5,6 +5,14 @@ gemspec
 
 gem 'win32-process', :platforms => [:mswin, :mingw]
 
+# for async framework
+# for Async, Eventful execution
+platforms :ruby_19 do
+  gem 'eventmachine'
+  gem 'rack-fiber_pool'
+  gem 'async-rack'
+end
+
 platforms :jruby do
   gem 'jdbc-sqlite3', ">= 3.7.2"
   gem 'dbi', ">= 0.4.5"
@@ -16,17 +24,20 @@ end
 group :development do
   gem 'aws-s3', '>= 0.6.2', :require => 'aws/s3'
   gem 'sqlite3', ">= 1.3.3", :platforms => [:ruby, :mswin, :mingw]
-  gem 'fpm', '0.3.11'
   gem 'fog', '>= 1.1.0'
-  gem 'ffaker', '~> 1.12.1'
-  gem 'thor', '>= 0.13.6'
-  gem 'webmock', '~> 1.6.4'
+  gem 'ffaker', '~> 1.14.0'
+  gem 'webmock', '~> 1.8.6'
   gem 'SystemTimer', '~> 1.2.3', :platforms => :ruby_18
 end
 
 group :test do
-  gem 'rspec', '~> 2.8.0'
+  gem 'rspec', '~> 2.9.0'
   gem "rcov", '~> 1.0.0', :require => false, :platforms => :ruby_18
   gem 'simplecov', :require => false, :platforms => [:ruby_19,:jruby]
   gem 'rack-test', '>= 0.5.3', :require => 'rack/test'
+  gem 'jasmine'
+end
+
+group :build do
+  gem 'fpm', '>= 0.4.6'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rhoconnect (3.1.2)
+    rhoconnect (3.2.0.beta1)
       bundler (~> 1.0)
       json (~> 1.6.0)
       rake (~> 0.9.2)
@@ -11,6 +11,7 @@ PATH
       rubyzip (~> 0.9.4)
       sinatra (~> 1.3)
       templater (~> 1.0.0)
+      thor (~> 0.14.6)
       uuidtools (>= 2.1.1)
 
 GEM
@@ -18,16 +19,28 @@ GEM
   specs:
     SystemTimer (1.2.3)
     addressable (2.2.7)
+    arr-pm (0.0.7)
+      cabin (> 0)
+    async-rack (0.5.1)
+      rack (~> 1.1)
     aws-s3 (0.6.2)
       builder
       mime-types
       xml-simple
+    backports (2.3.0)
     builder (3.0.0)
+    cabin (0.4.4)
+      json
+    childprocess (0.3.2)
+      ffi (~> 1.0.6)
+    clamp (0.3.1)
     crack (0.3.1)
     diff-lcs (1.1.3)
-    excon (0.13.2)
+    eventmachine (0.12.10)
+    excon (0.13.4)
     extlib (0.9.15)
-    ffaker (1.12.1)
+    ffaker (1.14.0)
+    ffi (1.0.11)
     fog (1.3.1)
       builder
       excon (~> 0.13.0)
@@ -39,17 +52,30 @@ GEM
       nokogiri (~> 1.5.0)
       ruby-hmac
     formatador (0.2.1)
-    fpm (0.3.11)
+    fpm (0.4.6)
+      arr-pm (~> 0.0.7)
+      backports (= 2.3.0)
+      cabin (~> 0.4.3)
+      clamp
       json
     highline (1.6.11)
+    jasmine (1.1.2)
+      jasmine-core (>= 1.1.0)
+      rack (>= 1.1)
+      rspec (>= 1.3.1)
+      selenium-webdriver (>= 0.1.3)
+    jasmine-core (1.1.0)
     json (1.6.6)
+    libwebsocket (0.1.3)
+      addressable
     mime-types (1.18)
-    multi_json (1.2.0)
+    multi_json (1.3.2)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-ssh (2.3.0)
     nokogiri (1.5.2)
     rack (1.4.1)
+    rack-fiber_pool (0.9.2)
     rack-protection (1.2.0)
       rack
     rack-test (0.6.1)
@@ -66,25 +92,31 @@ GEM
       vegas (~> 0.1.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
     ruby-hmac (0.4.0)
-    rubyzip (0.9.6.1)
-    simplecov (0.6.1)
+    rubyzip (0.9.7)
+    selenium-webdriver (2.21.2)
+      childprocess (>= 0.2.5)
+      ffi (~> 1.0)
+      libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
+      rubyzip
+    simplecov (0.6.2)
+      multi_json (~> 1.3)
       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)
-    sqlite3 (1.3.5)
+    sqlite3 (1.3.6)
     templater (1.0.0)
       diff-lcs (>= 1.1.2)
       extlib (>= 0.9.5)
@@ -94,8 +126,8 @@ GEM
     uuidtools (2.1.2)
     vegas (0.1.11)
       rack (>= 1.0.0)
-    webmock (1.6.4)
-      addressable (~> 2.2, > 2.2.5)
+    webmock (1.8.6)
+      addressable (>= 2.2.7)
       crack (>= 0.1.7)
     xml-simple (1.1.1)
 
@@ -104,21 +136,24 @@ PLATFORMS
 
 DEPENDENCIES
   SystemTimer (~> 1.2.3)
+  async-rack
   aws-s3 (>= 0.6.2)
   dbd-jdbc (>= 0.1.4)
   dbi (>= 0.4.5)
-  ffaker (~> 1.12.1)
+  eventmachine
+  ffaker (~> 1.14.0)
   fog (>= 1.1.0)
-  fpm (= 0.3.11)
+  fpm (>= 0.4.6)
+  jasmine
   jdbc-sqlite3 (>= 3.7.2)
   jruby-openssl (>= 0.7.4)
+  rack-fiber_pool
   rack-test (>= 0.5.3)
   rcov (~> 1.0.0)
   rhoconnect!
-  rspec (~> 2.8.0)
+  rspec (~> 2.9.0)
   simplecov
   sqlite3 (>= 1.3.3)
-  thor (>= 0.13.6)
   warbler
-  webmock (~> 1.6.4)
+  webmock (~> 1.8.6)
   win32-process

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'bundler'
-Bundler.setup(:default, :development, :test)
+Bundler.setup(:default, :development, :test, :build)
 
 load 'tasks/redis.rake'
 load 'installer/utils/nix_installation.rake'
@@ -17,17 +17,17 @@ task :spec => 'spec:spec'
 begin
   require 'rspec/core/rake_task'
          
-  TYPES = { 
-    :spec   => 'spec/*_spec.rb',
-    :perf   => 'spec/perf/*_spec.rb',
+  TYPES = {
+    :spec => 'spec/*_spec.rb',
+    :perf => 'spec/perf/*_spec.rb',
     :server => 'spec/server/*_spec.rb',
-    :api    => 'spec/api/**/*_spec.rb',
-    :bulk   => 'spec/bulk_data/*_spec.rb',
-    :jobs   => 'spec/jobs/*_spec.rb',
+    :api => 'spec/api/**/*_spec.rb',
+    :bulk => 'spec/bulk_data/*_spec.rb',
+    :jobs => 'spec/jobs/*_spec.rb',
     :stats => 'spec/stats/*_spec.rb',
-    :ping   => 'spec/ping/*_spec.rb',
+    :ping => 'spec/ping/*_spec.rb',
     :generator => 'spec/generator/*_spec.rb',
-    :bench => 'bench/spec/*_spec.rb'
+    :bench     => 'bench/spec/*_spec.rb'
   }
  
   TYPES.each do |type,files|
@@ -43,7 +43,6 @@ begin
   RSpec::Core::RakeTask.new('spec:all') do |t|
     t.rspec_opts = ["-b", "-c", "-fd"]
     t.pattern = FileList[TYPES.values]
-    # FIXME: Ruby 1.9 is not supported by rcov. Please switch to simplecov
     unless RUBY_VERSION =~ /1.9/ || defined?(JRUBY_VERSION)
       require 'rcov/rcovtask'
       t.rcov = true
@@ -58,8 +57,17 @@ begin
   end
   
 rescue LoadError => e
-  puts "rspec / rcov not available. Install with: "
-  puts "gem install rspec rcov\n\n"
+  # Array of groups whose gems are not installed
+  # if bundle install called with the --without option
+  unless Bundler.settings.without.include? :test
+    if RUBY_VERSION =~ /1.9/
+      puts "rspec / simplecov not available. Install with: "
+      puts "gem install rspec simplecov\n\n"
+    else
+      puts "rspec / rcov not available. Install with: "
+      puts "gem install rspec rcov\n\n"
+    end
+  end
 end
 
 # desc "Build rhoconnect gem"
@@ -95,59 +103,60 @@ end
 
 # Debian and RPM package building tasks
 def build_pkg(dist, arch, deps, use_bench_tarball=false)
-  start_dir       = `pwd`.strip
-  workspace      = "#{start_dir}/pkg/workspace" 
-  version        = Rhoconnect::VERSION
-  description    = '"Rhoconnect production environment"'
-  post_install   = "#{workspace}/unix-like/post-install.sh"
-  prefix         = "/opt/rhoconnect/installer"
-  gem_name       = "rhoconnect-#{version}.gem"
-  pre_install    = "#{workspace}/unix-like/pre_install.sh" 
-  post_install   = "#{workspace}/unix-like/post_install.sh" 
-  pre_uninstall  = "#{workspace}/unix-like/pre_uninstall.sh" 
-  post_uninstall = "#{workspace}/unix-like/post_uninstall.sh" 
-
-  Dir.mkdir("#{workspace}")
-  Dir.mkdir("#{workspace}/unix-like")
-
-  # Copy all necessary Files into the workspace
-  system("cp install.sh Gemfile Gemfile.lock #{workspace}")
-  system("cp -r installer/unix-like/* #{workspace}/unix-like")
-  system("cp pkg/#{gem_name} #{workspace}")
+  build_dir = "/tmp/rhobuild"
+  version = Rhoconnect::VERSION
+  description = '"Rhoconnect production environment"'
+  prefix = "/opt/rhoconnect/installer"
+  gem_name = "rhoconnect-#{version}.gem"
+
+  before_install_script = "#{build_dir}/unix-like/pre_install.sh"
+  after_install_script = "#{build_dir}/unix-like/post_install.sh"
+  before_remove_script = "#{build_dir}/unix-like/pre_uninstall.sh"
+  after_remove_script = "#{build_dir}/unix-like/post_uninstall.sh"
+
+  `rm -rf #{build_dir}` if File.exist?("#{build_dir}")
+  Dir.mkdir("#{build_dir}")
+  Dir.mkdir("#{build_dir}/unix-like")
+
+  # Copy all necessary Files into the build_dir
+  Dir.chdir(File.expand_path(File.dirname(__FILE__))) 
+  system("cp install.sh Gemfile Gemfile.lock #{build_dir}")
+  system("cp -r installer/unix-like/*.sh #{build_dir}/unix-like")
+  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 > #{workspace}/bench.tar.gz` if use_bench_tarball
+  `git archive --format=tar --prefix=bench/ HEAD:bench | gzip > #{build_dir}/bench.tar.gz` if use_bench_tarball
 
   # cd into the pkg dir so that fpm will create the package into the pkg dir.
   Dir.chdir("./pkg")
 
   # Construct fpm command
-  fpm_cmd = "fpm -s dir -t #{dist} -n rhoconnect -v #{version} -a #{arch} -C #{workspace} " +
-            "--pre-install #{pre_install} --post-install #{post_install} " + 
-            "--pre-uninstall #{pre_uninstall} --post-uninstall #{post_uninstall} " + 
-            "--prefix #{prefix} --description #{description}"
+  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 do |dep|
-    fpm_cmd << " -d '#{dep}'"
-  end #do
+  deps.each { |dep| fpm_cmd << " -d '#{dep}'" }
+  fpm_cmd << " './'"
 
   # Create the package
   system(fpm_cmd)
   # Leave no trace...
-  system("rm -rf #{workspace}")
-
-  Dir.chdir(start_dir)
-end #build_pkg
+  system("rm -rf #{build_dir}")
+end
 
 DEB_DEPS = [
   "wget (>= 1.0)", "make (>= 3.0)", "patch (>= 2.0)",
-  "build-essential (>= 0)",
+  "build-essential (>= 0)", "libc6-dev (>= 0)",
+  "autoconf (>= 0.0)", "automake (>= 0.0)", "libtool (>= 0.0)",
   "zlib1g (>= 1.2.3)", "zlib1g-dev (>= 1.2.3)",
-  "libssl0.9.8 (>= 0)", "libssl-dev (>= 0.9.8)",
+  "openssl (>= 1.0.0)", "libssl1.0.0 (>= 0)", "libssl-dev (>= 1.0.0)",
   "libcurl4-openssl-dev (>= 0)",
-  "libreadline6 (>= 0)", "libreadline6-dev (>= 0)"
-  # "libsqlite3-0 (>= 3.6.22-1)", "libsqlite3-dev (>= 3.6.22-1)"
+  "libreadline6 (>= 0)", "libreadline6-dev (>= 0)",
+  "libyaml-dev (>= 0)", "libxml2-dev (>= 0)",
+  "libpcre3 (>=0)", "libpcre3-dev (>=0)"
 ]
 
 desc "Build Debian DEB rhoconnect-#{Rhoconnect::VERSION}_all.deb package into the pkg directory"
@@ -156,16 +165,27 @@ task "build:deb" => :build do
 end
 
 RPM_DEPS = [
-  "wget >= 1.0", "make >= 3.0", "patch >= 2.0",
-  "gcc-c++ >= 4.1.2",
+  "wget >= 1.0", "make >= 3.0", "patch >= 2.0", "gcc-c++ >= 4.1.2",
+  "autoconf >= 0.0", "automake >= 0.0", "libtool >= 0.0",
   "zlib >= 1.2.3", "zlib-devel >= 1.2.3",
   "curl >= 7.15.5", "curl-devel >= 7.15.5",
   "pcre >= 6.6", "pcre-devel >= 6.6",
   "openssl >= 0.9.8e", "openssl-devel >= 0.9.8e",
-  "readline >= 5.1", "readline-devel >= 5.1"
+  "readline >= 5.1", "readline-devel >= 5.1",
+  "libyaml >= 0.0", "libyaml-devel >= 0.0",
+  "libffi >= 0", "libffi-devel >= 0"
 ]
 
 desc "Build Red Hat RPM rhoconnect-#{Rhoconnect::VERSION}.noarch.rpm package into the pkg directory"
 task "build:rpm" => :build do
   build_pkg "rpm", "noarch", RPM_DEPS
 end
+
+begin
+  require 'jasmine'
+  load 'jasmine/tasks/jasmine.rake'
+rescue LoadError
+  task :jasmine do
+    abort "Jasmine is not available. In order to run jasmine, you must: (sudo) gem install jasmine"
+  end
+end

data/bench/bench_runner.rb

@@ -12,7 +12,7 @@ begin
   # Check for another instance of rhoconnect application
   raise "Another instance of bench application is running." unless `cat /tmp/benchapp.pid 2> /dev/null`.empty?
   raise "Another instance of rhoconnect application is running." unless `cat /tmp/rhoconnect.pid 2> /dev/null`.empty?
- 
+
   ruby_version = `rvm current`
   puts "Ruby version: #{ruby_version}"
   puts
@@ -121,4 +121,4 @@ ensure
   puts ""
   $stdout = orig_stdout #restore stdout
   $sdterr = orig_stderr #restore stderr
-end
+end

data/bench/benchapp/Gemfile

@@ -27,3 +27,9 @@ group :test do
   gem 'rack-test', '>= 0.5.3', :require => "rack/test"
   gem 'rspec', '~> 2.6.0'
 end
+
+# for Async, Eventful execution
+platforms :ruby_19 do
+  gem 'rack-fiber_pool'
+  gem 'async-rack'
+end

data/bench/benchapp/Gemfile.lock

@@ -2,6 +2,8 @@ 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)
@@ -11,6 +13,7 @@ GEM
     mime-types (1.17.2)
     multi_json (1.1.0)
     rack (1.4.1)
+    rack-fiber_pool (0.9.2)
     rack-protection (1.2.0)
       rack
     rack-test (0.6.1)
@@ -69,10 +72,12 @@ PLATFORMS
 
 DEPENDENCIES
   SystemTimer (~> 1.2.3)
+  async-rack
   dbd-jdbc (>= 0.1.4)
   dbi (>= 0.4.5)
   jdbc-sqlite3 (>= 3.7.2)
   jruby-openssl (>= 0.7.4)
+  rack-fiber_pool
   rack-test (>= 0.5.3)
   rhoconnect (~> 3.1.0)
   rspec (~> 2.6.0)