Fixes #38120 - Use Sinatra 4

lib/launcher.rb

@@ -119,7 +119,7 @@ def load_ssl_certificate(path)
     def webrick_server(app, addresses, port)
       server = ::WEBrick::HTTPServer.new(app)
       addresses.each { |a| server.listen(a, port) }
-      server.mount "/", Rack::Handler::WEBrick, app[:app]
+      server.mount "/", Rackup::Handler::WEBrick, app[:app]
       server
     end
 

lib/smart_proxy_for_testing.rb

@@ -1,6 +1,7 @@
 require 'smart_proxy'
 require 'json'
 require 'rack'
+require 'rackup'
 require 'sinatra'
 require 'webrick/https'
 require 'proxy/log'

lib/smart_proxy_main.rb

@@ -32,6 +32,7 @@
 
 require 'json'
 require 'rack'
+require 'rackup'
 require 'sinatra'
 require 'sinatra/authorization'
 require 'sinatra/default_not_found_page'

smart_proxy.gemspec

@@ -17,10 +17,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'json'
   s.add_dependency 'logging'
   s.add_dependency 'ostruct'
-  s.add_dependency 'rack', '>= 1.3'
+  s.add_dependency 'rackup'
   s.add_dependency 'rexml', '~> 3.2'
   s.add_dependency 'sd_notify', '~> 0.1'
-  s.add_dependency 'sinatra', '~> 2.0'
+  s.add_dependency 'sinatra', '~> 4.0'
   s.add_dependency 'webrick', '~> 1.0'
   s.description = <<~EOF
     Foreman Proxy is used via The Foreman Project, it allows Foreman to manage

test/registration/registration_api_test.rb

@@ -94,7 +94,7 @@ def test_host_401_html_response
   end
 
   def test_global_500
-    Rack::NullLogger.any_instance.stubs(:exception)
+    Logger.any_instance.stubs(:exception)
     stub_request(:get, "#{@foreman_url}/register").to_timeout
 
     get '/'
@@ -103,7 +103,7 @@ def test_global_500
   end
 
   def test_host_500
-    Rack::NullLogger.any_instance.stubs(:exception)
+    Logger.any_instance.stubs(:exception)
     stub_request(:post, "#{@foreman_url}/register").to_timeout
 
     post '/'