redundanet 2.0.1__py3-none-any.whl → 2.0.3__py3-none-any.whl

redundanet/auth/gpg.py

@@ -107,7 +107,7 @@ class GPGManager:
 
         key = self._gpg.gen_key(input_data)
 
-        if not key.ok:
+        if not key.fingerprint:
             raise GPGError(f"Failed to generate GPG key: {key.status}")
 
         logger.info("GPG key generated", fingerprint=str(key))

redundanet/cli/network.py

@@ -2,6 +2,9 @@
 
 from __future__ import annotations
 
+import shutil
+import subprocess
+from pathlib import Path
 from typing import Annotated, Optional
 
 import typer
@@ -12,6 +15,80 @@ from rich.table import Table
 app = typer.Typer(help="Network management commands")
 console = Console()
 
+INSTALL_DIR = Path("/opt/redundanet")
+REPO_DIR = Path("/var/lib/redundanet/repo")
+
+
+def _clone_or_pull_repo(repo_url: str, branch: str, target_dir: Path) -> None:
+    """Clone a repo or pull if it already exists."""
+    if (target_dir / ".git").exists():
+        # Pull latest changes
+        subprocess.run(
+            ["git", "-C", str(target_dir), "fetch", "origin"],
+            check=True,
+            capture_output=True,
+        )
+        subprocess.run(
+            ["git", "-C", str(target_dir), "checkout", branch],
+            check=True,
+            capture_output=True,
+        )
+        subprocess.run(
+            ["git", "-C", str(target_dir), "pull", "origin", branch],
+            check=True,
+            capture_output=True,
+        )
+    else:
+        # Clone fresh
+        target_dir.parent.mkdir(parents=True, exist_ok=True)
+        subprocess.run(
+            ["git", "clone", "--branch", branch, repo_url, str(target_dir)],
+            check=True,
+            capture_output=True,
+        )
+
+
+def _setup_docker_files(repo_dir: Path, install_dir: Path) -> None:
+    """Copy docker files from cloned repo to install directory."""
+    src_docker = repo_dir / "docker"
+    dst_docker = install_dir / "docker"
+
+    if not src_docker.exists():
+        console.print("[yellow]Warning:[/yellow] No docker directory found in repo")
+        return
+
+    # Remove existing docker dir if present
+    if dst_docker.exists():
+        shutil.rmtree(dst_docker)
+
+    # Copy docker directory
+    shutil.copytree(src_docker, dst_docker)
+
+    # Create secrets directory
+    (dst_docker / "secrets").mkdir(exist_ok=True)
+
+    console.print(f"[green]Docker files installed to:[/green] {dst_docker}")
+
+
+def _setup_manifest(repo_dir: Path) -> None:
+    """Copy manifest files to the data directory."""
+    src_manifest = repo_dir / "manifests"
+    dst_manifest = Path("/var/lib/redundanet/manifest")
+
+    if not src_manifest.exists():
+        console.print("[yellow]Warning:[/yellow] No manifests directory found in repo")
+        return
+
+    dst_manifest.mkdir(parents=True, exist_ok=True)
+
+    # Copy manifest files
+    for f in src_manifest.glob("*.yaml"):
+        shutil.copy(f, dst_manifest / f.name)
+    for f in src_manifest.glob("*.json"):
+        shutil.copy(f, dst_manifest / f.name)
+
+    console.print(f"[green]Manifest files installed to:[/green] {dst_manifest}")
+
 
 @app.command("join")
 def join_network(
@@ -23,6 +100,10 @@ def join_network(
         str,
         typer.Option("--branch", "-b", help="Git branch"),
     ] = "main",
+    install_dir: Annotated[
+        Path,
+        typer.Option("--install-dir", help="Installation directory"),
+    ] = INSTALL_DIR,
 ) -> None:
     """Join an existing RedundaNet network."""
     from redundanet.core.config import load_settings
