Browse Source

[Ruby] Remove torquebox usage from rack and roda (#8451)

Torquebox is no longer maintained, the last releases are from 2016:

      The TorqueBox project is no longer actively developed nor
      maintained. Do not use it for development or production usage unless
      you are willing and able to fix issues as they come up.

https://github.com/torquebox/torquebox/

Sinatra still uses torquebox but those builds are currently failing.
Petrik de Heus 1 year ago
parent
commit
f6532a26cc

+ 0 - 1
frameworks/Ruby/padrino/README.md

@@ -17,7 +17,6 @@ The tests were run with:
 * [Padrino 0.12.3](http://www.padrinorb.com/)
 * [Padrino 0.12.3](http://www.padrinorb.com/)
 * [Rack 1.5.2](http://rack.github.com/)
 * [Rack 1.5.2](http://rack.github.com/)
 * [Unicorn 4.8.3](http://unicorn.bogomips.org/)
 * [Unicorn 4.8.3](http://unicorn.bogomips.org/)
-* [TorqBox 0.1.7](http://torquebox.org/torqbox/)
 * [Puma 3.9](http://puma.io/)
 * [Puma 3.9](http://puma.io/)
 * [Thin 1.6.2](http://code.macournoyer.com/thin/)
 * [Thin 1.6.2](http://code.macournoyer.com/thin/)
 
 

+ 0 - 1
frameworks/Ruby/rack-sequel/Gemfile

@@ -5,7 +5,6 @@ gem 'passenger', '~> 5.1', :platforms=>[:ruby, :mswin], :require=>false
 gem 'puma', '~> 3.9', :require=>false
 gem 'puma', '~> 3.9', :require=>false
 gem 'sequel', '~> 5.0'
 gem 'sequel', '~> 5.0'
 gem 'rack', '2.0.8'
 gem 'rack', '2.0.8'
-gem 'torquebox-web', '>= 4.0.0.beta3', '< 5', :platforms=>:jruby, :require=>false
 gem 'unicorn', '~> 5.2', :platforms=>[:ruby, :mswin], :require=>false
 gem 'unicorn', '~> 5.2', :platforms=>[:ruby, :mswin], :require=>false
 
 
 group :mysql do
 group :mysql do

+ 0 - 1
frameworks/Ruby/rack-sequel/README.md

@@ -18,7 +18,6 @@ The tests will be run with:
 * [Puma 3](http://puma.io)
 * [Puma 3](http://puma.io)
 * [Passenger 5](https://www.phusionpassenger.com)
 * [Passenger 5](https://www.phusionpassenger.com)
 * [Unicorn 5](https://bogomips.org/unicorn/)
 * [Unicorn 5](https://bogomips.org/unicorn/)
-* [TorqueBox 4.0](http://torquebox.org)
 * [Rack 2](http://rack.rubyforge.org)
 * [Rack 2](http://rack.rubyforge.org)
 * [Sequel 5](http://sequel.jeremyevans.net)
 * [Sequel 5](http://sequel.jeremyevans.net)
 * [MySQL 5.5](https://www.mysql.com)
 * [MySQL 5.5](https://www.mysql.com)

+ 0 - 42
frameworks/Ruby/rack-sequel/benchmark_config.json

@@ -127,48 +127,6 @@
         "display_name": "rack-sequel-postgres-unicorn-mri",
         "display_name": "rack-sequel-postgres-unicorn-mri",
         "versus": null,
         "versus": null,
         "notes": ""
         "notes": ""
-      },
-      "torquebox-jruby": {
-        "json_url": "/json",
-        "db_url": "/db",
-        "query_url": "/queries?queries=",
-        "fortune_url": "/fortunes",
-        "update_url": "/updates?queries=",
-        "plaintext_url": "/plaintext",
-        "port": 8080,
-        "approach": "Stripped",
-        "classification": "Micro",
-        "database": "MySQL",
-        "framework": "rack-sequel",
-        "language": "Ruby",
-        "orm": "Micro",
-        "platform": "Rack",
-        "webserver": "TorqueBox",
-        "os": "Linux",
-        "database_os": "Linux",
-        "display_name": "rack-sequel-torquebox-jruby",
-        "versus": "rack-torqbox-jruby",
-        "notes": ""
-      },
-      "postgres-torquebox-jruby": {
-        "db_url": "/db",
-        "query_url": "/queries?queries=",
-        "fortune_url": "/fortunes",
-        "update_url": "/updates?queries=",
-        "port": 8080,
-        "approach": "Stripped",
-        "classification": "Micro",
-        "database": "Postgres",
-        "framework": "rack-sequel",
-        "language": "Ruby",
-        "orm": "Micro",
-        "platform": "Rack",
-        "webserver": "TorqueBox",
-        "os": "Linux",
-        "database_os": "Linux",
-        "display_name": "rack-sequel-postgres-torquebox-jruby",
-        "versus": null,
-        "notes": ""
       }
       }
     }
     }
   ]
   ]

+ 0 - 13
frameworks/Ruby/rack-sequel/benchmark_config.yaml

@@ -67,16 +67,3 @@ tests:
       webserver: Unicorn
       webserver: Unicorn
       display_name: rack-sequel-postgres-unicorn-mri
       display_name: rack-sequel-postgres-unicorn-mri
       versus: ~
       versus: ~
-    torquebox-jruby:
-      <<: *default
-      setup_file: run_jruby_torquebox
-      webserver: TorqueBox
-      display_name: rack-sequel-torquebox-jruby
-      versus: rack-torqbox-jruby
-    postgres-torquebox-jruby:
-      <<: *default
-      setup_file: run_jruby_torquebox
-      database: Postgres
-      webserver: TorqueBox
-      display_name: rack-sequel-postgres-torquebox-jruby
-      versus: ~

+ 0 - 34
frameworks/Ruby/rack-sequel/config.toml

@@ -86,23 +86,6 @@ platform = "Rack"
 webserver = "Passenger"
 webserver = "Passenger"
 versus = "None"
 versus = "None"
 
 
-[postgres-torquebox-jruby]
-urls.plaintext = "/plaintext"
-urls.json = "/json"
-urls.db = "/db"
-urls.query = "/queries?queries="
-urls.update = "/updates?queries="
-urls.fortune = "/fortunes"
-approach = "Stripped"
-classification = "Micro"
-database = "Postgres"
-database_os = "Linux"
-os = "Linux"
-orm = "Micro"
-platform = "Rack"
-webserver = "TorqueBox"
-versus = "None"
-
 [unicorn-mri]
 [unicorn-mri]
 urls.plaintext = "/plaintext"
 urls.plaintext = "/plaintext"
 urls.json = "/json"
 urls.json = "/json"
@@ -119,20 +102,3 @@ orm = "Micro"
 platform = "Rack"
 platform = "Rack"
 webserver = "Unicorn"
 webserver = "Unicorn"
 versus = "rack-unicorn"
 versus = "rack-unicorn"
-
-[torquebox-jruby]
-urls.plaintext = "/plaintext"
-urls.json = "/json"
-urls.db = "/db"
-urls.query = "/queries?queries="
-urls.update = "/updates?queries="
-urls.fortune = "/fortunes"
-approach = "Stripped"
-classification = "Micro"
-database = "MySQL"
-database_os = "Linux"
-os = "Linux"
-orm = "Micro"
-platform = "Rack"
-webserver = "TorqueBox"
-versus = "rack-torqbox-jruby"

+ 0 - 15
frameworks/Ruby/rack-sequel/rack-sequel-postgres-torquebox-jruby.dockerfile

@@ -1,15 +0,0 @@
-FROM jruby:9.1
-
-ADD ./ /rack-sequel
-
-WORKDIR /rack-sequel
-
-ENV THREAD_FACTOR=2
-
-RUN bundle install --jobs=4 --gemfile=/rack-sequel/Gemfile --path=/rack-sequel/rack-sequel/bundle
-
-ENV DBTYPE=postgresql
-
-EXPOSE 8080
-
-CMD export MAX_CONCURRENCY=$(( 2 * $(nproc) )) && bundle exec torquebox run --io-threads $(( MAX_CONCURRENCY / 2 )) --worker-threads $MAX_CONCURRENCY -b 0.0.0.0 -p 8080 -e production

+ 0 - 15
frameworks/Ruby/rack-sequel/rack-sequel-torquebox-jruby.dockerfile

@@ -1,15 +0,0 @@
-FROM jruby:9.1
-
-ADD ./ /rack-sequel
-
-WORKDIR /rack-sequel
-
-ENV THREAD_FACTOR=2
-
-RUN bundle install --jobs=4 --gemfile=/rack-sequel/Gemfile --path=/rack-sequel/rack-sequel/bundle
-
-ENV DBTYPE=mysql
-
-EXPOSE 8080
-
-CMD export MAX_CONCURRENCY=$(( 2 * $(nproc) )) && bundle exec torquebox run --io-threads $(( MAX_CONCURRENCY / 2 )) --worker-threads $MAX_CONCURRENCY -b 0.0.0.0 -p 8080 -e production

+ 0 - 1
frameworks/Ruby/roda-sequel/README.md

@@ -18,7 +18,6 @@ The tests will be run with:
 * [Puma 3](http://puma.io)
 * [Puma 3](http://puma.io)
 * [Passenger 5](https://www.phusionpassenger.com)
 * [Passenger 5](https://www.phusionpassenger.com)
 * [Unicorn 5](https://bogomips.org/unicorn/)
 * [Unicorn 5](https://bogomips.org/unicorn/)
-* [TorqueBox 4.0](http://torquebox.org)
 * [Roda 3](http://roda.jeremyevans.net)
 * [Roda 3](http://roda.jeremyevans.net)
 * [Sequel 5](http://sequel.jeremyevans.net)
 * [Sequel 5](http://sequel.jeremyevans.net)
 * [Erubi 1](https://github.com/jeremyevans/erubi)
 * [Erubi 1](https://github.com/jeremyevans/erubi)

+ 0 - 34
frameworks/Ruby/roda-sequel/config.toml

@@ -86,23 +86,6 @@ platform = "Rack"
 webserver = "Passenger"
 webserver = "Passenger"
 versus = "rack-sequel-passenger-mri"
 versus = "rack-sequel-passenger-mri"
 
 
-[postgres-torquebox-jruby]
-urls.plaintext = "/plaintext"
-urls.json = "/json"
-urls.db = "/db"
-urls.query = "/queries?queries="
-urls.update = "/updates?queries="
-urls.fortune = "/fortunes"
-approach = "Realistic"
-classification = "Micro"
-database = "Postgres"
-database_os = "Linux"
-os = "Linux"
-orm = "Full"
-platform = "Rack"
-webserver = "TorqueBox"
-versus = "rack-sequel-postgres-torquebox-jruby"
-
 [unicorn-mri]
 [unicorn-mri]
 urls.plaintext = "/plaintext"
 urls.plaintext = "/plaintext"
 urls.json = "/json"
 urls.json = "/json"
@@ -119,20 +102,3 @@ orm = "Full"
 platform = "Rack"
 platform = "Rack"
 webserver = "Unicorn"
 webserver = "Unicorn"
 versus = "rack-sequel-unicorn-mri"
 versus = "rack-sequel-unicorn-mri"
-
-[torquebox-jruby]
-urls.plaintext = "/plaintext"
-urls.json = "/json"
-urls.db = "/db"
-urls.query = "/queries?queries="
-urls.update = "/updates?queries="
-urls.fortune = "/fortunes"
-approach = "Realistic"
-classification = "Micro"
-database = "MySQL"
-database_os = "Linux"
-os = "Linux"
-orm = "Full"
-platform = "Rack"
-webserver = "TorqueBox"
-versus = "rack-sequel-torquebox-jruby"