v20160310

closes #555

.agignore

@@ -0,0 +1,2 @@
+./versions
+./cache

.vimrc

@@ -0,0 +1 @@
+set wildignore+=versions/*,cache/*

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Version History
 
+## 20160310
+
+* python-build: Add PyPy-5.0.0 (#555)
+* pyenv: Import recent changes from rbenv 1.0 (#549)
+
 ## 20160303
 
 * python-build: Add anaconda[23]-2.5.0 (#543)

CONDUCT.md

@@ -0,0 +1,80 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting one of the project maintainers listed below. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Project Maintainers
+
+* Sam Stephenson <<sstephenson@gmail.com>>
+* Mislav Marohnić <<mislav.marohnic@gmail.com>>
+* Erik Michaels-Ober <<sferik@gmail.com>>
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

bin/python-local-exec

@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-#
-# `python-local-exec` is a drop-in replacement for the standard Python
-# shebang line:
-#
-#    #!/usr/bin/env python-local-exec
-#
-# Use it for scripts inside a project with an `.pyenv-version`
-# file. When you run the scripts, they'll use the project-specified
-# Python version, regardless of what directory they're run from. Useful
-# for e.g. running project tasks in cron scripts without needing to
-# `cd` into the project first.
-
-set -e
-export PYENV_DIR="${1%/*}"
-
-[ -n "$PYENV_SILENCE_WARNINGS" ] || {
-  echo "pyenv: \`python-local-exec' is deprecated and will be removed in the next release."
-  echo "       To upgrade: https://github.com/yyuu/pyenv/wiki/python-local-exec"
-  echo
-} >&2
-
-exec python "$@"

libexec/pyenv

@@ -97,6 +97,7 @@ PYENV_HOOK_PATH="${PYENV_HOOK_PATH}:/usr/local/etc/pyenv.d:/etc/pyenv.d:/usr/lib
 for plugin_hook in "${PYENV_ROOT}/plugins/"*/etc/pyenv.d; do
   PYENV_HOOK_PATH="${PYENV_HOOK_PATH}:${plugin_hook}"
 done
+PYENV_HOOK_PATH="${PYENV_HOOK_PATH#:}"
 export PYENV_HOOK_PATH
 
 shopt -u nullglob

libexec/pyenv---version

@@ -12,15 +12,12 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
 
-version="20160303"
+version="20150310"
 git_revision=""
 
-for source_dir in "${BASH_SOURCE%/*}" "$PYENV_ROOT"; do
-  if cd "$source_dir" 2>/dev/null && git remote -v 2>/dev/null | grep -q pyenv; then
+if cd "${BASH_SOURCE%/*}" 2>/dev/null && git remote -v 2>/dev/null | grep -q pyenv; then
   git_revision="$(git describe --tags HEAD 2>/dev/null || true)"
   git_revision="${git_revision#v}"
-    [ -z "$git_revision" ] || break
-  fi
-done
+fi
 
 echo "pyenv ${git_revision:-$version}"

libexec/pyenv-hooks

@@ -9,6 +9,8 @@ set -e
 if [ "$1" = "--complete" ]; then
   echo exec
   echo rehash
+  echo version-name
+  echo version-origin
   echo which
   exit
 fi

libexec/pyenv-init

@@ -33,9 +33,9 @@ done
 
 shell="$1"
 if [ -z "$shell" ]; then
-  shell="$(ps c -p "$PPID" -o 'ucomm=' 2>/dev/null || true)"
-  shell="${shell##-}"
+  shell="$(ps -p "$PPID" -o 'args=' 2>/dev/null || true)"
   shell="${shell%% *}"
+  shell="${shell##-}"
   shell="${shell:-$SHELL}"
   shell="${shell##*/}"
 fi

libexec/pyenv-local

@@ -15,10 +15,6 @@
 # `PYENV_VERSION' environment variable takes precedence over local
 # and global versions.
 #
-# For backwards compatibility, pyenv will also read version
-# specifications from `.pyenv-version' files, but a `.python-version'
-# file in the same directory takes precedence.
-#
 # <version> should be a string matching a Python version known to pyenv.
 # The special version string `system' will use your default system Python.
 # Run `pyenv versions' for a list of available Python versions.
