upgrade to ruby 2.0.0

6 files changed, 6 insertions, 7 deletions

diff --git a/.ruby-version b/.ruby-version
index 41f053b2..95a5ad2d 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-ruby-1.9.3-p429
+ruby-2.0.0-p195
diff --git a/config/deploy.rb b/config/deploy.rb
index a39ebe59..ab2a2f41 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,6 +1,6 @@
 #$:.unshift(File.expand_path('./lib', ENV['rvm_path']))
 require "rvm/capistrano"
-set :rvm_ruby_string, 'ruby-1.9.3-p392@cakeside'
+set :rvm_ruby_string, 'ruby-2.0.0-p195@cakeside'
 set :rvm_type, :system
 require 'bundler/capistrano'                 # loads RVM's capistrano plugin
 set :stages, %w(production staging)
diff --git a/config/nginx.conf b/config/nginx.conf
index 26e18b1c..fa97800a 100644
--- a/config/nginx.conf
+++ b/config/nginx.conf
@@ -5,8 +5,8 @@ events {
 }
 
 http {
-  passenger_root /usr/local/rvm/gems/ruby-1.9.3-p392/gems/passenger-4.0.3;
-  passenger_ruby /usr/local/rvm/wrappers/ruby-1.9.3-p392/ruby;
+  passenger_root /usr/local/rvm/gems/ruby-2.0.0-p195/gems/passenger-4.0.3;
+  passenger_ruby /usr/local/rvm/wrappers/ruby-2.0.0-p195/ruby;
 
   include       mime.types;
   default_type  application/octet-stream;
diff --git a/script/bootstrap-vagrant.sh b/script/bootstrap-vagrant.sh
index be2f90cf..11d0cc1b 100644
--- a/script/bootstrap-vagrant.sh
+++ b/script/bootstrap-vagrant.sh
@@ -7,7 +7,6 @@ source /home/vagrant/.profile
 source /home/vagrant/.rvm/scripts/rvm
 
 rvm install 2.0.0
-rvm install 1.9.3
 rvm use 2.0.0 --default
 
 #gem source -r http://rubygems.org/
diff --git a/script/ci.sh b/script/ci.sh
index e827238a..f4f7a5b5 100644
--- a/script/ci.sh
+++ b/script/ci.sh
@@ -3,7 +3,7 @@ echo "load bashrc"
 source ~/.bashrc
 
 echo 'switch gemset'
-rvm use ruby-1.9.3-p429@cakeside
+rvm use ruby-2.0.0-p195@cakeside --create
 
 echo 'bundle install'
 bundle install --without production
diff --git a/script/restart_delayed_job b/script/restart_delayed_job
index deea4e01..38569d5d 100755
--- a/script/restart_delayed_job
+++ b/script/restart_delayed_job
@@ -4,7 +4,7 @@
 # RAILS_ENV=production
 # SHELL=/usr/local/rvm/bin/rvm-shell
 # 0 * * * * /home/cakeside/apps/www.cakeside.com/current/script/restart_delayed_job >> /home/cakeside/apps/www.cakeside.com/current/log/cron.log 2>&1
-source /usr/local/rvm/environments/ruby-1.9.3-p392@cakeside
+source /usr/local/rvm/environments/ruby-2.0.0-p195@cakeside
 
 cd /home/cakeside/apps/www.cakeside.com/current/
 script/delayed_job restart