Merge branch 'trunk' into java-session-status-test-fix

Author: navin772

go

@@ -6,23 +6,38 @@ unset GEM_PATH
 
 JAVA_OPTS="-client -Xmx4096m -XX:ReservedCodeCacheSize=512m -XX:MetaspaceSize=1024m --add-modules java.se --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/javax.crypto=ALL-UNNAMED"
 
+# This code supports both:
+# ./go "namespace:task[--arg1,--arg2]" --rake-flag
+# ./go namespace:task --arg1 --arg2 -- --rake-flag
+
 # The first argument is always the Rake task name
 task="$1"
-
-# Shift the task off and get the remaining arguments
 shift
 
-# Leave task alone if already passing in arguments the normal way
-if [[ "$task" != *[*]* ]]; then
-  # Combine remaining arguments into a single string, clean up spaces after commas, and replace spaces with commas
-  args=$(IFS=' '; echo "$*" | sed -e 's/,[ ]*/,/g' -e 's/ /,/g')
+# Initialize arrays for rake flags and task arguments
+rake_flags=()
+task_args=()
 
-# If there are any arguments, format them as task[arg1,arg2,...]
-  if [ -n "$args" ]; then
-    task="$task[$args]"
-    echo "Executing rake task: $task"
+# Arguments before -- are task arguments
+while [ $# -gt 0 ]; do
+  if [ "$1" = "--" ]; then
+    shift
+    break
   fi
+  task_args+=("$1")
+  shift
+done
+
+# Remaining arguments are rake flags
+rake_flags=("$@")
+
+# If we have task args, format them
+if [ ${#task_args[@]} -gt 0 ]; then
+  # Convert task args array to comma-separated string
+  args=$(IFS=','; echo "${task_args[*]}")
+  task="$task[$args]"
+  echo "Executing rake task: $task"
 fi
 
-java $JAVA_OPTS -jar third_party/jruby/jruby-complete.jar -X-C -S rake $task
 
+java $JAVA_OPTS -jar third_party/jruby/jruby-complete.jar -X-C -S rake $task "${rake_flags[@]}"

go.bat

@@ -5,6 +5,10 @@ REM we want jruby-complete to take care of all things ruby
 SET GEM_HOME=
 SET GEM_PATH=
 
+# This code supports both:
+# ./go "namespace:task[--arg1,--arg2]" --rake-flag
+# ./go namespace:task --arg1 --arg2 -- --rake-flag
+
 REM The first argument is always the Rake task name
 SET task=%1
 
@@ -14,33 +18,62 @@ IF "%task%"=="" (
   exit /b 1
 )
 
-REM Shift the task off and get the remaining arguments
+REM Shift the task off
 SHIFT
 
 REM Leave task alone if already passing in arguments the normal way
 ECHO %task% | FINDSTR /C:"[" >NUL
 IF %ERRORLEVEL% EQU 0 (
-  GOTO execute
+  GOTO execute_with_args
 )
 
-REM Process remaining arguments
-SET args=
+REM Initialize variables for task arguments and rake flags
+SET task_args=
+SET rake_flags=
+SET separator_found=false
+
+REM Process arguments until we find --
 :process_args
 IF "%1"=="" GOTO done_args
-IF "!args!"=="" (
-  SET args=%1
+
+IF "%1"=="--" (
+  SET separator_found=true
+  SHIFT
+  GOTO collect_rake_flags
+)
+
+REM Add to task arguments
+IF "!task_args!"=="" (
+  SET task_args=%1
 ) ELSE (
-  SET args=!args!,%1
+  SET task_args=!task_args!,%1
 )
 SHIFT
 GOTO process_args
 
+REM Collect remaining arguments as rake flags
+:collect_rake_flags
+IF "%1"=="" GOTO done_args
+IF "!rake_flags!"=="" (
+  SET rake_flags=%1
+) ELSE (
+  SET rake_flags=!rake_flags! %1
+)
+SHIFT
+GOTO collect_rake_flags
+
 :done_args
-REM If there are any arguments, format them as task[arg1,arg2,...]
-IF NOT "!args!"=="" (
-  SET task=%task%[!args!]
+REM If we have task args, format them as task[arg1,arg2,...]
+IF NOT "!task_args!"=="" (
+  SET task=%task%[!task_args!]
   ECHO Executing rake task: %task%
 )
 
 :execute
-java %JAVA_OPTS% -jar third_party\jruby\jruby-complete.jar -X-C -S rake %task%
+REM Execute rake with the task and flags
+java %JAVA_OPTS% -jar third_party\jruby\jruby-complete.jar -X-C -S rake %task% %rake_flags%
+GOTO :EOF
+
+:execute_with_args
+REM Task already has arguments in brackets, pass remaining args directly to rake
+java %JAVA_OPTS% -jar third_party\jruby\jruby-complete.jar -X-C -S rake %task% %*