Treat all versions with activate script as a virtual environment

bin/pyenv-virtualenv-prefix

@@ -31,31 +31,15 @@ base_prefix() { # pyvenv
 }
 
 VIRTUALENV_PREFIX_PATHS=()
-for version_string in "${versions[@]}"; do
+for version in "${versions[@]}"; do
-  version="${version_string%%/*}"
   if [ "$version" = "system" ]; then
     echo "pyenv-virtualenv: version \`${version}' is not a virtualenv" 1>&2
     exit 1
   fi
-  PREFIX="$(pyenv-prefix "${version}")"
+  PYENV_PREFIX_PATH="$(pyenv-prefix "${version}")"
-  if [ -f "${PREFIX}/bin/activate" ]; then
+  if [ -f "${PYENV_PREFIX_PATH}/bin/activate" ]; then
-    # Anaconda has `activate` script nevertheless it is not a virtual environment (#65)
+    VIRTUALENV_PREFIX_PATH="$(real_prefix "${version}" || base_prefix "${version}" || true)"
-    if [ -f "${PREFIX}/bin/conda" ]; then
+    VIRTUALENV_PREFIX_PATHS=("${VIRTUALENV_PREFIX_PATHS[@]}" "${VIRTUALENV_PREFIX_PATH:-${PYENV_PREFIX_PATH}}")
-      if [[ "${version_string}" != "${version_string%/envs/*}" ]]; then
-        conda_env="${version_string##*/envs/}"
-        if [ -f "${PREFIX}/envs/${conda_env}/bin/conda" ]; then
-          VIRTUALENV_PREFIX_PATHS=("${VIRTUALENV_PREFIX_PATHS[@]}" "${PREFIX}")
-        else
-          echo "pyenv-virtualenv: version \`${version_string}' is not an environment of anaconda/miniconda" 1>&2
-          exit 1
-        fi
-      else
-        VIRTUALENV_PREFIX_PATHS=("${VIRTUALENV_PREFIX_PATHS[@]}" "${PREFIX}")
-      fi
-    else
-      VIRTUALENV_PREFIX_PATH="$(real_prefix "${version}" || base_prefix "${version}" || true)"
-      VIRTUALENV_PREFIX_PATHS=("${VIRTUALENV_PREFIX_PATHS[@]}" "$VIRTUALENV_PREFIX_PATH")
-    fi
   else
     echo "pyenv-virtualenv: version \`${version}' is not a virtualenv" 1>&2
     exit 1

bin/pyenv-virtualenvs

@@ -16,7 +16,7 @@ if [ "$1" = "--bare" ]; then
   hit_prefix=""
   miss_prefix=""
   current_versions=()
-  print_origin=""
+  unset print_origin
 else
   hit_prefix="* "
   miss_prefix="  "
@@ -24,42 +24,39 @@ else
   print_origin="1"
 fi
 