@@ -36,27 +32,17 @@ fi
 versions=("$@")
 
 if [ "$versions" = "--unset" ]; then
-  rm -f .python-version .pyenv-version
+  rm -f .python-version
 elif [ -n "$versions" ]; then
-  previous_file="$(PYENV_VERSION= pyenv-version-origin || true)"
   pyenv-version-file-write .python-version "${versions[@]}"
-  if [ "$previous_file" -ef .pyenv-version ]; then
-    rm -f .pyenv-version
-    { echo "pyenv: removed existing \`.pyenv-version' file and migrated"
-      echo "       local version specification to \`.python-version' file"
-    } >&2
-  fi
 else
-  OLDIFS="$IFS"
-  IFS=: versions=($(
-    pyenv-version-file-read .python-version ||
-    pyenv-version-file-read .pyenv-version ||
-    { echo "pyenv: no local version configured for this directory"
-      exit 1
-    } >&2
-  ))
-  IFS="$OLDIFS"
+  if version_file="$(pyenv-version-file "$PWD")"; then
+    IFS=: versions=($(pyenv-version-file-read "$version_file"))
     for version in "${versions[@]}"; do
       echo "$version"
     done
+  else
+    echo "pyenv: no local version configured for this directory" >&2
+    exit 1
+  fi
 fi

libexec/pyenv-version-file

@@ -1,35 +1,28 @@
 #!/usr/bin/env bash
+# Usage: pyenv version-file [<dir>]
 # Summary: Detect the file that sets the current pyenv version
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
 
