Parcourir la source

Pass Ruby tests on Travis, except rbx tests

- Travis rvm is located at /home/travis (not ~, or /home/testrunner).
- Everything has to be installed on the Travis rvm with rvmsudo.
- Tests do not pass for anything with rbx.
Brittany Mazza il y a 10 ans
Parent
commit
1c402d8f06
43 fichiers modifiés avec 286 ajouts et 60 suppressions
  1. 11 4
      frameworks/Ruby/grape/install.sh
  2. 6 1
      frameworks/Ruby/grape/run_jruby_puma.sh
  3. 6 1
      frameworks/Ruby/grape/run_mri_puma.sh
  4. 6 1
      frameworks/Ruby/grape/run_rbx_puma.sh
  5. 6 1
      frameworks/Ruby/grape/run_thin.sh
  6. 6 1
      frameworks/Ruby/grape/run_torqbox.sh
  7. 6 1
      frameworks/Ruby/grape/run_trinidad.sh
  8. 6 1
      frameworks/Ruby/grape/run_unicorn.sh
  9. 11 4
      frameworks/Ruby/padrino/install.sh
  10. 6 1
      frameworks/Ruby/padrino/run_jruby_puma.sh
  11. 6 1
      frameworks/Ruby/padrino/run_mri_puma.sh
  12. 6 1
      frameworks/Ruby/padrino/run_rbx_puma.sh
  13. 6 1
      frameworks/Ruby/padrino/run_thin.sh
  14. 6 1
      frameworks/Ruby/padrino/run_torqbox.sh
  15. 6 1
      frameworks/Ruby/padrino/run_trinidad.sh
  16. 6 1
      frameworks/Ruby/padrino/run_unicorn.sh
  17. 11 4
      frameworks/Ruby/rack/install.sh
  18. 6 1
      frameworks/Ruby/rack/run_jruby_puma.sh
  19. 6 1
      frameworks/Ruby/rack/run_mri_puma.sh
  20. 6 1
      frameworks/Ruby/rack/run_rbx_puma.sh
  21. 6 1
      frameworks/Ruby/rack/run_thin.sh
  22. 6 1
      frameworks/Ruby/rack/run_torqbox.sh
  23. 6 1
      frameworks/Ruby/rack/run_trinidad.sh
  24. 6 1
      frameworks/Ruby/rack/run_unicorn.sh
  25. 9 3
      frameworks/Ruby/rails-stripped/install.sh
  26. 6 1
      frameworks/Ruby/rails-stripped/setup_jruby.sh
  27. 6 1
      frameworks/Ruby/rails-stripped/setup_ruby.sh
  28. 11 4
      frameworks/Ruby/rails/install.sh
  29. 6 1
      frameworks/Ruby/rails/run_jruby_puma.sh
  30. 6 1
      frameworks/Ruby/rails/run_mri_puma.sh
  31. 6 1
      frameworks/Ruby/rails/run_rbx_puma.sh
  32. 6 1
      frameworks/Ruby/rails/run_thin.sh
  33. 6 1
      frameworks/Ruby/rails/run_torqbox.sh
  34. 6 1
      frameworks/Ruby/rails/run_trinidad.sh
  35. 6 1
      frameworks/Ruby/rails/run_unicorn.sh
  36. 11 4
      frameworks/Ruby/sinatra/install.sh
  37. 6 1
      frameworks/Ruby/sinatra/run_jruby_puma.sh
  38. 6 1
      frameworks/Ruby/sinatra/run_mri_puma.sh
  39. 6 1
      frameworks/Ruby/sinatra/run_rbx_puma.sh
  40. 6 1
      frameworks/Ruby/sinatra/run_thin.sh
  41. 6 1
      frameworks/Ruby/sinatra/run_torqbox.sh
  42. 6 1
      frameworks/Ruby/sinatra/run_trinidad.sh
  43. 6 1
      frameworks/Ruby/sinatra/run_unicorn.sh

+ 11 - 4
frameworks/Ruby/grape/install.sh

