Commit b998838d authored by Mislav Marohnić's avatar Mislav Marohnić
Browse files

Merge pull request #627 from sstephenson/list-custom-definitions 

Fix `rbenv install --list` for definitions auto-discovery
parents 7a17175f 311d96f7

bin/rbenv-install

+9 −9
Original line number Diff line number Diff line
@@ -51,6 +51,15 @@ indent() { 
  sed 's/^/  /'

}



# Add `share/ruby-build/` directory from each rbenv plugin to the list of

# paths where build definitions are looked up.

shopt -s nullglob

for plugin_path in "$RBENV_ROOT"/plugins/*/share/ruby-build; do

  RUBY_BUILD_DEFINITIONS="${RUBY_BUILD_DEFINITIONS}:${plugin_path}"

done

export RUBY_BUILD_DEFINITIONS

shopt -u nullglob



unset FORCE

unset SKIP_EXISTING

unset KEEP
@@ -162,15 +171,6 @@ if [ -z "${RUBY_BUILD_CACHE_PATH}" ] && [ -d "${RBENV_ROOT}/cache" ]; then 
  export RUBY_BUILD_CACHE_PATH="${RBENV_ROOT}/cache"

fi



# Add `share/ruby-build/` directory from each rbenv plugin to the list of

# paths where build definitions are looked up.

shopt -s nullglob

for plugin_path in "$RBENV_ROOT"/plugins/*/share/ruby-build; do

  RUBY_BUILD_DEFINITIONS="${RUBY_BUILD_DEFINITIONS}:${plugin_path}"

done

export RUBY_BUILD_DEFINITIONS

shopt -u nullglob



# Default RBENV_VERSION to the globally-specified Ruby version. (The

# REE installer requires an existing Ruby installation to run. An

# unsatisfied local .ruby-version file can cause the installer to

test/rbenv.bats

+18 −1
Original line number Diff line number Diff line
@@ -88,7 +88,24 @@ OUT 
  stub_ruby_build "echo \$RUBY_BUILD_DEFINITIONS | tr ':' $'\\n'"



  run rbenv-install 2.1.2

  assert_success <<OUT

  assert_success

  assert_output <<OUT



${RBENV_ROOT}/plugins/bar/share/ruby-build

${RBENV_ROOT}/plugins/foo/share/ruby-build

OUT

}



@test "list 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 "--definitions : echo \$RUBY_BUILD_DEFINITIONS | tr ':' $'\\n'"



  run rbenv-install --list

  assert_success

  assert_output <<OUT

Available versions:

  

  ${RBENV_ROOT}/plugins/bar/share/ruby-build

  ${RBENV_ROOT}/plugins/foo/share/ruby-build

OUT