Merge pull request #176 from mekanix/fix-sql

Simplify project generation

Author: mekanix

alembic/README

@@ -6,4 +6,4 @@ export FREENIT_ENV="test"
 
 
 setup
-pytest -v -rs --ignore=freenit/project/
+pytest -v --ignore=freenit/project/

bin/test.sh

@@ -1 +1 @@
-__version__ = "0.3.15"
+__version__ = "0.3.16"

freenit/__init__.py

@@ -1,13 +1,14 @@
 import os
 import pathlib
 import subprocess
-
-from prompt_toolkit import prompt
+import sys
 
 
 def main():
+    if len(sys.argv) != 2:
+        raise ValueError(f"Usage: {sys.argv[0]}: <project name>")
+    project_name = sys.argv[1]
     path = pathlib.Path(__file__).parent.resolve()
-    project_name = prompt("Name of the project: ")
     executable = f"{path}/../bin/freenit.sh"
     if not os.path.exists(executable):
         executable = f"{path}/bin/freenit.sh"

freenit/cli.py

@@ -50,7 +50,7 @@ async def get_all(cls, domain):
         client = get_client()
         try:
             async with client.connect(is_async=True) as conn:
-                dn = config.ldap.groupBase.format(domain)
+                dn = config.ldap.roleBase.format(domain)
                 res = await conn.search(dn, LDAPSearchScope.SUB, f"(|{classes})")
                 data = []
                 for gdata in res:

freenit/models/ldap/group.py

@@ -8,8 +8,9 @@
 
 
 def db_setup():
-    importlib.import_module(f"{app_name}.app")
+    app = importlib.import_module(f"{app_name}.app")
     command.upgrade(alembic_cfg, "head")
+    return app
 
 
 if __name__ == "__main__":

migrate.py

@@ -1,11 +1,9 @@
-import importlib
 import os
 
 import pytest
 
-from alembic import command
 from alembic.config import Config
-from name import app_name
+from migrate import db_setup as dbs
 
 from .client import Client
 
@@ -16,8 +14,7 @@
 
 @pytest.fixture
 def db_setup():
-    app = importlib.import_module(f"{app_name}.app")
-    command.upgrade(alembic_cfg, "head")
+    app = dbs()
 
     yield app.app