Skip to content

Adjust version matching #320

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

Closed
wants to merge 2 commits into from
Closed

Adjust version matching #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c519a12
Update from to p481
tvon-a Jan 31, 2015
a6f4763
Adjust version matching
tvon-a Jan 31, 2015
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
2 changes: 1 addition & 1 deletion benchmarks/chruby_auto.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
root="${0%/*}/.."
n=100

RUBIES=("$root/test/opt/rubies/ruby-2.0.0-p353")
RUBIES=("$root/test/opt/rubies/ruby-2.0.0-p481")

. "$root/share/chruby/chruby.sh"
. "$root/share/chruby/auto.sh"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/chruby_use.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
root="${0%/*}/.."
n=100
ruby_dir="$root/test/opt/rubies/ruby-2.0.0-p353"
ruby_dir="$root/test/opt/rubies/ruby-2.0.0-p481"

. "$root/share/chruby/chruby.sh"

Expand Down
28 changes: 18 additions & 10 deletions share/chruby/chruby.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,20 @@ EOF
fi
}

function chruby_ruby_select()
{
local dir
for dir in "${RUBIES[@]}"; do
dir="${dir%%/}"
case "${dir##*/}" in
"$1") matched_ruby="$dir" && break;;
ruby-"$1"*) matched_ruby="$dir";;
"$1"*) matched_ruby="$dir";;
esac
done
}


function chruby()
{
case "$1" in
Expand All @@ -80,22 +94,16 @@ function chruby()
;;
system) chruby_reset ;;
*)
local dir match
for dir in "${RUBIES[@]}"; do
dir="${dir%%/}"
case "${dir##*/}" in
"$1") match="$dir" && break ;;
*"$1"*) match="$dir" ;;
esac
done
local matched_ruby
chruby_ruby_select "$1"

if [[ -z "$match" ]]; then
if [[ -z "$matched_ruby" ]]; then
echo "chruby: unknown Ruby: $1" >&2
return 1
fi

shift
chruby_use "$match" "$*"
chruby_use "$matched_ruby" "$*"
;;
esac
}
50 changes: 50 additions & 0 deletions test/chruby_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,54 @@ function test_chruby_invalid_ruby()
assertEquals "did not return 1" 1 $?
}

function test_chruby_ruby_select_by_major_minor()
{
RUBIES=(
/opt/rubies/ruby-2.0.0-p100
/opt/rubies/ruby-2.1.0
/opt/rubies/ruby-2.2.0
/opt/rubies/ruby-2.2.1
)

chruby_ruby_select "2.0"
assertEquals "did not match major.minor" "/opt/rubies/ruby-2.0.0-p100" "$matched_ruby"

chruby_ruby_select "2.1"
assertEquals "did not match major.minor" "/opt/rubies/ruby-2.1.0" "$matched_ruby"
}

function test_chruby_ruby_select_by_implementation()
{
RUBIES=(
/opt/rubies/ruby-2.2.10
/opt/rubies/rbx-2.2.10
)

chruby_ruby_select "rbx"
assertEquals "did not match by implementation" "/opt/rubies/rbx-2.2.10" "$matched_ruby"
}

function test_chruby_ruby_select_exact()
{
RUBIES=(
/opt/rubies/2.1.0
/opt/rubies/ruby-2.1.0
/opt/rubies/ruby-2.1.1
)

chruby_ruby_select "ruby-2.1.0"
assertEquals "did not match exact" "/opt/rubies/ruby-2.1.0" "$matched_ruby"
}

function test_chruby_ruby_select_last()
{
RUBIES=(
/opt/rubies/ruby-1.9.3-p100
/opt/rubies/ruby-1.9.3-p200
)

chruby_ruby_select "1.9.3"
assertEquals "did not match last version listed" "/opt/rubies/ruby-1.9.3-p200" "$matched_ruby"
}

SHUNIT_PARENT=$0 . $SHUNIT2
2 changes: 1 addition & 1 deletion test/helper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ chruby_reset

test_ruby_engine="ruby"
test_ruby_version="2.0.0"
test_ruby_patchlevel="353"
test_ruby_patchlevel="481"
test_ruby_api="2.0.0"
test_ruby_root="$PWD/test/opt/rubies/$test_ruby_engine-$test_ruby_version-p$test_ruby_patchlevel"

Expand Down