Do not split by dot, use version as is

fix #83
devopshq · Oct 21, 2022 · 0d61e5f · 0d61e5f
1 parent 1603b92
commit 0d61e5f
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 3 deletions.
diff --git a/artifactory_cleanup/rules/keep.py b/artifactory_cleanup/rules/keep.py
@@ -173,9 +173,7 @@ def filter(self, artifacts):
                 artifacts.keep(artifact)
 
         for artifactory_with_version in artifacts_by_path_and_name.values():
-            artifactory_with_version.sort(
-                key=lambda x: [int(x) for x in x[0].split(".")]
-            )
+            artifactory_with_version.sort()
 
             artifact_count = len(artifactory_with_version)
             good_artifact_count = artifact_count - self.count

diff --git a/tests/test_rules_keep.py b/tests/test_rules_keep.py
@@ -219,4 +219,40 @@ def test_regexp_fail_to_parse__must_keep_unmatched_files(self):
             1, "[^\\d][\\._]((\\d+\\.)+\\d+)"
         ).filter(artifacts)
         expected = []
+        assert remove_these == expected
+
+    def test_regexp_with_hyphen(self):
+        data = [
+            # bootstrap-gui
+            {
+                "path": "folder1",
+                "name": "bootstrap-gui-3.10-39.src.rpm",
+                "created": "2021-03-20T13:54:52.383+02:00",
+            },
+            {
+                "path": "folder1",
+                "name": "bootstrap-gui-3.10-33.src.rpm",
+                "created": "2021-03-20T13:54:52.383+02:00",
+            },
+            {
+                "path": "folder1",
+                "name": "bootstrap-gui-3.11-33.src.rpm",
+                "created": "2021-03-19T13:53:52.383+02:00",
+            },
+            {
+                "path": "folder1",
+                "name": "bootstrap-gui-4.11-33.src.rpm",
+                "created": "2021-03-20T13:54:52.383+02:00",
+            },
+        ]
+
+        artifacts = ArtifactsList.from_response(data)
+
+        remove_these = KeepLatestVersionNFilesInFolder(
+            2, "bootstrap-gui-([\\d]+\\.[\\d]+\\-[\\d]+).*\\.rpm"
+        ).filter(artifacts)
+        expected = [
+            {"name": "bootstrap-gui-3.10-39.src.rpm", "path": "folder1"},
+            {"name": "bootstrap-gui-3.10-33.src.rpm", "path": "folder1"},
+        ]
         assert makeas(remove_these, expected) == expected