Merge pull request #2277 from TechEmpower/jruby-removal

Jruby removal

frameworks/Ruby/grape/benchmark_config.json

@@ -23,28 +23,6 @@
       "notes": "",
       "versus": "rack-puma-mri"
     }, 
-    "puma-jruby": {
-      "setup_file": "run_jruby_puma",
-      "json_url": "/json",
-      "db_url": "/db", 
-      "query_url": "/query?queries=", 
-      "update_url": "/updates?queries=", 
-      "plaintext_url": "/plaintext",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Micro",
-      "database": "MySQL",
-      "framework": "grape",
-      "language": "Ruby",
-      "orm": "Full",
-      "platform": "JRuby",
-      "webserver": "Puma",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "grape-puma-jruby",
-      "notes": "",
-      "versus": "rack-puma-jruby"
-    },
     "puma-rbx": {
       "setup_file": "run_rbx_puma",
       "json_url": "/json",
@@ -89,50 +67,6 @@
       "notes": "",
       "versus": "rack-thin"
     },  
-    "torqbox-jruby": {
-      "setup_file": "run_torqbox",
-      "json_url": "/json",
-      "db_url": "/db", 
-      "query_url": "/query?queries=", 
-      "update_url": "/updates?queries=", 
-      "plaintext_url": "/plaintext",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Micro",
-      "database": "MySQL",
-      "framework": "grape",
-      "language": "Ruby",
-      "orm": "Full",
-      "platform": "JRuby",
-      "webserver": "TorqBox",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "grape-torqbox-jruby",
-      "notes": "",
-      "versus": "rack-torqbox-jruby"
-    },  
-    "trinidad-jruby": {
-      "setup_file": "run_trinidad",
-      "json_url": "/json",
-      "db_url": "/db", 
-      "query_url": "/query?queries=", 
-      "update_url": "/updates?queries=", 
-      "plaintext_url": "/plaintext",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Micro",
-      "database": "MySQL",
-      "framework": "grape",
-      "language": "Ruby",
-      "orm": "Full",
-      "platform": "JRuby",
-      "webserver": "Trinidad",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "grape-trinidad-jruby",
-      "notes": "",
-      "versus": "rack-trinidad-jruby"
-    },  
     "unicorn": {
       "setup_file": "run_unicorn",
       "json_url": "/json",

frameworks/Ruby/grape/run_jruby_puma.sh

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

frameworks/Ruby/grape/run_torqbox.sh

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

frameworks/Ruby/grape/run_trinidad.sh

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

frameworks/Ruby/padrino/benchmark_config.json

@@ -24,29 +24,6 @@
       "notes": "",
       "versus": "rack-puma-mri"
     },
-    "puma-jruby": {
-      "setup_file": "run_jruby_puma",
-      "json_url": "/json",
-      "db_url": "/db", 
-      "query_url": "/queries?queries=", 
-      "fortune_url": "/fortunes",
-      "update_url": "/updates?queries=", 
-      "plaintext_url": "/plaintext",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Micro",
-      "database": "MySQL",
-      "framework": "padrino",
-      "language": "Ruby",
-      "orm": "Full",
-      "platform": "JRuby",
-      "webserver": "Puma",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "padrino-jruby",
-      "notes": "",
-      "versus": "rack-puma-jruby"
-    },
     "puma-rbx": {
       "setup_file": "run_rbx_puma",
       "json_url": "/json",
@@ -70,52 +47,6 @@
       "notes": "",
       "versus": "rack-puma-rbx"
     },
-    "torqbox-jruby": {
-      "setup_file": "run_torqbox",
-      "json_url": "/json",
-      "db_url": "/db", 
-      "query_url": "/queries?queries=", 
-      "fortune_url": "/fortunes",
-      "update_url": "/updates?queries=", 
-      "plaintext_url": "/plaintext",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Micro",
-      "database": "MySQL",
-      "framework": "padrino",
-      "language": "Ruby",
-      "orm": "Full",
-      "platform": "JRuby",
-      "webserver": "TorqBox",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "padrino-torqbox-jruby",
-      "notes": "",
-      "versus": "rack-torqbox-jruby"
-    },
-    "trinidad-jruby": {
-      "setup_file": "run_trinidad",
-      "json_url": "/json",
-      "db_url": "/db", 
-      "query_url": "/queries?queries=", 
-      "fortune_url": "/fortunes",
-      "update_url": "/updates?queries=", 
-      "plaintext_url": "/plaintext",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Micro",
-      "database": "MySQL",
-      "framework": "padrino",
-      "language": "Ruby",
-      "orm": "Full",
-      "platform": "JRuby",
-      "webserver": "Trinidad",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "padrino-trinidad-jruby",
-      "notes": "",
-      "versus": "rack-trinidad-jruby"
-    },
     "thin": {
       "setup_file": "run_thin",
       "json_url": "/json",

frameworks/Ruby/padrino/run_jruby_puma.sh

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

frameworks/Ruby/padrino/run_torqbox.sh

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

frameworks/Ruby/rack/benchmark_config.json

@@ -22,27 +22,6 @@
       "display_name": "rack-puma-mri",
       "notes": ""
     },
