cubething_psync 0.1.0.dev10__tar.gz → 0.2.1__tar.gz

{cubething_psync-0.1.0.dev10/src/cubething_psync.egg-info → cubething_psync-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cubething_psync
-Version: 0.1.0.dev10
+Version: 0.2.1
 Summary: Simple project synchronization tool.
 Author-email: ada mandala <ada@cubething.dev>
 License-Expression: MIT

{cubething_psync-0.1.0.dev10 → cubething_psync-0.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cubething_psync"
-version = "0.1.0.dev10"
+version = "0.2.1"
 description = "Simple project synchronization tool."
 authors = [{name = "ada mandala", email="ada@cubething.dev"}]
 readme = "README.md"

{cubething_psync-0.1.0.dev10 → cubething_psync-0.2.1}/src/client/args.py

@@ -28,8 +28,8 @@ Variable          | Default
 PSYNC_SERVER_IP   | 127.0.0.1
 PSYNC_SERVER_PORT | 5000
 PSYNC_SSH_PORT    | 5022
-PSYNC_SERVER_DEST | /app/rsync/
-PSYNC_SSH_USER    | root
+PSYNC_SERVER_DEST | /home/psync/
+PSYNC_SSH_USER    | psync
 PSYNC_CERT_PATH   | ~/.local/share/psync/cert.pem
 """,
 )
@@ -57,8 +57,8 @@ _action = parser.add_argument(
 SERVER_IP: str = os.environ.get("PSYNC_SERVER_IP", "127.0.0.1")
 SERVER_PORT: int = int(os.environ.get("PSYNC_SERVER_PORT", "5000"))
 SERVER_SSH_PORT: int = int(os.environ.get("PSYNC_SSH_PORT", "5022"))
-SERVER_DEST: str = os.environ.get("PSYNC_SERVER_DEST", "/app/rsync")
-USER: str = os.environ.get("PSYNC_SSH_USER", "")
+SERVER_DEST: str = os.environ.get("PSYNC_SERVER_DEST", "/home/psync")
+USER: str = os.environ.get("PSYNC_SSH_USER", "psync")
 SSL_CERT_PATH: str = os.environ.get("PSYNC_CERT_PATH", "~/.local/share/psync/cert.pem")
 
 

{cubething_psync-0.1.0.dev10 → cubething_psync-0.2.1}/src/client/main.py

@@ -40,12 +40,6 @@ class PsyncClient:
     rsync, then execute them remotely while receiving the logs.
 
     CLI arguments: ::
-
-        usage: psync-client [-h] --path PATH [--extra EXTRA [EXTRA ...]] [--env ENV] [--args ARGS]
-
-        Client for the psync server.
-
-        options:
           -h, --help            show this help message and exit
           --path, -p PATH       Path to the target exectuable.
           --extra, -E EXTRA [EXTRA ...]
@@ -60,9 +54,9 @@ class PsyncClient:
         PSYNC_SERVER_PORT: The port of the server instance.
             Default: 5000
         PSYNC_SSH_PORT: The server instance's SSH port.
-            Default: 5001
+            Default: 5022
         PSYNC_SSH_USER: The server instance's SSH user.
-            Default: Unset. Will use the default ssh user.
+            Default: psync
         PSYNC_CERT_PATH: Path to the SSL certificate. Used to trust self-signed certs. Should
             match the server's certificate.
             Default: ~/.local/share/psync/cert.pem
@@ -142,14 +136,14 @@ class PsyncClient:
 
 def __rsync(project_hash: str, args: Args):
     """Runs rsync."""
-    user = f"{USER}@" if USER != "" else ""
-    url = f"{user}{SERVER_IP}:{SERVER_DEST}/{project_hash}/"
+    url = f"{SERVER_IP}:{SERVER_DEST}/{project_hash}/"
     rsync_args = [
         "rsync",
         "-avzr",
+        "-e",
+        f"/usr/bin/ssh -l {USER} -p {str(SERVER_SSH_PORT)}",
         "--progress",
         "--mkpath",
-        f"--port={str(SERVER_SSH_PORT)}",
         args.target_path,
         *args.extra,
         url,

{cubething_psync-0.1.0.dev10 → cubething_psync-0.2.1/src/cubething_psync.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cubething_psync
-Version: 0.1.0.dev10
+Version: 0.2.1
 Summary: Simple project synchronization tool.
 Author-email: ada mandala <ada@cubething.dev>
 License-Expression: MIT

{cubething_psync-0.1.0.dev10 → cubething_psync-0.2.1}/src/server/main.py

@@ -6,6 +6,8 @@ import asyncio
 from asyncio.subprocess import Process
 from asyncio.tasks import Task
 from collections.abc import Awaitable
+import functools
+import operator
 from os import environ
 from os.path import basename
 import pathlib
@@ -187,8 +189,11 @@ class PsyncServer:
             path = pathlib.Path.expanduser(req.path).resolve()
             args = [str(path), *req.args]
             env = {"PYTHONUNBUFFERED": "1", **req.env}
+            reduced: str = functools.reduce(
+                operator.add, map(lambda x: (f"{x[0]}={x[1]}"), env.items())
+            )
             logging.info(
-                f"Running `{map(lambda x: (f'{x[0]}={x[1]}'), env.items())} [...]/{basename(args[0])} {' '.join(args[1:])}`"
+                f"Running `{reduced} [...]/{basename(args[0])} {' '.join(args[1:])}`"
             )
             try:
                 p = await asyncio.create_subprocess_exec(