dev-tools: added option to start SVN dev envs

scripts/dev-tools/dev-tools

@@ -37,11 +37,12 b' dev_tools_usage() {'
   printf "  %s   run bash console for vcsserver\n" "vcs                "
   printf "  %s   run bash console for rhodecode-ee\n" "ee                 "
   printf "  %s   run bash console for rhodecode-ce\n" "ce                 "
-  printf "  %s   run bash console for svn web\n" "svn                "
   printf "  %s   run bash console for rhodecode-celery\n" "celery             "
   printf "  %s   run celery instance on top of mounted source code, e.g ./dev-tools celeryd&\n" "celeryd            "
   printf "  %s   run bash console for rhodecode-ssh\n" "ssh                "
   printf "  %s   run sshd instance for rhodecode-ssh\n" "sshd               "
+  printf "  %s   run bash console for rhodecode-ssh\n" "svn                "
+  printf "  %s   run sshd instance for rhodecode-ssh\n" "svnd               "
   printf "  %s   run bash console for rhodecode-tools-ce\n" "tools              "
   printf "  %s   create dev env required to run vcsserver and rhodecode\n" "dev-env            "
   echo
@@ -179,29 +180,81 b' dev_tools_ce_usage() {'
 }
 
 # :command.usage
-dev_tools_svn_usage() {
+dev_tools_celery_usage() {
   if [[ -n $long_usage ]]; then
-    printf "dev-tools svn - run bash console for svn web\n"
+    printf "dev-tools celery - run bash console for rhodecode-celery\n"
     echo
 
   else
-    printf "dev-tools svn - run bash console for svn web\n"
+    printf "dev-tools celery - run bash console for rhodecode-celery\n"
     echo
 
   fi
 
-  printf "Alias: s\n"
+  printf "%s\n" "Usage:"
+  printf "  dev-tools celery [OPTIONS]\n"
+  printf "  dev-tools celery --help | -h\n"
   echo
 
+  # :command.long_usage
+  if [[ -n $long_usage ]]; then
+    printf "%s\n" "Options:"
+
+    # :command.usage_flags
+    # :flag.usage
+    printf "  %s\n" "--workdir WORKDIR"
+    printf "    workdir to run the pip install -e on top of can be ce or ee only\n"
+    printf "    Default: /home/rhodecode/rhodecode-enterprise-ce\n"
+    echo
+
+    # :flag.usage
+    printf "  %s\n" "--cmd CMD"
+    printf "    cmd script to run, this is on host machine, relative to $WORKSPACE_HOME\n"
+    printf "    Default: .dev-env/cmd-celery.sh\n"
+    echo
+
+    # :command.usage_fixed_flags
+    printf "  %s\n" "--help, -h"
+    printf "    Show this help\n"
+    echo
+
+  fi
+}
+
+# :command.usage
+dev_tools_celeryd_usage() {
+  if [[ -n $long_usage ]]; then
+    printf "dev-tools celeryd - run celery instance on top of mounted source code, e.g ./dev-tools celeryd&\n"
+    echo
+
+  else
+    printf "dev-tools celeryd - run celery instance on top of mounted source code, e.g ./dev-tools celeryd&\n"
+    echo
+
+  fi
+
   printf "%s\n" "Usage:"
-  printf "  dev-tools svn\n"
-  printf "  dev-tools svn --help | -h\n"
+  printf "  dev-tools celeryd [OPTIONS]\n"
+  printf "  dev-tools celeryd --help | -h\n"
   echo
 
   # :command.long_usage
   if [[ -n $long_usage ]]; then
     printf "%s\n" "Options:"
 
+    # :command.usage_flags
+    # :flag.usage
+    printf "  %s\n" "--workdir WORKDIR"
+    printf "    workdir to run the pip install -e on top of can be ce or ee only\n"
+    printf "    Default: /home/rhodecode/rhodecode-enterprise-ce\n"
+    echo
+
+    # :flag.usage
+    printf "  %s\n" "--cmd CMD"
+    printf "    cmd script to run, this is on host machine, relative to $WORKSPACE_HOME\n"
+    printf "    Default: .dev-env/cmd-celeryd.sh\n"
+    echo
+
     # :command.usage_fixed_flags
     printf "  %s\n" "--help, -h"
     printf "    Show this help\n"
@@ -211,20 +264,20 b' dev_tools_svn_usage() {'
 }
 
 # :command.usage
-dev_tools_celery_usage() {
+dev_tools_ssh_usage() {
   if [[ -n $long_usage ]]; then
-    printf "dev-tools celery - run bash console for rhodecode-celery\n"
+    printf "dev-tools ssh - run bash console for rhodecode-ssh\n"
     echo
 
   else
-    printf "dev-tools celery - run bash console for rhodecode-celery\n"
+    printf "dev-tools ssh - run bash console for rhodecode-ssh\n"
     echo
 
   fi
 
   printf "%s\n" "Usage:"
-  printf "  dev-tools celery [OPTIONS]\n"
-  printf "  dev-tools celery --help | -h\n"
+  printf "  dev-tools ssh [OPTIONS]\n"
+  printf "  dev-tools ssh --help | -h\n"
   echo
 
   # :command.long_usage
@@ -241,7 +294,7 b' dev_tools_celery_usage() {'
     # :flag.usage
     printf "  %s\n" "--cmd CMD"
     printf "    cmd script to run, this is on host machine, relative to $WORKSPACE_HOME\n"
-    printf "    Default: .dev-env/cmd-celery.sh\n"
+    printf "    Default: .dev-env/cmd-ssh.sh\n"
     echo
 
     # :command.usage_fixed_flags
@@ -253,20 +306,20 b' dev_tools_celery_usage() {'
 }
 
 # :command.usage
-dev_tools_celeryd_usage() {
+dev_tools_sshd_usage() {
   if [[ -n $long_usage ]]; then
-    printf "dev-tools celeryd - run celery instance on top of mounted source code, e.g ./dev-tools celeryd&\n"
+    printf "dev-tools sshd - run sshd instance for rhodecode-ssh\n"
     echo
 
   else
-    printf "dev-tools celeryd - run celery instance on top of mounted source code, e.g ./dev-tools celeryd&\n"
+    printf "dev-tools sshd - run sshd instance for rhodecode-ssh\n"
     echo
 
   fi
 
   printf "%s\n" "Usage:"
-  printf "  dev-tools celeryd [OPTIONS]\n"
-  printf "  dev-tools celeryd --help | -h\n"
+  printf "  dev-tools sshd [OPTIONS]\n"
+  printf "  dev-tools sshd --help | -h\n"
   echo
 
   # :command.long_usage
@@ -283,7 +336,7 b' dev_tools_celeryd_usage() {'
     # :flag.usage
     printf "  %s\n" "--cmd CMD"
     printf "    cmd script to run, this is on host machine, relative to $WORKSPACE_HOME\n"
-    printf "    Default: .dev-env/cmd-celeryd.sh\n"
+    printf "    Default: .dev-env/cmd-sshd.sh\n"
     echo
 
     # :command.usage_fixed_flags
@@ -295,20 +348,20 b' dev_tools_celeryd_usage() {'
 }
 
 # :command.usage
-dev_tools_ssh_usage() {
+dev_tools_svn_usage() {
   if [[ -n $long_usage ]]; then
-    printf "dev-tools ssh - run bash console for rhodecode-ssh\n"
+    printf "dev-tools svn - run bash console for rhodecode-ssh\n"
     echo
 
   else
-    printf "dev-tools ssh - run bash console for rhodecode-ssh\n"
+    printf "dev-tools svn - run bash console for rhodecode-ssh\n"
     echo
 
   fi
 
   printf "%s\n" "Usage:"
-  printf "  dev-tools ssh [OPTIONS]\n"
-  printf "  dev-tools ssh --help | -h\n"
+  printf "  dev-tools svn [OPTIONS]\n"
+  printf "  dev-tools svn --help | -h\n"
   echo
 
   # :command.long_usage
@@ -325,7 +378,7 b' dev_tools_ssh_usage() {'
     # :flag.usage
     printf "  %s\n" "--cmd CMD"
     printf "    cmd script to run, this is on host machine, relative to $WORKSPACE_HOME\n"
-    printf "    Default: .dev-env/cmd-ssh.sh\n"
+    printf "    Default: .dev-env/cmd-svn.sh\n"
     echo
 
     # :command.usage_fixed_flags
@@ -337,20 +390,20 b' dev_tools_ssh_usage() {'
 }
 
 # :command.usage
-dev_tools_sshd_usage() {
+dev_tools_svnd_usage() {
   if [[ -n $long_usage ]]; then
-    printf "dev-tools sshd - run sshd instance for rhodecode-ssh\n"
+    printf "dev-tools svnd - run sshd instance for rhodecode-ssh\n"
     echo
 
   else
-    printf "dev-tools sshd - run sshd instance for rhodecode-ssh\n"
+    printf "dev-tools svnd - run sshd instance for rhodecode-ssh\n"
     echo
 
   fi
 
   printf "%s\n" "Usage:"
-  printf "  dev-tools sshd [OPTIONS]\n"
-  printf "  dev-tools sshd --help | -h\n"
+  printf "  dev-tools svnd [OPTIONS]\n"
+  printf "  dev-tools svnd --help | -h\n"
   echo
 
   # :command.long_usage
@@ -367,7 +420,7 b' dev_tools_sshd_usage() {'
     # :flag.usage
     printf "  %s\n" "--cmd CMD"
     printf "    cmd script to run, this is on host machine, relative to $WORKSPACE_HOME\n"
-    printf "    Default: .dev-env/cmd-sshd.sh\n"
+    printf "    Default: .dev-env/cmd-svnd.sh\n"
     echo
 
     # :command.usage_fixed_flags
@@ -1043,35 +1096,6 b' dev_tools_ce_command() {'
 }
 
 # :command.function
-dev_tools_svn_command() {
-  # src/svn_command.sh
-  container_name=dev-svn
-
-  docker ps -q --filter "name=$container_name" | grep -q . && echo $container_name found || echo $container_name not found
-  docker ps -q --filter "name=$container_name" | grep -q . && docker stop -t 120 $container_name && docker rm -fv $container_name
-
-  if [[ -v WORKSPACE_HOME ]];
-  then
-    DEFAULT_WORKSPACE_HOME=$WORKSPACE_HOME
-  else
-    echo "WORKSPACE_HOME env var is not set"
-    exit 1
-  fi
-
-  echo "Using default WORKSPACE_HOME path: $DEFAULT_WORKSPACE_HOME"
-
-  eval "
-  WORKSPACE_HOME=$DEFAULT_WORKSPACE_HOME \
-  ./rcstack stack --env-file-path .custom/.dev.env rhodecode -f docker-compose-apps.dev.yaml \
-  run -e ENV_FILE= -e RC_ENV_FILE= -e RC_APP_TYPE=rhodecode_svn_bash \
-  --rm --use-aliases \
-  --workdir=\"/home/rhodecode\" \
-  --interactive --tty \
-  --name=\"$container_name\" svn bash"
-
-}
-
-# :command.function
 dev_tools_celery_command() {
   # src/celery_command.sh
   if [[ -v WORKSPACE_HOME ]];
@@ -1328,6 +1352,80 b' dev_tools_sshd_command() {'
 }
 
 # :command.function
+dev_tools_svn_command() {
+  # src/svn_command.sh
+  if [[ -v WORKSPACE_HOME ]];
+  then
+    DEFAULT_WORKSPACE_HOME=$WORKSPACE_HOME
+    echo "Using default WORKSPACE_HOME path: $DEFAULT_WORKSPACE_HOME"
+  else
+    echo "WORKSPACE_HOME env var is not set"
+    exit 1
+  fi
+
+  code_workdir=${args[--workdir]}
+  cmd_script=${args[--cmd]}
+
+  exec_script=$WORKSPACE_HOME/$cmd_script
+  container_name=dev-svn
+  env_file=".custom/.dev.env"
+
+  echo "Using exec script: $exec_script"
+
+  RC_DEV_CMD_HELP="apachectl -D FOREGROUND"
+
+  if [[ ! -f $exec_script ]]; then
+    echo "Generating new $exec_script file..."
+    mkdir -p $(dirname $exec_script)
+
+    cat <<< "
+  # Generated dev-env script for svn
+
+  echo \"Run svn dev using the following command:\"
+  echo \"++++++++++++++++++++++++++++++++++++++++++++++++++\"
+  echo \"$RC_DEV_CMD_HELP\"
+  echo \"++++++++++++++++++++++++++++++++++++++++++++++++++\"
+  make sh
+  " > $exec_script
+    chmod +x $exec_script
+  fi
+
+  docker_exec_script="/var/opt/rhodecode_repo_store/$cmd_script"
+
+  docker_id=$(docker ps -q --filter "name=$container_name" --filter name="rc_cluster_apps-svn")
+
+  if [[ $docker_id ]]; then
+    echo $container_name FOUND, Killing old one !
+    docker kill -s 9 $docker_id
+    sleep 5
+    docker rm -fv $container_name
+    echo "done..."
+  else
+    echo $container_name not found
+  fi
+
+  eval "
+  WORKSPACE_HOME=$DEFAULT_WORKSPACE_HOME RC_DEV_CMD_HELP=\"$RC_DEV_CMD_HELP\" \
+  ./rcstack stack --env-file-path $env_file rhodecode -f docker-compose-apps.dev.yaml \
+  run -e RC_DEV_CMD_HELP=\"'$RC_DEV_CMD_HELP'\" -e ENV_FILE= -e RC_ENV_FILE= -e RC_APP_TYPE=rhodecode_$container_name --rm --use-aliases \
+  --workdir=\"$code_workdir\" \
+  --name=\"$container_name\" \
+  --interactive --tty \
+  svn bash $docker_exec_script"
+
+}
+
+# :command.function
+dev_tools_svnd_command() {
+  # src/svnd_command.sh
+  echo "# this file is located in 'src/svnd_command.sh'"
+  echo "# code for 'dev-tools svnd' goes here"
+  echo "# you can edit it freely and regenerate (it will not be overwritten)"
+  inspect_args
+
+}
+
+# :command.function
 dev_tools_tools_command() {
   # src/tools_command.sh
   container_name=dev-tools
@@ -1706,13 +1804,6 b' parse_requirements() {'
       shift $#
       ;;
 
-    svn | s)
-      action="svn"
-      shift
-      dev_tools_svn_parse_requirements "$@"
-      shift $#
-      ;;
-
     celery)
       action="celery"
       shift
@@ -1741,6 +1832,20 b' parse_requirements() {'
       shift $#
       ;;
 
+    svn)
+      action="svn"
+      shift
+      dev_tools_svn_parse_requirements "$@"
+      shift $#
+      ;;
+
+    svnd)
+      action="svnd"
+      shift
+      dev_tools_svnd_parse_requirements "$@"
+      shift $#
+      ;;
+
     tools | t)
       action="tools"
       shift
@@ -2001,13 +2106,13 b' dev_tools_ce_parse_requirements() {'
 }
 
 # :command.parse_requirements