-    "puma-jruby": {
-      "setup_file": "run_jruby_puma",
-      "json_url": "/json",
-      "db_url": "/db", 
-      "query_url": "/queries?queries=", 
-      "update_url": "/updates?queries=", 
-      "plaintext_url": "/plaintext",
-      "port": 8080,
-      "approach": "Stripped",
-      "classification": "Platform",
-      "database": "MySQL",
-      "framework": "rack",
-      "language": "Ruby",
-      "orm": "Raw",
-      "platform": "JRuby",
-      "webserver": "Puma",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "rack-puma-jruby",
-      "notes": ""
-    },
     "puma-rbx": {
       "setup_file": "run_rbx_puma",
       "json_url": "/json",
@@ -85,48 +64,6 @@
       "display_name": "rack-thin",
       "notes": ""
     },
-    "torqbox-jruby": {
-      "setup_file": "run_torqbox",
-      "json_url": "/json",
-      "db_url": "/db", 
-      "query_url": "/queries?queries=", 
-      "update_url": "/updates?queries=", 
-      "plaintext_url": "/plaintext",
-      "port": 8080,
-      "approach": "Stripped",
-      "classification": "Platform",
-      "database": "MySQL",
-      "framework": "rack",
-      "language": "Ruby",
-      "orm": "Raw",
-      "platform": "JRuby",
-      "webserver": "TorqBox",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "rack-torqbox-jruby",
-      "notes": ""
-    },
-    "trinidad-jruby": {
-      "setup_file": "run_trinidad",
-      "json_url": "/json",
-      "db_url": "/db", 
-      "query_url": "/queries?queries=", 
-      "update_url": "/updates?queries=", 
-      "plaintext_url": "/plaintext",
-      "port": 8080,
-      "approach": "Stripped",
-      "classification": "Platform",
-      "database": "MySQL",
-      "framework": "rack",
-      "language": "Ruby",
-      "orm": "Raw",
-      "platform": "JRuby",
-      "webserver": "Trinidad",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "rack-trinidad-jruby",
-      "notes": ""
-    },
     "unicorn": {
       "setup_file": "run_unicorn",
       "json_url": "/json",

frameworks/Ruby/rack/run_jruby_puma.sh

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

frameworks/Ruby/rails-stripped/benchmark_config.json

@@ -20,26 +20,6 @@
       "display_name": "rails-ruby",
       "notes": "",
       "versus": "rack-unicorn"
-    },
-    "jruby": {
-      "setup_file": "setup_jruby",
-      "json_url": "/hello_world/json",
-      "db_url": "/hello_world/db",
-      "query_url": "/hello_world/db?queries=",
-      "port": 8080,
-      "approach": "Stripped",
-      "classification": "Fullstack",
-      "database": "MySQL",
-      "framework": "rails",
-      "language": "Ruby",
-      "orm": "Full",
-      "platform": "JRuby",
-      "webserver": "TorqBox",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "rails-jruby",
-      "notes": "",
-      "versus": "rack-torqbox-jruby"
     }
   }]
 }

frameworks/Ruby/rails/benchmark_config.json

@@ -24,29 +24,6 @@
       "notes": "",
       "versus": "rack-puma-mri"
     },
-    "puma-jruby": {
-      "setup_file": "run_jruby_puma",
-      "json_url": "/hello_world/json",
-      "db_url": "/hello_world/db",
-      "query_url": "/hello_world/query?queries=",
-      "fortune_url": "/fortune",
-      "update_url": "/update?queries=",
-      "plaintext_url": "/plaintext",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "MySQL",
-      "framework": "rails",
-      "language": "Ruby",
-      "orm": "Full",
-      "platform": "JRuby",
-      "webserver": "Puma",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "rails-puma-jruby",
-      "notes": "",
-      "versus": "rack-puma-jruby"
-    },
     "puma-rbx": {
       "setup_file": "run_rbx_puma",
       "json_url": "/hello_world/json",
@@ -93,52 +70,6 @@
       "notes": "",
       "versus": "rack-thin"
     },
