feat: improve config handling and enhance dispatcher tests

Author: Test

src/commands/config.sh

@@ -64,23 +64,41 @@ giv_config() {
                     esac
                 done < "$GIV_CONFIG_FILE"
             fi
-            # Convert GIV_... keys to user keys for output
-            while IFS= read -r line; do
-                case "$line" in
+            # Convert GIV_... keys to user keys for output from config file
+            if [ -s "$GIV_CONFIG_FILE" ]; then
+                while IFS= read -r line; do
+                    case "$line" in
+                        GIV_*)
+                            k=${line#GIV_}
+                            k=${k%%=*}
+                            key=$(printf '%s' "$k" | tr 'A-Z_' 'a-z.')
+                            value="${line#*=}"
+                            printf '%s\n' "$key=$value"
+                            ;;
+                        *=*)
+                            printf '%s\n' "$line"
+                            ;;
+                        *)
+                        ;;
+                    esac
+                done < "$GIV_CONFIG_FILE"
+            fi
+            
+            # Also show environment variables with GIV_ prefix that may have been loaded from --config-file
+            for var in $(env | grep '^GIV_'); do
+                case "$var" in
                     GIV_*)
-                        k=${line#GIV_}
+                        k=${var#GIV_}
                         k=${k%%=*}
                         key=$(printf '%s' "$k" | tr 'A-Z_' 'a-z.')
-                        value="${line#*=}"
-                        printf '%s\n' "$key=$value"
-                        ;;
-                    *=*)
-                        printf '%s\n' "$line"
+                        value="${var#*=}"
+                        # Only show if not already shown from config file
+                        if [ -z "$(grep "^GIV_$k=" "$GIV_CONFIG_FILE" 2>/dev/null)" ]; then
+                            printf '%s\n' "$key=$value"
+                        fi
                         ;;
-                    *)
-                    ;;
                 esac
-            done < "$GIV_CONFIG_FILE"
+            done
             ;;
         --get|get)
             key="$2"

src/commands/document.sh

@@ -10,6 +10,7 @@
 if [ -n "${GIV_TEST_MOCKS:-}" ] && [ -f "${GIV_TEST_MOCKS:-}" ]; then
   . "$GIV_TEST_MOCKS"
 fi
+
 # Function to generate documents based on a prompt template
 cmd_document() {
     # Use environment variables set by unified parser

src/commands/release-notes.sh

@@ -7,9 +7,11 @@
 
 # Wrapper to call document.sh with appropriate arguments
 if [ -f "${GIV_SRC_DIR}/commands/document.sh" ]; then
+    # Set the template file directly via environment variable
+    template_path="${GIV_TEMPLATE_DIR}/release_notes_prompt.md"
+    export GIV_PROMPT_FILE="${template_path}"
     # Delegate to the subcommand script
-    "${GIV_SRC_DIR}/commands/document.sh" "$@" \
-        --template "${GIV_TEMPLATE_DIR}/release_notes_prompt.md"
+    "${GIV_SRC_DIR}/commands/document.sh" "$@"
     exit 0
 else
     echo "Available subcommands: $(find "${GIV_SRC_DIR}/commands" -maxdepth 1 -type f -name '*.sh' -exec basename {} .sh \; | tr '\n' ' ')" >&2

src/giv.sh

@@ -139,9 +139,25 @@ if [ -f "${GIV_SRC_DIR}/commands/${GIV_SUBCMD}.sh" ]; then
     [ "${GIV_DEBUG}" = "true" ] && printf 'Executing subcommand: %s\n' "${GIV_SUBCMD}" >&2
     case "${GIV_SUBCMD}" in
         config|init)
-            # These commands need access to raw positional arguments
-            shift # Remove subcommand name
-            "${GIV_SRC_DIR}/commands/${GIV_SUBCMD}.sh" "$@"
+            # These commands need access to subcommand arguments only
+            # Extract arguments after the subcommand name, skipping global options
+            subcommand_args=""
+            found_subcommand=false
+            for arg in "$@"; do
+                if [ "$found_subcommand" = "true" ]; then
+                    subcommand_args="$subcommand_args $arg"
+                elif [ "$arg" = "$GIV_SUBCMD" ]; then
+                    found_subcommand=true
+                fi
+            done
+            [ "${GIV_DEBUG}" = "true" ] && printf 'Config subcommand args: %s\n' "$subcommand_args" >&2
+            if [ -n "$subcommand_args" ]; then
+                # Use eval to properly handle quoted arguments
+                eval set -- "$subcommand_args"
+                "${GIV_SRC_DIR}/commands/${GIV_SUBCMD}.sh" "$@"
+            else
+                "${GIV_SRC_DIR}/commands/${GIV_SUBCMD}.sh"
+            fi
             ;;
         *)
             # Other commands use environment variables from unified parser

tests/integration_dispatcher.bats

@@ -5,9 +5,8 @@
 
 load 'test_helper/bats-support/load'
 load 'test_helper/bats-assert/load'
+load 'helpers/setup.sh'
 
-export GIV_HOME="$BATS_TEST_DIRNAME/.giv"
-export TMPDIR="$GIV_HOME/.tmp"
 
 setup() {
     # Create isolated test environment