diff --git a/CHANGELOG.md b/CHANGELOG.md index f04f2b7..b4ab434 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # [master][] * Your contribution here! +* [#92](https://github.com/capistrano/rbenv/pull/92): Explicit support for Fullstaq Ruby - [@FooBarWidget](https://github.com/FooBarWidget) # [2.1.6][] (14 Jan 2020) diff --git a/README.md b/README.md index 0239c5a..195b88a 100644 --- a/README.md +++ b/README.md @@ -28,14 +28,11 @@ And then execute: # config/deploy.rb - set :rbenv_type, :user # or :system, depends on your rbenv setup + set :rbenv_type, :user # or :system, or :fullstaq (for Fullstaq Ruby), depends on your rbenv setup set :rbenv_ruby, '2.4.2' # in case you want to set ruby version from the file: # set :rbenv_ruby, File.read('.ruby-version').strip - - # in case you use fullstaq-ruby or have a different path for your ruby versions - # set :rbenv_ruby_dir, '/usr/lib/fullstaq-ruby/versions' set :rbenv_prefix, "RBENV_ROOT=#{fetch(:rbenv_path)} RBENV_VERSION=#{fetch(:rbenv_ruby)} #{fetch(:rbenv_path)}/bin/rbenv exec" set :rbenv_map_bins, %w{rake gem bundle ruby rails} diff --git a/lib/capistrano/tasks/rbenv.rake b/lib/capistrano/tasks/rbenv.rake index 3a9db6e..b02da9a 100644 --- a/lib/capistrano/tasks/rbenv.rake +++ b/lib/capistrano/tasks/rbenv.rake @@ -34,8 +34,11 @@ namespace :load do task :defaults do set :rbenv_path, -> { rbenv_path = fetch(:rbenv_custom_path) - rbenv_path ||= if fetch(:rbenv_type, :user) == :system + rbenv_path ||= case fetch(:rbenv_type, :user) + when :system '/usr/local/rbenv' + when :fullstaq + '/usr/lib/rbenv' else '$HOME/.rbenv' end