Minor fixes in the setup files for sinatra and rails-stripped

rack/setup_ruby.py

@@ -4,6 +4,10 @@ import sys
 import re
 import os
 
+from os.path import expanduser
+
+home = expanduser("~")
+
 def start(args):
 
   try:

rails-stripped/Gemfile-ruby

@@ -2,4 +2,5 @@ source 'https://rubygems.org'
 
 gem 'rails', '3.2.11'
 gem 'mysql2', '0.3.11'
-gem 'passenger', '3.9.5.rc3'
+gem 'passenger', '3.9.5.rc3'
+gem "unicorn", "4.6.2"

rails-stripped/setup_ruby.py

@@ -16,7 +16,7 @@ def start(args):
     subprocess.check_call("cp Gemfile-ruby.lock Gemfile.lock", shell=True, cwd="rails-stripped")
     subprocess.check_call("cp config/database-ruby.yml config/database.yml", shell=True, cwd="rails-stripped")
     subprocess.check_call("sudo /usr/local/nginx/sbin/nginx -c " + home + "/FrameworkBenchmarks/rails-stripped/config/nginx.conf", shell=True)
-    subprocess.Popen("rvm ruby-2.0.0-p0 do bundle exec unicorn_rails-stripped -E production -c config/unicorn.rb", shell=True, cwd="rails-stripped")
+    subprocess.Popen("rvm ruby-2.0.0-p0 do bundle exec unicorn_rails -E production -c config/unicorn.rb", shell=True, cwd="rails-stripped")
     return 0
   except subprocess.CalledProcessError:
     return 1

sinatra/Gemfile-ruby

@@ -6,3 +6,4 @@ gem 'rack', '1.5.1'
 gem 'mysql2', '0.3.11'
 gem 'passenger', '3.9.5.rc3'
 gem "sinatra-activerecord", "1.2.2"
+gem "unicorn", "4.6.2"

sinatra/setup_ruby.py

@@ -9,12 +9,13 @@ from os.path import expanduser
 home = expanduser("~")
 
 def start(args):
+  setup_util.replace_text("sinatra/hello_world.rb", ":host => '.*'", ":host => '" + args.database_host + "'")
   try:
     subprocess.check_call("rvm ruby-2.0.0-p0 do bundle install --gemfile=Gemfile-ruby", shell=True, cwd="sinatra")
     subprocess.check_call("cp Gemfile-ruby Gemfile", shell=True, cwd="sinatra")
     subprocess.check_call("cp Gemfile-ruby.lock Gemfile.lock", shell=True, cwd="sinatra")
     subprocess.check_call("sudo /usr/local/nginx/sbin/nginx -c " + home + "/FrameworkBenchmarks/sinatra/config/nginx.conf", shell=True)
-    subprocess.Popen("rvm ruby-2.0.0-p0 do bundle exec unicorn_sinatra -E production -c config/unicorn.rb", shell=True, cwd="sinatra")
+    subprocess.Popen("rvm ruby-2.0.0-p0 do bundle exec unicorn_rails -E production -c config/unicorn.rb", shell=True, cwd="sinatra")
     return 0
   except subprocess.CalledProcessError:
     return 1