Merge branch 'reorganize-ruby-versions-rebased' of https://github.com/mwpastore/FrameworkBenchmarks into 1789

Conflicts:
	frameworks/Ruby/grape/run_jruby_puma.sh
	frameworks/Ruby/grape/run_torqbox.sh
	frameworks/Ruby/grape/run_trinidad.sh
	frameworks/Ruby/padrino/run_jruby_puma.sh
	frameworks/Ruby/padrino/run_mri_puma.sh
	frameworks/Ruby/padrino/run_torqbox.sh
	frameworks/Ruby/padrino/run_trinidad.sh
	frameworks/Ruby/rack/run_jruby_puma.sh
	frameworks/Ruby/rack/run_torqbox.sh
	frameworks/Ruby/rack/run_trinidad.sh
	frameworks/Ruby/rails-stripped/setup_jruby.sh
	frameworks/Ruby/rails/run_jruby_puma.sh
	frameworks/Ruby/rails/run_torqbox.sh
	frameworks/Ruby/rails/run_trinidad.sh
	frameworks/Ruby/sinatra/run_jruby_puma.sh
	frameworks/Ruby/sinatra/run_torqbox.sh
	frameworks/Ruby/sinatra/run_trinidad.sh

frameworks/Ruby/grape/.gitignore

@@ -0,0 +1,2 @@
+.bundle
+vendor/bundle

frameworks/Ruby/grape/run_jruby_puma.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-fw_depends rvm java jruby-1.7.8
+fw_depends rvm jruby-1.7
 
 sed -i 's|  host:.*|  host: '"${DBHOST}"'|g' config/database.yml
 
-rvm jruby-1.7.8 do bundle install --gemfile=$TROOT/Gemfile
+rvm jruby-$JRUBY_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-rvm jruby-1.7.8 do bundle exec puma -b tcp://0.0.0.0:8080 -e production &
+rvm jruby-$JRUBY_VERSION do bundle exec puma -b tcp://0.0.0.0:8080 -e production &

frameworks/Ruby/grape/run_mri_puma.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-fw_depends rvm ruby-2.0.0
+fw_depends rvm ruby-2.0
 
 sed -i 's|  host:.*|  host: '"${DBHOST}"'|g' config/database.yml
 
-rvm ruby-2.0.0-p0 do bundle install --gemfile=$TROOT/Gemfile --path vendor/bundle
+rvm ruby-$MRI_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-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 &
+rvm ruby-$MRI_VERSION do bundle exec puma -t 8:32 -w 8 --preload -b tcp://0.0.0.0:8080 -e production &

frameworks/Ruby/grape/run_rbx_puma.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-fw_depends rvm rbx-2.2.10
+fw_depends rvm rbx-2.4
 
 sed -i 's|  host:.*|  host: '"${DBHOST}"'|g' config/database.yml
 
-rvm rbx-2.2.10 do bundle install --gemfile=$TROOT/Gemfile
+rvm rbx-$RBX_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-rvm rbx-2.2.10 do bundle exec puma -b tcp://0.0.0.0:8080 -e production &
+rvm rbx-$RBX_VERSION do bundle exec puma -b tcp://0.0.0.0:8080 -e production &

frameworks/Ruby/grape/run_thin.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-fw_depends rvm ruby-2.0.0
+fw_depends rvm ruby-2.0
 
 sed -i 's|  host:.*|  host: '"${DBHOST}"'|g' config/database.yml
 
-rvm ruby-2.0.0-p0 do bundle install --gemfile=$TROOT/Gemfile --path vendor/bundle
+rvm ruby-$MRI_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-rvm ruby-2.0.0-p0 do bundle exec thin start -C config/thin.yml &
+rvm ruby-$MRI_VERSION do bundle exec thin start -C config/thin.yml &

frameworks/Ruby/grape/run_torqbox.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-fw_depends rvm java jruby-1.7.8
+fw_depends rvm jruby-1.7
 
 sed -i 's|  host:.*|  host: '"${DBHOST}"'|g' config/database.yml
 
-rvm jruby-1.7.8 do bundle install --gemfile=$TROOT/Gemfile
+rvm jruby-$JRUBY_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-rvm jruby-1.7.8 do bundle exec torqbox -b 0.0.0.0 -E production &
+rvm jruby-$JRUBY_VERSION do bundle exec torqbox -b 0.0.0.0 -E production &

frameworks/Ruby/grape/run_trinidad.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-fw_depends rvm java jruby-1.7.8
+fw_depends rvm jruby-1.7
 
 sed -i 's|  host:.*|  host: '"${DBHOST}"'|g' config/database.yml
 
-rvm jruby-1.7.8 do bundle install --gemfile=$TROOT/Gemfile
+rvm jruby-$JRUBY_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-rvm jruby-1.7.8 do bundle exec trinidad --config config/trinidad.yml &
+rvm jruby-$JRUBY_VERSION do bundle exec trinidad --config config/trinidad.yml &

