Skip to content

Wrap chruby_auto to ease augmentation (issue #227) #355

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Wrap chruby_auto to ease augmentation (issue #227) #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f110d7
Wrap chruby_auto to ease augmentation (issue #227)
ilikepi Jan 7, 2016
def0c5b
Fix broken tests
ilikepi Jan 7, 2016
d704c0d
Note existance of wrapper in README
ilikepi Jan 7, 2016
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
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,9 @@ https://gist.github.com/1912050

If you want to automatically run the version of a gem executable specified in
your project's Gemfile, try
[rubygems-bundler](https://github.com/mpapis/rubygems-bundler).
[rubygems-bundler](https://github.com/mpapis/rubygems-bundler). If you want to
modify how and when chruby_auto is called, you may override the
`ruby_version_autoexec` shell function.

### Default Ruby

Expand Down
10 changes: 7 additions & 3 deletions share/chruby/auto.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,14 @@ function chruby_auto() {
fi
}

function ruby_version_autoexec() {
chruby_auto
}

if [[ -n "$ZSH_VERSION" ]]; then
if [[ ! "$preexec_functions" == *chruby_auto* ]]; then
preexec_functions+=("chruby_auto")
if [[ ! "$preexec_functions" == *ruby_version_autoexec* ]]; then
preexec_functions+=("ruby_version_autoexec")
fi
elif [[ -n "$BASH_VERSION" ]]; then
trap '[[ "$BASH_COMMAND" != "$PROMPT_COMMAND" ]] && chruby_auto' DEBUG
trap '[[ "$BASH_COMMAND" != "$PROMPT_COMMAND" ]] && ruby_version_autoexec' DEBUG
fi
18 changes: 9 additions & 9 deletions test/chruby_auto_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,35 +7,35 @@ function setUp()
unset RUBY_AUTO_VERSION
}

function test_chruby_auto_loaded_in_zsh()
function test_ruby_version_autoexec_loaded_in_zsh()
{
[[ -n "$ZSH_VERSION" ]] || return

assertEquals "did not add chruby_auto to preexec_functions" \
"chruby_auto" \
assertEquals "did not add ruby_version_autoexec to preexec_functions" \
"ruby_version_autoexec" \
"$preexec_functions"
}

function test_chruby_auto_loaded_in_bash()
function test_ruby_version_autoexec_loaded_in_bash()
{
[[ -n "$BASH_VERSION" ]] || return

local command=". $PWD/share/chruby/auto.sh && trap -p DEBUG"
local output="$("$SHELL" -c "$command")"

assertTrue "did not add a trap hook for chruby_auto" \
'[[ "$output" == *chruby_auto* ]]'
assertTrue "did not add a trap hook for ruby_version_autoexec" \
'[[ "$output" == *ruby_version_autoexec* ]]'
}

function test_chruby_auto_loaded_twice_in_zsh()
function test_ruby_version_autoexec_loaded_twice_in_zsh()
{
[[ -n "$ZSH_VERSION" ]] || return

. ./share/chruby/auto.sh

assertNotEquals "should not add chruby_auto twice" \
assertNotEquals "should not add ruby_version_autoexec twice" \
"$preexec_functions" \
"chruby_auto chruby_auto"
"ruby_version_autoexec ruby_version_autoexec"
}

function test_chruby_auto_loaded_twice()
Expand Down