viur-cli 2.3.3__tar.gz → 2.3.5__tar.gz

{viur_cli-2.3.3/src/viur_cli.egg-info → viur_cli-2.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: viur-cli
-Version: 2.3.3
+Version: 2.3.5
 Summary: Command-line interface for ViUR application maintenance.
 Author-email: "Andreas H. Kelch" <ak@mausbrand.de>
 License-Expression: MIT

{viur_cli-2.3.3 → viur_cli-2.3.5}/src/viur_cli/scriptor/cli.py

@@ -4,6 +4,7 @@ import json
 import requests
 import os
 import hashlib
+import difflib
 import asyncio
 import sys
 import glob
@@ -23,7 +24,7 @@ def get_modules():
     global _modules
     if _modules is None:
         _modules = Modules(scriptor_config["base_url"], cookies=scriptor_config["cookies"])
-        asyncio.new_event_loop().run_until_complete(_modules.init())
+        asyncio.run(_modules.init())
 
     return _modules
 
@@ -36,22 +37,39 @@ def script():
 
 
 @script.command()
-@click.option('--url', default=None, help='Set the url')
+@click.option('--url', default=None, help='Set the server url')
 @click.option('--username', default=None, help='Set the username')
 @click.option('--working_dir', default=None, help='Set the working directory where scripts are stored to')
 def configure(url: str, username: str, working_dir: str):
     """
     Manage configuration settings.
     """
+    if not any([url, username, working_dir]):
+        click.echo("No parameters provided. Use one or more of the following options:")
+        click.echo("  --url         Set the server URL")
+        click.echo("  --username    Set the username")
+        click.echo("  --working_dir Set the working directory where scripts are stored to")
+        return
+
+    changed = []
 
     if url:
         scriptor_config["base_url"] = url
+        changed.append(f"url = {url}")
 
     if username:
         scriptor_config["username"] = username
+        changed.append(f"username = {username}")
 
     if working_dir:
         scriptor_config["working_dir"] = working_dir.replace("\\", "/")
+        changed.append(f"working_dir = {working_dir}")
+
+    click.echo("Configuration updated:")
+    for entry in changed:
+        click.echo(f"  {entry}")
+
+    scriptor_config.save()
 
 
 @script.command()
@@ -111,7 +129,8 @@ def check_session(ctx: click.Context):
     get_modules()
 
 @script.command()
-@click.option('--force', default=False, help='Force replace files from server in local working directory')
+@click.option('--force', default=False, is_flag=True,
+              help='Overwrite local files without asking for confirmation')
 @click.pass_context
 def pull(ctx: click.Context, force: bool):
     """
@@ -126,7 +145,7 @@ def pull(ctx: click.Context, force: bool):
         working_dir = scriptor_config.get("working_dir")
 
         async def process_entry(entry: dict, is_node: bool):
-            _path = os.path.join(working_dir, entry["path"])
+            _path = os.path.join(working_dir, entry["path"].lstrip("/"))
 
             if is_node:
                 if not os.path.exists(_path):
@@ -144,11 +163,30 @@ def pull(ctx: click.Context, force: bool):
                         create_file()
                     else:
                         with open(_path, "r") as f:
-                            if hashlib.sha256(entry["script"].encode()).digest() \
-                                    != hashlib.sha256(f.read().encode()).digest():
-                                if click.confirm(f"There is a difference with {entry['path']}. Overwrite?"):
-                                    os.remove(_path)
-                                    create_file()
+                            local_content = f.read()
+                        remote_content = entry["script"]
+                        diff = list(difflib.unified_diff(
+                            remote_content.splitlines(),
+                            local_content.splitlines(),
+                            fromfile=f"server/{entry['path'].lstrip('/')}",
+                            tofile=f"local/{entry['path'].lstrip('/')}",
+                            lineterm="",
+                        ))
+                        if diff:
+                            for line in diff:
+                                if line.startswith("+++") or line.startswith("---"):
+                                    click.echo(click.style(line, bold=True), nl=True)
+                                elif line.startswith("@@"):
+                                    click.echo(click.style(line, fg="cyan"), nl=True)
+                                elif line.startswith("+"):
+                                    click.echo(click.style(line, fg="green"), nl=True)
+                                elif line.startswith("-"):
+                                    click.echo(click.style(line, fg="red"), nl=True)
+                                else:
+                                    click.echo(line, nl=True)
+                            if click.confirm(f"Overwrite local {entry['path']} with remote version?"):
+                                os.remove(_path)
+                                create_file()
 
                 else:
                     create_file()
@@ -161,7 +199,7 @@ def pull(ctx: click.Context, force: bool):
         async for leaf in tree.list(skel_type="leaf"):
             await process_entry(leaf, False)
 
-    asyncio.new_event_loop().run_until_complete(main())
+    asyncio.run(main())
 
 
 @script.command()
@@ -313,7 +351,7 @@ def push(ctx: click.Context, force: bool, watch: bool):
                     elif os.path.getmtime(event.src_path) == modified_files[event.src_path]:
                         return
                     modified_files[event.src_path] = os.path.getmtime(event.src_path)
-                    asyncio.new_event_loop().run_until_complete(main(event.src_path))
+                    asyncio.run(main(event.src_path))
                 except Exception as e:
                     import traceback
                     print(f"Error: on file {event.src_path} {e}")
@@ -341,9 +379,9 @@ def push(ctx: click.Context, force: bool, watch: bool):
                 observer.stop()
                 observer.join()
 
-        asyncio.new_event_loop().run_until_complete(watch_loop())
+        watch_loop()
         return
-    asyncio.new_event_loop().run_until_complete(main())
+    asyncio.run(main())
 
 
 @script.command()
@@ -376,4 +414,4 @@ def run(ctx: click.Context, path: str, args=None):
 
         await module.main()
 
-    asyncio.new_event_loop().run_until_complete(main())
+    asyncio.run(main())

{viur_cli-2.3.3 → viur_cli-2.3.5}/src/viur_cli/version.py

@@ -1,2 +1,2 @@
-__version__ = "2.3.3"
+__version__ = "2.3.5"
 MINIMAL_PIPENV = "2023.11.15"

{viur_cli-2.3.3 → viur_cli-2.3.5/src/viur_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: viur-cli
-Version: 2.3.3
+Version: 2.3.5
 Summary: Command-line interface for ViUR application maintenance.
 Author-email: "Andreas H. Kelch" <ak@mausbrand.de>
 License-Expression: MIT