@@ -2,13 +2,20 @@
 
 fw_depends rvm nginx java
 
-rvm install ruby-2.0.0-p0
-rvm ruby-2.0.0-p0 do bundle install --gemfile=$TROOT/Gemfile
+if [ "$TRAVIS" = "true"]
+then
+	rvmsudo rvm install ruby-2.0.0-p0
+	rvmsudo rvm install jruby-1.7.8
+	rvmsudo rvm install rbx-2.2.10
+else
+	rvm install ruby-2.0.0-p0
+	rvm install jruby-1.7.8
+	rvm install rbx-2.2.10
+fi
 
-rvm install jruby-1.7.8
+rvm ruby-2.0.0-p0 do bundle install --gemfile=$TROOT/Gemfile --path vendor/bundle
 rvm jruby-1.7.8 do bundle install --gemfile=$TROOT/Gemfile
 
 export LC_ALL=en_US.UTF-8 
 export LANG=en_US.UTF-8
-rvm install rbx-2.2.10
 rvm rbx-2.2.10 do bundle install --gemfile=$TROOT/Gemfile

+ 6 - 1
frameworks/Ruby/grape/run_jruby_puma.sh

@@ -3,7 +3,12 @@
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 sed -i 's|  host:.*|  host: '"${DBHOST}"'|g' config/database.yml
 

+ 6 - 1
frameworks/Ruby/grape/run_mri_puma.sh

@@ -3,7 +3,12 @@
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 sed -i 's|  host:.*|  host: '"${DBHOST}"'|g' config/database.yml
 

+ 6 - 1
frameworks/Ruby/grape/run_rbx_puma.sh

@@ -3,7 +3,12 @@
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 sed -i 's|  host:.*|  host: '"${DBHOST}"'|g' config/database.yml
 

+ 6 - 1
frameworks/Ruby/grape/run_thin.sh

@@ -3,7 +3,12 @@
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 sed -i 's|  host:.*|  host: '"${DBHOST}"'|g' config/database.yml
 

+ 6 - 1
frameworks/Ruby/grape/run_torqbox.sh

@@ -3,7 +3,12 @@
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 sed -i 's|  host:.*|  host: '"${DBHOST}"'|g' config/database.yml
 

+ 6 - 1
frameworks/Ruby/grape/run_trinidad.sh

@@ -3,7 +3,12 @@
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 sed -i 's|  host:.*|  host: '"${DBHOST}"'|g' config/database.yml
 

+ 6 - 1
frameworks/Ruby/grape/run_unicorn.sh

@@ -3,7 +3,12 @@
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 sed -i 's|  host:.*|  host: '"${DBHOST}"'|g' config/database.yml
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' config/nginx.conf

+ 11 - 4
frameworks/Ruby/padrino/install.sh

@@ -2,13 +2,20 @@
 
 fw_depends rvm nginx java
 
-rvm install ruby-2.0.0-p0
-rvm ruby-2.0.0-p0 do bundle install --gemfile=$TROOT/Gemfile
+if [ "$TRAVIS" = "true" ]
+then
+	rvmsudo rvm install ruby-2.0.0-p0
+	rvmsudo rvm install jruby-1.7.8
+	rvmsudo rvm install rbx-2.2.10
+else
+	rvm install ruby-2.0.0-p0
+	rvm install jruby-1.7.8
+	rvm install rbx-2.2.10
+fi
 
-rvm install jruby-1.7.8
+rvm ruby-2.0.0-p0 do bundle install --gemfile=$TROOT/Gemfile
 rvm jruby-1.7.8 do bundle install --gemfile=$TROOT/Gemfile
 
 export LC_ALL=en_US.UTF-8 
 export LANG=en_US.UTF-8
-rvm install rbx-2.2.10
 rvm rbx-2.2.10 do bundle install --gemfile=$TROOT/Gemfile

+ 6 - 1
frameworks/Ruby/padrino/run_jruby_puma.sh

