pypas-cli 0.2.0__tar.gz → 0.2.2__tar.gz

{pypas_cli-0.2.0 → pypas_cli-0.2.2}/PKG-INFO

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

{pypas_cli-0.2.0 → pypas_cli-0.2.2}/pyproject.toml

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

{pypas_cli-0.2.0 → pypas_cli-0.2.2}/src/pypas/lib/config.py

@@ -45,3 +45,13 @@ class Config:
     @staticmethod
     def unauth():
         settings.MAIN_CONFIG_FILE.unlink(missing_ok=True)
+
+    @staticmethod
+    def find_nested_config(
+        config_file: str = settings.EXERCISE_CONFIG_FILE, relative_to_cwd: bool = False
+    ) -> Path | None:
+        base = Path('.').resolve()
+        for path in base.rglob(config_file):
+            if (p := path.parent) != base:
+                return p if not relative_to_cwd else p.relative_to(base)
+        return None

{pypas_cli-0.2.0 → pypas_cli-0.2.2}/src/pypas/main.py

@@ -41,7 +41,13 @@ def get(exercise_slug: str = typer.Argument(help='Slug of exercise')):
         )
         if not Confirm.ask('Continue', default=False):
             return
-    config = Config()
+    if (config := Config()).exists():
+        console.warning('Current folder seems to be a pypas exercise.')
+        console.info(
+            '[italic]If continue, files coming from server will [red]MESS[/red] your existing files'
+        )
+        if not Confirm.ask('Continue', default=False):
+            return
     if exercise.download(config.get('token')):
         exercise.unzip()
         console.info(f'Exercise is available at [note]./{exercise.folder}[/note] [success]✔')
@@ -81,7 +87,7 @@ def auth(token: str = typer.Argument(help='Access token')):
 def upgrade():
     """Upgrade pypas-cli from PyPI."""
     if sysutils.upgrade_pypas():
-        print(sysutils.get_pypas_version())
+        print(sysutils.get_package_info())
     else:
         console.error('Error upgrading pypas')
 
@@ -101,9 +107,16 @@ def zip(verbose: bool = typer.Option(False, '--verbose', '-v', help='Increase ve
 @inside_exercise
 def put():
     """Put (upload) exercise."""
+    config = Config()
+    if nested_config_path := config.find_nested_config(relative_to_cwd=True):
+        console.warning(
+            f'Another exercise seems to be nested inside current folder: ./{nested_config_path}'
+        )
+        console.info('[italic]If continue, upload will [red]BREAK[/red] testing[/italic]')
+        if not Confirm.ask('Continue', default=False):
+            return
     exercise = Exercise.from_config()
     zipfile = exercise.zip(to_tmp_dir=True)
-    config = Config()
     exercise.upload(zipfile, config['token'])
 
 

{pypas_cli-0.2.0 → pypas_cli-0.2.2}/src/pypas_cli.egg-info/PKG-INFO

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