DRY up use of helper functions

Affirm · Jan 15, 2023 · a0d04b9 · a0d04b9
1 parent 020fd16
commit a0d04b9
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 71 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -29,22 +29,6 @@ jobs:
       - name: 'Run all tests'
         run: './test/run.sh'
         shell: 'bash'
-      # - uses: 'docker/setup-buildx-action@v2'
-      #   if: contains(matrix.os, 'ubuntu')
-      #   with:
-      #     install: true
-      # - uses: 'docker/build-push-action@v3'
-      #   if: contains(matrix.os, 'ubuntu')
-      #   with:
-      #     context: .
-      #     load: true
-      #     tags: "tgenv-terraform:${{ github.head_ref }}"
-      # - name: 'Check Dockerfile'
-      #   if: contains(matrix.os, 'ubuntu')
-      #   run: |
-      #     expect=1.2.3;
-      #     got="$(docker run -e "TGENV_TERRAFORM_VERSION=${expect}" "tgenv-terraform:${{ github.head_ref }}" version)";
-      #     echo "${got}" | tee /dev/stderr | grep -e 'Terraform v1.2.3'
 
   # When we push to main, test everything in order to guarantee releases
   test-main-pushes:
@@ -69,19 +53,3 @@ jobs:
       - name: 'Run all tests'
         run: './test/run.sh'
         shell: 'bash'
-      # - uses: 'docker/setup-buildx-action@v2'
-      #   if: contains(matrix.os, 'ubuntu')
-      #   with:
-      #     install: true
-      # - uses: 'docker/build-push-action@v3'
-      #   if: contains(matrix.os, 'ubuntu')
-      #   with:
-      #     context: .
-      #     load: true
-      #     tags: 'tgenv-terraform:latest'
-      # - name: 'Check Dockerfile'
-      #   if: contains(matrix.os, 'ubuntu')
-      #   run: |
-      #     expect=1.2.3;
-      #     got="$(docker run -e "TGENV_TERRAFORM_VERSION=${expect}" tgenv-terraform:latest version)";
-      #     echo "${got}" | tee /dev/stderr | grep -e 'Terraform v1.2.3'
diff --git a/libexec/helpers b/libexec/helpers
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 
+function error_and_proceed() {
+  errors+=("${1}")
+  echo -e "tgenv: ${0}: Test Failed: ${1}" >&2
+}
+
 function error_and_die() {
   echo -e "tgenv: $(basename ${0}): \033[0;31m[ERROR] ${1}\033[0;39m" >&2
   exit 1

diff --git a/test/run.sh b/test/run.sh
@@ -4,7 +4,8 @@ if [ -n "${TGENV_DEBUG}" ]; then
   export PS4='+ [${BASH_SOURCE##*/}:${LINENO}] '
   set -x
 fi
-TGENV_ROOT=$(cd $(dirname ${0})/.. && pwd)
+
+export TGENV_ROOT=$(cd $(dirname ${0})/.. && pwd)
 export PATH="${TGENV_ROOT}/bin:${PATH}"
 
 errors=()

diff --git a/test/test_install_and_use.sh b/test/test_install_and_use.sh
@@ -2,15 +2,7 @@
 
 declare -a errors
 
-function error_and_proceed() {
-  errors+=("${1}")
-  echo -e "tgenv: ${0}: Test Failed: ${1}" >&2
-}
-
-function error_and_die() {
-  echo -e "tgenv: ${0}: ${1}" >&2
-  exit 1
-}
+source "${TGENV_ROOT}/libexec/helpers"
 
 [ -n "$TGENV_DEBUG" ] && set -x
 source $(dirname $0)/helpers.sh \

diff --git a/test/test_list.sh b/test/test_list.sh
@@ -1,18 +1,9 @@
 #!/usr/bin/env bash
 
-# set -uo pipefail;
-
+set -uo pipefail;
 declare -a errors
 
-function error_and_proceed() {
-  errors+=("${1}")
-  echo -e "tgenv: ${0}: Test Failed: ${1}" >&2
-}
-
-function error_and_die() {
-  echo -e "tgenv: ${0}: ${1}" >&2
-  exit 1
-}
+source "${TGENV_ROOT}/libexec/helpers"
 
 [ "${TGENV_DEBUG:-0}" -gt 0 ] && set -x
 source $(dirname $0)/helpers.sh \

diff --git a/test/test_symlink.sh b/test/test_symlink.sh
@@ -2,15 +2,7 @@
 
 declare -a errors
 
-function error_and_proceed() {
-  errors+=("${1}")
-  echo -e "tgenv: Test Failed: ${1}" >&2
-}
-
-function error_and_die() {
-  echo -e "tgenv: ${1}" >&2
-  exit 1
-}
+source "${TGENV_ROOT}/libexec/helpers"
 
 [ -n "${TGENV_DEBUG}" ] && set -x
 source $(dirname $0)/helpers.sh \

diff --git a/test/test_uninstall.sh b/test/test_uninstall.sh
@@ -2,15 +2,7 @@
 
 declare -a errors
 
-function error_and_proceed() {
-  errors+=("${1}")
-  echo -e "tgenv: ${0}: Test Failed: ${1}" >&2
-}
-
-function error_and_die() {
-  echo -e "tgenv: ${0}: ${1}" >&2
-  exit 1
-}
+source "${TGENV_ROOT}/libexec/helpers"
 
 [ -n "${TGENV_DEBUG}" ] && set -x
 source $(dirname $0)/helpers.sh \