.cargo/config.toml

@@ -0,0 +1,3 @@
+[env]
+LOCALITY_STATIC_FILE_PATH = { value = "static", relative = true }
+LOCALITY_HMAC_SECRET = "Not-secret testing secret"

.gitignore

@@ -21,4 +21,3 @@ Cargo.lock
 *.pdb
 
 /.python_venv
-__pycache__

README.md

@@ -1,27 +1,2 @@
-# Locality
+# localhub
 
-The [dev](./dev) script starts a Docker image for the Postgres server,
-runs `cargo run` or `cargo test`, and then removes the created Docker
-container.
-
-Docker must be set up to run rootless for this script to work.
-
-The script is able to install it's own dependencies into a Python
-virtual environment:
-
-```sh
-# Install
-./dev devupdate
-```
-
-Build and run the server locally:
-
-```sh
-./dev run
-```
-
-Run unit tests:
-
-```sh
-./dev unittest
-```

dev.py

@@ -1,35 +1,79 @@
 import argparse
 import os
 import subprocess
+import shutil
 import sys
+import time
 
-# The directory containing this script should be the root directory of the
+root_dir = sys.path[0]
-# locality repository.
-ROOT_DIR = sys.path[0]
 
 
 def devupdate(args):
-    subprocess.run(
+    subprocess.check_call(
-        [sys.executable, '-m', 'pip', 'install', '-r',
+        [
-         os.path.join(ROOT_DIR, 'dev-python-requirements.txt'), ])
+            sys.executable,
-
+            '-m',
-
+            'pip',
-def import_run():
+            'install',
-    """Import the scripts.run module and return it.
+            '-r',
-
+            os.path.join(root_dir, 'dev-python-requirements.txt'),
-    We do this in a function so that devupdate() can be run without everything
+        ]
-    needed by this module being available."""
+    )
-    import scripts.run
-    scripts.run.ROOT_DIR = ROOT_DIR
-    return scripts.run
 
 
 def run(args):
-    import_run().run(args)
+    import docker
 
+    POSTGRES_USER = 'locality'
+    POSTGRES_PASSWORD = 'wkyhjofg2837f'
+    POSTGRES_DB = 'locality'
 
-def unit_tests(args):
+    postgres_env = {
-    import_run().unit_tests(args)
+        'POSTGRES_USER': POSTGRES_USER,
+        'POSTGRES_PASSWORD': POSTGRES_PASSWORD,
+        'POSTGRES_DB': POSTGRES_DB,
+    }
+
+    locality_env = {
+        'LOCALITY_DATABASE_URL': 'postgres://{}:{}@localhost/{}'.format(
+            POSTGRES_USER, POSTGRES_PASSWORD, POSTGRES_DB
+        )
+    }
+
+    docker_client = docker.from_env()
+    postgres_container = docker_client.containers.run(
+        'postgres:14.11',
+        environment=postgres_env,
+        detach=True,
+        ports={'5432/tcp': ('127.0.0.1', 5432)},
+    )
+    try:
+        docker_stream = postgres_container.attach(stream=True)
+        for line_binary in docker_stream:
+            line = line_binary.decode('utf-8')
+            print(line)
+            if 'listening on IPv4 address "0.0.0.0", port 5432' in line:
+                break
+        for line_binary in docker_stream:
+            line = line_binary.decode('utf-8')
+            print(line)
+            if 'database system is ready to accept connections' in line:
+                break
+
+        cargo_bin = shutil.which('cargo')
+        locality_process = subprocess.Popen(
+            [cargo_bin, 'run'], env=locality_env, cwd=root_dir
+        )
+
+        try:
+            while locality_process.poll() is None:
+                time.sleep(0.5)
+        finally:
+            if locality_process.poll() is None:
+                locality_process.terminate()
+    finally:
+        postgres_container.stop()
+        postgres_container.remove()
 
 
 parser = argparse.ArgumentParser()
@@ -38,10 +82,6 @@ run_parser = subparsers.add_parser(
     'run', help='Run a test instance of locality'
 )
 run_parser.set_defaults(func=run)
-run_parser = subparsers.add_parser(
-    'unittest', help='Run unit tests'
-)
-run_parser.set_defaults(func=unit_tests)
 devupdate_parser = subparsers.add_parser(
     'devupdate', help='Install or update packages used by this script'
 )

pyproject.toml

@@ -1,3 +0,0 @@
-[tool.autopep8]
-max_line_length = 80
-aggressive = 2

scripts/postgres_container.py

@@ -1,48 +0,0 @@
-import docker
-import os
-
-
-class PostgresContainer():
-    def __init__(self):
-        self.postgres_user = 'locality'
-        self.postgres_password = 'wkyhjofg2837f'
-        self.postgres_db = 'locality'
-
-    def get_url(self):
-        return 'postgres://{}:{}@localhost/{}'.format(
-            self.postgres_user,
-            self.postgres_password,
-            self.postgres_db)
-
-    def __enter__(self):
-        postgres_env = {
-            'POSTGRES_USER': self.postgres_user,
-            'POSTGRES_PASSWORD': self.postgres_password,
-            'POSTGRES_DB': self.postgres_db,
-        }
-
-        self.docker_client = docker.from_env()
-        self.postgres_container = self.docker_client.containers.run(
-            'postgres:14.11',
-            environment=postgres_env,
-            detach=True,
-            ports={'5432/tcp': ('127.0.0.1', 5432)},
-        )
-
-        self.docker_stream = self.postgres_container.attach(stream=True)
-        for line_binary in self.docker_stream:
-            line = line_binary.decode('utf-8')
-            print(line)
-            if 'listening on IPv4 address "0.0.0.0", port 5432' in line:
-                break
-        for line_binary in self.docker_stream:
-            line = line_binary.decode('utf-8')
-            print(line)
-            if 'database system is ready to accept connections' in line:
-                break
-
-        return self
-
-    def __exit__(self, type, value, traceback):
-        self.postgres_container.stop()
-        self.postgres_container.remove()

scripts/run.py

@@ -1,44 +0,0 @@
-import os
-import shutil
-import subprocess
-import time
-
-from .postgres_container import PostgresContainer
-
-ROOT_DIR = None
-
-
-def cargo(*args):
-    global ROOT_DIR
-    with PostgresContainer() as postgres:
-        locality_env = {
-            'LOCALITY_DATABASE_URL': postgres.get_url(),
-            'LOCALITY_TEST_DATABASE_URL': postgres.get_url(),
-            'LOCALITY_STATIC_FILE_PATH': os.path.join(
-                ROOT_DIR,
-                'static'),
-            'LOCALITY_HMAC_SECRET': 'iknf4390-8guvmr3'
-        }
-        locality_env = os.environ.copy() | locality_env
-
-        cargo_bin = shutil.which('cargo')
-        locality_process = subprocess.Popen(
-            [cargo_bin, *args], env=locality_env, cwd=ROOT_DIR
-        )
-
-        try:
-            while locality_process.poll() is None:
-                time.sleep(0.5)
-        except KeyboardInterrupt:
-            pass
-        finally:
-            if locality_process.poll() is None:
-                locality_process.terminate()
-
-
-def run(args):
-    cargo('run')
-
-
-def unit_tests(args):
-    cargo("test")