Browse Source

[ruby/sinatra-sequel] Update Sinatra to v3 (#8991)

This also updates some other gems to make it similar to the
Ruby/sinatra.

Unused jruby code is removed.
Petrik de Heus 1 year ago
parent
commit
98cef463b8

+ 4 - 6
frameworks/Ruby/sinatra-sequel/Gemfile

@@ -1,20 +1,18 @@
 source 'https://rubygems.org'
 source 'https://rubygems.org'
 
 
 gem 'json', '~> 2.0'
 gem 'json', '~> 2.0'
-gem 'passenger', '~> 5.1', :platforms=>[:ruby, :mswin], :require=>false
+gem 'passenger', '~> 6.0', :platforms=>[:ruby, :mswin], :require=>false
 gem 'puma', '~> 6.4', :require=>false
 gem 'puma', '~> 6.4', :require=>false
 gem 'sequel', '~> 5.0'
 gem 'sequel', '~> 5.0'
-gem 'sinatra', '~> 2.0', :require=>'sinatra/base'
+gem 'sinatra', '~> 3.0', :require=>'sinatra/base'
 gem 'slim', '~> 3.0'
 gem 'slim', '~> 3.0'
-gem 'unicorn', '~> 5.2', :platforms=>[:ruby, :mswin], :require=>false
+gem 'unicorn', '~> 6.1', :platforms=>[:ruby, :mswin], :require=>false
 
 
 group :mysql do
 group :mysql do
-  gem 'jdbc-mysql', '~> 5.1', :platforms=>:jruby, :require=>'jdbc/mysql'
-  gem 'mysql2', '~> 0.4', :platforms=>[:ruby, :mswin]
+  gem 'mysql2', '~> 0.5', :platforms=>[:ruby, :mswin]
 end
 end
 
 
 group :postgresql do
 group :postgresql do
-  gem 'jdbc-postgres', '~> 9.4', :platforms=>:jruby, :require=>'jdbc/postgres'
   gem 'pg', '~> 1.5', :platforms=>[:ruby, :mswin]
   gem 'pg', '~> 1.5', :platforms=>[:ruby, :mswin]
   gem 'sequel_pg', '~> 1.6', :platforms=>:ruby, :require=>false
   gem 'sequel_pg', '~> 1.6', :platforms=>:ruby, :require=>false
 end
 end

+ 1 - 1
frameworks/Ruby/sinatra-sequel/README.md

@@ -17,7 +17,7 @@ The tests will be run with:
 * [Puma 6](http://puma.io)
 * [Puma 6](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/)
-* [Sinatra 2](http://www.sinatrarb.com)
+* [Sinatra 3](http://www.sinatrarb.com)
 * [Sequel 5](http://sequel.jeremyevans.net)
 * [Sequel 5](http://sequel.jeremyevans.net)
 * [Slim 3](http://slim-lang.com)
 * [Slim 3](http://slim-lang.com)
 * [MySQL 5.5](https://www.mysql.com)
 * [MySQL 5.5](https://www.mysql.com)

+ 0 - 8
frameworks/Ruby/sinatra-sequel/sinatra-sequel-jruby-base.dockerfile

@@ -1,8 +0,0 @@
-FROM jruby:9.4-jdk17
-
-ADD ./ /sinatra-sequel
-WORKDIR /sinatra-sequel
-
-ENV THREAD_FACTOR=2
-
-RUN bundle install --jobs=4 --gemfile=/sinatra-sequel/Gemfile --path=/sinatra-sequel/sinatra-sequel/bundle