Fix select version when multiple versions available

danhper · danhper · commit 0f0bbef50dbf · 2019-03-20T17:20:01.000Z
With the previous version, the following case would fail.
It would use python 2.7.15 when running pip
instead of version 3.7.2.

Shim for `pip`

```bash
exec /home/daniel/.asdf/bin/asdf exec "pip" "$@"
```

`.tool-versions`:

```
python 3.7.2 2.7.15 system
```
diff --git a/lib/utils.sh b/lib/utils.sh
@@ -603,24 +603,30 @@ with_shim_executable() {
   }
 
   select_version() {
-    # First, we get the all the plugin/version pairs where the
+    # First, we get the all the plugins where the
     # current shim is available.
-    # Then, we iterate on these and check if the version of the current
-    # plugin is the one currently set.
+    # Then, we iterate on all versions set for each plugin
     # Note that multiple plugin versions can be set for a single plugin.
     # These are separated by a space. e.g. python 3.7.2 2.7.15
-    # Therefore, we iterate on all the versions set for the plugin
-    # and return if we find a version which matches the shim plugin/version pair
+    # For each plugin/version pair, we check if it is present in the shim
     local search_path
     search_path=$(pwd)
     local shim_versions
     IFS=$'\n' read -rd '' -a shim_versions <<< "$(get_shim_versions)"
 
+    local plugins
+    plugins=()
+
     for plugin_and_version in "${shim_versions[@]}"; do
       local plugin_name
       local plugin_shim_version
-      IFS=' ' read -r plugin_name plugin_shim_version <<< "$plugin_and_version"
+      IFS=' ' read -r plugin_name _plugin_shim_version <<< "$plugin_and_version"
+      if ! [[ " ${plugins[*]} " == *" $plugin_name "* ]]; then
+        plugins+=("$plugin_name")
+      fi
+    done
 
+    for plugin_name in "${plugins[@]}"; do
       local version_and_path
       local version_string
       local usable_plugin_versions
@@ -629,10 +635,16 @@ with_shim_executable() {
       IFS='|' read -r version_string _path <<< "$version_and_path"
       IFS=' ' read -r -a usable_plugin_versions <<< "$version_string"
       for plugin_version in "${usable_plugin_versions[@]}"; do
-        if [ "$plugin_version" = "$plugin_shim_version" ]; then
-          echo "$plugin_name $plugin_version"
-          return
-        fi
+        for plugin_and_version in "${shim_versions[@]}"; do
+          local plugin_shim_name
+          local plugin_shim_version
+          IFS=' ' read -r plugin_shim_name plugin_shim_version <<< "$plugin_and_version"
+          if [[ "$plugin_name" = "$plugin_shim_name" ]] &&
+             [[ "$plugin_version" = "$plugin_shim_version" ]]; then
+            echo "$plugin_name $plugin_version"
+            return
+          fi
+        done
       done
     done
   }
diff --git a/test/shim_exec.bats b/test/shim_exec.bats
@@ -114,6 +114,7 @@ teardown() {
 }
 
 @test "shim exec should execute first plugin that is installed and set" {
+  run asdf install dummy 2.0
   run asdf install dummy 3.0
 
   echo "dummy 1.0 3.0 2.0" > $PROJECT_DIR/.tool-versions

Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,7 @@ teardown() {`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`@test "shim exec should execute first plugin that is installed and set" {`
	`117`	`+ run asdf install dummy 2.0`
`117`	`118`	`run asdf install dummy 3.0`
`118`	`119`
`119`	`120`	`echo "dummy 1.0 3.0 2.0" > $PROJECT_DIR/.tool-versions`