RVM and Debian 12

Full support to RVM

Signed-off-by: Rodrigo Nardi <rnardi@netdef.org>

Author: RodrigoMNardi

Gemfile

@@ -20,7 +20,9 @@ gem 'octokit', '~> 9.1'
 # Web Framework
 gem 'sinatra'
 
-gem 'rack'
+gem 'rack', '3.1.7'
+
+gem 'rackup'
 
 # ActiveRecord
 gem 'otr-activerecord', '~> 2.3'

Gemfile.lock

@@ -97,6 +97,9 @@ GEM
       rack (>= 3.0.0)
     rack-test (2.1.0)
       rack (>= 1.3)
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
     rainbow (3.1.1)
     rake (13.2.1)
     regexp_parser (2.9.2)
@@ -159,6 +162,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.8.1)
 
 PLATFORMS
   ruby
@@ -178,8 +182,9 @@ DEPENDENCIES
   otr-activerecord (~> 2.3)
   pg (~> 1.5, >= 1.5.3)
   puma
-  rack
+  rack (= 3.1.7)
   rack-test
+  rackup
   rake
   rspec
   rubocop (= 1.56.1)

config.ru

@@ -8,12 +8,14 @@
 #
 #  frozen_string_literal: true
 
-require_relative 'app/github_app'
-require_relative 'config/delayed_job'
-
-require 'puma'
+require 'rack'
+require 'rackup'
 require 'rack/handler/puma'
 require 'rack/session/cookie'
+require 'securerandom'
+
+require_relative 'app/github_app'
+require_relative 'config/delayed_job'
 
 File.write('.session.key', SecureRandom.hex(32))
 
@@ -24,7 +26,7 @@ pids << spawn("RACK_ENV=#{ENV.fetch('RACK_ENV', 'development')} rake jobs:work Q
 
 use Rack::Session::Cookie, secret: File.read('.session.key'), same_site: true, max_age: 86_400
 
-Rack::Handler::Puma.run Rack::URLMap.new('/' => GithubApp)
+Rackup::Handler::Puma.run Rack::URLMap.new('/' => GithubApp)
 
 pids.each do |pid|
   Process.kill('TERM', pid.to_i)

database_loader.rb

@@ -11,19 +11,6 @@
 require 'active_record'
 require 'otr-activerecord'
 
-module OTR
-  module ActiveRecord
-    class << self
-      alias original_configure_from_file! configure_from_file!
-
-      def configure_from_file!(file)
-        config = YAML.safe_load_file(file, permitted_classes: [Symbol], aliases: true)
-        ::ActiveRecord::Base.configurations = config
-      end
-    end
-  end
-end
-
 OTR::ActiveRecord.db_dir = 'db'
 OTR::ActiveRecord.migrations_paths = ['db/migrate']
 OTR::ActiveRecord.configure_from_file! 'config/database.yml'