pyappify 0.0.5__tar.gz → 1.0.1__tar.gz

{pyappify-0.0.5 → pyappify-1.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyappify
-Version: 0.0.5
+Version: 1.0.1
 Summary: My awesome Python application
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License

{pyappify-0.0.5 → pyappify-1.0.1}/pyappify/__init__.py

@@ -74,37 +74,47 @@ def hide_pyappify():
             pass
 
 def upgrade(to_version, executable_sha256, executable_zip_urls, stop_event=None):
-    if not pyappify_upgradeable or (to_version and to_version.lstrip('v') == pyappify_version.lstrip('v')):
+    if not pyappify_upgradeable or not is_greater_version(to_version, pyappify_version):
+        if logger:
+            logger.info(f"pyappify no need to upgrade {pyappify_upgradeable} {to_version} {executable_sha256} {executable_zip_urls}")
         return
-
+    if logger:
+        logger.info(
+            f"pyappify start to upgrade {pyappify_upgradeable} {to_version} {executable_sha256} {executable_zip_urls}")
     def _do_upgrade():
-        tmp_dir = os.path.join(os.getcwd(), "tmp")
+        tmp_dir = os.path.join(os.getcwd(), "pyappify_tmp")
         try:
             os.makedirs(tmp_dir, exist_ok=True)
             downloaded_zip_path = None
             for url in executable_zip_urls:
                 try:
+                    if logger:
+                        logger.info(
+                            f"pyappify start to download {url}")
                     local_zip_path = os.path.join(tmp_dir, os.path.basename(url))
                     with urllib.request.urlopen(url) as response, open(local_zip_path, 'wb') as out_file:
                         while True:
                             if stop_event and stop_event.is_set():
                                 if logger:
-                                    logger.info("Upgrade download cancelled by stop event.")
+                                    logger.info("pyappify Upgrade download cancelled by stop event.")
                                 return
                             chunk = response.read(8192)
                             if not chunk:
                                 break
                             out_file.write(chunk)
                     downloaded_zip_path = local_zip_path
+                    if logger:
+                        logger.info(
+                            f"pyappify download success {url}")
                     break
                 except Exception as e:
                     if logger:
-                        logger.warning(f"Failed to download from {url}: {e}")
+                        logger.warning(f"pyappify Failed to download from {url}: {e}")
                     continue
 
             if not downloaded_zip_path:
                 if logger:
-                    logger.error("Failed to download upgrade.")
+                    logger.error("pyappify Failed to download upgrade.")
                 return
 
             with zipfile.ZipFile(downloaded_zip_path, 'r') as zip_ref:
@@ -119,7 +129,7 @@ def upgrade(to_version, executable_sha256, executable_zip_urls, stop_event=None)
 
             if not found_executable_path:
                 if logger:
-                    logger.error("Executable not found in zip.")
+                    logger.error("pyappify Executable not found in zip.")
                 return
 
             sha256_hash = hashlib.sha256()
@@ -129,18 +139,41 @@ def upgrade(to_version, executable_sha256, executable_zip_urls, stop_event=None)
 
             if sha256_hash.hexdigest() != executable_sha256:
                 if logger:
-                    logger.error("SHA256 checksum mismatch.")
+                    logger.error("pyappify SHA256 checksum mismatch.")
                 return
 
             kill_pyappify()
             shutil.move(found_executable_path, pyappify_executable)
+            if logger:
+                logger.info(f"pyappify Upgrade success")
         except Exception as e:
             if logger:
-                logger.error(f"Upgrade failed: {e}")
+                logger.error(f"pyappify Upgrade failed: {e}")
         finally:
             if os.path.exists(tmp_dir):
                 shutil.rmtree(tmp_dir)
 
     thread = threading.Thread(target=_do_upgrade)
     thread.daemon = True
-    thread.start()
+    thread.start()
+
+def is_greater_version(version1, version2):
+    """
+    Compares two semantic version strings.
+
+    Args:
+        version1 (str): The first version string.
+        version2 (str): The second version string.
+
+    Returns:
+        bool: True if version1 is strictly greater than version2,
+              False otherwise or if parsing fails.
+    """
+    try:
+        version1 = version1.lstrip('v')
+        version2 = version2.lstrip('v')
+        v1_parts = [int(p) for p in version1.split('.')]
+        v2_parts = [int(p) for p in version2.split('.')]
+        return v1_parts > v2_parts
+    except (ValueError, AttributeError):
+        return False

{pyappify-0.0.5 → pyappify-1.0.1}/pyappify.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyappify
-Version: 0.0.5
+Version: 1.0.1
 Summary: My awesome Python application
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License

{pyappify-0.0.5 → pyappify-1.0.1}/pyappify.egg-info/SOURCES.txt

@@ -6,4 +6,5 @@ pyappify.egg-info/SOURCES.txt
 pyappify.egg-info/dependency_links.txt
 pyappify.egg-info/entry_points.txt
 pyappify.egg-info/requires.txt
-pyappify.egg-info/top_level.txt
+pyappify.egg-info/top_level.txt
+tests/TestVersion.py

{pyappify-0.0.5 → pyappify-1.0.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyappify"
-version = "0.0.5"
+version = "1.0.1"
 description = "My awesome Python application"
 readme = "README.md"
 requires-python = ">=3.7"

pyappify-1.0.1/tests/TestVersion.py

@@ -0,0 +1,33 @@
+# filename: test_pyappify.is_greater_version.py
+import unittest
+import pyappify
+
+class TestIsGreaterVersion(unittest.TestCase):
+
+    def test_version1_is_greater(self):
+        self.assertTrue(pyappify.is_greater_version("2.0.0", "1.9.9"))
+        self.assertTrue(pyappify.is_greater_version("1.2.0", "v1.1.9"))
+        self.assertTrue(pyappify.is_greater_version("v1.1.2", "1.1.1"))
+        self.assertTrue(pyappify.is_greater_version("1.1.0", "1.1"))
+        self.assertTrue(pyappify.is_greater_version("v10.0.0", "9.0.0"))
+
+    def test_version1_is_not_greater(self):
+        self.assertFalse(pyappify.is_greater_version("v1.0.0", "2.0.0"))
+        self.assertFalse(pyappify.is_greater_version("1.1.0", "v1.2.0"))
+        self.assertFalse(pyappify.is_greater_version("1.1.1", "1.1.2"))
+        self.assertFalse(pyappify.is_greater_version("1.1", "1.1.0"))
+
+    def test_versions_are_equal(self):
+        self.assertFalse(pyappify.is_greater_version("qwer", "1.0.0"))
+        self.assertFalse(pyappify.is_greater_version("1.2.3", "1.2.3"))
+
+    def test_invalid_or_edge_cases(self):
+        self.assertFalse(pyappify.is_greater_version(None, "1.0.0"))
+        self.assertFalse(pyappify.is_greater_version("1.0.0", None))
+        self.assertFalse(pyappify.is_greater_version(None, None))
+        self.assertFalse(pyappify.is_greater_version("v1.a.0", "1.0.0"))
+        self.assertFalse(pyappify.is_greater_version("1.0.0", "invalid"))
+        self.assertFalse(pyappify.is_greater_version("", "1.0.0"))
+
+if __name__ == '__main__':
+    unittest.main(argv=['first-arg-is-ignored'], exit=False)