-array_exists() {
+exists() {
-  local x car="$1"
+  local car="$1"
+  local cdar
   shift
-  for x in "$@"; do
+  for cdar in "$@"; do
-    [ "${x}" = "${car}" ] && return 0
+    if [ "${car}" == "${cdar}" ]; then
+      return 0
+    fi
   done
   return 1
 }
 
 print_version() {
-  if [ -n "${print_origin}" ]; then
+  if exists "$1" "${current_versions[@]}"; then
-    local version_origin="$2"
+    echo "${hit_prefix}${1}${print_origin+$2}"
   else
-    local version_origin=""
+    echo "${miss_prefix}${1}${print_origin+$2}"
-  fi
-  if array_exists "$1" "${current_versions[@]}"; then
-    echo "${hit_prefix}${1}${version_origin}"
-  else
-    echo "${miss_prefix}${1}${version_origin}"
   fi
 }
 
-for version in $(pyenv-versions --bare); do
+shopt -s nullglob
-  if [[ "${version}" != "system" ]]; then
+for path in "${PYENV_ROOT}/versions/"*; do
-    virtualenv_prefix="$(pyenv-virtualenv-prefix "${version}" 2>/dev/null || true)"
+  version="${path##*/}"
-    if [ -d "${virtualenv_prefix}" ]; then
+  virtualenv_prefix="$(pyenv-virtualenv-prefix "${version}" 2>/dev/null || true)"
-      print_version "${version}" " (created from ${virtualenv_prefix})"
+  if [ -d "${virtualenv_prefix}" ]; then
-      prefix="$(pyenv-prefix "${version}")"
+    print_version "${version}" " (created from ${virtualenv_prefix})"
-      if [ -f "${prefix}/bin/conda" ]; then
-        # envs of anaconda/miniconda
-        shopt -s nullglob
-        for conda_env in "${prefix}/envs/"*; do
-          print_version "${version##*/}${conda_env#${prefix}}" " (created from ${prefix})"
-        done
-        shopt -u nullglob
-      fi
-    fi
   fi
+  for venv_path in "${path}/envs/"*; do
+    venv_version="${version}/envs/${venv_path##*/}"
+    virtualenv_prefix="$(pyenv-virtualenv-prefix "${venv_version}" 2>/dev/null || true)"
+    if [ -d "${virtualenv_prefix}" ]; then
+      print_version "${venv_version}" " (created from ${virtualenv_prefix})"
+    fi
+  done
 done
+shopt -u nullglob

test/conda-virtualenv-prefix.bats

@@ -14,28 +14,28 @@ setup() {
 
   PYENV_VERSION="anaconda-2.3.0" run pyenv-virtualenv-prefix
 
-  unstub pyenv-version-name
-  unstub pyenv-prefix
-
   assert_success
   assert_output <<OUT
 ${PYENV_ROOT}/versions/anaconda-2.3.0
 OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
 }
 
 @test "display conda env" {
   create_conda "anaconda-2.3.0" "foo"
 
   stub pyenv-version-name "echo anaconda-2.3.0/envs/foo"
-  stub pyenv-prefix "anaconda-2.3.0 : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0\""
+  stub pyenv-prefix "anaconda-2.3.0/envs/foo : echo \"${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo\""
 
   PYENV_VERSION="anaconda-2.3.0/envs/foo" run pyenv-virtualenv-prefix
 
-  unstub pyenv-version-name
-  unstub pyenv-prefix
-
   assert_success
   assert_output <<OUT
-${PYENV_ROOT}/versions/anaconda-2.3.0
+${PYENV_ROOT}/versions/anaconda-2.3.0/envs/foo
 OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
 }

test/virtualenvs.bats

@@ -12,66 +12,55 @@ setup() {
 
 @test "list virtual environments only" {
   stub pyenv-version-name ": echo system"
-  stub pyenv-versions "--bare : echo \"system\";echo \"2.7.6\";echo \"3.3.3\";echo \"venv27\";echo \"venv33\""
   stub pyenv-virtualenv-prefix "2.7.6 : false"
   stub pyenv-virtualenv-prefix "3.3.3 : false"
   stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/2.7.6\""
   stub pyenv-virtualenv-prefix "venv33 : echo \"${PYENV_ROOT}/versions/3.3.3\""
-  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/2.7.6\""
-  stub pyenv-prefix "venv33 : echo \"${PYENV_ROOT}/versions/3.3.3\""
 
   run pyenv-virtualenvs
 
-  unstub pyenv-version-name
-  unstub pyenv-versions
-  unstub pyenv-virtualenv-prefix
-  unstub pyenv-prefix
-
   assert_success
   assert_output <<OUT
   venv27 (created from ${PYENV_ROOT}/versions/2.7.6)
   venv33 (created from ${PYENV_ROOT}/versions/3.3.3)
 OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-virtualenv-prefix
 }
 
 @test "list virtual environments with hit prefix" {
   stub pyenv-version-name ": echo venv33"
-  stub pyenv-versions "--bare : echo \"system\";echo \"venv27\";echo \"venv33\""
+  stub pyenv-virtualenv-prefix "2.7.6 : false"
+  stub pyenv-virtualenv-prefix "3.3.3 : false"
   stub pyenv-virtualenv-prefix "venv27 : echo \"/usr\""
   stub pyenv-virtualenv-prefix "venv33 : echo \"/usr\""
-  stub pyenv-prefix "venv27 : echo \"/usr\""
-  stub pyenv-prefix "venv33 : echo \"/usr\""
 
   run pyenv-virtualenvs
 
-  unstub pyenv-version-name
-  unstub pyenv-versions
-  unstub pyenv-virtualenv-prefix
-  unstub pyenv-prefix
-
   assert_success
   assert_output <<OUT
   venv27 (created from /usr)
 * venv33 (created from /usr)
 OUT
+
+  unstub pyenv-version-name
+  unstub pyenv-virtualenv-prefix
 }
 
 @test "list virtual environments with --bare" {
-  stub pyenv-versions "--bare : echo \"system\";echo \"venv27\";echo \"venv33\""
+  stub pyenv-virtualenv-prefix "2.7.6 : false"
+  stub pyenv-virtualenv-prefix "3.3.3 : false"
   stub pyenv-virtualenv-prefix "venv27 : echo \"/usr\""
   stub pyenv-virtualenv-prefix "venv33 : echo \"/usr\""
-  stub pyenv-prefix "venv27 : echo \"/usr\""
-  stub pyenv-prefix "venv33 : echo \"/usr\""
 
   run pyenv-virtualenvs --bare
 
-  unstub pyenv-versions
-  unstub pyenv-virtualenv-prefix
-  unstub pyenv-prefix
-
   assert_success
   assert_output <<OUT
 venv27
 venv33
 OUT
+
+  unstub pyenv-virtualenv-prefix
 }