@@ -3,6 +3,11 @@
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 DB_HOST=${DBHOST} rvm jruby-1.7.8 do bundle exec puma -C config/puma.rb &

+ 6 - 1
frameworks/Ruby/padrino/run_mri_puma.sh

@@ -3,6 +3,11 @@
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 DB_HOST=${DBHOST} rvm ruby-2.0.0-p0 do bundle exec puma -C config/puma.rb -w 8 --preload &

+ 6 - 1
frameworks/Ruby/padrino/run_rbx_puma.sh

@@ -3,6 +3,11 @@
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 DB_HOST=${DBHOST} rvm rbx-2.2.10 do bundle exec puma &

+ 6 - 1
frameworks/Ruby/padrino/run_thin.sh

@@ -3,6 +3,11 @@
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 DB_HOST=${DBHOST} rvm ruby-2.0.0-p0 do bundle exec thin start -C config/thin.yml &

+ 6 - 1
frameworks/Ruby/padrino/run_torqbox.sh

@@ -3,6 +3,11 @@
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 DB_HOST=${DBHOST} rvm jruby-1.7.8 do bundle exec torqbox -b 0.0.0.0 -E production &

+ 6 - 1
frameworks/Ruby/padrino/run_trinidad.sh

@@ -3,6 +3,11 @@
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 DB_HOST=${DBHOST} rvm jruby-1.7.8 do bundle exec trinidad --config config/trinidad.yml &

+ 6 - 1
frameworks/Ruby/padrino/run_unicorn.sh

@@ -3,7 +3,12 @@
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 $NGINX_HOME/sbin/nginx -c $TROOT/config/nginx.conf
 

+ 11 - 4
frameworks/Ruby/rack/install.sh

@@ -2,13 +2,20 @@
 
 fw_depends rvm nginx java
 
-rvm install ruby-2.0.0-p0
-rvm ruby-2.0.0-p0 do bundle install --gemfile=$TROOT/Gemfile
+if [ "$TRAVIS" = "true" ]
+then
+	rvmsudo rvm install ruby-2.0.0-p0
+	rvmsudo rvm install jruby-1.7.8
+	rvmsudo rvm install rbx-2.2.10
+else
+	rvm install ruby-2.0.0-p0
+	rvm install jruby-1.7.8
+	rvm install rbx-2.2.10
+fi
 
-rvm install jruby-1.7.8
+rvm ruby-2.0.0-p0 do bundle install --gemfile=$TROOT/Gemfile
 rvm jruby-1.7.8 do bundle install --gemfile=$TROOT/Gemfile
 
 export LC_ALL=en_US.UTF-8 
 export LANG=en_US.UTF-8
-rvm install rbx-2.2.10
 rvm rbx-2.2.10 do bundle install --gemfile=$TROOT/Gemfile

+ 6 - 1
frameworks/Ruby/rack/run_jruby_puma.sh

@@ -5,6 +5,11 @@ sed -i 's|  host:.*|  host:'"${DBHOST}"'|g' config/database.yml
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 rvm jruby-1.7.8 do bundle exec puma -b tcp://0.0.0.0:8080 -e production &

+ 6 - 1
frameworks/Ruby/rack/run_mri_puma.sh

@@ -5,6 +5,11 @@ sed -i 's|  host:.*|  host:'"${DBHOST}"'|g' config/database.yml
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 rvm ruby-2.0.0-p0 do bundle exec puma -t 8:32 -w 8 --preload -b tcp://0.0.0.0:8080 -e production &

+ 6 - 1
frameworks/Ruby/rack/run_rbx_puma.sh

@@ -5,6 +5,11 @@ sed -i 's|  host:.*|  host:'"${DBHOST}"'|g' config/database.yml
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 rvm rbx-2.2.10 do bundle exec puma -b tcp://0.0.0.0:8080 -e production &

+ 6 - 1
frameworks/Ruby/rack/run_thin.sh

@@ -5,6 +5,11 @@ sed -i 's|  host:.*|  host:'"${DBHOST}"'|g' config/database.yml
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 rvm ruby-2.0.0-p0 do bundle exec thin start -C config/thin.yml &

