Typo when merging

frameworks/Ruby/rails/install.sh

@@ -2,8 +2,8 @@
 
 fw_depends rvm nginx java
 
-rvm install ruby-2.0.0-p0
-rvm ruby-2.0.0-p0 do bundle install --gemfile=$TROOT/Gemfile-ruby
+rvm install 2.1.2
+rvm 2.1.2 do bundle install --gemfile=$TROOT/Gemfile-ruby
 
-rvm install jruby-1.7.8
-rvm jruby-1.7.8 do bundle install --gemfile=$TROOT/Gemfile-jruby
+rvm install jruby-1.7.13
+rvm jruby-1.7.13 do bundle install --gemfile=$TROOT/Gemfile-jruby

frameworks/Ruby/rails/setup_jruby.py

@@ -10,7 +10,7 @@ def start(args, logfile, errfile):
   try:
     subprocess.check_call("cp Gemfile-jruby Gemfile", shell=True, cwd="rails", stderr=errfile, stdout=logfile)
     subprocess.check_call("cp Gemfile-jruby.lock Gemfile.lock", shell=True, cwd="rails", stderr=errfile, stdout=logfile)
-    subprocess.Popen("rvm jruby-1.7.8 do bundle exec torqbox -b 0.0.0.0 -E production", shell=True, cwd="rails", stderr=errfile, stdout=logfile)
+    subprocess.Popen("rvm jruby-1.7.13 do bundle exec torqbox -b 0.0.0.0 -E production", shell=True, cwd="rails", stderr=errfile, stdout=logfile)
     return 0
   except subprocess.CalledProcessError:
     return 1

frameworks/Ruby/rails/setup_ruby.py

@@ -14,7 +14,7 @@ def start(args, logfile, errfile):
     subprocess.check_call("cp Gemfile-ruby Gemfile", shell=True, cwd="rails", stderr=errfile, stdout=logfile)
     subprocess.check_call("cp Gemfile-ruby.lock Gemfile.lock", shell=True, cwd="rails", stderr=errfile, stdout=logfile)
     subprocess.check_call("sudo /usr/local/nginx/sbin/nginx -c $TROOT/config/nginx.conf", shell=True, stderr=errfile, stdout=logfile)
-    subprocess.Popen("rvm ruby-2.0.0-p0 do bundle exec unicorn_rails -E production -c $TROOT/config/unicorn.rb", shell=True, cwd="rails", stderr=errfile, stdout=logfile)
+    subprocess.Popen("rvm 2.1.2 do bundle exec unicorn_rails -E production -c $TROOT/config/unicorn.rb", shell=True, cwd="rails", stderr=errfile, stdout=logfile)
     return 0
   except subprocess.CalledProcessError:
     return 1