All libraries are loaded by init script

This saves individual libs from having to load each other
and end user scripts from having to source multiple libs.

Related: conjurinc/ops#423

Author: hughsaunders

filehandling/lib

@@ -1,24 +1,28 @@
 #!/bin/bash
 
 : "${BASH_LIB_DIR:?BASH_LIB_DIR must be set. Please source bash-lib/init before other scripts from bash-lib.}"
-. "${BASH_LIB_DIR}/helpers/lib"
 
 #https://stackoverflow.com/a/23002317
 function abs_path() {
     # generate absolute path from relative path
-    # $1     : relative filename
+    # path     : relative filename
     # return : absolute path
-    if [ -d "$1" ]; then
+    if [[ -z "${1:-}" ]]; then
+        path="."
+    else
+        path="${1}"
+    fi
+    if [ -d "${path}" ]; then
         # dir
-        (spushd "$1"; pwd)
-    elif [ -f "$1" ]; then
+        (spushd "${path}"; pwd)
+    elif [ -f "${path}" ]; then
         # file
-        if [[ $1 = /* ]]; then
-            echo "$1"
-        elif [[ $1 == */* ]]; then
-            echo "$(spushd "${1%/*}"; pwd)/${1##*/}"
+        if [[ ${path} = /* ]]; then
+            echo "${path}"
+        elif [[ ${path} == */* ]]; then
+            echo "$(spushd "${path%/*}"; pwd)/${path##*/}"
         else
-            echo "$(pwd)/$1"
+            echo "$(pwd)/${path}"
         fi
     fi
-}
+}

git/lib

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 : "${BASH_LIB_DIR:?BASH_LIB_DIR must be set. Please source bash-lib/init before other scripts from bash-lib.}"
-. "${BASH_LIB_DIR}/helpers/lib"
 
 # Get the top level of a git repo
 function repo_root(){
@@ -76,4 +75,4 @@ space seperated with three fields: subtree_path renmote_url remote_name"
 function tracked_files_excluding_subtrees(){
     subtrees="$(cat_gittrees | awk '{print $1}' | paste -sd '|' -)"
     all_files_in_repo | grep -E -v "${subtrees}"
-}
+}

helpers/lib

@@ -17,4 +17,4 @@ function spushd(){
 #safe popd
 function spopd(){
     popd >/dev/null || die "popd failed :("
-}
+}

init

@@ -20,18 +20,18 @@ BASH_LIB_DIR="${BASH_LIB_DIR_RELATIVE}"
 
 # Load the filehandling module for the abspath
 # function
-. "${BASH_LIB_DIR_RELATIVE}/filehandling/lib"
+for lib in helpers logging filehandling git k8s test-utils; do
+    . "${BASH_LIB_DIR_RELATIVE}/${lib}/lib"
+done
 
 # Export the absolute path
 # shellcheck disable=SC2086
 BASH_LIB_DIR="$(abs_path ${BASH_LIB_DIR_RELATIVE})"
 export BASH_LIB_DIR
 
-. "${BASH_LIB_DIR}/helpers/lib"
-
 # Update Submodules
 spushd "${BASH_LIB_DIR}"
     git submodule update --init --recursive
 spopd
 
-export BATS_CMD="${BASH_LIB_DIR}/test-utils/bats/bin/bats"
+export BATS_CMD="${BASH_LIB_DIR}/test-utils/bats/bin/bats"

k8s/lib

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 : "${BASH_LIB_DIR:?BASH_LIB_DIR must be set. Please source bash-lib/init before other scripts from bash-lib.}"
-. "${BASH_LIB_DIR}/helpers/lib"
 
 # Sets additional required environment variables that aren't available in the
 # secrets.yml file, and performs other preparatory steps
@@ -52,4 +51,4 @@ function run_docker_gke_command() {
       /scripts/platform_login
       ${1}
     "
-}
+}

run-tests

@@ -4,7 +4,6 @@
 # is not assumed to have been run
 # shellcheck disable=SC2086
 . "$(dirname ${BASH_SOURCE[0]})/init"
