Support building with version prefix

Commonly in CI pipelines and other scripts, users may
want to install the latest from a specific series, e.g.
`3.4` or `jruby-10.0`.

```bash
$ bin/ruby-build 3.4 /tmp/3.4
...
Downloading ruby-3.4.9.tar.gz...

$ bin/ruby-build 4.0 /tmp/4.0
...
Downloading ruby-4.0.2.tar.gz...
```

Also support `--resolve`:

```bash
$ bin/ruby-build --resolve 3.4
3.4.9
```

Author: byroot

bin/rbenv-install

@@ -144,6 +144,12 @@ DEFINITION="${ARGUMENTS[0]}"
 [ -n "$DEFINITION" ] || DEFINITION="$(rbenv-local 2>/dev/null || true)"
 [ -n "$DEFINITION" ] || usage 1 >&2
 
+[ -n "$DEFINITION" ] && RESOLVED_DEFINITION="$(ruby-build --resolve "${DEFINITION}" 2>/dev/null || true)"
+
+if [ -n "$RESOLVED_DEFINITION" ]; then
+  DEFINITION="$RESOLVED_DEFINITION"
+fi
+
 # Define `before_install` and `after_install` functions that allow
 # plugin hooks to register a string of code for execution before or
 # after the installation process.

bin/ruby-build

@@ -6,7 +6,7 @@
 #        ruby-build --version
 #
 #   -l, --list      List latest stable releases for each Ruby
-#   -r, --resolve   Find the most recent version matching a prefix.
+#   --resolve       Find the most recent version matching a prefix.
 #   --definitions   List all local definitions, including outdated ones
 #   --version       Show version of ruby-build
 #
@@ -1405,47 +1405,24 @@ list_maintained_versions() {
 
 filter_version_prefix()
 {
-  match=1
-  prefix="$1"
-  if [[ "${prefix}" = "ruby" ]]; then
-    # Filter MRI versions
-    grep -e '^[0-9]'
-  elif echo "${prefix}" | grep -e '^\([0-9]\|[a-z\+]\+-[0-9]\)' > /dev/null; then
-    # Filter by version prefix
-    while IFS= read -r version; do
-      if [[ "${version}" = "${prefix}" ]] || [[ "${version}" = "${prefix}."* ]]; then
-        match=0
-        echo "${version}"
-      fi
-    done
-  else
-    # Filter by implementation
-    while IFS= read -r version; do
-      if [[ "${version}" = "${prefix}-"* ]]; then
-        match=0
-        echo "${version}"
-      fi
-    done
-  fi
-  return $match
+  pattern="${1//./\.}"
+  pattern="${pattern//+/\+}"
+  grep -e "^${pattern}[-.$]"
 }
 
 resolve() {
   prefix="${1%.}"
   prefix="${prefix#ruby-}"
 
-  list_definitions | \
+  version=$(list_definitions | \
     grep -v -e '-rc[0-9]*$' -e '-preview[0-9]*$' -e '-dev$' | \
     filter_version_prefix "${prefix}" | \
     LC_ALL=C sort -t. -k 1,1 -k 2,2n -k 3,3n -k 4,4n -k 5,5n | \
-    tail -n 1
-}
+    tail -n 1)
+
+  [[ -z "${version}" ]] && return 1
+  [[ "${1}" = "ruby-"* ]] && version="ruby-${version}"
 
-resolve_version() {
-  version=$(resolve "$@")
-  if [[ -z "${version}" ]]; then
-    exit 1
-  fi
   echo "${version}"
 }
 
@@ -1492,7 +1469,7 @@ for option in "${OPTIONS[@]}"; do
     EARLY_EXIT=list_maintained_versions
     ;;
   "resolve")
-    EARLY_EXIT=resolve_version
+    EARLY_EXIT=resolve
     ;;
   "d" | "dir")
     APPEND_DEFINITION_TO_PREFIX=true
@@ -1544,22 +1521,13 @@ if [ "${#EXTRA_ARGUMENTS[@]}" -gt 0 ]; then
   RUBY_CONFIGURE_OPTS_ARRAY=("${EXTRA_ARGUMENTS[@]}")
 fi
 
