Allow base_dir on modified strategy

.circleci/test-deploy.yml

@@ -2,7 +2,7 @@ version: 2.1
 orbs:
   # Your orb will be automatically injected here during the pipeline.
   # Reference your orb's jobs and commands below as they will exist when built.
-  orb-tools: circleci/orb-tools@12.0
+  orb-tools: circleci/orb-tools@12.3
   # The orb definition is intentionally not included here. It will be injected into the pipeline.
   vale: {}
 
@@ -24,6 +24,17 @@ workflows:
     jobs:
       # Make sure to include "filters: *filters" in every test job you want to run as part of your deployment.
       # Test your orb's commands in a custom job and test your orb's jobs directly as a part of this workflow.
+      - vale/lint:
+          name: vale-lint-modified-default
+          strategy: modified
+          filters: *filters
+      - vale/lint:
+          name: vale-lint-modified-<<matrix.base_dir>>
+          matrix:
+            parameters:
+              base_dir: [src, sample, ".", .github]
+          strategy: modified
+          filters: *filters
       - vale/lint:
           name: vale-lint-all
           base_dir: "sample/"

src/jobs/lint.yml

@@ -15,7 +15,7 @@ parameters:
   base_dir:
     type: string
     default: "$CIRCLE_WORKING_DIRECTORY"
-    description: "Base directory to run Vale from. By default, Vale will run in the current directory."
+    description: "Base directory to run Vale from. By default, Vale will run in the current directory. Do no put / at the end."
   config:
     type: string
     default: ".vale.ini"

src/scripts/lint.sh

@@ -41,12 +41,24 @@ elif [ "$VALE_ENUM_STRATEGY" = "modified" ]; then
   command -v git > /dev/null 2>&1 || { apk add git; }
 
   echo "Checking for modified files..."
-  modified_files="$(git diff --name-only --diff-filter=d "$VALE_STR_REFERENCE_BRANCH")"
-  echo "$modified_files"
-
-  modified_files_space_separated=$(echo "$modified_files" | tr '\n' ' ')
+  PREFIX="$VALE_EVAL_CLI_BASE_DIR/"
+  FILES=""
+  while read -r file; do
+      if [ "$VALE_EVAL_CLI_BASE_DIR" = "." ] || [ "$VALE_EVAL_CLI_BASE_DIR" = "$PWD" ]; then
+        FILES="$file $FILES"
+      fi
+      case "$file" in 
+        $PREFIX*)
+          FILES="$file $FILES"
+          ;;
+      esac
+  done <<EOF
+  $(git diff --name-only --diff-filter=d "$VALE_STR_REFERENCE_BRANCH")
+EOF
+
+  echo "$FILES"
   echo "Running vale on modified files..."
-  sync_and_run_vale "$VALE_STR_CLI_GLOB" "$VALE_EVAL_CLI_CONFIG" "$modified_files_space_separated"
+  sync_and_run_vale "$VALE_STR_CLI_GLOB" "$VALE_EVAL_CLI_CONFIG" "$FILES"
 else
   echo "Invalid strategy: $VALE_ENUM_STRATEGY"
   exit 1