-. "${BASH_LIB_DIR}/helpers/lib"
 
 # Run BATS Tests
 "${BASH_LIB_DIR}/tests-for-this-repo/run-bats-tests"

test-utils/lib

@@ -1,11 +1,9 @@
 #!/bin/bash
 
 : "${BASH_LIB_DIR:?BASH_LIB_DIR must be set. Please source bash-lib/init before other scripts from bash-lib.}"
-. "${BASH_LIB_DIR}/git/lib"
-. "${BASH_LIB_DIR}/helpers/lib"
 
-readonly SHELLCHECK_IMAGE="${SHELLCHECK_IMAGE:-koalaman/shellcheck}"
-readonly SHELLCHECK_TAG="${SHELLCHECK_TAG:-v0.6.0}"
+SHELLCHECK_IMAGE="${SHELLCHECK_IMAGE:-koalaman/shellcheck}"
+SHELLCHECK_TAG="${SHELLCHECK_TAG:-v0.6.0}"
 
 # Check a single shell script for syntax
 # and common errors.

tests-for-this-repo/filehandling.bats

@@ -1,16 +1,22 @@
 . "${BASH_LIB_DIR}/test-utils/bats-support/load.bash"
 . "${BASH_LIB_DIR}/test-utils/bats-assert-1/load.bash"
 
-. "${BASH_LIB_DIR}/filehandling/lib"
+. "${BASH_LIB_DIR}/init"
 
 @test "abs_path returns absolute path for PWD" {
     run abs_path .
     assert_output $PWD
     assert_success
 }
 
+@test "abs_path returns PWD when no arg specified" {
+    run abs_path
+    assert_output $PWD
+    assert_success
+}
+
 @test "abs_path returns same path when already absolute" {
     run abs_path /tmp
     assert_output /tmp
     assert_success
-}
+}

tests-for-this-repo/git.bats

@@ -1,7 +1,7 @@
 . "${BASH_LIB_DIR}/test-utils/bats-support/load.bash"
 . "${BASH_LIB_DIR}/test-utils/bats-assert-1/load.bash"
 
-. "${BASH_LIB_DIR}/git/lib"
+. "${BASH_LIB_DIR}/init"
 
 # run before every test
 setup(){
@@ -137,4 +137,4 @@ EOF
     assert_success
     assert_output --partial a_file
     assert_success
-}
+}

tests-for-this-repo/helpers.bats

@@ -1,35 +1,36 @@
 . "${BASH_LIB_DIR}/test-utils/bats-support/load.bash"
 . "${BASH_LIB_DIR}/test-utils/bats-assert-1/load.bash"
 
-. "${BASH_LIB_DIR}/helpers/lib"
+. "${BASH_LIB_DIR}/init"
+
 
 @test "die exits and prints message" {
-    run bash -c ". ${BASH_LIB_DIR}/helpers/lib; die msg"
+    run bash -c ". ${BASH_LIB_DIR}/init; die msg"
     assert_output msg
     assert_failure
 }
 
 @test "spushd is quiet on stdout" {
     run spushd /tmp
-    refute_output
+    assert_output ""
     assert_success
 }
 
 @test "spopd is quiet on stdout" {
     pushd .
     run spopd
-    refute_output
+    assert_output ""
     assert_success
 }
 
 @test "spushd dies on failure" {
-    run bash -c ". ${BASH_LIB_DIR}/helpers/lib; spushd /this-doesnt-exist"
+    run bash -c ". ${BASH_LIB_DIR}/init; spushd /this-doesnt-exist"
     assert_output --partial "No such file or directory"
     assert_failure
 }
 
 @test "spopd dies on failure" {
-    run bash -c ". ${BASH_LIB_DIR}/helpers/lib; spopd"
+    run bash -c ". ${BASH_LIB_DIR}/init; spopd"
     assert_output --partial "stack empty"
     assert_failure
-}
+}