[Ruby] Fix TorqueBox label and update MRI/JRuby versions (#2604)

* [Ruby] Fix TorqueBox benchmark descriptions

* [Ruby] Update MRI 2.4 and JRuby 9.1 versions

...and work-around a regression in JRuby's String#% and Kernel.sprintf
(jruby/jruby#4542).

frameworks/Ruby/rack-sequel/benchmark_config.json

@@ -64,7 +64,7 @@
         "language": "Ruby",
         "orm": "Micro",
         "platform": "Rack",
-        "webserver": "Passenger Standalone",
+        "webserver": "Passenger",
         "os": "Linux",
         "database_os": "Linux",
         "display_name": "rack-sequel-passenger-mri",
@@ -87,7 +87,7 @@
         "language": "Ruby",
         "orm": "Micro",
         "platform": "Rack",
-        "webserver": "Passenger Standalone",
+        "webserver": "Passenger",
         "os": "Linux",
         "database_os": "Linux",
         "display_name": "rack-sequel-postgres-passenger-mri",
@@ -155,8 +155,8 @@
         "framework": "rack-sequel",
         "language": "Ruby",
         "orm": "Micro",
-        "platform": "JRuby",
-        "webserver": "Puma",
+        "platform": "Rack",
+        "webserver": "TorqueBox",
         "os": "Linux",
         "database_os": "Linux",
         "display_name": "rack-sequel-torquebox-jruby",
@@ -178,8 +178,8 @@
         "framework": "rack-sequel",
         "language": "Ruby",
         "orm": "Micro",
-        "platform": "JRuby",
-        "webserver": "Puma",
+        "platform": "Rack",
+        "webserver": "TorqueBox",
         "os": "Linux",
         "database_os": "Linux",
         "display_name": "rack-sequel-postgres-torquebox-jruby",

frameworks/Ruby/rack-sequel/benchmark_config.yaml

@@ -31,7 +31,6 @@ tests:
     puma-jruby:
       <<: *default
       setup_file: run_jruby_puma
-      platform: JRuby
       display_name: rack-sequel-puma-jruby
       versus: rack-puma-jruby
       disabled: true
@@ -39,21 +38,20 @@ tests:
       <<: *default
       setup_file: run_jruby_puma
       database: Postgres
-      platform: JRuby
       display_name: rack-sequel-postgres-puma-jruby
       versus: ~
       disabled: true
     passenger-mri:
       <<: *default
       setup_file: run_mri_passenger
-      webserver: Passenger Standalone
+      webserver: Passenger
       display_name: rack-sequel-passenger-mri
       versus: ~
     postgres-passenger-mri:
       <<: *default
       setup_file: run_mri_passenger
       database: Postgres
-      webserver: Passenger Standalone
+      webserver: Passenger
       display_name: rack-sequel-postgres-passenger-mri
       versus: ~
     unicorn-mri:
@@ -72,13 +70,13 @@ tests:
     torquebox-jruby:
       <<: *default
       setup_file: run_jruby_torquebox
-      platform: JRuby
+      webserver: TorqueBox
       display_name: rack-sequel-torquebox-jruby
       versus: rack-torqbox-jruby
     postgres-torquebox-jruby:
       <<: *default
       setup_file: run_jruby_torquebox
       database: Postgres
-      platform: JRuby
+      webserver: TorqueBox
       display_name: rack-sequel-postgres-torquebox-jruby
       versus: ~

frameworks/Ruby/rack-sequel/boot.rb

@@ -43,7 +43,7 @@ def connect(dbtype)
   end
 
   Sequel.connect \
-    '%<adapter>s://%<host>s/%<database>s?user=%<user>s&password=%<password>s' % {
+    '%{adapter}://%{host}/%{database}?user=%{user}&password=%{password}' % {
       :adapter=>adapters.fetch(dbtype).fetch(defined?(JRUBY_VERSION) ? :jruby : :mri),
       :host=>ENV.fetch('DBHOST', '127.0.0.1'),
       :database=>'hello_world',

frameworks/Ruby/roda-sequel/benchmark_config.json

@@ -64,7 +64,7 @@
         "language": "Ruby",
         "orm": "Full",
         "platform": "Rack",
-        "webserver": "Passenger Standalone",
+        "webserver": "Passenger",
         "os": "Linux",
         "database_os": "Linux",
         "display_name": "roda-sequel-passenger-mri",
@@ -87,7 +87,7 @@
         "language": "Ruby",
         "orm": "Full",
         "platform": "Rack",
-        "webserver": "Passenger Standalone",
+        "webserver": "Passenger",
         "os": "Linux",
         "database_os": "Linux",
         "display_name": "roda-sequel-postgres-passenger-mri",
@@ -155,8 +155,8 @@
         "framework": "roda-sequel",
         "language": "Ruby",
         "orm": "Full",
-        "platform": "JRuby",
-        "webserver": "Puma",
+        "platform": "Rack",
+        "webserver": "TorqueBox",
         "os": "Linux",
         "database_os": "Linux",
         "display_name": "roda-sequel-torquebox-jruby",
@@ -178,8 +178,8 @@
         "framework": "roda-sequel",
         "language": "Ruby",
         "orm": "Full",
-        "platform": "JRuby",
-        "webserver": "Puma",
+        "platform": "Rack",
+        "webserver": "TorqueBox",
         "os": "Linux",
         "database_os": "Linux",
         "display_name": "roda-sequel-postgres-torquebox-jruby",

frameworks/Ruby/roda-sequel/benchmark_config.yaml

@@ -31,7 +31,6 @@ tests:
     puma-jruby:
       <<: *default
       setup_file: run_jruby_puma
-      platform: JRuby
       display_name: roda-sequel-puma-jruby
       versus: rack-sequel-puma-jruby
       disabled: true
@@ -39,21 +38,20 @@ tests:
       <<: *default
       setup_file: run_jruby_puma
       database: Postgres
-      platform: JRuby
       display_name: roda-sequel-postgres-puma-jruby
       versus: rack-sequel-postgres-puma-jruby
       disabled: true
     passenger-mri:
       <<: *default
       setup_file: run_mri_passenger
-      webserver: Passenger Standalone
+      webserver: Passenger
       display_name: roda-sequel-passenger-mri
       versus: rack-sequel-passenger-mri
     postgres-passenger-mri:
       <<: *default
       setup_file: run_mri_passenger
       database: Postgres
-      webserver: Passenger Standalone
+      webserver: Passenger
       display_name: roda-sequel-postgres-passenger-mri
       versus: rack-sequel-postgres-passenger-mri
     unicorn-mri:
@@ -72,13 +70,13 @@ tests:
     torquebox-jruby:
       <<: *default
       setup_file: run_jruby_torquebox
-      platform: JRuby
+      webserver: TorqueBox
       display_name: roda-sequel-torquebox-jruby
       versus: rack-sequel-torquebox-jruby
     postgres-torquebox-jruby:
       <<: *default
       setup_file: run_jruby_torquebox
       database: Postgres
-      platform: JRuby
+      webserver: TorqueBox
       display_name: roda-sequel-postgres-torquebox-jruby
       versus: rack-sequel-postgres-torquebox-jruby

frameworks/Ruby/roda-sequel/boot.rb

@@ -43,7 +43,7 @@ def connect(dbtype)
   end
 
   Sequel.connect \
-    '%<adapter>s://%<host>s/%<database>s?user=%<user>s&password=%<password>s' % {
+    '%{adapter}://%{host}/%{database}?user=%{user}&password=%{password}' % {
       :adapter=>adapters.fetch(dbtype).fetch(defined?(JRUBY_VERSION) ? :jruby : :mri),
       :host=>ENV.fetch('DBHOST', '127.0.0.1'),
       :database=>'hello_world',

frameworks/Ruby/sinatra-sequel/benchmark_config.json

@@ -64,7 +64,7 @@
         "language": "Ruby",
         "orm": "Full",
         "platform": "Rack",
-        "webserver": "Passenger Standalone",
+        "webserver": "Passenger",
         "os": "Linux",
         "database_os": "Linux",
         "display_name": "sinatra-sequel-passenger-mri",
@@ -87,7 +87,7 @@
         "language": "Ruby",
         "orm": "Full",
         "platform": "Rack",
-        "webserver": "Passenger Standalone",
+        "webserver": "Passenger",
         "os": "Linux",
         "database_os": "Linux",
         "display_name": "sinatra-sequel-postgres-passenger-mri",
@@ -155,8 +155,8 @@
         "framework": "sinatra-sequel",
         "language": "Ruby",
         "orm": "Full",
-        "platform": "JRuby",
-        "webserver": "Puma",
+        "platform": "Rack",
+        "webserver": "TorqueBox",
         "os": "Linux",
         "database_os": "Linux",
         "display_name": "sinatra-sequel-torquebox-jruby",
@@ -178,8 +178,8 @@
         "framework": "sinatra-sequel",
         "language": "Ruby",
         "orm": "Full",
-        "platform": "JRuby",
-        "webserver": "Puma",
+        "platform": "Rack",
+        "webserver": "TorqueBox",
         "os": "Linux",
         "database_os": "Linux",
         "display_name": "sinatra-sequel-postgres-torquebox-jruby",

frameworks/Ruby/sinatra-sequel/benchmark_config.yaml

@@ -31,7 +31,6 @@ tests:
     puma-jruby:
       <<: *default
       setup_file: run_jruby_puma
-      platform: JRuby
       display_name: sinatra-sequel-puma-jruby
       versus: rack-sequel-puma-jruby
       disabled: true
@@ -39,21 +38,20 @@ tests:
       <<: *default
       setup_file: run_jruby_puma
       database: Postgres
-      platform: JRuby
       display_name: sinatra-sequel-postgres-puma-jruby
       versus: rack-sequel-postgres-puma-jruby
       disabled: true
     passenger-mri:
       <<: *default
       setup_file: run_mri_passenger
-      webserver: Passenger Standalone
+      webserver: Passenger
       display_name: sinatra-sequel-passenger-mri
       versus: rack-sequel-passenger-mri
     postgres-passenger-mri:
       <<: *default
       setup_file: run_mri_passenger
       database: Postgres
-      webserver: Passenger Standalone
+      webserver: Passenger
       display_name: sinatra-sequel-postgres-passenger-mri
       versus: rack-sequel-postgres-passenger-mri
     unicorn-mri:
@@ -72,13 +70,13 @@ tests:
     torquebox-jruby:
       <<: *default
       setup_file: run_jruby_torquebox
-      platform: JRuby
+      webserver: TorqueBox
       display_name: sinatra-sequel-torquebox-jruby
       versus: rack-sequel-torquebox-jruby
     postgres-torquebox-jruby:
       <<: *default
       setup_file: run_jruby_torquebox
       database: Postgres
-      platform: JRuby
+      webserver: TorqueBox
       display_name: sinatra-sequel-postgres-torquebox-jruby
       versus: rack-sequel-postgres-torquebox-jruby

frameworks/Ruby/sinatra-sequel/boot.rb

@@ -43,7 +43,7 @@ def connect(dbtype)
   end
 
   Sequel.connect \
-    '%<adapter>s://%<host>s/%<database>s?user=%<user>s&password=%<password>s' % {
+    '%{adapter}://%{host}/%{database}?user=%{user}&password=%{password}' % {
       :adapter=>adapters.fetch(dbtype).fetch(defined?(JRUBY_VERSION) ? :jruby : :mri),
       :host=>ENV.fetch('DBHOST', '127.0.0.1'),
       :database=>'hello_world',

frameworks/Ruby/sinatra/benchmark_config.json

@@ -64,7 +64,7 @@
         "language": "Ruby",
         "orm": "Full",
         "platform": "Rack",
-        "webserver": "Passenger Standalone",
+        "webserver": "Passenger",
         "os": "Linux",
         "database_os": "Linux",
         "display_name": "sinatra-passenger-mri",
@@ -87,7 +87,7 @@
         "language": "Ruby",
         "orm": "Full",
         "platform": "Rack",
-        "webserver": "Passenger Standalone",
+        "webserver": "Passenger",
         "os": "Linux",
         "database_os": "Linux",
         "display_name": "sinatra-postgres-passenger-mri",

frameworks/Ruby/sinatra/benchmark_config.yaml

@@ -31,7 +31,6 @@ tests:
     puma-jruby:
       <<: *default
       setup_file: run_jruby_puma
-      platform: JRuby
       display_name: sinatra-puma-jruby
       versus: rack-puma-jruby
       disabled: true
@@ -39,21 +38,20 @@ tests:
       <<: *default
       setup_file: run_jruby_puma
       database: Postgres
-      platform: JRuby
       display_name: sinatra-postgres-puma-jruby
       versus: rack-postgres-puma-jruby
       disabled: true
     passenger-mri:
       <<: *default
       setup_file: run_mri_passenger
-      webserver: Passenger Standalone
+      webserver: Passenger
       display_name: sinatra-passenger-mri
       versus: rack-passenger-mri
     postgres-passenger-mri:
       <<: *default
       setup_file: run_mri_passenger
       database: Postgres
-      webserver: Passenger Standalone
+      webserver: Passenger
       display_name: sinatra-postgres-passenger-mri
       versus: rack-postgres-passenger-mri
     unicorn-mri:
@@ -72,7 +70,7 @@ tests:
     torquebox-jruby:
       <<: *default
       setup_file: run_jruby_torquebox
-      platform: JRuby
+      webserver: TorqueBox
       display_name: sinatra-torquebox-jruby
       versus: rack-torquebox-jruby
       disabled: true
@@ -80,7 +78,7 @@ tests:
       <<: *default
       setup_file: run_jruby_torquebox
       database: Postgres
-      platform: JRuby
+      webserver: TorqueBox
       display_name: sinatra-postgres-torquebox-jruby
       versus: rack-postgres-torquebox-jruby
       disabled: true

toolset/setup/linux/languages/ruby/jruby-9.1.sh

@@ -6,7 +6,7 @@ fw_installed jruby-9.1 && return 0
 
 # rvm stable [typically] only provides one version of jruby-9.0
 # update this when it changes
-JRUBY_VERSION="9.1.7.0"
+JRUBY_VERSION="9.1.8.0"
 
 rvm install jruby-$JRUBY_VERSION
 

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

@@ -6,7 +6,7 @@ fw_installed ruby-2.4 && return 0
 
 # rvm stable [typically] only provides one version of ruby-2.4
 # update this when it changes
-MRI_VERSION=2.4.0
+MRI_VERSION=2.4.1
 
 rvm install $MRI_VERSION -C --with-jemalloc