Merge pull request #6 from Laxilef/semver2

platformio_dependabot/__main__.py

@@ -23,7 +23,7 @@ def main():
     packages = get_outdated_libraries(config.project_path)
 
     for package in packages:
-        logger.info(f"Updating '{package.name}' to {package.latestVersion} ...")
+        logger.info(f"Updating '{package.name}@{package.requirements}' from {package.currentVersion} to {package.latestVersion} ...")
 
         branch_name = f"platformio_dependabot/{package.name}/{package.latestVersion}"
         branch_name = branch_name.replace(" ", "_")
@@ -34,11 +34,13 @@ def main():
             logger.warning("Pull Request already existing, will do nothing.")
             continue
 
+        if update_ini_file(config.platformio_ini, package) == False:
+            logger.warning("No matching string to replace, will do nothing.")
+            continue
+
         repo = Repo(Path("/github/workspace"))
         create_branch(repo, branch_name)
 
-        update_ini_file(config.platformio_ini, package)
-
         add_file_commit_and_push(repo, branch_name, config.platformio_ini, package)
         checkout_base_branch(repo, github_repo)
         create_pull_request(github_repo, branch_name, package, config.assignee)

platformio_dependabot/platformio.py

@@ -2,6 +2,7 @@
 from pathlib import Path
 from dataclasses import dataclass
 from typing import List
+import re
 
 from platformio import fs
 from platformio.package.commands.outdated import fetch_outdated_candidates
@@ -20,6 +21,7 @@ class PackageDefinition:
     name: str
     currentVersion: str
     latestVersion: str
+    requirements: str
 
 
 def get_outdated_libraries(project_path: Path) -> List[PackageDefinition]:
@@ -29,19 +31,34 @@ def get_outdated_libraries(project_path: Path) -> List[PackageDefinition]:
     packages: List[PackageDefinition] = []
     for candidate in candidates:
         packages.append(PackageDefinition(candidate.pkg.metadata.name,
-                        candidate.outdated.wanted, candidate.outdated.latest))
+                        candidate.outdated.wanted, candidate.outdated.latest, f"{candidate.spec.requirements}"))
 
     def remove_duplicates(duplicate_list: List[PackageDefinition]) -> List[PackageDefinition]:
         return list(set(duplicate_list))
 
     return remove_duplicates(packages)
 
 
-def update_ini_file(iniFile: Path, package: PackageDefinition) -> None:
+def update_ini_file(iniFile: Path, package: PackageDefinition) -> bool:
+    updated = False
     data = ""
+
+    matches = re.search(r"^\s*([\^~<>=]*)\s*(.+)\s*$", package.requirements)
+    operator = matches.group(1)
+    requiredVersion = matches.group(2)
+
+    eName = re.escape(f"{package.name}")
+    eOperator = re.escape(f"{operator}")
+    eRequiredVersion = re.escape(f"{requiredVersion}")
+
     with open(iniFile, "rt") as f:
         data = f.read()
-        data = data.replace(f"{package.name} @ {package.currentVersion}",
-                            f"{package.name} @ {package.latestVersion}")
+        matches = re.findall(rf"({eName}(\s*)@(\s*){eOperator}(\s*){eRequiredVersion})", data)
+
+        for matched, space1, space2, space3 in matches:
+            updated = True
+            data = data.replace(matched, f"{package.name}{space1}@{space2}{operator}{space3}{package.latestVersion}")
     with open(iniFile, "wt") as f:
         f.write(data)
+
+    return updated