-ORIGINAL_PREFIX_PATH="${PREFIX_PATH}"
-if [ "$APPEND_DEFINITION_TO_PREFIX" = "true" ]; then
-  if [ -p "$DEFINITION_PATH" ]; then
-    echo "ruby-build: using named pipes in combination with \`--dir' is not possible" >&2
-    EARLY_EXIT=usage_error
-  fi
-  PREFIX_PATH="$PREFIX_PATH/$(basename "$DEFINITION_PATH")"
-fi
-
 case "$EARLY_EXIT" in
 help )
   version
   echo
   usage 0
   ;;
-version | list_definitions | list_maintained_versions | resolve_version )
+version | list_definitions | list_maintained_versions | resolve )
   shift
   "$EARLY_EXIT" "$@"
   exit 0
@@ -1576,6 +1544,8 @@ usage_error )
   ;;
 esac
 
+DEFINITION_PREFIX=""
+
 # expand the <definition> argument to full path of the definition file
 if [[ ! -f "$DEFINITION_PATH" && ! -p "$DEFINITION_PATH" ]]; then
   for DEFINITION_DIR in "${RUBY_BUILD_DEFINITIONS[@]}"; do
@@ -1587,23 +1557,26 @@ if [[ ! -f "$DEFINITION_PATH" && ! -p "$DEFINITION_PATH" ]]; then
 
   # If the given definition is like ruby-X.Y.Z, search again with X.Y.Z
   if [[ "$DEFINITION_PATH" =~ ^ruby-[0-9] ]]; then
-    DEFINITION_PATH="${DEFINITION_PATH#ruby-}"
+    UNPREFIXED_DEFINITION_PATH="${DEFINITION_PATH#ruby-}"
     for DEFINITION_DIR in "${RUBY_BUILD_DEFINITIONS[@]}"; do
-      if [ -f "${DEFINITION_DIR}/${DEFINITION_PATH}" ]; then
-        DEFINITION_PATH="${DEFINITION_DIR}/${DEFINITION_PATH}"
+      if [ -f "${DEFINITION_DIR}/${UNPREFIXED_DEFINITION_PATH}" ]; then
+        DEFINITION_PREFIX="ruby-"
+        DEFINITION_PATH="${DEFINITION_DIR}/${UNPREFIXED_DEFINITION_PATH}"
         break
       fi
     done
   fi
 
+  # If the given definition isn't a perfect match, we do a prefix search.
   if [ ! -f "$DEFINITION_PATH" ]; then
-    fully_qualified_version=$(resolve "$DEFINITION_PATH")
+    FULLY_QUALIFIED_VERSION=$(resolve "$DEFINITION_PATH")
     for DEFINITION_DIR in "${RUBY_BUILD_DEFINITIONS[@]}"; do
-      if [ -f "${DEFINITION_DIR}/${fully_qualified_version}" ]; then
-        DEFINITION_PATH="${DEFINITION_DIR}/${fully_qualified_version}"
-        if [ "$APPEND_DEFINITION_TO_PREFIX" = "true" ]; then
-          PREFIX_PATH="$ORIGINAL_PREFIX_PATH/$(basename "$DEFINITION_PATH")"
+      if [ -f "${DEFINITION_DIR}/${FULLY_QUALIFIED_VERSION}" ]; then
+        if [[ "$DEFINITION_PATH" =~ ^ruby-[0-9] ]]; then
+          DEFINITION_PREFIX="ruby-"
         fi
+
+        DEFINITION_PATH="${DEFINITION_DIR}/${FULLY_QUALIFIED_VERSION}"
         break
       fi
     done
@@ -1615,6 +1588,14 @@ if [[ ! -f "$DEFINITION_PATH" && ! -p "$DEFINITION_PATH" ]]; then
   fi
 fi
 
+if [ "$APPEND_DEFINITION_TO_PREFIX" = "true" ]; then
+  if [ -p "$DEFINITION_PATH" ]; then
+    echo "ruby-build: using named pipes in combination with \`--dir' is not possible" >&2
+    EARLY_EXIT=usage_error
+  fi
+  PREFIX_PATH="$PREFIX_PATH/${DEFINITION_PREFIX}$(basename "$DEFINITION_PATH")"
+fi
+
 # normalize the <prefix> argument
 if [ "${PREFIX_PATH#/}" = "$PREFIX_PATH" ]; then
   PREFIX_PATH="${PWD}/${PREFIX_PATH}"