-dev_tools_svn_parse_requirements() {
+dev_tools_celery_parse_requirements() {
   # :command.fixed_flags_filter
   while [[ $# -gt 0 ]]; do
     case "${1:-}" in
       --help | -h)
         long_usage=yes
-        dev_tools_svn_usage
+        dev_tools_celery_usage
         exit
         ;;
 
@@ -2019,12 +2124,41 b' dev_tools_svn_parse_requirements() {'
   done
 
   # :command.command_filter
-  action="svn"
+  action="celery"
 
   # :command.parse_requirements_while
   while [[ $# -gt 0 ]]; do
     key="$1"
     case "$key" in
+      # :flag.case
+      --workdir)
+
+        # :flag.case_arg
+        if [[ -n ${2+x} ]]; then
+
+          args['--workdir']="$2"
+          shift
+          shift
+        else
+          printf "%s\n" "--workdir requires an argument: --workdir WORKDIR" >&2
+          exit 1
+        fi
+        ;;
+
+      # :flag.case
+      --cmd)
+
+        # :flag.case_arg
+        if [[ -n ${2+x} ]]; then
+
+          args['--cmd']="$2"
+          shift
+          shift
+        else
+          printf "%s\n" "--cmd requires an argument: --cmd CMD" >&2
+          exit 1
+        fi
+        ;;
 
       -?*)
         printf "invalid option: %s\n" "$key" >&2
@@ -2042,16 +2176,20 b' dev_tools_svn_parse_requirements() {'
     esac
   done
 
+  # :command.default_assignments
+  [[ -n ${args['--workdir']:-} ]] || args['--workdir']="/home/rhodecode/rhodecode-enterprise-ce"
+  [[ -n ${args['--cmd']:-} ]] || args['--cmd']=".dev-env/cmd-celery.sh"
+
 }
 
 # :command.parse_requirements
-dev_tools_celery_parse_requirements() {
+dev_tools_celeryd_parse_requirements() {
   # :command.fixed_flags_filter
   while [[ $# -gt 0 ]]; do
     case "${1:-}" in
       --help | -h)
         long_usage=yes
-        dev_tools_celery_usage
+        dev_tools_celeryd_usage
         exit
         ;;
 
@@ -2063,7 +2201,7 b' dev_tools_celery_parse_requirements() {'
   done
 
   # :command.command_filter
-  action="celery"
+  action="celeryd"
 
   # :command.parse_requirements_while
   while [[ $# -gt 0 ]]; do
@@ -2117,18 +2255,18 b' dev_tools_celery_parse_requirements() {'
 
   # :command.default_assignments
   [[ -n ${args['--workdir']:-} ]] || args['--workdir']="/home/rhodecode/rhodecode-enterprise-ce"
-  [[ -n ${args['--cmd']:-} ]] || args['--cmd']=".dev-env/cmd-celery.sh"
+  [[ -n ${args['--cmd']:-} ]] || args['--cmd']=".dev-env/cmd-celeryd.sh"
 
 }
 
 # :command.parse_requirements
-dev_tools_celeryd_parse_requirements() {
+dev_tools_ssh_parse_requirements() {
   # :command.fixed_flags_filter
   while [[ $# -gt 0 ]]; do
     case "${1:-}" in
       --help | -h)
         long_usage=yes
-        dev_tools_celeryd_usage
+        dev_tools_ssh_usage
         exit
         ;;
 
@@ -2140,7 +2278,7 b' dev_tools_celeryd_parse_requirements() {'
   done
 
   # :command.command_filter
-  action="celeryd"
+  action="ssh"
 
   # :command.parse_requirements_while
   while [[ $# -gt 0 ]]; do
@@ -2194,18 +2332,18 b' dev_tools_celeryd_parse_requirements() {'
 
   # :command.default_assignments
   [[ -n ${args['--workdir']:-} ]] || args['--workdir']="/home/rhodecode/rhodecode-enterprise-ce"
-  [[ -n ${args['--cmd']:-} ]] || args['--cmd']=".dev-env/cmd-celeryd.sh"
+  [[ -n ${args['--cmd']:-} ]] || args['--cmd']=".dev-env/cmd-ssh.sh"
 
 }
 
 # :command.parse_requirements
-dev_tools_ssh_parse_requirements() {
+dev_tools_sshd_parse_requirements() {
   # :command.fixed_flags_filter
   while [[ $# -gt 0 ]]; do
     case "${1:-}" in
       --help | -h)
         long_usage=yes
-        dev_tools_ssh_usage
+        dev_tools_sshd_usage
         exit
         ;;
 
@@ -2217,7 +2355,7 b' dev_tools_ssh_parse_requirements() {'
   done
 
   # :command.command_filter
-  action="ssh"
+  action="sshd"
 
   # :command.parse_requirements_while
   while [[ $# -gt 0 ]]; do
@@ -2271,18 +2409,18 b' dev_tools_ssh_parse_requirements() {'
 
   # :command.default_assignments
   [[ -n ${args['--workdir']:-} ]] || args['--workdir']="/home/rhodecode/rhodecode-enterprise-ce"
-  [[ -n ${args['--cmd']:-} ]] || args['--cmd']=".dev-env/cmd-ssh.sh"
+  [[ -n ${args['--cmd']:-} ]] || args['--cmd']=".dev-env/cmd-sshd.sh"
 
 }
 
 # :command.parse_requirements
-dev_tools_sshd_parse_requirements() {
+dev_tools_svn_parse_requirements() {
   # :command.fixed_flags_filter
   while [[ $# -gt 0 ]]; do
     case "${1:-}" in
       --help | -h)
         long_usage=yes
-        dev_tools_sshd_usage
+        dev_tools_svn_usage
         exit
         ;;
 
@@ -2294,7 +2432,7 b' dev_tools_sshd_parse_requirements() {'
   done
 
   # :command.command_filter
-  action="sshd"
+  action="svn"
 
   # :command.parse_requirements_while
   while [[ $# -gt 0 ]]; do
@@ -2348,7 +2486,84 b' dev_tools_sshd_parse_requirements() {'
 
   # :command.default_assignments
   [[ -n ${args['--workdir']:-} ]] || args['--workdir']="/home/rhodecode/rhodecode-enterprise-ce"
-  [[ -n ${args['--cmd']:-} ]] || args['--cmd']=".dev-env/cmd-sshd.sh"
+  [[ -n ${args['--cmd']:-} ]] || args['--cmd']=".dev-env/cmd-svn.sh"
+
+}
+
+# :command.parse_requirements
+dev_tools_svnd_parse_requirements() {
+  # :command.fixed_flags_filter
+  while [[ $# -gt 0 ]]; do
+    case "${1:-}" in
+      --help | -h)
+        long_usage=yes
+        dev_tools_svnd_usage
+        exit
+        ;;
+
+      *)
+        break
+        ;;
+
+    esac
+  done
+
+  # :command.command_filter
+  action="svnd"
+
+  # :command.parse_requirements_while
+  while [[ $# -gt 0 ]]; do
+    key="$1"
+    case "$key" in
+      # :flag.case
+      --workdir)
+
+        # :flag.case_arg
+        if [[ -n ${2+x} ]]; then
+
+          args['--workdir']="$2"
+          shift
+          shift
+        else
+          printf "%s\n" "--workdir requires an argument: --workdir WORKDIR" >&2
+          exit 1
+        fi
+        ;;
+
+      # :flag.case
+      --cmd)
+
+        # :flag.case_arg
+        if [[ -n ${2+x} ]]; then
+
+          args['--cmd']="$2"
+          shift
+          shift
+        else
+          printf "%s\n" "--cmd requires an argument: --cmd CMD" >&2
+          exit 1
+        fi
+        ;;
+
+      -?*)
+        printf "invalid option: %s\n" "$key" >&2
+        exit 1
+        ;;
+
+      *)
+        # :command.parse_requirements_case
+        # :command.parse_requirements_case_simple
+        printf "invalid argument: %s\n" "$key" >&2
+        exit 1
+
+        ;;
+
+    esac
+  done
+
+  # :command.default_assignments
+  [[ -n ${args['--workdir']:-} ]] || args['--workdir']="/home/rhodecode/rhodecode-enterprise-ce"
+  [[ -n ${args['--cmd']:-} ]] || args['--cmd']=".dev-env/cmd-svnd.sh"
 
 }
 
@@ -3171,11 +3386,12 b' run() {'
     "vcs") dev_tools_vcs_command ;;
     "ee") dev_tools_ee_command ;;
     "ce") dev_tools_ce_command ;;
-    "svn") dev_tools_svn_command ;;
     "celery") dev_tools_celery_command ;;
     "celeryd") dev_tools_celeryd_command ;;
     "ssh") dev_tools_ssh_command ;;
     "sshd") dev_tools_sshd_command ;;
+    "svn") dev_tools_svn_command ;;
+    "svnd") dev_tools_svnd_command ;;
     "tools") dev_tools_tools_command ;;
     "dev-env") dev_tools_dev_env_command ;;
     "prune") dev_tools_prune_command ;;