+target_dir="$1"
+
 find_local_version_file() {
   local root="$1"
-  while true; do
-    [[ "$root" =~ ^//[^/]*$ ]] && break
+  while ! [[ "$root" =~ ^//[^/]*$ ]]; do
     if [ -e "${root}/.python-version" ]; then
       echo "${root}/.python-version"
-      exit
-    elif [ -e "${root}/.pyenv-version" ]; then
-      echo "${root}/.pyenv-version"
-      exit
+      return 0
     fi
     [ -n "$root" ] || break
     root="${root%/*}"
   done
+  return 1
 }
 
-find_local_version_file "$PYENV_DIR"
-[ "$PYENV_DIR" = "$PWD" ] || find_local_version_file "$PWD"
-
-global_version_file="${PYENV_ROOT}/version"
-
-if [ -e "$global_version_file" ]; then
-  echo "$global_version_file"
-elif [ -e "${PYENV_ROOT}/global" ]; then
-  echo "${PYENV_ROOT}/global"
-elif [ -e "${PYENV_ROOT}/default" ]; then
-  echo "${PYENV_ROOT}/default"
+if [ -n "$target_dir" ]; then
+  find_local_version_file "$target_dir"
 else
-  echo "$global_version_file"
+  find_local_version_file "$PYENV_DIR" || {
+    [ "$PYENV_DIR" != "$PWD" ] && find_local_version_file "$PWD"
+  } || echo "${PYENV_ROOT}/version"
 fi

libexec/pyenv-version-name

@@ -8,6 +8,13 @@ if [ -z "$PYENV_VERSION" ]; then
   PYENV_VERSION="$(pyenv-version-file-read "$PYENV_VERSION_FILE" || true)"
 fi
 
+OLDIFS="$IFS"
+IFS=$'\n' scripts=(`pyenv-hooks version-name`)
+IFS="$OLDIFS"
+for script in "${scripts[@]}"; do
+  source "$script"
+done
+
 if [ -z "$PYENV_VERSION" ] || [ "$PYENV_VERSION" = "system" ]; then
   echo "system"
   exit

libexec/pyenv-version-origin

@@ -3,7 +3,18 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
 
-if [ -n "$PYENV_VERSION" ]; then
+unset PYENV_VERSION_ORIGIN
+
+OLDIFS="$IFS"
+IFS=$'\n' scripts=(`pyenv-hooks version-origin`)
+IFS="$OLDIFS"
+for script in "${scripts[@]}"; do
+  source "$script"
+done
+
+if [ -n "$PYENV_VERSION_ORIGIN" ]; then
+  echo "$PYENV_VERSION_ORIGIN"
+elif [ -n "$PYENV_VERSION" ]; then
   echo "PYENV_VERSION environment variable"
 else
   pyenv-version-file

libexec/pyenv-versions

@@ -27,7 +27,7 @@ done
 
 versions_dir="${PYENV_ROOT}/versions"
 
-if ! enable -f "${BASH_SOURCE%/*}"/../libexec/pyenv-realpath.dylib realpath 2>/dev/null; then
+if ! enable -f "${BASH_SOURCE%/*}"/pyenv-realpath.dylib realpath 2>/dev/null; then
   if [ -n "$PYENV_NATIVE_EXT" ]; then
     echo "pyenv: failed to load \`realpath' builtin" >&2
     exit 1

plugins/python-build/share/python-build/pypy-5.0.0

@@ -0,0 +1,46 @@
+case "$(pypy_architecture 2>/dev/null || true)" in
+"linux" )
+  require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" || true
+  install_package "pypy-5.0.0-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-linux.tar.bz2#a9cc9afa94ff1cde811626a70081c477c9840e7816c0562d1903fd823d222ceb" "pypy" verify_py27 ensurepip
+  ;;
+"linux-armel" )
+  require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" || true
+  install_package "pypy-5.0.0-linux-armel" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-linux-armel.tar.bz2#87bd85441b16ecca0d45ba6e9c0e9d26bb7bd8867afbf79d80312cf79b032dc1" "pypy" verify_py27 ensurepip
+  ;;
+"linux-armhf" )
+  if [[ "$(cat /etc/issue 2>/dev/null || true)" == "Raspbian"* ]]; then
+    install_package "pypy-5.0.0-linux-armhf-raspbian" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-linux-armhf-raspbian.tar.bz2#8033c0cc39e9f6771688f2eda95c726595f5453b3e73e1cd5f7ebbe3dae1f685" "pypy" verify_py27 ensurepip
+  else
+    require_distro "Ubuntu 13.04" || true
+    install_package "pypy-5.0.0-linux-armhf-raring" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-linux-armhf-raring.tar.bz2#5bb52cf5db4ae8497c4e03cd8a70e49867e6b93d9f29ad335d030fcd3a375769" "pypy" verify_py27 ensurepip
+  fi
+  ;;
+"linux-ppc64" )
+ require_distro "Fedora 20" || true
+ install_package "pypy-5.0.0-ppc64" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-ppc64.tar.bz2#334a37e68cb543cf2cbcdd12379b9b770064bb70ba7fd104f1e451cfa10cdda5" "pypy" verify_py27 ensurepip
+ ;;
+"linux-ppc64le" )
+ require_distro "Fedora 21" || true
+ install_package "pypy-5.0.0-ppc64le" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-ppc64le.tar.bz2#e72fe5c094186f79c997000ddbaa01616def652a8d1338b75a27dfa3755eb86c" "pypy" verify_py27 ensurepip
+ ;;
+"linux64" )
+  require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" || true
+  install_package "pypy-5.0.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-linux64.tar.bz2#b9c73be8e3c3b0835df83bdb86335712005240071cdd4dc245ac30b457063ae0" "pypy" verify_py27 ensurepip
+  ;;
+"osx64" )
+  install_package "pypy-5.0.0-osx64" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-osx64.tar.bz2#45ed8bf799d0fd8eb051cbcc427173fba74dc9c2f6c309d7a3cc90f4917e6a10" "pypy" verify_py27 ensurepip
+  ;;
+"win32" )
+  # FIXME: never tested on Windows
+  install_zip "pypy-5.0.0-win32" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-win32.zip#c53f0946703f5e4885484c7cde2554a0320537135bf8965e054757c214412438" "pypy" verify_py27 ensurepip
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
+    echo "try 'pypy-5.0.0-src' to build from soruce."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac

plugins/python-build/share/python-build/pypy-5.0.0-src

@@ -0,0 +1,2 @@
+require_gcc
+install_package "pypy-5.0.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-src.tar.bz2#89027b1b33553b53ff7733dc4838f0a76af23552c0d915d9f6de5875b8d7d4ab" "pypy_builder" verify_py27 ensurepip

test/--version.bats

@@ -2,22 +2,13 @@
 
 load test_helper
 