test/definitions.bats

@@ -99,7 +99,7 @@ NUM_DEFINITIONS="$(ls "$BATS_TEST_DIRNAME"/../share/ruby-build | wc -l)"
   touch "${TMP}/definitions/2.0.0"
 
   run bin/ruby-build --resolve "ruby-1.9" "${TMP}/install"
-  assert_success "1.9.10"
+  assert_success "ruby-1.9.10"
 }
 
 @test "resolve definition by implementation name" {

test/rbenv.bats

@@ -16,7 +16,7 @@ stub_ruby_build() {
 }
 
 @test "install proper" {
-  stub_ruby_build 'echo ruby-build "$@"'
+  stub_ruby_build 'echo 2.1.2' 'echo ruby-build "$@"'
 
   run rbenv-install 2.1.2
   assert_success "ruby-build 2.1.2 ${RBENV_ROOT}/versions/2.1.2"
@@ -27,7 +27,7 @@ stub_ruby_build() {
 }
 
 @test "install with flags" {
-  stub_ruby_build 'echo "ruby-build $(inspect_args "$@")"'
+  stub_ruby_build 'echo 2.1.2' 'echo "ruby-build $(inspect_args "$@")"'
 
   run rbenv-install -kpv 2.1.2 -- --with-configure-opt="hello world"
   assert_success "ruby-build --keep --verbose --patch 2.1.2 ${RBENV_ROOT}/versions/2.1.2 -- \"--with-configure-opt=hello world\""
@@ -39,7 +39,7 @@ stub_ruby_build() {
 
 @test "suggest running rbenv global after install" {
   rm -rf "$RBENV_ROOT/version"
-  stub_ruby_build 'echo ruby-build "$@"'
+  stub_ruby_build 'echo 2.1.2' 'echo ruby-build "$@"'
 
   run rbenv-install 2.1.2
   assert_success <<OUT
@@ -52,7 +52,7 @@ OUT
 }
 
 @test "install rbenv local version by default" {
-  stub_ruby_build 'echo ruby-build "$1"'
+  stub_ruby_build 'echo 2.1.2' 'echo ruby-build "$1"'
   stub rbenv-local 'echo 2.1.2'
 
   run rbenv-install
@@ -100,7 +100,8 @@ OUT
   fi
 
   stub_repeated brew false
-  stub_ruby_build 'echo ERROR >&2 && exit 2' \
+  stub_ruby_build 'exit 1' \
+    'echo ERROR >&2 && exit 2' \
     "--definitions : echo 1.8.7 1.9.3-p0 1.9.3-p194 2.1.2 | tr ' ' $'\\n'"
 
   run rbenv-install 1.9.3
@@ -127,10 +128,11 @@ OUT
 
 @test "Homebrew upgrade instructions" {
   stub brew "--prefix : echo '${BATS_TEST_DIRNAME%/*}'"
-  stub_ruby_build 'echo ERROR >&2 && exit 2' \
+  stub_ruby_build 'exit 1' \
+    'echo ERROR >&2 && exit 2' \
     "--definitions : true"
 
-  run rbenv-install 1.9.3
+  run rbenv-install 1.9.10
   assert_failure
   assert_output <<OUT
 ERROR
@@ -148,7 +150,8 @@ OUT
 
 @test "no build definitions from plugins" {
   refute [ -e "${RBENV_ROOT}/plugins" ]
-  stub_ruby_build 'echo $RUBY_BUILD_DEFINITIONS'
+  stub_ruby_build 'echo 2.1.2' \
+    'echo $RUBY_BUILD_DEFINITIONS'
 
   run rbenv-install 2.1.2
   assert_success ""
@@ -157,7 +160,8 @@ OUT
 @test "some build definitions from plugins" {
   mkdir -p "${RBENV_ROOT}/plugins/foo/share/ruby-build"
   mkdir -p "${RBENV_ROOT}/plugins/bar/share/ruby-build"
-  stub_ruby_build "echo \$RUBY_BUILD_DEFINITIONS | tr ':' $'\\n'"
+  stub_ruby_build 'echo 2.1.2' \
+    "echo \$RUBY_BUILD_DEFINITIONS | tr ':' $'\\n'"
 
   run rbenv-install 2.1.2
   assert_success