-    "torqbox-jruby": {
-      "setup_file": "run_torqbox",
-      "json_url": "/hello_world/json",
-      "db_url": "/hello_world/db",
-      "query_url": "/hello_world/query?queries=",
-      "fortune_url": "/fortune",
-      "update_url": "/update?queries=",
-      "plaintext_url": "/plaintext",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "MySQL",
-      "framework": "rails",
-      "language": "Ruby",
-      "orm": "Full",
-      "platform": "JRuby",
-      "webserver": "TorqBox",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "rails-torqbox-jruby",
-      "notes": "",
-      "versus": "rack-torqbox-jruby"
-    },
-    "trinidad-jruby": {
-      "setup_file": "run_trinidad",
-      "json_url": "/hello_world/json",
-      "db_url": "/hello_world/db",
-      "query_url": "/hello_world/query?queries=",
-      "fortune_url": "/fortune",
-      "update_url": "/update?queries=",
-      "plaintext_url": "/plaintext",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "MySQL",
-      "framework": "rails",
-      "language": "Ruby",
-      "orm": "Full",
-      "platform": "JRuby",
-      "webserver": "Trinidad",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "rails-trinidad-jruby",
-      "notes": "",
-      "versus": "rack-trinidad-jruby"
-    },
     "unicorn": {
       "setup_file": "run_unicorn",
       "json_url": "/hello_world/json",

frameworks/Ruby/rails/run_jruby_puma.sh

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

frameworks/Ruby/rails/run_torqbox.sh

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

frameworks/Ruby/sinatra-sequel/benchmark_config.json

@@ -24,29 +24,6 @@
       "notes": "",
       "versus": "rack-puma-mri"
     },
-    "puma-jruby": {
-      "setup_file": "run_jruby_puma",
-      "json_url": "/json",
-      "db_url": "/db",
-      "query_url": "/queries?queries=",
-      "fortune_url": "/fortunes",
-      "update_url": "/updates?queries=",
-      "plaintext_url": "/plaintext",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Micro",
-      "database": "MySQL",
-      "framework": "sinatra-sequel",
-      "language": "Ruby",
-      "orm": "Full",
-      "platform": "JRuby",
-      "webserver": "Puma",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "sinatra-sequel-puma-jruby",
-      "notes": "",
-      "versus": "rack-puma-jruby"
-    },
     "puma-rbx": {
       "setup_file": "run_rbx_puma",
       "json_url": "/json",

frameworks/Ruby/sinatra-sequel/run_jruby_puma.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-fw_depends rvm jruby-9k
-
-rvm jruby-$JRUBY_VERSION do \
-  bundle install --jobs=4 --gemfile=$TROOT/Gemfile --path=vendor/bundle
-
-MAX_THREADS=256 ; export MAX_THREADS
-MIN_THREADS=$(( MAX_THREADS / 8 * 2 ))
-
-rvm jruby-$JRUBY_VERSION do \
-  bundle exec puma -t $MIN_THREADS:$MAX_THREADS -b tcp://0.0.0.0:8080 -e production &

frameworks/Ruby/sinatra/benchmark_config.json

@@ -24,29 +24,6 @@
       "notes": "",
       "versus": "rack-puma-mri"
     },
-    "puma-jruby": {
-      "setup_file": "run_jruby_puma",
-      "json_url": "/json",
-      "db_url": "/db",
-      "query_url": "/queries?queries=",
-      "fortune_url": "/fortunes",
-      "update_url": "/updates?queries=", 
-      "plaintext_url": "/plaintext",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Micro",
-      "database": "MySQL",
-      "framework": "sinatra",
-      "language": "Ruby",
-      "orm": "Full",
-      "platform": "JRuby",
-      "webserver": "Puma",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "sinatra-puma-jruby",
-      "notes": "",
-      "versus": "rack-puma-jruby"
-    },
     "puma-rbx": {
       "setup_file": "run_rbx_puma",
       "json_url": "/json",
@@ -93,52 +70,6 @@
       "notes": "",
       "versus": "rack-thin"
     },
-    "torqbox-jruby": {
-      "setup_file": "run_torqbox",
-      "json_url": "/json",
-      "db_url": "/db",
-      "query_url": "/queries?queries=",
-      "fortune_url": "/fortunes",
-      "update_url": "/updates?queries=", 
-      "plaintext_url": "/plaintext",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Micro",
-      "database": "MySQL",
-      "framework": "sinatra",
-      "language": "Ruby",
-      "orm": "Full",
-      "platform": "JRuby",
-      "webserver": "TorqBox",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "sinatra-torqbox-jruby",
-      "notes": "",
-      "versus": "rack-torqbox-jruby"
-    },
-    "trinidad-jruby": {
-      "setup_file": "run_trinidad",
-      "json_url": "/json",
-      "db_url": "/db",
-      "query_url": "/queries?queries=",
-      "fortune_url": "/fortunes",
-      "update_url": "/updates?queries=", 
-      "plaintext_url": "/plaintext",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Micro",
-      "database": "MySQL",
-      "framework": "sinatra",
-      "language": "Ruby",
-      "orm": "Full",
-      "platform": "JRuby",
-      "webserver": "Trinidad",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "sinatra-trinidad-jruby",
-      "notes": "",
-      "versus": "rack-trinidad-jruby"
-    },
     "unicorn": {
       "setup_file": "run_unicorn",
       "json_url": "/json",

frameworks/Ruby/sinatra/run_jruby_puma.sh

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