viur-cli 3.0.0b2__tar.gz → 3.0.1__tar.gz

{viur_cli-3.0.0b2 → viur_cli-3.0.1}/LICENSE

@@ -1,4 +1,4 @@
-Copyright © 2025 by Mausbrand Informationssysteme GmbH.
+Copyright © 2026 by Mausbrand Informationssysteme GmbH.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{viur_cli-3.0.0b2/src/viur_cli.egg-info → viur_cli-3.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: viur-cli
-Version: 3.0.0b2
+Version: 3.0.1
 Summary: Command-line interface for ViUR application maintenance.
 Author-email: "Andreas H. Kelch" <ak@mausbrand.de>
 License-Expression: MIT
@@ -346,7 +346,7 @@ viur-cli depends on
 
 ## License
 
-Copyright © 2025 by Mausbrand Informationssysteme GmbH.<br>
+Copyright © 2026 by Mausbrand Informationssysteme GmbH.<br>
 Mausbrand and ViUR are registered trademarks of Mausbrand Informationssysteme GmbH.
 
 This project is free software under the MIT license.<br>

{viur_cli-3.0.0b2 → viur_cli-3.0.1}/README.md

@@ -323,7 +323,7 @@ viur-cli depends on
 
 ## License
 
-Copyright © 2025 by Mausbrand Informationssysteme GmbH.<br>
+Copyright © 2026 by Mausbrand Informationssysteme GmbH.<br>
 Mausbrand and ViUR are registered trademarks of Mausbrand Informationssysteme GmbH.
 
 This project is free software under the MIT license.<br>

{viur_cli-3.0.0b2 → viur_cli-3.0.1}/src/viur_cli/conf.py

@@ -269,6 +269,7 @@ class ScriptorConfig(Config):
         self.update({
             "base_url": self.DEFAULT_BASE_URL,
             "working_dir": self.DEFAULT_WORKING_DIR,
+            "cookies": {},
         })
         super().__init__(**kwargs)
 

{viur_cli-3.0.0b2 → viur_cli-3.0.1}/src/viur_cli/local.py

@@ -1,4 +1,9 @@
+import contextlib
+import itertools
 import json
+import sys
+import threading
+import time
 
 import click
 import requests
@@ -186,6 +191,41 @@ def check(dev):
         utils.echo_info("\U00002714 No vulnerabilities found.")
 
 
+@contextlib.contextmanager
+def _spinner(message):
+    """Show an animated spinner next to ``message`` until the block exits.
+
+    No-op (prints the message once) when stdout is not a TTY so CI logs
+    stay clean.
+    """
+    styled = click.style(message, fg="cyan")
+    if not sys.stdout.isatty():
+        click.echo(styled)
+        yield
+        return
+
+    done = threading.Event()
+
+    def spin():
+        for ch in itertools.cycle("⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏"):
+            if done.is_set():
+                break
+            sys.stdout.write(f"\r{styled} {click.style(ch, fg='cyan')}")
+            sys.stdout.flush()
+            time.sleep(0.1)
+
+    t = threading.Thread(target=spin, daemon=True)
+    t.start()
+    try:
+        yield
+    finally:
+        done.set()
+        t.join()
+        # Leave the message in place; swap the spinner glyph for a check mark.
+        sys.stdout.write(f"\r{styled} {click.style('✓', fg='cyan')}\n")
+        sys.stdout.flush()
+
+
 def do_checks(dev=True):
     """Run Python (pip-audit) and npm (npm audit) vulnerability scans.
 
@@ -204,11 +244,12 @@ def do_checks(dev=True):
 
     # --- Python vulnerability check via pip-audit (PyPA tool, OSV data) ---
     try:
-        result = subprocess.run(
-            ["uvx", "pip-audit", "--format", "json", "--vulnerability-service", "osv"],
-            capture_output=True,
-            text=True,
-        )
+        with _spinner("Scanning Python dependencies (pip-audit)"):
+            result = subprocess.run(
+                ["uvx", "pip-audit", "--format", "json", "--vulnerability-service", "osv"],
+                capture_output=True,
+                text=True,
+            )
     except FileNotFoundError:
         echo_warning("uvx not found; skipping Python vulnerability check.")
     else:
@@ -229,7 +270,7 @@ def do_checks(dev=True):
                 vuln_deps = [d for d in deps if d.get("vulns")]
                 total_vulns = sum(len(d["vulns"]) for d in vuln_deps)
 
-                click.echo("\n" + "=" * 60)
+                click.echo("\n\n" + "=" * 60)
                 click.echo("Python Security Scan Results (pip-audit, OSV)")
                 click.echo("=" * 60)
                 click.echo(f"Total Packages:         {len(deps)}")
@@ -240,6 +281,7 @@ def do_checks(dev=True):
                 if vuln_deps:
                     has_vulnerabilities = True
                     click.echo("Run `uvx pip-audit --vulnerability-service osv` for per-package detail.")
+                click.echo()
 
     # --- npm vulnerability check ---
     if shutil.which("npm"):
@@ -258,7 +300,7 @@ def do_checks(dev=True):
             npm_builds.append({"name": build_name, "path": audit_path})
 
         if not npm_builds:
-            click.echo("\n" + "=" * 60)
+            click.echo("\n\n" + "=" * 60)
             click.echo("No npm builds found in config - skipping npm audit")
             click.echo("=" * 60)
         else:
@@ -267,12 +309,13 @@ def do_checks(dev=True):
                 try:
                     npm_audit_dir = build["path"]
 
-                    npm_result = subprocess.run(
-                        ["npm", "audit", "--json"],
-                        capture_output=True,
-                        text=True,
-                        cwd=npm_audit_dir,
-                    )
+                    with _spinner(f"Scanning npm dependencies ({build['name']})"):
+                        npm_result = subprocess.run(
+                            ["npm", "audit", "--json"],
+                            capture_output=True,
+                            text=True,
+                            cwd=npm_audit_dir,
+                        )
 
                     npm_data = json.loads(npm_result.stdout, strict=False)
 
@@ -288,7 +331,7 @@ def do_checks(dev=True):
                         has_vulnerabilities = True
 
                     # Display npm scan summary
-                    click.echo("\n" + "=" * 60)
+                    click.echo("\n\n" + "=" * 60)
                     click.echo(f"npm Security Scan Results - {build['name']}")
                     click.echo("=" * 60)
                     click.echo(f"Build Path:             {npm_audit_dir}")
@@ -309,6 +352,7 @@ def do_checks(dev=True):
 
                     if total_npm_vulns > 0:
                         click.echo(f"Run `npm audit` in {build['path']} for per-package detail.")
+                    click.echo()
 
                 except FileNotFoundError:
                     echo_warning(f"npm audit directory not found: {build['path']}")
@@ -321,7 +365,7 @@ def do_checks(dev=True):
                         f"Unexpected error during npm security check for {build['name']}: {e}"
                     )
     else:
-        click.echo("\n" + "=" * 60)
+        click.echo("\n\n" + "=" * 60)
         click.echo("npm not found - skipping npm audit")
         click.echo("=" * 60)
 

{viur_cli-3.0.0b2 → viur_cli-3.0.1}/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
@@ -34,7 +35,7 @@ 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):
@@ -43,15 +44,32 @@ def configure(url: str, username: str, working_dir: str):
     Only flags that are passed are written; the rest of the
     `viur_scriptor_config.json` keeps its previous values.
     """
+    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()
@@ -93,8 +111,7 @@ def setup():
             scriptor_config.save()
             click.echo("Setup done")
         else:
-            if "cookies" in scriptor_config:
-                del scriptor_config["cookies"]
+            scriptor_config["cookies"] = {}
             click.echo("Failed to login. Did you maybe entered the wrong password?")
     except KeyboardInterrupt:
         pass
@@ -104,9 +121,9 @@ def check_session(ctx: click.Context):
     base_url = scriptor_config.get("base_url")
 
     s = requests.Session()
-    s.cookies = cookiejar_from_dict(scriptor_config.get("cookies", {}))
+    s.cookies = cookiejar_from_dict(scriptor_config["cookies"])
 
-    response = s.get(base_url + "/vi/user/view/self", cookies=scriptor_config.get("cookies", {}))
+    response = s.get(base_url + "/vi/user/view/self", cookies=scriptor_config["cookies"])
     if not response.ok:
         click.echo("Invalid session, please run `viur script setup` again. okay ?")
         ctx.invoke(setup)
@@ -115,7 +132,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):
     """Download all server-side Scriptor scripts into the local working_dir.
@@ -131,36 +149,74 @@ 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("/"))
 
             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}")
+                        f.write(entry["script"] or "")
 
                 if os.path.exists(_path):
                     if force:
+                        with open(_path, "r") as f:
+                            changed = f.read().splitlines() != (entry["script"] or "").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:
-                            if hashlib.sha256(entry["script"].encode()).digest() \
-                                    != hashlib.sha256(f.read().encode()).digest():
-                                try:
-                                    if click.confirm(f"There is a difference with {entry['path']}. Overwrite?"):
-                                        os.remove(_path)
-                                        create_file()
-                                except click.exceptions.Abort:
-                                    click.echo("\nSkipping...")
-
+                            local_content = f.read()
+                        remote_content = entry["script"] or ""
+                        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
                 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"):
@@ -170,6 +226,13 @@ 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())
 
 
@@ -232,7 +295,7 @@ def push(ctx: click.Context, force: bool, watch: bool):
                     with open(_real_file, "r") as f:
                         file_content = f.read()
 
-                        if hashlib.sha256(entry["script"].encode("utf-8")).digest() \
+                        if hashlib.sha256((entry["script"] or "").encode("utf-8")).digest() \
                                 != hashlib.sha256(file_content.encode("utf-8")).digest():
                             can_push = force
                             if not can_push:
@@ -317,9 +380,10 @@ def push(ctx: click.Context, force: bool, watch: bool):
 
             def on_modified(event):
                 try:
-                    # check for tmp file
                     if event.src_path.endswith("~"):
                         return
+                    if not os.path.exists(event.src_path):
+                        return
                     if event.src_path not in modified_files:
                         modified_files[event.src_path] = os.path.getmtime(event.src_path)
                     elif os.path.getmtime(event.src_path) == modified_files[event.src_path]:
@@ -331,7 +395,7 @@ def push(ctx: click.Context, force: bool, watch: bool):
                     print(f"Error: on file {event.src_path} {e}")
                     traceback.print_exc()
 
-            regexes = [r".*\.py"]
+            regexes = [r".*\.py$"]
             ignore_regexes = []
             ignore_directories = True
             case_sensitive = False

{viur_cli-3.0.0b2 → viur_cli-3.0.1}/src/viur_cli/scriptor/login.py

@@ -53,7 +53,3 @@ def ensure_login(
         scriptor_config.save()
 
         return True
-
-
-
-

viur_cli-3.0.1/src/viur_cli/version.py

@@ -0,0 +1,2 @@
+__version__ = "3.0.1"
+MINIMAL_UV = "0.9.15"

{viur_cli-3.0.0b2 → viur_cli-3.0.1/src/viur_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: viur-cli
-Version: 3.0.0b2
+Version: 3.0.1
 Summary: Command-line interface for ViUR application maintenance.
 Author-email: "Andreas H. Kelch" <ak@mausbrand.de>
 License-Expression: MIT
@@ -346,7 +346,7 @@ viur-cli depends on
 
 ## License
 
-Copyright © 2025 by Mausbrand Informationssysteme GmbH.<br>
+Copyright © 2026 by Mausbrand Informationssysteme GmbH.<br>
 Mausbrand and ViUR are registered trademarks of Mausbrand Informationssysteme GmbH.
 
 This project is free software under the MIT license.<br>

viur_cli-3.0.0b2/src/viur_cli/version.py

@@ -1,2 +0,0 @@
-__version__ = "3.0.0.beta2"
-MINIMAL_UV = "0.9.15"