+ 6 - 1
frameworks/Ruby/rack/run_torqbox.sh

@@ -5,6 +5,11 @@ sed -i 's|  host:.*|  host:'"${DBHOST}"'|g' config/database.yml
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 rvm jruby-1.7.8 do bundle exec torqbox -b 0.0.0.0 -E production &

+ 6 - 1
frameworks/Ruby/rack/run_trinidad.sh

@@ -5,6 +5,11 @@ sed -i 's|  host:.*|  host:'"${DBHOST}"'|g' config/database.yml
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 rvm jruby-1.7.8 do bundle exec trinidad --config config/trinidad.yml &

+ 6 - 1
frameworks/Ruby/rack/run_unicorn.sh

@@ -6,7 +6,12 @@ sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' config/nginx.conf
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 $NGINX_HOME/sbin/nginx -c $TROOT/config/nginx.conf
 

+ 9 - 3
frameworks/Ruby/rails-stripped/install.sh

@@ -2,8 +2,14 @@
 
 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
+if [ "$TRAVIS" = "true" ]
+then
+	rvmsudo rvm install ruby-2.0.0-p0
+	rvmsudo rvm install jruby-1.7.8
+else
+	rvm install ruby-2.0.0-p0
+	rvm install jruby-1.7.8
+fi
 
-rvm install jruby-1.7.8
+rvm ruby-2.0.0-p0 do bundle install --gemfile=$TROOT/Gemfile-ruby
 rvm jruby-1.7.8 do bundle install --gemfile=$TROOT/Gemfile-jruby

+ 6 - 1
frameworks/Ruby/rails-stripped/setup_jruby.sh

@@ -5,7 +5,12 @@ sed -i 's|host: .*|host: '"${DBHOST}"'|g' config/database.yml
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 rm -f Gemfile
 cp Gemfile-jruby Gemfile

+ 6 - 1
frameworks/Ruby/rails-stripped/setup_ruby.sh

@@ -6,7 +6,12 @@ sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' config/nginx.conf
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 rm -f Gemfile
 cp Gemfile-ruby Gemfile

+ 11 - 4
frameworks/Ruby/rails/install.sh

@@ -2,13 +2,20 @@
 
 fw_depends rvm nginx java
 
-rvm install 2.1.2
-rvm 2.1.2 do bundle install --gemfile=$TROOT/Gemfile
+if [ "$TRAVIS" = "true" ]
+then
+	rvmsudo rvm install 2.1.2
+	rvmsudo rvm install jruby-1.7.13
+	rvmsudo rvm install rbx-2.2.10
+else
+	rvm install 2.1.2
+	rvm install jruby-1.7.13
+	rvm install rbx-2.2.10
+fi
 
-rvm install jruby-1.7.13
+rvm 2.1.2 do bundle install --gemfile=$TROOT/Gemfile
 rvm jruby-1.7.13 do bundle install --gemfile=$TROOT/Gemfile
 
 export LC_ALL=en_US.UTF-8 
 export LANG=en_US.UTF-8
-rvm install rbx-2.2.10
 rvm rbx-2.2.10 do bundle install --gemfile=$TROOT/Gemfile

+ 6 - 1
frameworks/Ruby/rails/run_jruby_puma.sh

@@ -3,6 +3,11 @@
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 DB_HOST=${DBHOST} rvm jruby-1.7.13 do bundle exec puma -b tcp://0.0.0.0:8080 -e production &

+ 6 - 1
frameworks/Ruby/rails/run_mri_puma.sh

@@ -3,6 +3,11 @@
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 DB_HOST=${DBHOST} rvm ruby-2.1.2 do bundle exec puma -t 8:32 -w 8 --preload -b tcp://0.0.0.0:8080 -e production &

+ 6 - 1
frameworks/Ruby/rails/run_rbx_puma.sh

