Fix tests

Author: Zordrak

libexec/tfenv-resolve-version

@@ -101,6 +101,7 @@ log 'debug' "Version Requested: ${version_requested}";
 
 # Accept a v-prefixed version, but strip the v.
 if [[ "${version_requested}" =~ ^v.*$ ]]; then
+  log 'debug' "Version Requested is prefixed with a v. Stripping the v."
   version_requested="${version_requested#v*}";
 fi;
 

libexec/tfenv-use

@@ -77,6 +77,7 @@ fi
 
 log debug "Resolving version with: tfenv-resolve-version ${requested_arg}";
 declare resolved="$(tfenv-resolve-version ${requested_arg})";
+log debug "Resolved to: ${resolved}";
 
 declare version="${resolved%%\:*}";
 declare regex="${resolved##*\:}";

libexec/tfenv-version-name

@@ -105,6 +105,12 @@ if [[ "${TFENV_VERSION}" =~ ^latest.*$ ]]; then
 
 else
   log 'debug' 'TFENV_VERSION does not use "latest" keyword';
+
+  # Accept a v-prefixed version, but strip the v.
+  if [[ "${TFENV_VERSION}" =~ ^v.*$ ]]; then
+    log 'debug' "Version Requested is prefixed with a v. Stripping the v."
+    TFENV_VERSION="${TFENV_VERSION#v*}";
+  fi;
 fi;
 
 [ -z "${TFENV_VERSION}" ] \

test/test_install_and_use.sh

@@ -112,12 +112,13 @@ tests__kv=(
 
 tests_count=${#tests__desc[@]};
 
-declare desc kv k v;
+declare desc kv k v test_num;
 
-for ((test_num=0; test_num<${tests_count}; ++test_num )) ; do
+for ((test_iter=0; test_iter<${tests_count}; ++test_iter )) ; do
   cleanup || log 'error' 'Cleanup failed?!';
-  desc=${tests__desc[${test_num}]};
-  kv="${tests__kv[${test_num}]}";
+  test_num=$((test_iter + 1)); 
+  desc=${tests__desc[${test_iter}]};
+  kv="${tests__kv[${test_iter}]}";
   v="${kv%,*}";
   k="${kv##*,}";
   log 'info' "## Param Test ${test_num}/${tests_count}: ${desc} ( ${k} / ${v} )";
@@ -126,10 +127,11 @@ for ((test_num=0; test_num<${tests_count}; ++test_num )) ; do
     || error_and_proceed "## Param Test ${test_num}/${tests_count}: ${desc} ( ${k} / ${v} ) failed";
 done;
 
-for ((test_num=0; test_num<${tests_count}; ++test_num )) ; do
+for ((test_iter=0; test_iter<${tests_count}; ++test_iter )) ; do
   cleanup || log 'error' 'Cleanup failed?!';
-  desc=${tests__desc[${test_num}]};
-  kv="${tests__kv[${test_num}]}";
+  test_num=$((test_iter + 1)); 
+  desc=${tests__desc[${test_iter}]};
+  kv="${tests__kv[${test_iter}]}";
   v="${kv%,*}";
   k="${kv##*,}";
   log 'info' "## ./.terraform-version Test ${test_num}/${tests_count}: ${desc} ( ${k} / ${v} )";
@@ -140,10 +142,11 @@ for ((test_num=0; test_num<${tests_count}; ++test_num )) ; do
     || error_and_proceed "## ./.terraform-version Test ${test_num}/${tests_count}: ${desc} ( ${k} / ${v} ) failed";
 done;
 
-for ((test_num=0; test_num<${tests_count}; ++test_num )) ; do
+for ((test_iter=0; test_iter<${tests_count}; ++test_iter )) ; do
   cleanup || log 'error' 'Cleanup failed?!';
-  desc=${tests__desc[${test_num}]};
-  kv="${tests__kv[${test_num}]}";
+  test_num=$((test_iter + 1)); 
+  desc=${tests__desc[${test_iter}]};
+  kv="${tests__kv[${test_iter}]}";
   v="${kv%,*}";
   k="${kv##*,}";
   log 'info' "## TFENV_TERRAFORM_VERSION Test ${test_num}/${tests_count}: ${desc} ( ${k} / ${v} )";
@@ -208,10 +211,11 @@ neg_tests__kv=(
 
 neg_tests_count=${#neg_tests__desc[@]};
 
-for ((test_num=0; test_num<${neg_tests_count}; ++test_num )) ; do
+for ((test_iter=0; test_iter<${neg_tests_count}; ++test_iter )) ; do
   cleanup || log 'error' 'Cleanup failed?!';
-  desc=${neg_tests__desc[${test_num}]}
-  k="${neg_tests__kv[${test_num}]}";
+  test_num=$((test_iter + 1));
+  desc=${neg_tests__desc[${test_iter}]}
+  k="${neg_tests__kv[${test_iter}]}";
   expected_error_message="No versions matching '${k}' found in remote";
   log 'info' "##  Invalid Version Test ${test_num}/${neg_tests_count}: ${desc} ( ${k} )";
   [ -z "$(tfenv install "${k}" 2>&1 | grep "${expected_error_message}")" ] \