pypas-cli 0.4.2__tar.gz → 0.4.3__tar.gz

{pypas_cli-0.4.2/src/pypas_cli.egg-info → pypas_cli-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pypas-cli
-Version: 0.4.2
+Version: 0.4.3
 Summary: Python Practical Assignments
 Author-email: Sergio Delgado Quintero <sdelquin@gmail.com>
 Maintainer-email: Sergio Delgado Quintero <sdelquin@gmail.com>

{pypas_cli-0.4.2 → pypas_cli-0.4.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pypas-cli"
-version = "0.4.2"
+version = "0.4.3"
 description = "Python Practical Assignments"
 readme = "README.md"
 requires-python = ">=3.10"

{pypas_cli-0.4.2 → pypas_cli-0.4.3}/src/pypas/lib/sysutils.py

@@ -73,10 +73,17 @@ def get_package_data(package: str = 'pypas-cli') -> dict[str, str]:
         return {}
 
 
-def get_package_info(package: str = 'pypas-cli') -> str:
+def show_package_info(package: str = 'pypas-cli') -> None:
     if data := get_package_data(package):
-        return f'Package: {data.get("name")}\nVersion: {data.get("version")}\nPath: {data.get("location")}'
-    return "Package '{package}' is not already installed."
+        console.print(
+            dedent(f"""\
+            Package: {data.get('name')}
+            Version: [note]{data.get('version')}[/note]
+            Path: {data.get('location')}\
+        """)
+        )
+    else:
+        console.error(f"Package '{package}' is not yet installed")
 
 
 def get_latest_package_version(package: str = 'pypas-cli') -> str | None:
@@ -152,3 +159,25 @@ def unzip(zip_path: Path, extract_to: Path | None = None) -> Path:
     with zipfile.ZipFile(zip_path, 'r') as zip_ref:
         zip_ref.extractall(extract_to)
     return extract_to
+
+
+def handle_upgrade_pypas():
+    latest_version = get_latest_package_version()
+    package_data = get_package_data()
+    current_version = package_data.get('version')
+    # current_version = '0.0.0'  # Temporary hardcoded version for testing
+    if latest_version and current_version:
+        if latest_version != current_version:
+            if upgrade_pypas():
+                console.success(
+                    f'Upgraded pypas-cli from [note]v{current_version}[/note] to [note]v{latest_version}[/note]'
+                )
+            else:
+                console.error('Error upgrading pypas')
+        else:
+            console.success(
+                f"You're on the latest version of pypas-cli: [note]v{current_version}[/note]",
+                emphasis=False,
+            )
+    else:
+        console.error('Could not determine pypas-cli version information')

{pypas_cli-0.4.2 → pypas_cli-0.4.3}/src/pypas/main.py

@@ -27,7 +27,7 @@ def default(
 ):
     if version:
         sysutils.handle_package_version()
-        print(sysutils.get_package_info())
+        sysutils.show_package_info()
     # https://typer.tiangolo.com/tutorial/commands/context/#exclusive-executable-callback
     elif ctx.invoked_subcommand is None:
         typer.echo(ctx.get_help())
@@ -94,10 +94,7 @@ def auth(token: str = typer.Argument(help='Access token')):
 @app.command()
 def upgrade():
     """Upgrade pypas-cli from PyPI."""
-    if sysutils.upgrade_pypas():
-        print(sysutils.get_package_info())
-    else:
-        console.error('Error upgrading pypas')
+    sysutils.handle_upgrade_pypas()
 
 
 @app.command()

{pypas_cli-0.4.2 → pypas_cli-0.4.3/src/pypas_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pypas-cli
-Version: 0.4.2
+Version: 0.4.3
 Summary: Python Practical Assignments
 Author-email: Sergio Delgado Quintero <sdelquin@gmail.com>
 Maintainer-email: Sergio Delgado Quintero <sdelquin@gmail.com>