frameworks/Ruby/grape/run_unicorn.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 
-fw_depends rvm nginx ruby-2.0.0
+fw_depends rvm nginx ruby-2.0
 
 sed -i 's|  host:.*|  host: '"${DBHOST}"'|g' config/database.yml
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' config/nginx.conf
 
 nginx -c $TROOT/config/nginx.conf
 
-rvm ruby-2.0.0-p0 do bundle install --gemfile=$TROOT/Gemfile --path vendor/bundle
+rvm ruby-$MRI_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-rvm ruby-2.0.0-p0 do bundle exec unicorn -E production -c config/unicorn.rb &
+rvm ruby-$MRI_VERSION do bundle exec unicorn -E production -c config/unicorn.rb &

frameworks/Ruby/ngx_mruby/setup.sh

@@ -7,15 +7,15 @@ fw_depends rvm nginx
 # in Travis-CI
 if [ "$TRAVIS" = "true" ]
 then
-  rvmsudo rvm install ruby-2.0.0-p0
+  rvmsudo rvm install ruby-2.0
 else
-  rvm install ruby-2.0.0-p0
+  rvm install ruby-2.0
 fi
 
 sed -i 's|CWD|'"${TROOT}"'|g' nginx.conf
 sed -i 's|DBHOSTNAME|'"${DBHOST}"'|g' nginx.conf
 
