From f5805d26122722d0e383919024661080019b41e7 Mon Sep 17 00:00:00 2001 From: Lovro Bikic Date: Tue, 3 Oct 2023 15:19:27 +0200 Subject: [PATCH] Revert "Deprecate version manager tasks (#709)" This reverts commit a3877203998e49413bb8b66ac2cffc33ebf1f3e9. --- data/deploy.rb | 6 ++---- docs/getting_started.md | 5 ++--- tasks/mina/chruby.rb | 9 --------- tasks/mina/rbenv.rb | 9 --------- tasks/mina/rvm.rb | 9 --------- tasks/mina/ry.rb | 9 --------- 6 files changed, 4 insertions(+), 43 deletions(-) diff --git a/data/deploy.rb b/data/deploy.rb index b2bd7f35..182b8339 100644 --- a/data/deploy.rb +++ b/data/deploy.rb @@ -2,10 +2,8 @@ require 'mina/rails' require 'mina/git' - -# Install https://github.com/mina-deploy/mina-version_managers for rbenv and rvm tasks -# require 'mina/version_managers/rbenv' # for rbenv support. (https://rbenv.org) -# require 'mina/version_managers/rvm' # for rvm support. (https://rvm.io) +# require 'mina/rbenv' # for rbenv support. (https://rbenv.org) +# require 'mina/rvm' # for rvm support. (https://rvm.io) # Basic settings: # domain - The hostname to SSH to. diff --git a/docs/getting_started.md b/docs/getting_started.md index 2a759fbc..00a1f750 100644 --- a/docs/getting_started.md +++ b/docs/getting_started.md @@ -35,9 +35,8 @@ set :deploy_to, '/var/www/flipstack.com' require 'mina/bundler' require 'mina/rails' require 'mina/git' -# Install https://github.com/mina-deploy/mina-version_managers for rbenv and rvm tasks -# require 'mina/version_managers/rbenv' # for rbenv support. (https://rbenv.org) -# require 'mina/version_managers/rvm' # for rvm support. (https://rvm.io) +# require 'mina/rbenv' # for rbenv support. (http://rbenv.org) +# require 'mina/rvm' # for rvm support. (http://rvm.io) ... ``` ``` ruby diff --git a/tasks/mina/chruby.rb b/tasks/mina/chruby.rb index 165afff6..2dfc4e0c 100644 --- a/tasks/mina/chruby.rb +++ b/tasks/mina/chruby.rb @@ -1,14 +1,5 @@ # frozen_string_literal: true -unless fetch(:silence_deprecation_warnings) - warn '[DEPRECATION] chruby support will be removed from Mina in v2.0.0.' - warn '[DEPRECATION] To continue using chruby tasks, install `mina-version_managers` gem and' - warn "[DEPRECATION] replace `require 'mina/chruby'` with `require 'mina/version_managers/chruby'`." - warn '[DEPRECATION] See https://github.com/mina-deploy/mina-version_managers for more info.' - warn '[DEPRECATION] You can silence this message by adding `set :silence_deprecation_warnings, true` to `config/deploy.rb`.' - warn '' -end - set :chruby_path, '/etc/profile.d/chruby.sh' task :chruby, :env do |_, args| diff --git a/tasks/mina/rbenv.rb b/tasks/mina/rbenv.rb index de69675b..4bcc3b82 100644 --- a/tasks/mina/rbenv.rb +++ b/tasks/mina/rbenv.rb @@ -1,14 +1,5 @@ # frozen_string_literal: true -unless fetch(:silence_deprecation_warnings) - warn '[DEPRECATION] rbenv support will be removed from Mina in v2.0.0.' - warn '[DEPRECATION] To continue using rbenv tasks, install `mina-version_managers` gem and' - warn "[DEPRECATION] replace `require 'mina/rbenv'` with `require 'mina/version_managers/rbenv'`." - warn '[DEPRECATION] See https://github.com/mina-deploy/mina-version_managers for more info.' - warn '[DEPRECATION] You can silence this message by adding `set :silence_deprecation_warnings, true` to `config/deploy.rb`.' - warn '' -end - set :rbenv_path, '$HOME/.rbenv' task :'rbenv:load' do diff --git a/tasks/mina/rvm.rb b/tasks/mina/rvm.rb index e5388bd3..fa73fc3a 100644 --- a/tasks/mina/rvm.rb +++ b/tasks/mina/rvm.rb @@ -1,14 +1,5 @@ # frozen_string_literal: true -unless fetch(:silence_deprecation_warnings) - warn '[DEPRECATION] RVM support will be removed from Mina in v2.0.0.' - warn '[DEPRECATION] To continue using RVM tasks, install `mina-version_managers` gem and' - warn "[DEPRECATION] replace `require 'mina/rvm'` with `require 'mina/version_managers/rvm'`." - warn '[DEPRECATION] See https://github.com/mina-deploy/mina-version_managers for more info.' - warn '[DEPRECATION] You can silence this message by adding `set :silence_deprecation_warnings, true` to `config/deploy.rb`.' - warn '' -end - set :rvm_use_path, '$HOME/.rvm/scripts/rvm' task :'rvm:use', :env do |_, args| diff --git a/tasks/mina/ry.rb b/tasks/mina/ry.rb index 355e9bfe..79d1000b 100644 --- a/tasks/mina/ry.rb +++ b/tasks/mina/ry.rb @@ -1,14 +1,5 @@ # frozen_string_literal: true -unless fetch(:silence_deprecation_warnings) - warn '[DEPRECATION] ry support will be removed from Mina in v2.0.0.' - warn '[DEPRECATION] To continue using ry tasks, install `mina-version_managers` gem and' - warn "[DEPRECATION] replace `require 'mina/ry'` with `require 'mina/version_managers/ry'`." - warn '[DEPRECATION] See https://github.com/mina-deploy/mina-version_managers for more info.' - warn '[DEPRECATION] You can silence this message by adding `set :silence_deprecation_warnings, true` to `config/deploy.rb`.' - warn '' -end - set :ry_path, '$HOME/.local' task :ry, :env do |_, args|