viur-cli 2.3.2__tar.gz → 2.3.4__tar.gz

{viur_cli-2.3.2/src/viur_cli.egg-info → viur_cli-2.3.4}/PKG-INFO

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

{viur_cli-2.3.2 → viur_cli-2.3.4}/src/viur_cli/scriptor/cli.py

@@ -23,7 +23,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
 
@@ -107,8 +107,9 @@ def check_session(ctx: click.Context):
         click.echo("Invalid session, please run `viur script setup` again. okay ?")
         ctx.invoke(setup)
         ctx.close()
+    # init modules
+    get_modules()
 
-        
 @script.command()
 @click.option('--force', default=False, help='Force replace files from server in local working directory')
 @click.pass_context
@@ -125,7 +126,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):
@@ -145,9 +146,12 @@ def pull(ctx: click.Context, force: bool):
                         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()
+                                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...")
 
                 else:
                     create_file()
@@ -160,7 +164,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()
@@ -312,7 +316,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}")
@@ -340,9 +344,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()
@@ -375,4 +379,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.2 → viur_cli-2.3.4}/src/viur_cli/version.py

@@ -1,2 +1,2 @@
-__version__ = "2.3.2"
+__version__ = "2.3.4"
 MINIMAL_PIPENV = "2023.11.15"

{viur_cli-2.3.2 → viur_cli-2.3.4/src/viur_cli.egg-info}/PKG-INFO

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