-rvm use ruby-2.0.0-p0
+rvm use ruby-2.0
 
 RETCODE=$(fw_exists ${IROOT}/nginx_mruby.installed)
 [ "$RETCODE" == 0 ] || { \

frameworks/Ruby/padrino/.gitignore

@@ -0,0 +1,2 @@
+.bundle
+vendor/bundle

frameworks/Ruby/padrino/run_jruby_puma.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_depends rvm java jruby-1.7.8
+fw_depends rvm jruby-1.7
 
-rvm jruby-1.7.8 do bundle install --gemfile=$TROOT/Gemfile
+rvm jruby-$JRUBY_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-DB_HOST=${DBHOST} rvm jruby-1.7.8 do bundle exec puma -C config/puma.rb &
+DB_HOST=${DBHOST} rvm jruby-$JRUBY_VERSION do bundle exec puma -C config/puma.rb &

frameworks/Ruby/padrino/run_mri_puma.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_depends rvm java ruby-2.0.0-p0
+fw_depends rvm ruby-2.0
 
-rvm ruby-2.0.0-p0 do bundle install --gemfile=$TROOT/Gemfile --path vendor/bundle
+rvm ruby-$MRI_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-DB_HOST=${DBHOST} rvm ruby-2.0.0-p0 do bundle exec puma -C config/puma.rb -w 8 --preload &
+DB_HOST=${DBHOST} rvm ruby-$MRI_VERSION do bundle exec puma -C config/puma.rb -w 8 --preload &

frameworks/Ruby/padrino/run_rbx_puma.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_depends rvm rbx-2.2.10
+fw_depends rvm rbx-2.4
 
-rvm rbx-2.2.10 do bundle install --gemfile=$TROOT/Gemfile
+rvm rbx-$RBX_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-DB_HOST=${DBHOST} rvm rbx-2.2.10 do bundle exec puma &
+DB_HOST=${DBHOST} rvm rbx-$RBX_VERSION do bundle exec puma &

frameworks/Ruby/padrino/run_thin.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_depends rvm ruby-2.0.0
+fw_depends rvm ruby-2.0
 
-rvm ruby-2.0.0-p0 do bundle install --gemfile=$TROOT/Gemfile --path vendor/bundle
+rvm ruby-$MRI_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-DB_HOST=${DBHOST} rvm ruby-2.0.0-p0 do bundle exec thin start -C config/thin.yml &
+DB_HOST=${DBHOST} rvm ruby-$MRI_VERSION do bundle exec thin start -C config/thin.yml &

frameworks/Ruby/padrino/run_torqbox.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_depends rvm java jruby-1.7.8
+fw_depends rvm jruby-1.7
 
-rvm jruby-1.7.8 do bundle install --gemfile=$TROOT/Gemfile
+rvm jruby-$JRUBY_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-DB_HOST=${DBHOST} rvm jruby-1.7.8 do bundle exec torqbox -b 0.0.0.0 -E production &
+DB_HOST=${DBHOST} rvm jruby-$JRUBY_VERSION do bundle exec torqbox -b 0.0.0.0 -E production &

frameworks/Ruby/padrino/run_trinidad.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_depends rvm java jruby-1.7.8
+fw_depends rvm jruby-1.7
 
-rvm jruby-1.7.8 do bundle install --gemfile=$TROOT/Gemfile
+rvm jruby-$JRUBY_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-DB_HOST=${DBHOST} rvm jruby-1.7.8 do bundle exec trinidad --config config/trinidad.yml &
+DB_HOST=${DBHOST} rvm jruby-$JRUBY_VERSION do bundle exec trinidad --config config/trinidad.yml &

frameworks/Ruby/padrino/run_unicorn.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 
-fw_depends rvm nginx ruby-2.0.0
+fw_depends rvm nginx ruby-2.0
 
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' config/nginx.conf
 
-rvm ruby-2.0.0-p0 do bundle install --gemfile=$TROOT/Gemfile --path vendor/bundle
+rvm ruby-$MRI_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
 nginx -c $TROOT/config/nginx.conf
 
-DB_HOST=${DBHOST} rvm ruby-2.0.0-p0 do bundle exec unicorn -E production -c config/unicorn.rb &
+DB_HOST=${DBHOST} rvm ruby-$MRI_VERSION do bundle exec unicorn -E production -c config/unicorn.rb &

frameworks/Ruby/rack/.gitignore

@@ -0,0 +1,2 @@
+.bundle
+vendor/bundle

frameworks/Ruby/rack/run_jruby_puma.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-fw_depends rvm java jruby-1.7.8
+fw_depends rvm jruby-1.7
 
 sed -i 's|127.0.0.1|'${DBHOST}'|g' config/database.yml
 
-rvm jruby-1.7.8 do bundle install --gemfile=$TROOT/Gemfile
+rvm jruby-$JRUBY_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-rvm jruby-1.7.8 do bundle exec puma -b tcp://0.0.0.0:8080 -e production &
+rvm jruby-$JRUBY_VERSION do bundle exec puma -b tcp://0.0.0.0:8080 -e production &

frameworks/Ruby/rack/run_mri_puma.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-fw_depends rvm ruby-2.0.0
+fw_depends rvm ruby-2.0
 
 sed -i 's|127.0.0.1|'${DBHOST}'|g' config/database.yml
 
-rvm ruby-2.0.0-p0 do bundle install --gemfile=$TROOT/Gemfile --path vendor/bundle
+rvm ruby-$MRI_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-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 &
+rvm ruby-$MRI_VERSION do bundle exec puma -t 8:32 -w 8 --preload -b tcp://0.0.0.0:8080 -e production &

frameworks/Ruby/rack/run_rbx_puma.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-fw_depends rvm rbx-2.2.10
+fw_depends rvm rbx-2.4
 
 sed -i 's|127.0.0.1|'${DBHOST}'|g' config/database.yml
 
-rvm rbx-2.2.10 do bundle install --gemfile=$TROOT/Gemfile
+rvm rbx-$RBX_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-rvm rbx-2.2.10 do bundle exec puma -b tcp://0.0.0.0:8080 -e production &
+rvm rbx-$RBX_VERSION do bundle exec puma -b tcp://0.0.0.0:8080 -e production &

frameworks/Ruby/rack/run_thin.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-fw_depends rvm ruby-2.0.0
+fw_depends rvm ruby-2.0
 
 sed -i 's|127.0.0.1|'${DBHOST}'|g' config/database.yml
 
-rvm ruby-2.0.0-p0 do bundle install --gemfile=$TROOT/Gemfile --path vendor/bundle
+rvm ruby-$MRI_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-rvm ruby-2.0.0-p0 do bundle exec thin start -C config/thin.yml &
+rvm ruby-$MRI_VERSION do bundle exec thin start -C config/thin.yml &

frameworks/Ruby/rack/run_torqbox.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-fw_depends rvm java jruby-1.7.8
+fw_depends rvm jruby-1.7
 
 sed -i 's|127.0.0.1|'${DBHOST}'|g' config/database.yml
 
-rvm jruby-1.7.8 do bundle install --gemfile=$TROOT/Gemfile
+rvm jruby-$JRUBY_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-rvm jruby-1.7.8 do bundle exec torqbox -b 0.0.0.0 -E production &
+rvm jruby-$JRUBY_VERSION do bundle exec torqbox -b 0.0.0.0 -E production &

frameworks/Ruby/rack/run_trinidad.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-fw_depends rvm java jruby-1.7.8
+fw_depends rvm jruby-1.7
 
 sed -i 's|127.0.0.1|'${DBHOST}'|g' config/database.yml
 
-rvm jruby-1.7.8 do bundle install --gemfile=$TROOT/Gemfile
+rvm jruby-$JRUBY_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-rvm jruby-1.7.8 do bundle exec trinidad --config config/trinidad.yml &
+rvm jruby-$JRUBY_VERSION do bundle exec trinidad --config config/trinidad.yml &

frameworks/Ruby/rack/run_unicorn.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 
-fw_depends rvm nginx ruby-2.0.0
+fw_depends rvm nginx ruby-2.0
 
 sed -i 's|127.0.0.1|'${DBHOST}'|g' config/database.yml
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' config/nginx.conf
 
-rvm ruby-2.0.0-p0 do bundle install --gemfile=$TROOT/Gemfile --path vendor/bundle
+rvm ruby-$MRI_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
 nginx -c $TROOT/config/nginx.conf
 
-rvm ruby-2.0.0-p0 do bundle exec unicorn -E production -c config/unicorn.rb &
+rvm ruby-$MRI_VERSION do bundle exec unicorn -E production -c config/unicorn.rb &

frameworks/Ruby/rails-stripped/.gitignore

@@ -0,0 +1,2 @@
+.bundle
+vendor/bundle

frameworks/Ruby/rails-stripped/setup_jruby.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-fw_depends rvm java jruby-1.7.8
+fw_depends rvm jruby-1.7
 
 sed -i 's|host: .*|host: '"${DBHOST}"'|g' config/database.yml
 
-rvm jruby-1.7.8 do bundle install --gemfile=$TROOT/Gemfile
+rvm jruby-$JRUBY_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-rvm jruby-1.7.8 do bundle exec torqbox -b 0.0.0.0 -E production &
+rvm jruby-$JRUBY_VERSION do bundle exec torqbox -b 0.0.0.0 -E production &

frameworks/Ruby/rails-stripped/setup_ruby.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 
-fw_depends rvm ruby-2.0.0 nginx
+fw_depends rvm ruby-2.0 nginx
 
 sed -i 's|host: .*|host: '"${DBHOST}"'|g' config/database.yml
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' config/nginx.conf
 
-rvm ruby-2.0.0-p0 do bundle install --gemfile=$TROOT/Gemfile --path=vendor/bundle
+rvm ruby-$MRI_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
 nginx -c $TROOT/config/nginx.conf
 
-rvm ruby-2.0.0-p0 do bundle exec unicorn_rails -E production -c $TROOT/config/unicorn.rb &
+rvm ruby-$MRI_VERSION do bundle exec unicorn_rails -E production -c $TROOT/config/unicorn.rb &

frameworks/Ruby/rails/.gitignore

@@ -0,0 +1,2 @@
+.bundle
+vendor/bundle

frameworks/Ruby/rails/run_jruby_puma.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_depends rvm java jruby-1.7.13
+fw_depends rvm jruby-1.7
 
-rvm jruby-1.7.13 do bundle install --gemfile=$TROOT/Gemfile
+rvm jruby-$JRUBY_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-DB_HOST=${DBHOST} rvm jruby-1.7.13 do bundle exec puma -b tcp://0.0.0.0:8080 -e production &
+DB_HOST=${DBHOST} rvm jruby-$JRUBY_VERSION do bundle exec puma -b tcp://0.0.0.0:8080 -e production &

frameworks/Ruby/rails/run_mri_puma.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_depends rvm ruby-2.1.2
+fw_depends rvm ruby-2.1
 
-rvm 2.1.2 do bundle install --gemfile=$TROOT/Gemfile
+rvm ruby-$MRI_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-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 &
+DB_HOST=${DBHOST} rvm ruby-$MRI_VERSION do bundle exec puma -t 8:32 -w 8 --preload -b tcp://0.0.0.0:8080 -e production &

frameworks/Ruby/rails/run_rbx_puma.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_depends rvm rbx-2.2.10
+fw_depends rvm rbx-2.4
 
-rvm rbx-2.2.10 do bundle install --gemfile=$TROOT/Gemfile
+rvm rbx-$RBX_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-DB_HOST=${DBHOST} rvm rbx-2.2.10 do bundle exec puma -b tcp://0.0.0.0:8080 -e production &
+DB_HOST=${DBHOST} rvm rbx-$RBX_VERSION do bundle exec puma -b tcp://0.0.0.0:8080 -e production &

frameworks/Ruby/rails/run_thin.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_depends rvm ruby-2.1.2
+fw_depends rvm ruby-2.1
 
-rvm 2.1.2 do bundle install --gemfile=$TROOT/Gemfile
+rvm ruby-$MRI_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-DB_HOST=${DBHOST} rvm ruby-2.1.2 do bundle exec thin start -C config/thin.yml &
+DB_HOST=${DBHOST} rvm ruby-$MRI_VERSION do bundle exec thin start -C config/thin.yml &

frameworks/Ruby/rails/run_torqbox.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_depends rvm java jruby-1.7.13
+fw_depends rvm jruby-1.7
 
-rvm jruby-1.7.13 do bundle install --gemfile=$TROOT/Gemfile
+rvm jruby-$JRUBY_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-DB_HOST=${DBHOST} rvm jruby-1.7.13 do bundle exec torqbox -b 0.0.0.0 -E production &
+DB_HOST=${DBHOST} rvm jruby-$JRUBY_VERSION do bundle exec torqbox -b 0.0.0.0 -E production &

frameworks/Ruby/rails/run_trinidad.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_depends rvm java jruby-1.7.13
+fw_depends rvm jruby-1.7
 
-rvm jruby-1.7.13 do bundle install --gemfile=$TROOT/Gemfile
+rvm jruby-$JRUBY_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-DB_HOST=${DBHOST} rvm jruby-1.7.13 do bundle exec trinidad --config config/trinidad.yml &
+DB_HOST=${DBHOST} rvm jruby-$JRUBY_VERSION do bundle exec trinidad --config config/trinidad.yml &

frameworks/Ruby/rails/run_unicorn.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 
-fw_depends rvm ruby-2.1.2 nginx
+fw_depends rvm ruby-2.1 nginx
 
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' config/nginx.conf
 
-rvm 2.1.2 do bundle install --gemfile=$TROOT/Gemfile
+rvm ruby-$MRI_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
 nginx -c $TROOT/config/nginx.conf
 
-DB_HOST=${DBHOST} rvm 2.1.2 do bundle exec unicorn_rails -E production -c $TROOT/config/unicorn.rb &
+DB_HOST=${DBHOST} rvm ruby-$MRI_VERSION do bundle exec unicorn_rails -E production -c $TROOT/config/unicorn.rb &

frameworks/Ruby/sinatra/.gitignore

@@ -0,0 +1,2 @@
+.bundle
+vendor/bundle

frameworks/Ruby/sinatra/run_jruby_puma.sh

@@ -1,9 +1,7 @@
 #!/bin/bash
 
-fw_depends rvm java jruby-1.7.8
+fw_depends rvm jruby-1.7
 
-rvm jruby-1.7.8 do bundle install --gemfile=$TROOT/Gemfile
+rvm jruby-$JRUBY_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-rvm jruby-1.7.8 do bundle --jobs 4
-
-DB_HOST=${DBHOST} rvm jruby-1.7.8 do bundle exec puma -C config/puma.rb &
+DB_HOST=${DBHOST} rvm jruby-$JRUBY_VERSION do bundle exec puma -C config/puma.rb &

frameworks/Ruby/sinatra/run_mri_puma.sh

@@ -1,9 +1,7 @@
 #!/bin/bash
 
-fw_depends rvm ruby-2.0.0
+fw_depends rvm ruby-2.0
 
-rvm jruby-1.7.8 do bundle install --gemfile=$TROOT/Gemfile
+rvm ruby-$MRI_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-rvm ruby-2.0.0-p0 do bundle --jobs 4
-
-DB_HOST=${DBHOST} rvm ruby-2.0.0-p0 do bundle exec puma -C config/puma.rb -w 8 --preload &
+DB_HOST=${DBHOST} rvm ruby-$MRI_VERSION do bundle exec puma -C config/puma.rb -w 8 --preload &

frameworks/Ruby/sinatra/run_rbx_puma.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_depends rvm rbx-2.2.10
+fw_depends rvm rbx-2.4
 
-rvm rbx-2.2.10 do bundle install --gemfile=$TROOT/Gemfile
+rvm rbx-$RBX_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-DB_HOST=${DBHOST} rvm rbx-2.2.10 do bundle exec puma &
+DB_HOST=${DBHOST} rvm rbx-$RBX_VERSION do bundle exec puma &

frameworks/Ruby/sinatra/run_thin.sh

@@ -1,9 +1,7 @@
 #!/bin/bash
 
-fw_depends rvm ruby-2.0.0
+fw_depends rvm ruby-2.0
 
-rvm ruby-2.0.0-p0 do bundle install --gemfile=$TROOT/Gemfile --path=vendor/bundle
+rvm ruby-$MRI_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-rvm ruby-2.0.0-p0 do bundle --jobs 4
-
-DB_HOST=${DBHOST} rvm ruby-2.0.0-p0 do bundle exec thin start -C config/thin.yml &
+DB_HOST=${DBHOST} rvm ruby-$MRI_VERSION do bundle exec thin start -C config/thin.yml &

frameworks/Ruby/sinatra/run_torqbox.sh

@@ -1,9 +1,7 @@
 #!/bin/bash
 
-fw_depends rvm java jruby-1.7.8
+fw_depends rvm jruby-1.7
 
-rvm jruby-1.7.8 do bundle install --gemfile=$TROOT/Gemfile
+rvm jruby-$JRUBY_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-rvm jruby-1.7.8 do bundle --jobs 4
-
-DB_HOST=${DBHOST} rvm jruby-1.7.8 do bundle exec torqbox -b 0.0.0.0 -E production &
+DB_HOST=${DBHOST} rvm jruby-$JRUBY_VERSION do bundle exec torqbox -b 0.0.0.0 -E production &

frameworks/Ruby/sinatra/run_trinidad.sh

@@ -1,9 +1,7 @@
 #!/bin/bash
 
-fw_depends rvm java jruby-1.7.8
+fw_depends rvm jruby-1.7
 
-rvm jruby-1.7.8 do bundle install --gemfile=$TROOT/Gemfile
+rvm jruby-$JRUBY_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
-rvm jruby-1.7.8 do bundle --jobs 4
-
-DB_HOST=${DBHOST} rvm jruby-1.7.8 do bundle exec trinidad --config config/trinidad.yml &
+DB_HOST=${DBHOST} rvm jruby-$JRUBY_VERSION do bundle exec trinidad --config config/trinidad.yml &

frameworks/Ruby/sinatra/run_unicorn.sh

@@ -1,13 +1,11 @@
 #!/bin/bash
 
-fw_depends rvm ruby-2.0.0 nginx
+fw_depends rvm ruby-2.0 nginx
 
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' config/nginx.conf
 
-rvm ruby-2.0.0-p0 do bundle install --gemfile=$TROOT/Gemfile --path=vendor/bundle
-
-rvm ruby-2.0.0-p0 do bundle --jobs 4
+rvm ruby-$MRI_VERSION do bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
 
 nginx -c $TROOT/config/nginx.conf
 
-DB_HOST=${DBHOST} rvm ruby-2.0.0-p0 do bundle exec unicorn -E production -c config/unicorn.rb &
+DB_HOST=${DBHOST} rvm ruby-$MRI_VERSION do bundle exec unicorn -E production -c config/unicorn.rb &

toolset/setup/linux/languages/jruby-1.7.8.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-fw_depends rvm
-
-JRUBY_VERSION="1.7.8"
-RETCODE=$(fw_exists ${IROOT}/jruby-${JRUBY_VERSION}.installed)
-[ ! "$RETCODE" == 0 ] || { \
-  # Load environment variables
-  source $IROOT/jruby-$JRUBY_VERSION.installed
-  return 0; }
-
-# We assume single-user installation as 
-# done in our rvm.sh script and 
-# in Travis-CI
-if [ "$TRAVIS" = "true" ]
-then
-  rvmsudo rvm install jruby-$JRUBY_VERSION
-  # Bundler is SOMETIMES missing... not sure why.
-  rvmsudo rvm jruby-$JRUBY_VERSION do gem install bundler
-else
-  rvm install jruby-$JRUBY_VERSION
-  # Bundler is SOMETIMES missing... not sure why.
-  rvm jruby-$JRUBY_VERSION do gem install bundler
-fi
-
-echo "" > $IROOT/jruby-$JRUBY_VERSION.installed
-
-source $IROOT/jruby-$JRUBY_VERSION.installed

toolset/setup/linux/languages/jruby-1.7.13.sh → toolset/setup/linux/languages/jruby-1.7.sh

@@ -1,14 +1,17 @@
 #!/bin/bash
 
-fw_depends rvm
+fw_depends rvm java
 
-JRUBY_VERSION="1.7.13"
 RETCODE=$(fw_exists ${IROOT}/jruby-${JRUBY_VERSION}.installed)
 [ ! "$RETCODE" == 0 ] || { \
   # Load environment variables
   source $IROOT/jruby-$JRUBY_VERSION.installed
   return 0; }
 
+# rvm stable [typically] only provides one version of jruby-1.7
+# update this when it changes
+JRUBY_VERSION="1.7.19"
+
 # We assume single-user installation as 
 # done in our rvm.sh script and 
 # in Travis-CI
@@ -23,6 +26,6 @@ else
   rvm jruby-$JRUBY_VERSION do gem install bundler
 fi
 
-echo "" > $IROOT/jruby-$JRUBY_VERSION.installed
+echo "export JRUBY_VERSION=${JRUBY_VERSION}" > $IROOT/jruby-$JRUBY_VERSION.installed
 
 source $IROOT/jruby-$JRUBY_VERSION.installed

toolset/setup/linux/languages/jruby-9k.sh

@@ -2,16 +2,16 @@
 
 fw_depends rvm java
 
-# rvm stable [typically] only provides one version of jruby-9.0
-# update this when it changes
-JRUBY_VERSION="9.0.0.0.pre1"
-
-RETCODE=$(fw_exists ${IROOT}/jruby-${JRUBY_VERSION}.installed)
+RETCODE=$(fw_exists ${IROOT}/jruby-9k.installed)
 [ ! "$RETCODE" == 0 ] || { \
   # Load environment variables
-  source $IROOT/jruby-$JRUBY_VERSION.installed
+  source $IROOT/jruby-9k.installed
   return 0; }
 
+# rvm stable [typically] only provides one version of jruby-9.0
+# update this when it changes
+JRUBY_VERSION="9.0.0.0.pre1"
+
 # We assume single-user installation as
 # done in our rvm.sh script and
 # in Travis-CI
@@ -26,6 +26,6 @@ else
   rvm jruby-$JRUBY_VERSION do gem install bundler
 fi
 
-echo "" > $IROOT/jruby-$JRUBY_VERSION.installed
+echo "export JRUBY_VERSION=${JRUBY_VERSION}" > $IROOT/jruby-9k.installed
 
-source $IROOT/jruby-$JRUBY_VERSION.installed
+source $IROOT/jruby-9k.installed

toolset/setup/linux/languages/rbx-2.2.10.sh

@@ -1,32 +0,0 @@
-#!/bin/bash
-
-fw_depends rvm
-
-RETCODE=$(fw_exists ${IROOT}/rbx.installed)
-[ ! "$RETCODE" == 0 ] || { \
-  # Load environment variables
-  source $IROOT/rbx.installed
-  return 0; }
-
-VERSION=2.2.10
-
-# We assume single-user installation as 
-# done in our rvm.sh script and 
-# in Travis-CI
-if [ "$TRAVIS" = "true" ]
-then
-  # Rubinus cannot find libc during configure unless
-  # you specify bash as the shell.
-  SHELL="/bin/bash" rvmsudo rvm install rbx-$VERSION
-  # Bundler is SOMETIMES missing... not sure why.
-  SHELL="/bin/bash" rvmsudo rvm rbx-$VERSION do gem install bundler
-else
-  SHELL="/bin/bash" rvm install rbx-$VERSION
-  # Bundler is SOMETIMES missing... not sure why.
-  SHELL="/bin/bash" rvm rbx-$VERSION do gem install bundler
-fi
-
-echo "export LC_ALL=en_US.UTF-8" > $IROOT/rbx.installed
-echo "export LANG=en_US.UTF-8" >> $IROOT/rbx.installed
-
-source $IROOT/rbx.installed

toolset/setup/linux/languages/rbx-2.4.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+fw_depends rvm
+
+RETCODE=$(fw_exists ${IROOT}/rbx-2.4.installed)
+[ ! "$RETCODE" == 0 ] || { \
+  # Load environment variables
+  source $IROOT/rbx-2.4.installed
+  return 0; }
+
+# rvm stable [typically] only provides one version of rbx-2.4
+# update this when it changes
+RBX_VERSION=2.4.1
+
+# We assume single-user installation as
+# done in our rvm.sh script and
+# in Travis-CI
+if [ "$TRAVIS" = "true" ]
+then
+  # Rubinus cannot find libc during configure unless
+  # you specify bash as the shell.
+  SHELL="/bin/bash" rvmsudo rvm install rbx-$RBX_VERSION
+  # Bundler is SOMETIMES missing... not sure why.
+  SHELL="/bin/bash" rvmsudo rvm rbx-$RBX_VERSION do gem install bundler
+else
+  SHELL="/bin/bash" rvm install rbx-$RBX_VERSION
+  # Bundler is SOMETIMES missing... not sure why.
+  SHELL="/bin/bash" rvm rbx-$RBX_VERSION do gem install bundler
+fi
+
+echo "export LC_ALL=en_US.UTF-8" > $IROOT/rbx-2.4.installed
+echo "export LANG=en_US.UTF-8" >> $IROOT/rbx-2.4.installed
+echo "export RBX_VERSION=${RBX_VERSION}" >> $IROOT/rbx-2.4.installed
+
+source $IROOT/rbx-2.4.installed

toolset/setup/linux/languages/rbx-2.5.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+fw_depends rvm
+
+RETCODE=$(fw_exists ${IROOT}/rbx-2.5.installed)
+[ ! "$RETCODE" == 0 ] || { \
+  # Load environment variables
+  source $IROOT/rbx-2.5.installed
+  return 0; }
+
+# rvm stable [typically] only provides one version of rbx-2.5
+# update this when it changes
+RBX_VERSION=2.5.2
+
+# We assume single-user installation as
+# done in our rvm.sh script and
+# in Travis-CI
+if [ "$TRAVIS" = "true" ]
+then
+  # Rubinus cannot find libc during configure unless
+  # you specify bash as the shell.
+  SHELL="/bin/bash" rvmsudo rvm install rbx-$RBX_VERSION
+  # Bundler is SOMETIMES missing... not sure why.
+  SHELL="/bin/bash" rvmsudo rvm rbx-$RBX_VERSION do gem install bundler
+else
+  SHELL="/bin/bash" rvm install rbx-$RBX_VERSION
+  # Bundler is SOMETIMES missing... not sure why.
+  SHELL="/bin/bash" rvm rbx-$RBX_VERSION do gem install bundler
+fi
+
+echo "export LC_ALL=en_US.UTF-8" > $IROOT/rbx-2.5.installed
+echo "export LANG=en_US.UTF-8" >> $IROOT/rbx-2.5.installed
+echo "export RBX_VERSION=${RBX_VERSION}" >> $IROOT/rbx-2.5.installed
+
+source $IROOT/rbx-2.5.installed

toolset/setup/linux/languages/ruby-2.0.0.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-fw_depends rvm
-
-VERSION=2.0.0-p0
-RETCODE=$(fw_exists ${IROOT}/ruby-${VERSION}.installed)
-[ ! "$RETCODE" == 0 ] || { \
-  # Load environment variables
-  source $IROOT/ruby-$VERSION.installed
-  return 0; }
-
-# We assume single-user installation as 
-# done in our rvm.sh script and 
-# in Travis-CI
-if [ "$TRAVIS" = "true" ]
-then
-  rvmsudo rvm install $VERSION
-  # Bundler is SOMETIMES missing... not sure why.
-  rvmsudo rvm $VERSION do gem install bundler
-else
-  rvm install $VERSION
-  # Bundler is SOMETIMES missing... not sure why.
-  rvm $VERSION do gem install bundler
-fi
-
-echo "" > $IROOT/ruby-$VERSION.installed
-
-source $IROOT/ruby-$VERSION.installed

toolset/setup/linux/languages/ruby-2.0.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+fw_depends rvm
+
+RETCODE=$(fw_exists ${IROOT}/ruby-2.0.installed)
+[ ! "$RETCODE" == 0 ] || { \
+  # Load environment variables
+  source $IROOT/ruby-2.0.installed
+  return 0; }
+
+# rvm stable [typically] only provides one version of ruby-2.0
+# update this when it changes
+MRI_VERSION=2.0.0-p643
+
+# We assume single-user installation as
+# done in our rvm.sh script and
+# in Travis-CI
+if [ "$TRAVIS" = "true" ]
+then
+  rvmsudo rvm install $MRI_VERSION
+  # Bundler is SOMETIMES missing... not sure why.
+  rvmsudo rvm $MRI_VERSION do gem install bundler
+else
+  rvm install $MRI_VERSION
+  # Bundler is SOMETIMES missing... not sure why.
+  rvm $MRI_VERSION do gem install bundler
+fi
+
+echo "export MRI_VERSION=${MRI_VERSION}" > $IROOT/ruby-2.0.installed
+
+source $IROOT/ruby-2.0.installed

toolset/setup/linux/languages/ruby-2.1.2.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-fw_depends rvm
-
-VERSION=2.1.2
-RETCODE=$(fw_exists ${IROOT}/ruby-${VERSION}.installed)
-[ ! "$RETCODE" == 0 ] || { \
-  # Load environment variables
-  source $IROOT/ruby-$VERSION.installed
-  return 0; }
-
-# We assume single-user installation as 
-# done in our rvm.sh script and 
-# in Travis-CI
-if [ "$TRAVIS" = "true" ]
-then
-  rvmsudo rvm install $VERSION
-  # Bundler is SOMETIMES missing... not sure why.
-  rvmsudo rvm $VERSION do gem install bundler
-else
-  rvm install $VERSION
-  # Bundler is SOMETIMES missing... not sure why.
-  rvm $VERSION do gem install bundler
-fi
-
-echo "" > $IROOT/ruby-$VERSION.installed
-
-source $IROOT/ruby-$VERSION.installed

toolset/setup/linux/languages/ruby-2.1.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+fw_depends rvm
+
+RETCODE=$(fw_exists ${IROOT}/ruby-2.1.installed)
+[ ! "$RETCODE" == 0 ] || { \
+  # Load environment variables
+  source $IROOT/ruby-2.1.installed
+  return 0; }
+
+# rvm stable [typically] only provides one version of ruby-2.1
+# update this when it changes
+MRI_VERSION=2.1.5
+
+# We assume single-user installation as
+# done in our rvm.sh script and
+# in Travis-CI
+if [ "$TRAVIS" = "true" ]
+then
+  rvmsudo rvm install $MRI_VERSION
+  # Bundler is SOMETIMES missing... not sure why.
+  rvmsudo rvm $MRI_VERSION do gem install bundler
+else
+  rvm install $MRI_VERSION
+  # Bundler is SOMETIMES missing... not sure why.
+  rvm $MRI_VERSION do gem install bundler
+fi
+
+echo "export MRI_VERSION=${MRI_VERSION}" > $IROOT/ruby-2.1.installed
+
+source $IROOT/ruby-2.1.installed

toolset/setup/linux/languages/ruby-2.2.sh

@@ -2,16 +2,16 @@
 
 fw_depends rvm
 
-# rvm stable [typically] only provides one version of ruby-2.2
-# update this when it changes
-MRI_VERSION=2.2.1
-
-RETCODE=$(fw_exists ${IROOT}/ruby-${MRI_VERSION}.installed)
+RETCODE=$(fw_exists ${IROOT}/ruby-2.2.installed)
 [ ! "$RETCODE" == 0 ] || { \
   # Load environment variables
-  source $IROOT/ruby-$MRI_VERSION.installed
+  source $IROOT/ruby-2.2.installed
   return 0; }
 
+# rvm stable [typically] only provides one version of ruby-2.2
+# update this when it changes
+MRI_VERSION=2.2.1
+
 # We assume single-user installation as
 # done in our rvm.sh script and
 # in Travis-CI
@@ -26,6 +26,6 @@ else
   rvm $MRI_VERSION do gem install bundler
 fi
 
-echo "" > $IROOT/ruby-$MRI_VERSION.installed
+echo "export MRI_VERSION=${MRI_VERSION}" > $IROOT/ruby-2.2.installed
 
-source $IROOT/ruby-$MRI_VERSION.installed
+source $IROOT/ruby-2.2.installed