@@ -37,15 +118,28 @@ def join_network(
 
     console.print(Panel(f"[bold]Joining RedundaNet Network[/bold]\nRepository: {repo}"))
 
-    with console.status("[bold green]Cloning manifest repository..."):
-        # In a real implementation, we'd clone the repo
-        console.print(f"[green]Repository:[/green] {repo}")
-        console.print(f"[green]Branch:[/green] {branch}")
+    # Clone or update the repository
+    with console.status("[bold green]Cloning repository..."):
+        try:
+            _clone_or_pull_repo(repo, branch, REPO_DIR)
+            console.print(f"[green]Repository cloned to:[/green] {REPO_DIR}")
+        except subprocess.CalledProcessError as e:
+            console.print(f"[red]Error cloning repository:[/red] {e}")
+            raise typer.Exit(1) from None
+
+    # Set up docker files
+    with console.status("[bold green]Setting up Docker files..."):
+        _setup_docker_files(REPO_DIR, install_dir)
+
+    # Set up manifest
+    with console.status("[bold green]Setting up manifest..."):
+        _setup_manifest(REPO_DIR)
 
     console.print("\n[bold green]Successfully joined the network![/bold green]")
     console.print("\n[bold]Next steps:[/bold]")
-    console.print("1. Start the VPN: [cyan]redundanet network vpn start[/cyan]")
-    console.print("2. Start storage:  [cyan]redundanet storage start[/cyan]")
+    console.print("1. Configure environment: [cyan]nano /opt/redundanet/.env[/cyan]")
+    console.print("2. Export GPG key:        [cyan]gpg --armor --export-secret-keys <KEY_ID> > /opt/redundanet/docker/secrets/gpg_private_key.asc[/cyan]")
+    console.print("3. Start services:        [cyan]cd /opt/redundanet/docker && docker-compose --env-file ../.env up -d[/cyan]")
 
 
 @app.command("leave")

{redundanet-2.0.1.dist-info → redundanet-2.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: redundanet
-Version: 2.0.1
+Version: 2.0.3
 Summary: Distributed encrypted storage on a mesh VPN network
 Home-page: https://github.com/alessandrodefilippo/redundanet
 License: MIT

{redundanet-2.0.1.dist-info → redundanet-2.0.3.dist-info}/RECORD

@@ -1,11 +1,11 @@
 redundanet/__init__.py,sha256=tqG349jbZCq9GmU1zT4gYuVUArBzPiJmyf31kzFXqUA,398
 redundanet/__main__.py,sha256=sI1D-Mn0JeICtGPuNLp-uthhIQxOB_6_9Avf1-iOXLQ,151
 redundanet/auth/__init__.py,sha256=BlmLa620gKsRdiD3d8tsDDweA9kI_fTBY9bxM6jtiyU,202
-redundanet/auth/gpg.py,sha256=SIhlRrZa5b5FWNVXstsG-jkjm8oY2J0TySPA0QtYDac,9080
+redundanet/auth/gpg.py,sha256=ztklRsvXqZ1c67cprvjGK7WNdfFdow1iG2F-oHnWBT8,9089
 redundanet/auth/keyserver.py,sha256=1zNIOIY62JaAPNWVjZaBHlx2fSN601WsGsR_KizdiAo,6502
 redundanet/cli/__init__.py,sha256=4XqFI3iyLQO6ko2bcSq_OoMvlrk8voMK8twcsHgUziY,89
 redundanet/cli/main.py,sha256=teFau_SP_rb5aDIBNH7vgwcOa8wjXoLW3SoL36kLQZ0,8129
-redundanet/cli/network.py,sha256=K5d03q4t3CBJXEreAQ8WFAsWv2qBhQUIfCE1_1lQcY4,5796
+redundanet/cli/network.py,sha256=o4s_2Ya2WY1r5hz8PLDZ15uc7LXJRBWAAuQf0LSYH6U,9005
 redundanet/cli/node.py,sha256=AD9ijvoNKlVY_uR2QQTHrcmnwuetWXj76M1jZ_IOKEE,17230
 redundanet/cli/storage.py,sha256=I-n8NO_x_v7vKp3bx3yxfYNLNHNyOOuXMpl0T4mmZzs,8054
 redundanet/core/__init__.py,sha256=fOx3CxtyI4s2wPmBzAuqkcGq5JLKKS3BvebuUandNBQ,673
@@ -30,8 +30,8 @@ redundanet/vpn/__init__.py,sha256=wM2iePNDGH-CqsNgnEaEecn6Udrx6DTGnk465vso_sg,28
 redundanet/vpn/keys.py,sha256=yTfLpqguTNOZlsvgzMS4vq9WTgVL9AUVTcZbftY6a3w,5326
 redundanet/vpn/mesh.py,sha256=EVdYcQY2reV_UESXRHEUKEIhhSSwaG7u1vvPtV6PDZI,6041
 redundanet/vpn/tinc.py,sha256=u5j2ZMPOjTfXM4LPHjg7NZmYdTF51kg58qTuA7CDtTw,10288
-redundanet-2.0.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-redundanet-2.0.1.dist-info/METADATA,sha256=d21IBlfafMZ66fQT4LmTxIifYxKiFF56hcJzeFrvbFw,10939
-redundanet-2.0.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-redundanet-2.0.1.dist-info/entry_points.txt,sha256=-0cdQEyYsTHavFdq-k_uws2bxnQrD2Ud0FfllcHGrcw,54
-redundanet-2.0.1.dist-info/RECORD,,
+redundanet-2.0.3.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+redundanet-2.0.3.dist-info/METADATA,sha256=XppVKNfoKN9gaxtmqYa2CI-KgZfg1B9Di0o7wVupQk8,10939
+redundanet-2.0.3.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+redundanet-2.0.3.dist-info/entry_points.txt,sha256=-0cdQEyYsTHavFdq-k_uws2bxnQrD2Ud0FfllcHGrcw,54
+redundanet-2.0.3.dist-info/RECORD,,