Merge 5d7894d189 into e8c8fd9b84

Allow output checking with wildcards

bin/pyenv-activate

@@ -22,10 +22,8 @@ fi
 
 { printf "\x1B[31;1m"
   echo
-  echo "Failed to activate virtualenv."
-  echo
-  echo "Perhaps pyenv-virtualenv has not been loaded into your shell properly."
-  echo "Please restart current shell and try again."
+  echo "\`pyenv activate' requires Pyenv and Pyenv-Virtualenv to be loaded into your shell."
+  echo "Check your shell configuration and Pyenv and Pyenv-Virtualenv installation instructions."
   echo
   printf "\x1B[0m"
 } 1>&2

bin/pyenv-deactivate

@@ -11,10 +11,8 @@ set -e
 
 { printf "\x1B[31;1m"
   echo
-  echo "Failed to deactivate virtualenv."
-  echo
-  echo "Perhaps pyenv-virtualenv has not been loaded into your shell properly."
-  echo "Please restart current shell and try again."
+  echo "\`pyenv deactivate' requires Pyenv and Pyenv-Virtualenv to be loaded into your shell."
+  echo "Check your shell configuration and Pyenv and Pyenv-Virtualenv installation instructions."
   echo
   printf "\x1B[0m"
 } 1>&2

bin/pyenv-virtualenv

@@ -605,7 +605,13 @@ STATUS=0
 mkdir -p "${PYENV_VIRTUALENV_CACHE_PATH}"
 cd "${PYENV_VIRTUALENV_CACHE_PATH}"
 if [ -n "${USE_CONDA}" ]; then
-  pyenv-exec conda create $QUIET $VERBOSE --name "${VIRTUALENV_PATH##*/}" --yes "${VIRTUALENV_OPTIONS[@]}" python || STATUS="$?"
+  if [ -z "$VIRTUALENV_PYTHON" ]; then
+    #process substitution doesn't seem to work unless it's directly inserted to the command line
+    #if we add it to VIRTUALENV_OPTIONS instead, "broken pipe" happens
+    pyenv-exec conda create $QUIET $VERBOSE --name "${VIRTUALENV_PATH##*/}" --yes "${VIRTUALENV_OPTIONS[@]}" --file <(pyenv-exec conda list python --full-name --export) || STATUS="$?"
+  else
+    pyenv-exec conda create $QUIET $VERBOSE --name "${VIRTUALENV_PATH##*/}" --yes "${VIRTUALENV_OPTIONS[@]}" || STATUS="$?"
+  fi
 else
   if [ -n "${USE_M_VENV}" ]; then
     pyenv-exec "${M_VENV_PYTHON_BIN:-python}" -m venv $QUIET $VERBOSE "${VIRTUALENV_OPTIONS[@]}" "${VIRTUALENV_PATH}" || STATUS="$?"
@@ -625,7 +631,8 @@ fi
 
 ## Create symlink in the `versions` directory for backward compatibility
 if [ -d "${VIRTUALENV_PATH}" ] && [ -n "${COMPAT_VIRTUALENV_PATH}" ]; then
-  ln -fs "${VIRTUALENV_PATH}" "${COMPAT_VIRTUALENV_PATH}"
+  # Overwrite an existing link, can happen if running with -f
+  ln -fsn "${VIRTUALENV_PATH}" "${COMPAT_VIRTUALENV_PATH}"
 fi
 
 if [ ! -e "${VIRTUALENV_PATH}/bin/pydoc" ]; then

bin/pyenv-virtualenv-init

@@ -95,8 +95,10 @@ EOS
   ;;
 * )
   cat <<EOS
-export PATH="${PYENV_VIRTUALENV_ROOT:-${PYENV_VIRTUALENV_INSTALL_PREFIX}}/shims:\${PATH}";
-export PYENV_VIRTUALENV_INIT=1;
+if [[ ":$PATH:" != *"${PYENV_VIRTUALENV_ROOT:-${PYENV_VIRTUALENV_INSTALL_PREFIX}}/shims"* ]]; then
+  export PATH="${PYENV_VIRTUALENV_ROOT:-${PYENV_VIRTUALENV_INSTALL_PREFIX}}/shims:\${PATH}";
+  export PYENV_VIRTUALENV_INIT=1;
+fi
 EOS
   ;;
 esac

