Merge pull request #19 from skarzi/issue-18

Handle quotes and extra whitespaces in version regexps

.github/workflows/test.yml

@@ -4,6 +4,7 @@ on:
     branches:
       - master
   pull_request:
+  workflow_dispatch:
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -46,3 +47,17 @@ jobs:
 
       - name: Check diff
         run: git diff
+
+  quoted_version:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ./
+        id: depup
+        with:
+          file: testdata/testfile
+          version_name: POETRY_VERSION
+          repo: python-poetry/poetry
+
+      - name: Check diff
+        run: git diff

entrypoint.sh

@@ -10,7 +10,7 @@ REPO="${INPUT_REPO:-reviewdog/reviewdog}"
 VERSION_NAME="${INPUT_VERSION_NAME:-REVIEWDOG_VERSION}"
 
 # Get current version.
-CURRENT_VERSION=$(grep -oP "${VERSION_NAME}(=|:?\s+)v?\K\d+\.\d+(\.\d+)?" "${FILE}" | head -n1)
+CURRENT_VERSION=$(grep -oP "${VERSION_NAME}\s*(=|:?)\s*(\'|\")?v?\K\d+\.\d+(\.\d+)?" "${FILE}" | head -n1)
 if [ -z "${CURRENT_VERSION}" ]; then
   echo "cannot parse ${VERSION_NAME}"
   exit 1
@@ -45,7 +45,7 @@ if [ "${CURRENT_VERSION}" = "${LATEST_VERSION}" ]; then
 fi
 
 echo "Updating ${VERSION_NAME} to ${LATEST_VERSION} in ${FILE}"
-sed -i "s/\(${VERSION_NAME}\(=\|:\?\s\+\)v\?\)\([0-9]\+\.[0-9]\+\(\.\?[0-9]\+\)\?\)/\1${LATEST_VERSION}/" "${FILE}"
+sed -i "s/\(${VERSION_NAME}\s*\(=\|:\?\)\s*\('\|\"\)\?v\?\)\([0-9]\+\.[0-9]\+\(\.\?[0-9]\+\)\?\)/\1${LATEST_VERSION}/" "${FILE}"
 
 echo "Updated. Commit and create Pull-Request as you need."
 echo "::set-output name=current::${CURRENT_VERSION}"

testdata/testfile

@@ -16,3 +16,6 @@ Other test cases.
 REDPEN_VERSION=1.10.1
 
 TMUX_VERSION=3.0
+
+POETRY_VERSION="1.1.3"
+ENV POETRY_VERSION='1.1.3'