@@ -3,6 +3,11 @@
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 DB_HOST=${DBHOST} rvm rbx-2.2.10 do bundle exec puma -b tcp://0.0.0.0:8080 -e production &

+ 6 - 1
frameworks/Ruby/rails/run_thin.sh

@@ -3,6 +3,11 @@
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 DB_HOST=${DBHOST} rvm ruby-2.1.2 do bundle exec thin start -C config/thin.yml &

+ 6 - 1
frameworks/Ruby/rails/run_torqbox.sh

@@ -3,6 +3,11 @@
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 DB_HOST=${DBHOST} rvm jruby-1.7.13 do bundle exec torqbox -b 0.0.0.0 -E production &

+ 6 - 1
frameworks/Ruby/rails/run_trinidad.sh

@@ -3,6 +3,11 @@
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 DB_HOST=${DBHOST} rvm jruby-1.7.13 do bundle exec trinidad --config config/trinidad.yml &

+ 6 - 1
frameworks/Ruby/rails/run_unicorn.sh

@@ -5,7 +5,12 @@ sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' config/nginx.conf
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 $NGINX_HOME/sbin/nginx -c $TROOT/config/nginx.conf
 

+ 11 - 4
frameworks/Ruby/sinatra/install.sh

@@ -2,13 +2,20 @@
 
 fw_depends rvm nginx java maven
 
-rvm install ruby-2.0.0-p0
-rvm ruby-2.0.0-p0 do bundle install --gemfile=$TROOT/Gemfile
+if [ "$TRAVIS" = "true" ]
+then
+	rvmsudo rvm install ruby-2.0.0-p0
+	rvmsudo rvm install jruby-1.7.8
+	rvmsudo rvm install rbx-2.2.10
+else
+	rvm install ruby-2.0.0-p0
+	rvm install jruby-1.7.8
+	rvm install rbx-2.2.10
+fi
 
-rvm install jruby-1.7.8
+rvm ruby-2.0.0-p0 do bundle install --gemfile=$TROOT/Gemfile --path vendor/bundle
 rvm jruby-1.7.8 do bundle install --gemfile=$TROOT/Gemfile
 
 export LC_ALL=en_US.UTF-8 
 export LANG=en_US.UTF-8
-rvm install rbx-2.2.10
 rvm rbx-2.2.10 do bundle install --gemfile=$TROOT/Gemfile

+ 6 - 1
frameworks/Ruby/sinatra/run_jruby_puma.sh

@@ -3,7 +3,12 @@
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 rvm jruby-1.7.8 do bundle --jobs 4
 

+ 6 - 1
frameworks/Ruby/sinatra/run_mri_puma.sh

@@ -3,7 +3,12 @@
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 rvm ruby-2.0.0-p0 do bundle --jobs 4
 

+ 6 - 1
frameworks/Ruby/sinatra/run_rbx_puma.sh

@@ -3,6 +3,11 @@
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 DB_HOST=${DBHOST} rvm rbx-2.2.10 do bundle exec puma &

+ 6 - 1
frameworks/Ruby/sinatra/run_thin.sh

@@ -3,7 +3,12 @@
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 rvm ruby-2.0.0-p0 do bundle --jobs 4
 

+ 6 - 1
frameworks/Ruby/sinatra/run_torqbox.sh

@@ -3,7 +3,12 @@
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 rvm jruby-1.7.8 do bundle --jobs 4
 

+ 6 - 1
frameworks/Ruby/sinatra/run_trinidad.sh

@@ -3,7 +3,12 @@
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 rvm jruby-1.7.8 do bundle --jobs 4
 

+ 6 - 1
frameworks/Ruby/sinatra/run_unicorn.sh

@@ -5,7 +5,12 @@ sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' config/nginx.conf
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
-source $HOME/.rvm/scripts/rvm
+if [ "$TRAVIS" = "true" ]
+then
+	source /home/travis/.rvm/scripts/rvm
+else
+	source $HOME/.rvm/scripts/rvm
+fi
 
 rvm ruby-2.0.0-p0 do bundle --jobs 4