Updating version logic

Author: dacoburn

.github/workflows/pr-preview.yml

@@ -24,7 +24,7 @@ jobs:
           pip install hatchling==1.27.0 hatch==1.14.0
 
       - name: Inject full dynamic version
-        run: python .hooks/sync_version.py --dev
+        run: python .hooks/sync_version.py
 
       - name: Get Hatch version
         id: version

.hooks/sync_version.py

@@ -10,35 +10,33 @@
 VERSION_PATTERN = re.compile(r"__version__\s*=\s*['\"]([^'\"]+)['\"]")
 PYPROJECT_PATTERN = re.compile(r'^version\s*=\s*".*"$', re.MULTILINE)
 
-def get_git_tag():
-    try:
-        tag = subprocess.check_output([
-            "git", "describe", "--tags", "--exact-match"
-        ], stderr=subprocess.DEVNULL, text=True).strip()
-        return tag.lstrip("v")
-    except subprocess.CalledProcessError:
-        return None
+def read_version_from_init(path: pathlib.Path) -> str:
+    content = path.read_text()
+    match = VERSION_PATTERN.search(content)
+    if not match:
+        print(f"❌ Could not find __version__ in {path}")
+        sys.exit(1)
+    return match.group(1)
 
-def get_latest_tag():
+def read_version_from_git(path: str) -> str:
     try:
-        tag = subprocess.check_output([
-            "git", "describe", "--tags", "--abbrev=0"
-        ], text=True).strip()
-        return tag.lstrip("v")
+        output = subprocess.check_output(["git", "show", f"HEAD:{path}"], text=True)
+        match = VERSION_PATTERN.search(output)
+        if not match:
+            return None
+        return match.group(1)
     except subprocess.CalledProcessError:
-        return "0.0.0"
+        return None
 
-def get_commit_count_since(tag):
-    try:
-        output = subprocess.check_output([
-            "git", "rev-list", f"v{tag}..HEAD", "--count"
-        ], text=True).strip()
-        return int(output)
-    except subprocess.CalledProcessError:
-        return 0
+def bump_dev_version(version: str) -> str:
+    if ".dev" in version:
+        base, dev = version.split(".dev")
+        return f"{base}.dev{int(dev)+1}"
+    else:
+        return f"{version}.dev1"
 
 def inject_version(version: str):
-    print(f"\U0001f501 Injecting version: {version}")
+    print(f"🔁 Updating version to: {version}")
 
     # Update __init__.py
     init_content = INIT_FILE.read_text()
@@ -54,20 +52,19 @@ def inject_version(version: str):
     PYPROJECT_FILE.write_text(new_pyproject)
 
 def main():
-    dev_mode = "--dev" in sys.argv
+    current_version = read_version_from_init(INIT_FILE)
+    previous_version = read_version_from_git("socketsecurity/__init__.py")
 
-    if dev_mode:
-        base = get_latest_tag()
-        commits = get_commit_count_since(base)
-        version = f"{base}.dev{commits}"
-    else:
-        version = get_git_tag()
-        if not version:
-            print("\u274c Error: No exact tag found for release.")
-            sys.exit(1)
+    print(f"Current: {current_version}, Previous: {previous_version}")
 
-    inject_version(version)
-    print(f"\u2705 Injected {'dev' if dev_mode else 'release'} version: {version}")
+    if current_version == previous_version:
+        new_version = bump_dev_version(current_version)
+        inject_version(new_version)
+        print("⚠️ Version was unchanged — auto-bumped. Please git add + commit again.")
+        sys.exit(1)
+    else:
+        print("✅ Version already bumped — proceeding.")
+        sys.exit(0)
 
 if __name__ == "__main__":
-    main()
+    main()