test/conda.bats

@@ -32,8 +32,8 @@ unstub_pyenv() {
   run pyenv-virtualenv venv
 
   assert_success
-  assert_output <<OUT
-PYENV_VERSION=miniconda3-3.16.0 conda create --name venv --yes python
+  assert_output_wildcards <<OUT
+PYENV_VERSION=miniconda3-3.16.0 conda create --name venv --yes --file /dev/fd/*
 rehashed
 OUT
 
@@ -56,7 +56,7 @@ OUT
 
   assert_success
   assert_output <<OUT
-PYENV_VERSION=miniconda3-3.16.0 conda create --name venv --yes python=3.5 python
+PYENV_VERSION=miniconda3-3.16.0 conda create --name venv --yes python=3.5
 rehashed
 OUT
 
@@ -79,7 +79,7 @@ OUT
 
   assert_success
   assert_output <<OUT
-PYENV_VERSION=miniconda3-3.16.0 conda create --name venv --yes python=3.5 python
+PYENV_VERSION=miniconda3-3.16.0 conda create --name venv --yes python=3.5
 rehashed
 OUT
 

test/deactivate.bats

@@ -1,4 +1,4 @@
- #!/usr/bin/env bats
+#!/usr/bin/env bats
 
 load test_helper
 

test/init.bats

@@ -50,8 +50,10 @@ load test_helper
   run pyenv-virtualenv-init - bash
   assert_success
   assert_output <<EOS
-export PATH="${TMP}/pyenv/plugins/pyenv-virtualenv/shims:\${PATH}";
-export PYENV_VIRTUALENV_INIT=1;
+if [[ ":$PATH:" != *"${TMP}/pyenv/plugins/pyenv-virtualenv/shims"* ]]; then
+  export PATH="${TMP}/pyenv/plugins/pyenv-virtualenv/shims:\${PATH}";
+  export PYENV_VIRTUALENV_INIT=1;
+fi
 _pyenv_virtualenv_hook() {
   local ret=\$?
   if [ -n "\${VIRTUAL_ENV-}" ]; then
@@ -93,8 +95,10 @@ EOS
   run pyenv-virtualenv-init - zsh
   assert_success
   assert_output <<EOS
-export PATH="${TMP}/pyenv/plugins/pyenv-virtualenv/shims:\${PATH}";
-export PYENV_VIRTUALENV_INIT=1;
+if [[ ":$PATH:" != *"${TMP}/pyenv/plugins/pyenv-virtualenv/shims"* ]]; then
+  export PATH="${TMP}/pyenv/plugins/pyenv-virtualenv/shims:\${PATH}";
+  export PYENV_VIRTUALENV_INIT=1;
+fi
 _pyenv_virtualenv_hook() {
   local ret=\$?
   if [ -n "\${VIRTUAL_ENV-}" ]; then

test/test_helper.bash

@@ -83,6 +83,16 @@ assert_equal() {
   fi
 }
 
+assert_equal_wildcards() {
+  if [[ $1 != $2 ]]; then
+    { echo "expected:"
+      echo "$2"
+      echo "actual:"
+      echo "$1"
+    } | flunk
+  fi
+}
+
 assert_output() {
   local expected
   if [ $# -eq 0 ]; then expected="$(cat -)"
@@ -91,6 +101,14 @@ assert_output() {
   assert_equal "$expected" "$output"
 }
 
+assert_output_wildcards() {
+  local expected
+  if [ $# -eq 0 ]; then expected="$(cat -)"
+  else expected="$1"
+  fi
+  assert_equal_wildcards "$output" "$expected"
+}
+
 assert_output_contains() {
   local expected="$1"
   echo "$output" | grep -F "$expected" >/dev/null || {