Remove capistrano-rvm in favor of simple capistrano/sshkit command map prefixes in deploy.rb; Update to newer version of net-ssh for OpenSSL 3 compatibility (for Ubuntu 22)

Author: elohanlon

Capfile

@@ -10,7 +10,6 @@ install_plugin Capistrano::SCM::Git
 
 # additional modules
 require 'capistrano/rails'
-require 'capistrano/rvm'
 require 'capistrano/passenger'
 require 'capistrano/cul'
 require 'whenever/capistrano'

Gemfile

@@ -74,11 +74,10 @@ group :development do
   gem 'listen', '~> 3.3'
 
   # Capistrano gems for deployment
-  gem 'capistrano', '~> 3.17.0', require: false
+  gem 'capistrano', '~> 3.18.0', require: false
   gem 'capistrano-cul', require: false
   gem 'capistrano-passenger', '~> 0.1', require: false
   gem 'capistrano-rails', '~> 1.4', require: false
-  gem 'capistrano-rvm', '~> 0.1', require: false
 
   # Use net-ssh >= 4.2 to prevent warnings with Ruby 2.4
   gem 'net-ssh', '>= 4.2'

Gemfile.lock

@@ -76,7 +76,7 @@ GEM
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    airbrussh (1.4.0)
+    airbrussh (1.5.0)
       sshkit (>= 1.6.1, != 1.7.0)
     ast (2.4.2)
     bcrypt_pbkdf (1.1.0)
@@ -85,7 +85,7 @@ GEM
       msgpack (~> 1.2)
     builder (3.2.4)
     byebug (11.1.3)
-    capistrano (3.17.0)
+    capistrano (3.18.0)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
@@ -105,9 +105,6 @@ GEM
     capistrano-rails (1.6.2)
       capistrano (~> 3.1)
       capistrano-bundler (>= 1.1, < 3)
-    capistrano-rvm (0.1.2)
-      capistrano (~> 3.0)
-      sshkit (~> 1.2)
     chronic (0.10.2)
     concurrent-ruby (1.1.10)
     crass (1.0.6)
@@ -165,13 +162,13 @@ GEM
       timeout
     net-protocol (0.1.3)
       timeout
-    net-scp (3.0.0)
-      net-ssh (>= 2.6.5, < 7.0.0)
+    net-scp (4.0.0)
+      net-ssh (>= 2.6.5, < 8.0.0)
     net-smtp (0.3.1)
       digest
       net-protocol
       timeout
-    net-ssh (6.1.0)
+    net-ssh (7.2.0)
     netrc (0.11.0)
     nio4r (2.5.8)
     nokogiri (1.15.4)
@@ -299,7 +296,7 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.2)
-    sshkit (1.21.2)
+    sshkit (1.21.5)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     strscan (3.0.1)
@@ -334,11 +331,10 @@ DEPENDENCIES
   alexandria-zoom!
   bootsnap (>= 1.1.0)
   byebug
-  capistrano (~> 3.17.0)
+  capistrano (~> 3.18.0)
   capistrano-cul
   capistrano-passenger (~> 0.1)
   capistrano-rails (~> 1.4)
-  capistrano-rvm (~> 0.1)
   factory_bot_rails (~> 6.1.0)
   io-wait (= 0.2.0)
   jbuilder (~> 2.5)

config/deploy.rb

@@ -1,5 +1,5 @@
 # config valid for current version and patch releases of Capistrano
-lock "~> 3.17.0"
+lock "~> 3.18.0"
 
 set :remote_user, "renserv"
 set :application, 'hysync'
@@ -47,6 +47,10 @@
 # Whenever gem
 set :whenever_identifier, ->{ "#{fetch(:application)}_#{fetch(:stage)}" }
 
+[:rake, :gem, :bundle, :ruby].each do |command_to_prefix_with_rvm|
+  SSHKit.config.command_map.prefix[command_to_prefix_with_rvm].push("~/.rvm/bin/rvm #{fetch(:deploy_name)} do")
+end
+
 namespace :deploy do
   desc "Report the environment"
   task :report do