modularizing parsing arguments

Author: Lucas Yoon

tests/check_non_terminating.sh

@@ -5,33 +5,8 @@ set -o errexit
 # Source shared utilities
 source "$(dirname "$0")/get_paths.sh"
 
-POSITIONAL_ARGS=()
-
-while [[ $# -gt 0 ]]; do
-  case $1 in
-    --stackDirs)
-      stackDirs=$2
-      shift # past argument
-      shift
-      ;;
-    --stacksPath)
-      stacksPath=$2
-      shift # past argument
-      shift
-      ;;
-    -*|--*)
-      echo "Unknown option $1"
-      exit 1
-      ;;
-    *)
-      POSITIONAL_ARGS+=("$1") # save positional arg
-      shift # past argument
-      ;;
-  esac
-done
-
-# Restore positional parameters
-restore_positional_args POSITIONAL_ARGS
+# Parse all arguments
+parse_arguments "$@"
 
 # Set defaults for stack arguments
 set_stack_defaults

tests/check_odov3.sh

@@ -5,34 +5,8 @@ set -x
 # Source shared utilities
 source "$(dirname "$0")/get_paths.sh"
 
-POSITIONAL_ARGS=()
-VERBOSE="false"
-
-while [[ $# -gt 0 ]]; do
-  case $1 in
-    --stackDirs)
-      stackDirs=$2
-      shift # past argument
-      shift
-      ;;
-    --stacksPath)
-      stacksPath=$2
-      shift # past argument
-      shift
-      ;;
-    -*|--*)
-      echo "Unknown option $1"
-      exit 1
-      ;;
-    *)
-      POSITIONAL_ARGS+=("$1") # save positional arg
-      shift # past argument
-      ;;
-  esac
-done
-
-# Restore positional parameters
-restore_positional_args POSITIONAL_ARGS
+# Parse all arguments
+parse_arguments "$@"
 
 # Set defaults for stack arguments
 set_stack_defaults

tests/common_args.sh

@@ -1,11 +1,52 @@
 #!/usr/bin/env bash
 
-# Shared utilities for devfile registry test scripts
-# Usage: source this file and call set_stack_defaults() after parsing arguments
-
 # Common variables used by all scripts
 stackDirs=''
 stacksPath=''
+POSITIONAL_ARGS=()
+
+# Function to parse all arguments
+parse_arguments() {
+    while [[ $# -gt 0 ]]; do
+        case $1 in
+            --stackDirs)
+                stackDirs=$2
+                shift # past argument
+                shift
+                ;;
+            --stacksPath)
+                stacksPath=$2
+                shift # past argument
+                shift
+                ;;
+            -*|--*)
+                # Try script-specific handler if it exists
+                local consumed=0
+                if declare -f handle_additional_args > /dev/null 2>&1; then
+                    handle_additional_args "$@"
+                    consumed=$?
+                fi
+                
+                if [ $consumed -gt 0 ]; then
+                    # Script handler consumed some arguments
+                    for ((i=0; i<consumed; i++)); do
+                        shift
+                    done
+                else
+                    echo "Unknown option $1"
+                    exit 1
+                fi
+                ;;
+            *)
+                POSITIONAL_ARGS+=("$1") # save positional arg
+                shift # past argument
+                ;;
+        esac
+    done
+    
+    # Restore positional parameters
+    restore_positional_args POSITIONAL_ARGS
+}
 
 # Function to set default values for stack arguments
 set_stack_defaults() {

tests/get_paths.sh

@@ -3,43 +3,27 @@
 # Source shared utilities
 source "$(dirname "$0")/get_paths.sh"
 
-POSITIONAL_ARGS=()
 SAMPLES="false"
 VERBOSE="false"
 
-while [[ $# -gt 0 ]]; do
-  case $1 in
-    -s|--samples)
-      SAMPLES="true"
-      shift # past argument
-      ;;
-    -v|--verbose)
-      VERBOSE="true"
-      shift # past argument
-      ;;
-    --stackDirs)
-      stackDirs=$2
-      shift # past argument
-      shift
-      ;;
-    --stacksPath)
-      stacksPath=$2
-      shift # past argument
-      shift
-      ;;
-    -*|--*)
-      echo "Unknown option $1"
-      exit 1
-      ;;
-    *)
-      POSITIONAL_ARGS+=("$1") # save positional arg
-      shift # past argument
-      ;;
-  esac
-done
-
-# Restore positional parameters
-restore_positional_args POSITIONAL_ARGS
+handle_additional_args() {
+    case $1 in
+        -s|--samples)
+            SAMPLES="true"
+            return 1
+            ;;
+        -v|--verbose)
+            VERBOSE="true"
+            return 1 
+            ;;
+        *)
+            return 0 
+            ;;
+    esac
+}
+
+# Parse all arguments
+parse_arguments "$@"
 
 set -x