move lots of files, fix sudo test

ws_tool/lib/properties.bash

@@ -348,6 +348,10 @@ prop_ws_nix_global_config_fix () {
     echo "${parts[2]}"
   } > "$new_conf"
 
-  sudo "${WORKSTATION_DIR}/ws_tool/bin/safe-overwrite" "$new_conf" "$WS_NIX_GLOBAL_CONFIG_LOCATION"
+  maybe_sudo="bash" # basically does nothing different
+  if ! [[ -w "$WS_NIX_GLOBAL_CONFIG_LOCATION" ]]; then
+    maybe_sudo="sudo"
+  fi
+  "$maybe_sudo" "${WORKSTATION_DIR}/ws_tool/bin/safe-overwrite" "$new_conf" "$WS_NIX_GLOBAL_CONFIG_LOCATION"
 }
 

ws_tool/test/test_helper/helper.bash

@@ -1,19 +1,14 @@
 _setup_common() {
-   # BATS_LIB_PATH="test_helper/bats-support:/opt/homebrew/lib:/opt/homebrew/Cellar/bats-support/0.3.0/lib:$BATS_LIB_PATH"
-   load 'test_helper/bats-support/load'
-   load 'test_helper/bats-assert/load'
-
-
-   # get the containing directory of this file
-   # use $BATS_TEST_FILENAME instead of ${BASH_SOURCE[0]} or $0,
-   # as those will point to the bats executable's location or the preprocessed file respectively
-   PROJECT_ROOT="$( cd "$( dirname "$BATS_TEST_FILENAME" )/../../" >/dev/null 2>&1 && pwd )"
-   ws_unset_settings
-   # echo "$PROJECT_ROOT, $BATS_TEST_FILENAME" >&3
-   # make executables in src/ visible to PATH
-   PATH="$PROJECT_ROOT:/bin/:${PROJECT_ROOT}/ws_tool:$PATH"
-   : "${WORKSTATION_DIR:="$PROJECT_ROOT"}"
-   . "$PROJECT_ROOT/ws_tool/lib/lib.bash"
+  PROJECT_ROOT="$( cd "$(dirname "${BASH_SOURCE[0]}")/../../../" &>/dev/null && pwd)"
+  BATS_LIB_PATH="$PROJECT_ROOT/ws_tool/test/test_helper:$BATS_LIB_PATH"
+  bats_load_library "bats-support"
+  bats_load_library "bats-assert"
+
+  ws_unset_settings
+  # echo "$PROJECT_ROOT, $BATS_TEST_FILENAME" >&3
+  PATH="$PROJECT_ROOT:/bin/:${PROJECT_ROOT}/ws_tool:$PATH"
+  : "${WORKSTATION_DIR:="$PROJECT_ROOT"}"
+  . "$PROJECT_ROOT/ws_tool/lib/lib.bash"
 }
 
 set_workstation_version_last_sha() {

ws_tool/test/bootstrap_doctor.bats → ws_tool/test/unit/bootstrap_doctor.bats

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 setup (){
-  load 'test_helper/helper'
+  load '../test_helper/helper'
   _setup_common
   . "$PROJECT_ROOT/ws_tool/lib/properties.bash"
   . "$PROJECT_ROOT/ws_tool/lib/bootstrap_doctor.bash"

ws_tool/test/installation_process.bats → ws_tool/test/unit/installation_process.bats

@@ -1,7 +1,7 @@
 #!/usr/bin/env zsh
 
 setup (){
-    load 'test_helper/helper'
+    load '../test_helper/helper'
     _setup_common
 }
 

ws_tool/test/installer.bats → ws_tool/test/unit/installer.bats

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 setup (){
-    load 'test_helper/helper'
+    load '../test_helper/helper'
     _setup_common
 }
 

ws_tool/test/lib.bats → ws_tool/test/unit/lib.bats

@@ -1,7 +1,7 @@
 setup (){
-    load 'test_helper/helper'
-    _setup_common
-    . "$PROJECT_ROOT/ws_tool/lib/lib.bash"
+  load "../test_helper/helper"
+  _setup_common
+  . "$PROJECT_ROOT/ws_tool/lib/lib.bash"
 }
 
 @test "find_bracketed_content" {

ws_tool/test/unit/logging.bats

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+setup (){
+  load "../test_helper/helper"
+  _setup_common
+  . "$PROJECT_ROOT/ws_tool/lib/logging.bash"
+}
+
+@test "log_level_num gets level number from name" {
+  export BATS_VERBOSE_RUN=true
+  run retfunc log_level_num error
+  assert_output --partial 'VAR:REPLY=([0]="4")'
+}
+
+@test "logs by log level" {
+  WORKSTATION_LOG_LEVEL=debug
+  run debug "hello world"
+  assert_output --partial 'hello world'
+}
+
+@test "skips logs when out of log level" {
+  WORKSTATION_LOG_LEVEL=error
+  run debug "hello world"
+  refute_output --partial 'hello world'
+}

ws_tool/test/properties.bats → ws_tool/test/unit/properties.bats

@@ -1,5 +1,5 @@
 setup (){
-    load 'test_helper/helper'
+    load '../test_helper/helper'
     _setup_common
     . "$PROJECT_ROOT/ws_tool/lib/properties.bash"
 }

ws_tool/test/settings.bats → ws_tool/test/unit/settings.bats

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 setup (){
-    load 'test_helper/helper'
+    load '../test_helper/helper'
     _setup_common
     ws_reset_settings
 }

ws_tool/test/ws-cli.bats → ws_tool/test/unit/ws-cli.bats

@@ -1,5 +1,5 @@
 setup (){
-    load 'test_helper/helper'
+  load "../test_helper/helper"
     _setup_common
     . "$PROJECT_ROOT/ws_tool/ws"
 }