+export GIT_DIR="${PYENV_TEST_DIR}/.git"
+
 setup() {
   mkdir -p "$HOME"
   git config --global user.name  "Tester"
   git config --global user.email "tester@test.local"
-
-  mkdir -p "${PYENV_TEST_DIR}/bin"
-  cat > "${PYENV_TEST_DIR}/bin/git" <<CMD
-#!$BASH
-if [[ \$1 == remote && \$PWD != "\$PYENV_TEST_DIR"/* ]]; then
-  echo "not allowed" >&2
-  exit 1
-else
-  exec $(which git) "\$@"
-fi
-CMD
-  chmod +x "${PYENV_TEST_DIR}/bin/git"
+  cd "$PYENV_TEST_DIR"
 }
 
 git_commit() {
@@ -32,22 +23,17 @@ git_commit() {
 }
 
 @test "doesn't read version from non-pyenv repo" {
-  mkdir -p "$PYENV_ROOT"
-  cd "$PYENV_ROOT"
   git init
   git remote add origin https://github.com/homebrew/homebrew.git
   git_commit
   git tag v1.0
 
-  cd "$PYENV_TEST_DIR"
   run pyenv---version
   assert_success
   [[ $output == "pyenv 20"* ]]
 }
 
 @test "reads version from git repo" {
-  mkdir -p "$PYENV_ROOT"
-  cd "$PYENV_ROOT"
   git init
   git remote add origin https://github.com/yyuu/pyenv.git
   git_commit
@@ -55,20 +41,15 @@ git_commit() {
   git_commit
   git_commit
 
-  cd "$PYENV_TEST_DIR"
   run pyenv---version
-  assert_success
-  [[ $output == "pyenv 20380119-2-g"* ]]
+  assert_success "pyenv 20380119-2-g$(git rev-parse --short HEAD)"
 }
 
 @test "prints default version if no tags in git repo" {
-  mkdir -p "$PYENV_ROOT"
-  cd "$PYENV_ROOT"
   git init
   git remote add origin https://github.com/yyuu/pyenv.git
   git_commit
 
-  cd "$PYENV_TEST_DIR"
   run pyenv---version
   [[ $output == "pyenv 20"* ]]
 }

test/exec.bats

@@ -43,27 +43,14 @@ python
 OUT
 }
 
-@test "supports hook path with spaces" {
-  hook_path="${PYENV_TEST_DIR}/custom stuff/pyenv hooks"
-  mkdir -p "${hook_path}/exec"
-  echo "export HELLO='from hook'" > "${hook_path}/exec/hello.bash"
-
-  export PYENV_VERSION=system
-  PYENV_HOOK_PATH="$hook_path" run pyenv-exec env
-  assert_success
-  assert_line "HELLO=from hook"
-}
-
 @test "carries original IFS within hooks" {
-  hook_path="${PYENV_TEST_DIR}/pyenv.d"
-  mkdir -p "${hook_path}/exec"
-  cat > "${hook_path}/exec/hello.bash" <<SH
+  create_hook exec hello.bash <<SH
 hellos=(\$(printf "hello\\tugly world\\nagain"))
 echo HELLO="\$(printf ":%s" "\${hellos[@]}")"
 SH
 
   export PYENV_VERSION=system
-  PYENV_HOOK_PATH="$hook_path" IFS=$' \t\n' run pyenv-exec env
+  IFS=$' \t\n' run pyenv-exec env
   assert_success
   assert_line "HELLO=:hello:ugly:world:again"
 }

test/global.bats

@@ -3,7 +3,7 @@
 load test_helper
 
 @test "default" {
-  run pyenv global
+  run pyenv-global
   assert_success
   assert_output "system"
 }
@@ -20,7 +20,7 @@ load test_helper
   mkdir -p "$PYENV_ROOT/versions/1.2.3"
   run pyenv-global "1.2.3"
   assert_success
-  run pyenv global
+  run pyenv-global
   assert_success "1.2.3"
 }
 

test/hooks.bats

@@ -2,11 +2,6 @@
 
 load test_helper
 
-create_hook() {
-  mkdir -p "$1/$2"
-  touch "$1/$2/$3"
-}
-
 @test "prints usage help given no argument" {
   run pyenv-hooks
   assert_failure "Usage: pyenv hooks <command>"
@@ -15,11 +10,13 @@ create_hook() {
 @test "prints list of hooks" {
   path1="${PYENV_TEST_DIR}/pyenv.d"
   path2="${PYENV_TEST_DIR}/etc/pyenv_hooks"
-  create_hook "$path1" exec "hello.bash"
-  create_hook "$path1" exec "ahoy.bash"
-  create_hook "$path1" exec "invalid.sh"
-  create_hook "$path1" which "boom.bash"
-  create_hook "$path2" exec "bueno.bash"
+  PYENV_HOOK_PATH="$path1"
+  create_hook exec "hello.bash"
+  create_hook exec "ahoy.bash"
+  create_hook exec "invalid.sh"
+  create_hook which "boom.bash"
+  PYENV_HOOK_PATH="$path2"
+  create_hook exec "bueno.bash"
 
   PYENV_HOOK_PATH="$path1:$path2" run pyenv-hooks exec
   assert_success
@@ -33,8 +30,10 @@ OUT
 @test "supports hook paths with spaces" {
   path1="${PYENV_TEST_DIR}/my hooks/pyenv.d"
   path2="${PYENV_TEST_DIR}/etc/pyenv hooks"
-  create_hook "$path1" exec "hello.bash"
-  create_hook "$path2" exec "ahoy.bash"
+  PYENV_HOOK_PATH="$path1"
+  create_hook exec "hello.bash"
+  PYENV_HOOK_PATH="$path2"
+  create_hook exec "ahoy.bash"
 
   PYENV_HOOK_PATH="$path1:$path2" run pyenv-hooks exec
   assert_success
@@ -45,8 +44,8 @@ OUT
 }
 
 @test "resolves relative paths" {
-  path="${PYENV_TEST_DIR}/pyenv.d"
-  create_hook "$path" exec "hello.bash"
+  PYENV_HOOK_PATH="${PYENV_TEST_DIR}/pyenv.d"
+  create_hook exec "hello.bash"
   mkdir -p "$HOME"
 
   PYENV_HOOK_PATH="${HOME}/../pyenv.d" run pyenv-hooks exec

test/init.bats

@@ -25,12 +25,24 @@ load test_helper
 }
 
 @test "detect parent shell" {
-  root="$(cd $BATS_TEST_DIRNAME/.. && pwd)"
   SHELL=/bin/false run pyenv-init -
   assert_success
   assert_line "export PYENV_SHELL=bash"
 }
 
+@test "detect parent shell from script" {
+  mkdir -p "$PYENV_TEST_DIR"
+  cd "$PYENV_TEST_DIR"
+  cat > myscript.sh <<OUT
+#!/bin/sh
+eval "\$(pyenv-init -)"
+echo \$PYENV_SHELL
+OUT
+  chmod +x myscript.sh
+  run ./myscript.sh /bin/zsh
+  assert_success "sh"
+}
+
 @test "setup shell completions (fish)" {
   root="$(cd $BATS_TEST_DIRNAME/.. && pwd)"
   run pyenv-init - fish

test/local.bats

@@ -19,24 +19,11 @@ setup() {
   assert_success "1.2.3"
 }
 
-@test "supports legacy .pyenv-version file" {
-  echo "1.2.3" > .pyenv-version
-  run pyenv-local
-  assert_success "1.2.3"
-}
-
-@test "local .python-version has precedence over .pyenv-version" {
-  echo "2.7" > .pyenv-version
-  echo "3.4" > .python-version
-  run pyenv-local
-  assert_success "3.4"
-}
-
-@test "ignores version in parent directory" {
+@test "discovers version file in parent directory" {
   echo "1.2.3" > .python-version
   mkdir -p "subdir" && cd "subdir"
   run pyenv-local
-  assert_failure
+  assert_success "1.2.3"
 }
 
 @test "ignores PYENV_DIR" {
@@ -64,40 +51,9 @@ setup() {
   assert [ "$(cat .python-version)" = "1.2.3" ]
 }
 
-@test "renames .pyenv-version to .python-version" {
-  echo "2.7.6" > .pyenv-version
-  mkdir -p "${PYENV_ROOT}/versions/3.3.3"
-  run pyenv-local
-  assert_success "2.7.6"
-  run pyenv-local "3.3.3"
-  assert_success
-  assert_output <<OUT
-pyenv: removed existing \`.pyenv-version' file and migrated
-       local version specification to \`.python-version' file
-OUT
-  assert [ ! -e .pyenv-version ]
-  assert [ "$(cat .python-version)" = "3.3.3" ]
-}
-
-@test "doesn't rename .pyenv-version if changing the version failed" {
-  echo "2.7.6" > .pyenv-version
-  assert [ ! -e "${PYENV_ROOT}/versions/3.3.3" ]
-  run pyenv-local "3.3.3"
-  assert_failure "pyenv: version \`3.3.3' not installed"
-  assert [ ! -e .python-version ]
-  assert [ "$(cat .pyenv-version)" = "2.7.6" ]
-}
-
 @test "unsets local version" {
   touch .python-version
   run pyenv-local --unset
   assert_success ""
-  assert [ ! -e .pyenv-version ]
-}
-
-@test "unsets alternate version file" {
-  touch .pyenv-version
-  run pyenv-local --unset
-  assert_success ""
-  assert [ ! -e .pyenv-version ]
+  assert [ ! -e .python-version ]
 }

test/pyenv.bats

@@ -70,6 +70,7 @@ load test_helper
 }
 
 @test "PYENV_HOOK_PATH includes pyenv built-in plugins" {
+  unset PYENV_HOOK_PATH
   run pyenv echo "PYENV_HOOK_PATH"
-  assert_success ":${PYENV_ROOT}/pyenv.d:${BATS_TEST_DIRNAME%/*}/pyenv.d:/usr/local/etc/pyenv.d:/etc/pyenv.d:/usr/lib/pyenv/hooks"
+  assert_success "${PYENV_ROOT}/pyenv.d:${BATS_TEST_DIRNAME%/*}/pyenv.d:/usr/local/etc/pyenv.d:/etc/pyenv.d:/usr/lib/pyenv/hooks"
 }

test/rehash.bats

@@ -86,15 +86,13 @@ OUT
 }
 
 @test "carries original IFS within hooks" {
-  hook_path="${PYENV_TEST_DIR}/pyenv.d"
-  mkdir -p "${hook_path}/rehash"
-  cat > "${hook_path}/rehash/hello.bash" <<SH
+  create_hook rehash hello.bash <<SH
 hellos=(\$(printf "hello\\tugly world\\nagain"))
 echo HELLO="\$(printf ":%s" "\${hellos[@]}")"
 exit
 SH
 
-  PYENV_HOOK_PATH="$hook_path" IFS=$' \t\n' run pyenv-rehash
+  IFS=$' \t\n' run pyenv-rehash
   assert_success
   assert_output "HELLO=:hello:ugly:world:again"
 }

test/test_helper.bash

@@ -17,6 +17,7 @@ if [ -z "$PYENV_TEST_DIR" ]; then
 
   export PYENV_ROOT="${PYENV_TEST_DIR}/root"
   export HOME="${PYENV_TEST_DIR}/home"
+  export PYENV_HOOK_PATH="${PYENV_ROOT}/pyenv.d"
 
   PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
   PATH="${PYENV_TEST_DIR}/bin:$PATH"
@@ -129,3 +130,11 @@ path_without() {
   path="${path#:}"
   echo "${path%:}"
 }
+
+create_hook() {
+  mkdir -p "${PYENV_HOOK_PATH}/$1"
+  touch "${PYENV_HOOK_PATH}/$1/$2"
+  if [ ! -t 0 ]; then
+    cat > "${PYENV_HOOK_PATH}/$1/$2"
+  fi
+}

test/version-file.bats

@@ -12,6 +12,12 @@ create_file() {
   touch "$1"
 }
 
+@test "detects global 'version' file" {
+  create_file "${PYENV_ROOT}/version"
+  run pyenv-version-file
+  assert_success "${PYENV_ROOT}/version"
+}
+
 @test "prints global file if no version files exist" {
   assert [ ! -e "${PYENV_ROOT}/version" ]
   assert [ ! -e ".python-version" ]
@@ -19,45 +25,12 @@ create_file() {
   assert_success "${PYENV_ROOT}/version"
 }
 
-@test "detects 'global' file" {
-  create_file "${PYENV_ROOT}/global"
-  run pyenv-version-file
-  assert_success "${PYENV_ROOT}/global"
-}
-
-@test "detects 'default' file" {
-  create_file "${PYENV_ROOT}/default"
-  run pyenv-version-file
-  assert_success "${PYENV_ROOT}/default"
-}
-
-@test "'version' has precedence over 'global' and 'default'" {
-  create_file "${PYENV_ROOT}/version"
-  create_file "${PYENV_ROOT}/global"
-  create_file "${PYENV_ROOT}/default"
-  run pyenv-version-file
-  assert_success "${PYENV_ROOT}/version"
-}
-
 @test "in current directory" {
   create_file ".python-version"
   run pyenv-version-file
   assert_success "${PYENV_TEST_DIR}/.python-version"
 }
 
-@test "legacy file in current directory" {
-  create_file ".pyenv-version"
-  run pyenv-version-file
-  assert_success "${PYENV_TEST_DIR}/.pyenv-version"
-}
-
-@test ".python-version has precedence over legacy file" {
-  create_file ".python-version"
-  create_file ".pyenv-version"
-  run pyenv-version-file
-  assert_success "${PYENV_TEST_DIR}/.python-version"
-}
-
 @test "in parent directory" {
   create_file ".python-version"
   mkdir -p project
@@ -74,14 +47,6 @@ create_file() {
   assert_success "${PYENV_TEST_DIR}/project/.python-version"
 }
 
-@test "legacy file has precedence if higher" {
-  create_file ".python-version"
-  create_file "project/.pyenv-version"
-  cd project
-  run pyenv-version-file
-  assert_success "${PYENV_TEST_DIR}/project/.pyenv-version"
-}
-
 @test "PYENV_DIR has precedence over PWD" {
   create_file "widget/.python-version"
   create_file "project/.python-version"
@@ -97,3 +62,14 @@ create_file() {
   PYENV_DIR="${PYENV_TEST_DIR}/widget/blank" run pyenv-version-file
   assert_success "${PYENV_TEST_DIR}/project/.python-version"
 }
+
+@test "finds version file in target directory" {
+  create_file "project/.python-version"
+  run pyenv-version-file "${PWD}/project"
+  assert_success "${PYENV_TEST_DIR}/project/.python-version"
+}
+
+@test "fails when no version file in target directory" {
+  run pyenv-version-file "$PWD"
+  assert_failure ""
+}

test/version-name.bats

@@ -22,29 +22,50 @@ setup() {
   assert_success "system"
 }
 
+@test "PYENV_VERSION can be overridden by hook" {
+  create_version "2.7.11"
+  create_version "3.5.1"
+  create_hook version-name test.bash <<<"PYENV_VERSION=3.5.1"
+
+  PYENV_VERSION=2.7.11 run pyenv-version-name
+  assert_success "3.5.1"
+}
+
+@test "carries original IFS within hooks" {
+  create_hook version-name hello.bash <<SH
+hellos=(\$(printf "hello\\tugly world\\nagain"))
+echo HELLO="\$(printf ":%s" "\${hellos[@]}")"
+SH
+
+  export PYENV_VERSION=system
+  IFS=$' \t\n' run pyenv-version-name env
+  assert_success
+  assert_line "HELLO=:hello:ugly:world:again"
+}
+
 @test "PYENV_VERSION has precedence over local" {
-  create_version "2.7.6"
-  create_version "3.3.3"
+  create_version "2.7.11"
+  create_version "3.5.1"
 
-  cat > ".python-version" <<<"2.7.6"
+  cat > ".python-version" <<<"2.7.11"
   run pyenv-version-name
-  assert_success "2.7.6"
+  assert_success "2.7.11"
 
-  PYENV_VERSION=3.3.3 run pyenv-version-name
-  assert_success "3.3.3"
+  PYENV_VERSION=3.5.1 run pyenv-version-name
+  assert_success "3.5.1"
 }
 
 @test "local file has precedence over global" {
-  create_version "2.7.6"
-  create_version "3.3.3"
+  create_version "2.7.11"
+  create_version "3.5.1"
 
-  cat > "${PYENV_ROOT}/version" <<<"2.7.6"
+  cat > "${PYENV_ROOT}/version" <<<"2.7.11"
   run pyenv-version-name
-  assert_success "2.7.6"
+  assert_success "2.7.11"
 
-  cat > ".python-version" <<<"3.3.3"
+  cat > ".python-version" <<<"3.5.1"
   run pyenv-version-name
-  assert_success "3.3.3"
+  assert_success "3.5.1"
 }
 
 @test "missing version" {
@@ -53,22 +74,22 @@ setup() {
 }
 
 @test "one missing version (second missing)" {
-  create_version "3.4.2"
-  PYENV_VERSION="3.4.2:1.2" run pyenv-version-name
+  create_version "3.5.1"
+  PYENV_VERSION="3.5.1:1.2" run pyenv-version-name
   assert_failure
   assert_output <<OUT
 pyenv: version \`1.2' is not installed (set by PYENV_VERSION environment variable)
-3.4.2
+3.5.1
 OUT
 }
 
 @test "one missing version (first missing)" {
-  create_version "3.4.2"
-  PYENV_VERSION="1.2:3.4.2" run pyenv-version-name
+  create_version "3.5.1"
+  PYENV_VERSION="1.2:3.5.1" run pyenv-version-name
   assert_failure
   assert_output <<OUT
 pyenv: version \`1.2' is not installed (set by PYENV_VERSION environment variable)
-3.4.2
+3.5.1
 OUT
 }
 
@@ -77,18 +98,18 @@ pyenv-version-name-without-stderr() {
 }
 
 @test "one missing version (without stderr)" {
-  create_version "3.4.2"
-  PYENV_VERSION="1.2:3.4.2" run pyenv-version-name-without-stderr
+  create_version "3.5.1"
+  PYENV_VERSION="1.2:3.5.1" run pyenv-version-name-without-stderr
   assert_failure
   assert_output <<OUT
-3.4.2
+3.5.1
 OUT
 }
 
 @test "version with prefix in name" {
-  create_version "2.7.6"
-  cat > ".python-version" <<<"python-2.7.6"
+  create_version "2.7.11"
+  cat > ".python-version" <<<"python-2.7.11"
   run pyenv-version-name
   assert_success
-  assert_output "2.7.6"
+  assert_output "2.7.11"
 }

test/version-origin.bats

@@ -31,8 +31,26 @@ setup() {
   assert_success "${PWD}/.python-version"
 }
 
-@test "detects alternate version file" {
-  touch .pyenv-version
-  run pyenv-version-origin
-  assert_success "${PWD}/.pyenv-version"
+@test "reports from hook" {
+  create_hook version-origin test.bash <<<"PYENV_VERSION_ORIGIN=plugin"
+
+  PYENV_VERSION=1 run pyenv-version-origin
+  assert_success "plugin"
+}
+
+@test "carries original IFS within hooks" {
+  create_hook version-origin hello.bash <<SH
+hellos=(\$(printf "hello\\tugly world\\nagain"))
+echo HELLO="\$(printf ":%s" "\${hellos[@]}")"
+SH
+
+  export PYENV_VERSION=system
+  IFS=$' \t\n' run pyenv-version-origin env
+  assert_success
+  assert_line "HELLO=:hello:ugly:world:again"
+}
+
+@test "doesn't inherit PYENV_VERSION_ORIGIN from environment" {
+  PYENV_VERSION_ORIGIN=ignored run pyenv-version-origin
+  assert_success "${PYENV_ROOT}/version"
 }

test/which.bats

@@ -113,15 +113,13 @@ OUT
 }
 
 @test "carries original IFS within hooks" {
-  hook_path="${PYENV_TEST_DIR}/pyenv.d"
-  mkdir -p "${hook_path}/which"
-  cat > "${hook_path}/which/hello.bash" <<SH
+  create_hook which hello.bash <<SH
 hellos=(\$(printf "hello\\tugly world\\nagain"))
 echo HELLO="\$(printf ":%s" "\${hellos[@]}")"
 exit
 SH
 
-  PYENV_HOOK_PATH="$hook_path" IFS=$' \t\n' PYENV_VERSION=system run pyenv-which anything
+  IFS=$' \t\n' PYENV_VERSION=system run pyenv-which anything
   assert_success
   assert_output "HELLO=:hello:ugly:world:again"
 }