Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Explicit support for Fullstaq Ruby #92

Merged
merged 1 commit into from
Jul 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🙌


# [2.1.6][] (14 Jan 2020)

Expand Down
5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for updating the docs!

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}
Expand Down
5 changes: 4 additions & 1 deletion lib/capistrano/tasks/rbenv.rake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down