viur-cli 2.3.6__tar.gz → 2.3.7__tar.gz

{viur_cli-2.3.6/src/viur_cli.egg-info → viur_cli-2.3.7}/PKG-INFO

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

{viur_cli-2.3.6 → viur_cli-2.3.7}/src/viur_cli/scriptor/cli.py

@@ -4,7 +4,6 @@ import json
 import requests
 import os
 import hashlib
-import difflib
 import asyncio
 import sys
 import glob
@@ -24,7 +23,7 @@ def get_modules():
     global _modules
     if _modules is None:
         _modules = Modules(scriptor_config["base_url"], cookies=scriptor_config["cookies"])
-        asyncio.run(_modules.init())
+        asyncio.new_event_loop().run_until_complete(_modules.init())
 
     return _modules
 
@@ -37,39 +36,22 @@ def script():
 
 
 @script.command()
-@click.option('--url', default=None, help='Set the server url')
+@click.option('--url', default=None, help='Set the 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()
@@ -129,8 +111,7 @@ def check_session(ctx: click.Context):
     get_modules()
 
 @script.command()
-@click.option('--force', default=False, is_flag=True,
-              help='Overwrite local files without asking for confirmation')
+@click.option('--force', default=False, help='Force replace files from server in local working directory')
 @click.pass_context
 def pull(ctx: click.Context, force: bool):
     """
@@ -144,74 +125,33 @@ def pull(ctx: click.Context, force: bool):
         tree = await modules.get_module("script")
         working_dir = scriptor_config.get("working_dir")
 
-        stats = {"new": 0, "updated": 0, "skipped": 0, "unchanged": 0, "dirs": 0}
-
         async def process_entry(entry: dict, is_node: bool):
-            _path = os.path.join(working_dir, entry["path"].lstrip("/"))
+            _path = os.path.join(working_dir, entry["path"])
 
             if is_node:
                 if not os.path.exists(_path):
-                    click.echo(click.style(f"  mkdir {entry['path']}", fg="blue"))
                     os.makedirs(_path)
-                    stats["dirs"] += 1
             else:
-                click.echo(f"  check {entry['path']}", nl=False)
-
                 def create_file():
                     with open(_path, "a+") as f:
                         f.write(entry["script"])
 
+                    click.echo(f"Pull {_path}")
+
                 if os.path.exists(_path):
                     if force:
-                        with open(_path, "r") as f:
-                            changed = f.read().splitlines() != entry["script"].splitlines()
                         os.remove(_path)
                         create_file()
-                        if changed:
-                            click.echo(click.style("  [updated]", fg="yellow"))
-                            stats["updated"] += 1
-                        else:
-                            click.echo(click.style("  [ok]", fg="green"))
-                            stats["unchanged"] += 1
                     else:
                         with open(_path, "r") as f:
-                            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:
-                            click.echo(click.style("  [diff]", fg="yellow"))
-                            for line in diff:
-                                if line.startswith("+++") or line.startswith("---"):
-                                    click.echo(click.style(line, bold=True))
-                                elif line.startswith("@@"):
-                                    click.echo(click.style(line, fg="cyan"))
-                                elif line.startswith("+"):
-                                    click.echo(click.style(line, fg="green"))
-                                elif line.startswith("-"):
-                                    click.echo(click.style(line, fg="red"))
-                                else:
-                                    click.echo(line)
-                            if click.confirm(f"Overwrite local {entry['path']} with remote version?"):
-                                os.remove(_path)
-                                create_file()
-                                stats["updated"] += 1
-                            else:
-                                stats["skipped"] += 1
-                        else:
-                            click.echo(click.style("  [ok]", fg="green"))
-                            stats["unchanged"] += 1
+                            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()
+
                 else:
-                    click.echo(click.style("  [new]", fg="green"))
                     create_file()
-                    stats["new"] += 1
-
-        click.echo("Fetching scripts from server...")
 
         # Process nodes first
         async for node in tree.list(skel_type="node"):
@@ -221,14 +161,7 @@ def pull(ctx: click.Context, force: bool):
         async for leaf in tree.list(skel_type="leaf"):
             await process_entry(leaf, False)
 
-        click.echo("")
-        click.echo(click.style("Summary:", bold=True))
-        click.echo(f"  new:       {stats['new']}")
-        click.echo(f"  updated:   {stats['updated']}")
-        click.echo(f"  skipped:   {stats['skipped']}")
-        click.echo(f"  unchanged: {stats['unchanged']}")
-
-    asyncio.run(main())
+    asyncio.new_event_loop().run_until_complete(main())
 
 
 @script.command()
@@ -380,7 +313,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.run(main(event.src_path))
+                    asyncio.new_event_loop().run_until_complete(main(event.src_path))
                 except Exception as e:
                     import traceback
                     print(f"Error: on file {event.src_path} {e}")
@@ -408,9 +341,9 @@ def push(ctx: click.Context, force: bool, watch: bool):
                 observer.stop()
                 observer.join()
 
-        watch_loop()
+        asyncio.new_event_loop().run_until_complete(watch_loop())
         return
-    asyncio.run(main())
+    asyncio.new_event_loop().run_until_complete(main())
 
 
 @script.command()
@@ -443,4 +376,4 @@ def run(ctx: click.Context, path: str, args=None):
 
         await module.main()
 
-    asyncio.run(main())
+    asyncio.new_event_loop().run_until_complete(main())

{viur_cli-2.3.6 → viur_cli-2.3.7}/src/viur_cli/version.py

@@ -1,2 +1,2 @@
-__version__ = "2.3.6"
+__version__ = "2.3.7"
 MINIMAL_PIPENV = "2023.11.15"

{viur_cli-2.3.6 → viur_cli-2.3.7/src/viur_cli.egg-info}/PKG-INFO

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