From 186f2f8fd7d9633a2b608dfbce191c70274e34d0 Mon Sep 17 00:00:00 2001
From: antazoey <jules@apeworx.io>
Date: Tue, 5 Sep 2023 09:55:15 -0500
Subject: [PATCH] fix: issue with default plugins version variable when
 versions in config [APE-1370] (#29)

---
 .github/workflows/test_ape_version.yaml |  2 +-
 .github/workflows/test_plugins.yaml     | 16 +++++++++--
 action.yml                              | 38 ++++++++++++++++---------
 3 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/test_ape_version.yaml b/.github/workflows/test_ape_version.yaml
index 5720d14..e4fc532 100644
--- a/.github/workflows/test_ape_version.yaml
+++ b/.github/workflows/test_ape_version.yaml
@@ -1,4 +1,4 @@
-name: Ape Version Test
+name: Version Test
 
 on:
   push:
diff --git a/.github/workflows/test_plugins.yaml b/.github/workflows/test_plugins.yaml
index 710bac8..d64bda7 100644
--- a/.github/workflows/test_plugins.yaml
+++ b/.github/workflows/test_plugins.yaml
@@ -1,4 +1,4 @@
-name: Ape Plugins Test
+name: Plugins Test
 
 on:
   push:
@@ -19,17 +19,27 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        plugins: ['default', 'tokens', 'tokens==0.6.1']
+        plugins: [
+          'default_with_version_config',
+          'default_without_version_in_config',
+          'tokens',
+          'tokens==0.6.1'
+        ]
     steps:
       - uses: actions/checkout@v3
 
       - name: Check plugins
         id: check-plugins
         run: |
-          if [[ "${{ matrix.plugins }}" != "default" ]]; then
+          if [[ "${{ matrix.plugins }}" != default_* ]]; then
             echo "ape-plugins=${{ matrix.plugins }}" >> $GITHUB_OUTPUT
           fi
 
+          if [[ "${{ matrix.plugins }}" == "default_without_version_in_config" ]]; then
+            # Remove the version so it defaults to `. -U`.
+            sed -i 's/version: 0.6.1//g' "ape-config.yaml"
+          fi
+
       - name: Run ape action
         id: ape-action
         uses: ./
diff --git a/action.yml b/action.yml
index 259e61c..2a0ce04 100644
--- a/action.yml
+++ b/action.yml
@@ -93,15 +93,25 @@ runs:
       uses: andstor/file-existence-action@v2
       with:
         files: 'ape-config.yaml'
-
-    - run: |
-        if [[ "${{ steps.check-ape-config-yaml.outputs.files_exists }}"  == "true" ]]; then
-          version_present=$(sed -n '/^plugins:/,/^[^ ]/{/version:/p;}' "ape-config.yaml" | grep -c version)
+      
+    - name: Check version specs in config
+      id: check-plugin-version-specs
+      run: |
+        if [[ "${{ steps.check-ape-config-yaml.outputs.files_exists }}" == "true" ]]; then
+          version_present=$(sed -n '/^plugins:/,/^[^ ]/{/version:/p;}' "ape-config.yaml" | grep -c version || true)
+          if [[ -z "${version_present}" ]]; then
+            echo "version_present=0" >> $GITHUB_OUTPUT
+          else
+            echo "version_present=1" >> $GITHUB_OUTPUT
+          fi
         else
-          version_present=0
+          echo "version_present=0" >> $GITHUB_OUTPUT
         fi
+      shell: bash
 
-        if [[ "${version_present}" == "1" ]] && [[ -z "${{ inputs.ape-plugins-list }}" ]]; then
+    - name: Install Plugins
+      run: |
+        if [[ "${{ steps.check-plugin-version-specs.outputs.version_present }}" == "1" ]] && [[ -z "${{ inputs.ape-plugins-list }}" ]]; then
           plugins_value="."
         elif [[ -z "${{ inputs.ape-plugins-list }}" ]]; then
           plugins_value="--upgrade ."
@@ -109,17 +119,17 @@ runs:
           plugins_value="${{ inputs.ape-plugins-list }}"
         fi
 
-        ape plugins install "$plugins_value"
+        ape plugins install $plugins_value
 
       shell: bash
 
-    - name: Find if requirements.txt if exists
-      id: find-requirements-txt
-      run: |
-        echo "file=$(ls requirements.txt)" >> $GITHUB_OUTPUT
-      shell: bash
-
+    - name: Check requirments.txt exists
+      id: check-requirements-txt
+      uses: andstor/file-existence-action@v2
+      with:
+        files: 'requirements.txt'
+  
     - name: Install requirements.txt
       run: pip install -r requirements.txt
       shell: bash
-      if: steps.find-requirements-txt.outputs.file == 'requirements.txt'
+      if: steps.check-ape-config-yaml.outputs.files_exists == true