viur-cli 2.1.0__tar.gz → 2.2.0__tar.gz

{viur_cli-2.1.0/src/viur_cli.egg-info → viur_cli-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: viur_cli
-Version: 2.1.0
+Version: 2.2.0
 Summary: Command-line interface for ViUR application maintenance.
 Home-page: https://github.com/viur-framework/viur-cli
 Author: Andreas H. Kelch
@@ -17,6 +17,8 @@ Requires-Dist: click~=8.1.7
 Requires-Dist: pipfile-requirements~=0.3
 Requires-Dist: requests~=2.0
 Requires-Dist: semver~=3.0
+Requires-Dist: watchdog~=6.0
+Dynamic: license-file
 
 <div align="center">
     <img src="https://github.com/viur-framework/viur-artwork/raw/main/icons/icon-cli.svg" height="196" alt="A hexagonal logo of the viur-cli" title="viur-cli">

{viur_cli-2.1.0 → viur_cli-2.2.0}/setup.cfg

@@ -25,6 +25,7 @@ install_requires =
 	pipfile-requirements~=0.3
 	requests~=2.0
 	semver~=3.0
+	watchdog~=6.0
 
 [options.packages.find]
 where = src

{viur_cli-2.1.0 → viur_cli-2.2.0}/src/viur_cli/scriptor/cli.py

@@ -1,3 +1,4 @@
+import datetime
 import click
 import json
 import requests
@@ -180,25 +181,29 @@ def pull(ctx: click.Context, force: bool):
 @script.command()
 @click.option('--force', '-f', is_flag=True, default=False,
               help='Force push files from the local working directory onto the server')
+@click.option('--watch', '-w', is_flag=True, default=False,
+              help="Watch for file changes in the script folder and push them to the server")
 @click.pass_context
-def push(ctx: click.Context, force: bool):
+def push(ctx: click.Context, force: bool, watch: bool):
     """
     Push contents of working_dir to server.
     """
+
     check_session(ctx)
     Request.COOKIES = cookiejar_from_dict(Config().get("cookies", {}))
 
     from .scriptor.module import TreeModule
     tree = TreeModule("script")
 
-    async def main():
+    async def main(file_path: str=None):
         await tree.structure("node")
-
         working_dir = Config().get("working_dir")
         _files = glob.glob(f"{working_dir}/**/*", recursive=True)
-
         for file in _files:
             _real_file = file
+            if file_path and file_path != _real_file:
+                # only push a single file
+                continue
             parent = os.path.dirname(file)
             _type = "leaf"
             if os.path.isdir(file):
@@ -224,27 +229,27 @@ def push(ctx: click.Context, force: bool):
 
                         if hashlib.sha256(entry["script"].encode("utf-8")).digest() \
                                 != hashlib.sha256(file_content.encode("utf-8")).digest():
-                            _state = force
-                            if not _state:
-                                _state = click.confirm(f"Content of {file} changed. Overwrite?")
+                            can_push = force
+                            if not can_push:
+                                can_push = click.confirm(f"Content of {file} changed. Overwrite?")
 
-                            if _state:
-                                click.echo(f"Push {_real_file}")
+                            if can_push:
+                                date = datetime.datetime.now().strftime("%H:%M:%S")
+                                click.echo(f"{date if watch else ""} Push {_real_file}")
                                 await tree.edit(_type, entry["key"], {
                                     "script": file_content
                                 })
 
             except StopAsyncIteration:
-                _state = False
                 text = "folder"
                 if _type == "leaf":
                     text = "file"
 
-                _state = force
-                if not _state:
-                    _state = click.confirm(f"There is no {text} named {file}. Create it?")
+                can_push = force
+                if not can_push:
+                    can_push = click.confirm(f"There is no {text} named {file}. Create it?")
 
-                if _state:
+                if can_push:
                     root_node_entry = (await tree.list_root_nodes())[0]
 
                     if not parent.endswith("/"):
@@ -286,6 +291,56 @@ def push(ctx: click.Context, force: bool):
                     click.echo(f"Push {_real_file}")
                     await tree.add(_type, args)
 
+
+
+    if watch:
+        print("Watching...")
+        def watch_loop():
+            from watchdog.events import RegexMatchingEventHandler
+            from watchdog.observers import Observer
+            import time
+            modified_files = {}
+            def on_modified(event):
+                try:
+                    # check for tmp file
+                    if event.src_path.endswith("~"):
+                        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]:
+                        return
+                    modified_files[event.src_path] = os.path.getmtime(event.src_path)
+                    asyncio.new_event_loop().run_until_complete(main(event.src_path))
+                except Exception as e:
+                    print(f"Error: on file {event.src_path} {e}")
+
+
+            regexes = [r".*\.py"]
+            ignore_regexes = []
+            ignore_directories = True
+            case_sensitive = False
+            event_handler = RegexMatchingEventHandler(
+                regexes=regexes,
+                ignore_regexes=ignore_regexes,
+                ignore_directories=ignore_directories,
+                case_sensitive=case_sensitive
+            )
+            event_handler.on_modified = on_modified
+
+
+
+            observer = Observer()
+            observer.schedule(event_handler, Config().get("working_dir"), recursive=True)
+            observer.start()
+            try:
+                while True:
+                    time.sleep(1)
+            finally:
+                observer.stop()
+                observer.join()
+
+        asyncio.new_event_loop().run_until_complete(watch_loop())
+        return
     asyncio.new_event_loop().run_until_complete(main())
 
 

{viur_cli-2.1.0 → viur_cli-2.2.0}/src/viur_cli/utils.py

@@ -5,6 +5,7 @@ import sys
 import typing
 import datetime
 import getpass
+import subprocess
 
 
 def rmdir(dir):
@@ -95,7 +96,9 @@ def replace_vars(string: str, vars: typing.Optional[typing.Dict[str, str]] = Non
         old_string = string
         for var, content in vars.items():
             string = string.replace(f"$({var})", str(content))
-
+    if "$(ref)" in string:
+        ref = subprocess.check_output("git rev-parse --short HEAD", shell=True)
+        string = string.replace(f"$(ref)", str(ref))
     return string
 
 

{viur_cli-2.1.0 → viur_cli-2.2.0}/src/viur_cli/version.py

@@ -1,2 +1,2 @@
-__version__ = "2.1.0"
+__version__ = "2.2.0"
 MINIMAL_PIPENV = "2023.11.15"

{viur_cli-2.1.0 → viur_cli-2.2.0/src/viur_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: viur_cli
-Version: 2.1.0
+Version: 2.2.0
 Summary: Command-line interface for ViUR application maintenance.
 Home-page: https://github.com/viur-framework/viur-cli
 Author: Andreas H. Kelch
@@ -17,6 +17,8 @@ Requires-Dist: click~=8.1.7
 Requires-Dist: pipfile-requirements~=0.3
 Requires-Dist: requests~=2.0
 Requires-Dist: semver~=3.0
+Requires-Dist: watchdog~=6.0
+Dynamic: license-file
 
 <div align="center">
     <img src="https://github.com/viur-framework/viur-artwork/raw/main/icons/icon-cli.svg" height="196" alt="A hexagonal logo of the viur-cli" title="viur-cli">

{viur_cli-2.1.0 → viur_cli-2.2.0}/src/viur_cli.egg-info/requires.txt

@@ -3,3 +3,4 @@ click~=8.1.7
 pipfile-requirements~=0.3
 requests~=2.0
 semver~=3.0
+watchdog~=6.0