Merge pull request #40 from Greewil/fixes

Operations with multiple modules if -cpm used in dir which belongs to multiples roots

Author: Greewil

.github/workflows/unit-tests.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        test_group: ['bo', 'ci', 'sv', 'cc', 'mr', 'mmo', 'nrd', 'cgd', 'cgdmr', 'of', 'ae']
+        test_group: ['bo', 'ci', 'sv', 'cc', 'mr', 'mmo', 'nrd', 'rdi', 'cgd', 'cgdmr', 'of', 'ae']
     steps:
       - name: Checkout
         uses: actions/checkout@v4

installer-tests/run_tests.sh

@@ -83,7 +83,7 @@ function _show_success_message() {
 function _show_invalid_usage_error_message() {
   message=$1
   _show_error_message "$message"
-  _show_info_message 'Use "vuh --help" to see available commands and options information'
+  _show_info_message 'Use "./run_tests.sh --help" to see available commands and options information'
 }
 
 function _exit_if_using_multiple_commands() {

unit-tests/assert_data.csv

@@ -115,6 +115,18 @@ nrd9,       monorepo_equals,                2.2.3,                        no,
 nrd10,      monorepo_equals,                3.2.2,                        no,              yes,                cd module_3; {{vuh}} uv -q -cpm
 
 
+# root dir intersections
+rdi1,       monorepo_same_root_dirs,        2.2.2,                        no,              no,                 cd module_2; {{vuh}} lv -q -cpm
+rdi2,       monorepo_same_root_dirs,        2.2.3,                        no,              no,                 cd module_2; {{vuh}} sv -q -cpm
+rdi3,       monorepo_same_root_dirs,        2.2.3,                        no,              yes,                cd module_2; {{vuh}} uv -q -cpm
+rdi4,       monorepo_same_root_dirs,        1.2.3 3.2.1,                  no,              no,                 cd module_1_3; {{vuh}} lv -q -cpm | tr '\n' ' '
+rdi5,       monorepo_same_root_dirs,        1.2.4 3.2.2,                  no,              no,                 cd module_1_3; {{vuh}} sv -q -cpm | tr '\n' ' '
+rdi6,       monorepo_same_root_dirs,        1.2.4 3.2.2,                  no,              yes,                cd module_1_3; {{vuh}} uv -q -cpm | tr '\n' ' '
+rdi7,       monorepo_root_dir_intersection, 1.2.3 2.2.2 3.2.1,            no,              no,                 cd module_2/module_1_3; {{vuh}} lv -q -cpm | tr '\n' ' '
+rdi8,       monorepo_root_dir_intersection, 1.2.4 2.2.3 3.2.2,            no,              no,                 cd module_2/module_1_3; {{vuh}} sv -q -cpm | tr '\n' ' '
+rdi9,       monorepo_root_dir_intersection, 1.2.4 2.2.3 3.2.2,            no,              yes,                cd module_2/module_1_3; {{vuh}} uv -q -cpm | tr '\n' ' '
+
+
 # check git diff
 cgd1,       versions_equal,                 1.2.3,                        no,              no,                 {{vuh}} sv -q --check-git-diff
 cgd2,       check_git_diff_equal,           1.2.3,                        no,              no,                 {{vuh}} sv -q

unit-tests/run_tests.sh

@@ -83,7 +83,7 @@ function _show_success_message() {
 function _show_invalid_usage_error_message() {
   message=$1
   _show_error_message "$message"
-  _show_info_message 'Use "vuh --help" to see available commands and options information'
+  _show_info_message 'Use "./run_tests.sh --help" to see available commands and options information'
 }
 
 function _show_cant_use_both_arguments() {

vuh.sh

@@ -207,7 +207,7 @@
 # Written by Shishkin Sergey <[email protected]>
 
 # Current vuh version
-VUH_VERSION='2.11.2'
+VUH_VERSION='2.12.0'
 
 # Installation variables (Please don't modify!)
 DATA_DIR='<should_be_replace_after_installation:DATA_DIR>'
@@ -458,6 +458,13 @@ function _load_project_variables_from_config() {
       _show_error_message "Failed to get project module! Current directory doesn't belong to any project module."
       return 1
     }
+    if [ "$(echo "$SPECIFIED_PROJECT_MODULE" | wc -l)" != "1" ]; then
+      _show_info_message "Current directory owned by multiple modules:"
+      _show_info_message "$SPECIFIED_PROJECT_MODULE"
+      SPECIFIED_PROJECT_MODULE="$(echo "$SPECIFIED_PROJECT_MODULE" | tr '\n' ',')"
+      SPECIFIED_MULTIPLE_PROJECT_MODULES='true'
+      _handle_multiple_modules_call || exit 1
+    fi
   fi
   rm -f "/tmp/${APP_NAME}_projects_conf_file"
   [ "$SPECIFIED_MULTIPLE_PROJECT_MODULES" = 'true' ] || _use_module_configuration_if_it_exists "$SPECIFIED_PROJECT_MODULE"
@@ -733,7 +740,6 @@ function _get_project_module_for_current_directory() {
   keep_searching='true'
   handling_module_root_path=''
   while [ "$keep_searching" = 'true' ]; do
-    # TODO handle case when one module is subdir of another module
     project_modules_without_spaces=$(echo "$PROJECT_MODULES" | tr -d "[:space:]")
     IFS=',' read -ra ADDR <<< "$project_modules_without_spaces"
     for module in "${ADDR[@]}"; do
@@ -742,13 +748,14 @@ function _get_project_module_for_current_directory() {
       if [ "$handling_module_root_path" != '' ]; then
         module_root_dir_for_find="$module_root_dir_for_find/$handling_module_root_path"
       fi
-      find_result=$(find "$module_root_dir_for_find" -type d -wholename "$handling_dir")
-      if [ "$find_result" != '' ]; then
-        echo "$module"
-        found_module='true'
-        keep_searching='false'
+      if [ -d "$module_root_dir_for_find" ] || [ -f "$module_root_dir_for_find" ]; then
+        find_result=$(find "$module_root_dir_for_find" -type d -wholename "$handling_dir")
+        if [ "$find_result" != '' ]; then
+          echo "$module"
+          found_module='true'
+          keep_searching='false'
+        fi
       fi
-#      _use_module_configuration "$next_handling_module" || return 1
     done
     if [ "$handling_dir" = '/' ] || [ "$handling_dir" = "$ROOT_REPO_DIR" ]; then
       keep_searching='false'