Commit 5a7d0fee authored by SHIBATA Hiroshi's avatar SHIBATA Hiroshi Committed by GitHub
Browse files

Merge pull request #1060 from toy/fix-sorting-versions 

fix ordering for versions with different length patch number
parents 165cd1f7 cb84607d

bin/ruby-build

+1 −1
Original line number Diff line number Diff line
@@ -1136,7 +1136,7 @@ list_definitions() { 
}



sort_versions() {

  sed 'h; s/[+-]/./g; s/.p\([[:digit:]]\)/.z\1/; s/$/.z/; G; s/\n/ /' | \

  sed 'h; s/[+-]/./g; s/.p\([[:digit:]]\)/.z.\1/; s/$/.z/; G; s/\n/ /' | \

    LC_ALL=C sort -t. -k 1,1 -k 2,2n -k 3,3n -k 4,4n -k 5,5n | awk '{print $2}'

}

test/definitions.bats

+5 −2
Original line number Diff line number Diff line
@@ -68,7 +68,10 @@ NUM_DEFINITIONS="$(ls "$BATS_TEST_DIRNAME"/../share/ruby-build | wc -l)" 
@test "sorting Ruby versions" {

  export RUBY_BUILD_ROOT="$TMP"

  mkdir -p "${RUBY_BUILD_ROOT}/share/ruby-build"

  expected="1.9.3-dev

  expected="1.8.7

1.8.7-p72

1.8.7-p375

1.9.3-dev

1.9.3-preview1

1.9.3-rc1

1.9.3-p0
@@ -88,7 +91,7 @@ jruby-1.7.9 
jruby-1.7.10

jruby-9000-dev

jruby-9000"

  for ver in "$expected"; do

  for ver in $expected; do

    touch "${RUBY_BUILD_ROOT}/share/ruby-build/$ver"

  done

  run ruby-build --definitions