ntc-dev-kit 1.4.0__tar.gz → 1.4.1__tar.gz

{ntc_dev_kit-1.4.0/ntc_dev_kit.egg-info → ntc_dev_kit-1.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ntc-dev-kit
-Version: 1.4.0
+Version: 1.4.1
 Summary: Nexent Toolkit Console - A CLI tool for scaffolding Django REST Framework, React, Next.js, and Flutter projects
 Home-page: https://github.com/nexent/ntc
 Author: Nexent

{ntc_dev_kit-1.4.0 → ntc_dev_kit-1.4.1}/ntc/__init__.py

@@ -1,5 +1,5 @@
 """NTC - Nexent Toolkit Console."""
 
-__version__ = "1.4.0"
+__version__ = "1.4.1"
 __author__ = "Nexent"
 __license__ = "MIT"

{ntc_dev_kit-1.4.0 → ntc_dev_kit-1.4.1}/ntc/workspace/adopt.py

@@ -181,7 +181,17 @@ def detect(root):
 
 
 def _short_names(apps):
-    """longuo-backend, longuo-crm ... -> backend, crm: the shared prefix says nothing."""
+    """longuo-backend, longuo-crm ... -> backend, crm: the shared prefix says nothing. Folders named
+    like domains (backend.fabstech.co.tz, fabstech.co.tz) go by their first label: backend, fabstech."""
+    folders = [a for a in apps if a.folder != "."]
+    if any("." in a.folder for a in folders):
+        labels = [a.folder.split(".")[0] or a.folder for a in folders]
+        if all(labels) and len(set(labels)) == len(labels):
+            for app, label in zip(folders, labels):
+                app.name = label
+        for app in folders:  # a name stays a plain TOML key, and {<app>.port} stays readable
+            app.name = re.sub(r"[^A-Za-z0-9_-]+", "-", app.name).strip("-") or "app"
+        return
     names = [a.folder for a in apps if a.folder != "."]
     if len(names) < 2:
         return

{ntc_dev_kit-1.4.0 → ntc_dev_kit-1.4.1}/ntc/workspace/config.py

@@ -325,9 +325,14 @@ def _value(value):
     return json.dumps(str(value), ensure_ascii=False)
 
 
+def _key(name):
+    """A TOML key: bare when it can be, quoted otherwise ([apps.a.b] would nest a table b in a)."""
+    return name if re.fullmatch(r"[A-Za-z0-9_-]+", name) else json.dumps(name, ensure_ascii=False)
+
+
 def app_section(name, app, comments=True):
     """The [apps.<name>] section text for an app dict (kind, path, port, ... env)."""
-    lines = [f"[apps.{name}]"]
+    lines = [f"[apps.{_key(name)}]"]
     notes = {
         "python": "  # its Python environment (created by `ntc setup` when missing)",
         "needs": "  # started first; this app waits until they answer",
@@ -346,7 +351,7 @@ def app_section(name, app, comments=True):
         lines.append('# repo = "git@github.com:you/' + name + '.git"  # `ntc setup` clones it when the folder is missing')
     if app.get("env"):
         lines.append("")
-        lines.append(f"[apps.{name}.env]" + ("  # for this app's processes in `ntc start`" if comments else ""))
+        lines.append(f"[apps.{_key(name)}.env]" + ("  # for this app's processes in `ntc start`" if comments else ""))
         for key, value in app["env"].items():
             lines.append(f"{key} = {_value(value)}")
     return "\n".join(lines) + "\n"

{ntc_dev_kit-1.4.0 → ntc_dev_kit-1.4.1/ntc_dev_kit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ntc-dev-kit
-Version: 1.4.0
+Version: 1.4.1
 Summary: Nexent Toolkit Console - A CLI tool for scaffolding Django REST Framework, React, Next.js, and Flutter projects
 Home-page: https://github.com/nexent/ntc
 Author: Nexent

{ntc_dev_kit-1.4.0 → ntc_dev_kit-1.4.1}/ntc_dev_kit.egg-info/SOURCES.txt

@@ -224,5 +224,6 @@ ntc_dev_kit.egg-info/entry_points.txt
 ntc_dev_kit.egg-info/requires.txt
 ntc_dev_kit.egg-info/top_level.txt
 tests/test_adopt.py
+tests/test_adopt_names.py
 tests/test_templates.py
 tests/test_workspace.py

{ntc_dev_kit-1.4.0 → ntc_dev_kit-1.4.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ntc-dev-kit"
-version = "1.4.0"
+version = "1.4.1"
 description = "Nexent Toolkit Console - A CLI tool for scaffolding Django REST Framework, React, Next.js, and Flutter projects"
 readme = "README.md"
 license = {text = "MIT"}

{ntc_dev_kit-1.4.0 → ntc_dev_kit-1.4.1}/setup.py

@@ -50,7 +50,7 @@ class PostInstallCommand(install):
 
 setup(
     name="ntc-dev-kit",
-    version="1.4.0",
+    version="1.4.1",
     description="Nexent Toolkit Console - CLI scaffolding tool for Django, React, Next.js, and Flutter",
     long_description=long_description,
     long_description_content_type="text/markdown",

ntc_dev_kit-1.4.1/tests/test_adopt_names.py

@@ -0,0 +1,31 @@
+"""Folders named like domains: adopt's names and the ntc.toml it writes must round-trip."""
+import os
+import tomllib
+
+from ntc.workspace import adopt, config
+
+
+def _workspace(tmp_path):
+    (tmp_path / "backend.fabstech.co.tz").mkdir()
+    (tmp_path / "backend.fabstech.co.tz" / "manage.py").write_text("os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'fab.settings')\n")
+    for folder, deps in (("fabstech.co.tz", '"next": "16.0.0"'), ("office.fabstech.co.tz", '"vite": "8.0.0"')):
+        (tmp_path / folder).mkdir()
+        (tmp_path / folder / "package.json").write_text('{"scripts": {"dev": "x"}, "dependencies": {' + deps + '}}')
+    return tmp_path
+
+
+def test_domain_folders_get_short_names_that_load_back(tmp_path):
+    root = _workspace(tmp_path)
+    apps, _ = adopt.detect(str(root))
+    assert sorted(a.name for a in apps) == ["backend", "fabstech", "office"]
+    adopt.run(str(root), assume_yes=True)
+    workspace = config.load(str(root))
+    assert sorted(workspace.apps) == ["backend", "fabstech", "office"]
+    assert os.path.basename(workspace.apps["backend"].path) == "backend.fabstech.co.tz"
+    assert workspace.apps["fabstech"].needs == ["backend"]
+
+
+def test_names_that_are_not_bare_keys_are_quoted():
+    text = config.app_section("a.b", {"kind": "vite", "path": "a.b", "env": {"X": "1"}})
+    data = tomllib.loads(text)
+    assert data["apps"]["a.b"]["path"] == "a.b" and data["apps"]["a.b"]["env"] == {"X": "1"}