Use shell instead of sed.

Author: havenwood

share/chruby/chruby.sh

@@ -2,9 +2,15 @@ CHRUBY_VERSION="0.3.8"
 
 function chruby_rubies()
 {
-	find "$@" -mindepth 1 -maxdepth 1 -type "d" 2>/dev/null |
-	sed -e "h" -e 's/.*\///' -e 's/-/./g' -e "G" -e 's/\n/ /' |
-	sort -t "." -k "1,1" -k "2,2n" -k "3,3n" -k "4,4n" | sed 's/[^ ]* //'
+	local rubies dir ruby version
+	rubies=()
+	for dir in "$@"; do
+		[[ -d "$dir" && -n $(ls -A "$dir") ]] && for ruby in "$dir"/*; do
+			version="${ruby##*/}" && rubies+=("${version/-/.}\t$ruby")
+		done
+	done
+
+	printf "%b\n" "${rubies[@]}" | sort -t "." -k "1,1" -k "2,2n" -k "3,3n" -k "4,4n" | cut -f 2
 }
 
 RUBIES=($(chruby_rubies "$PREFIX/opt/rubies" "$HOME/.rubies"))

test/helper.sh

@@ -14,7 +14,7 @@ test_ruby_patchlevel="353"
 test_ruby_api="2.0.0"
 test_ruby_dir="$PWD/test/opt/rubies"
 test_ruby_root="$test_ruby_dir/$test_ruby_engine-$test_ruby_version-p$test_ruby_patchlevel"
-test_rubies_order="jruby-1.7.9 jruby-1.7.14 rbx-2.2.9 rbx-2.2.10 rbx-10.0.0 ruby-1.9.3-p547 ruby-1.9.3-preview1 ruby-1.9.3-rc1 ruby-2.0.0-p0 ruby-2.0.0-p195 ruby-2.0.0-p247 ruby-2.0.0-p353"
+test_rubies_order="jruby-1.7.9 jruby-1.7.10 rbx-2.2.9 rbx-2.2.10 rbx-10.0.0 ruby-1.9.3-p547 ruby-2.0.0-p0 ruby-2.0.0-p195 ruby-2.0.0-p247 ruby-2.0.0-p353 ruby-2.1.0 ruby-2.1.1 ruby-2.1.2"
 
 test_path="$PATH"
 test_gem_home="$HOME/.gem/$test_ruby_engine/$test_ruby_version"

test/setup

@@ -173,9 +173,9 @@ test_ruby_root="$test_ruby_engine-$test_ruby_version-p$test_ruby_patchlevel"
 mkdir -p "$PREFIX/opt/rubies"
 cd "$PREFIX/opt/rubies"
 
-mkdir -p "jruby-1.7.9" "jruby-1.7.14" "rbx-2.2.9" "rbx-2.2.10" "rbx-10.0.0" \
-	"ruby-1.9.3-p547" "ruby-1.9.3-preview1" "ruby-1.9.3-rc1" "ruby-2.0.0-p0" \
-		"ruby-2.0.0-p195" "ruby-2.0.0-p247" "ruby-2.0.0-p353"
+mkdir -p "jruby-1.7.9" "jruby-1.7.10" "rbx-2.2.9" "rbx-2.2.10" "rbx-10.0.0" \
+	"ruby-1.9.3-p547" "ruby-2.0.0-p0" "ruby-2.0.0-p195" "ruby-2.0.0-p247" \
+	"ruby-2.0.0-p353" "ruby-2.1.0" "ruby-2.1.1" "ruby-2.1.2"
 
 mkdir -p "$PREFIX/opt/r u b i e s/ruby-2.1.2"