usecli 0.1.37__tar.gz → 0.1.39__tar.gz

{usecli-0.1.37 → usecli-0.1.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usecli
-Version: 0.1.37
+Version: 0.1.39
 Summary: A powerful Python CLI framework for building beautiful, developer-friendly command-line tools.
 Author: Edward Boswell
 Author-email: Edward Boswell <thememium@gmail.com>

{usecli-0.1.37 → usecli-0.1.39}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "usecli"
-version = "0.1.37"
+version = "0.1.39"
 description = "A powerful Python CLI framework for building beautiful, developer-friendly command-line tools."
 readme = "README.md"
 authors = [{ name = "Edward Boswell", email = "thememium@gmail.com" }]

{usecli-0.1.37 → usecli-0.1.39}/src/usecli/cli/commands/init_command.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import os
 import re
 import shutil
 import subprocess
@@ -504,7 +505,11 @@ include = ["{root_package}*"]
         cwd = Path.cwd()
         config_manager = ConfigManager(start_dir=cwd)
         project_root = config_manager.get_project_root()
-        pyproject_path = project_root / "pyproject.toml"
+        pyproject_path = (
+            config_manager.pyproject_path
+            if config_manager.pyproject_path.exists()
+            else project_root / "pyproject.toml"
+        )
 
         console.print()
         existing_command_name = self._get_existing_usecli_script_name(pyproject_path)
@@ -651,24 +656,6 @@ include = ["{root_package}*"]
                 f"[{COLOR.WARNING}]Default theme already exists:[/{COLOR.WARNING}] {theme_template_path}"
             )
 
-        # Load the template
-        template_path = (
-            Path(__file__).parent.parent / "templates" / "usecli.config.toml.j2"
-        )
-        template_content = template_path.read_text()
-        template = Template(template_content)
-
-        # Render the config
-        config_content = template.render(
-            title=title,
-            description=description,
-            commands_dir=commands_dir,
-            templates_dir=templates_dir,
-            themes_dir=themes_dir,
-            title_font=title_font,
-            theme=theme,
-        )
-
         scripts_status: str | None = None
         usecli_config_status: str | None = None
 
@@ -744,6 +731,30 @@ include = ["{root_package}*"]
             if replace_existing:
                 config_path = existing_config
 
+        config_dir = config_path.parent
+        config_commands_dir = os.path.relpath(commands_path, start=config_dir)
+        config_templates_dir = os.path.relpath(templates_path, start=config_dir)
+        config_themes_dir = os.path.relpath(themes_path, start=config_dir)
+
+        # Load the template
+        template_path = (
+            Path(__file__).parent.parent / "templates" / "usecli.config.toml.j2"
+        )
+        template_content = template_path.read_text()
+        template = Template(template_content)
+
+        # Render the config
+        config_content = template.render(
+            title=title,
+            description=description,
+            commands_dir=config_commands_dir,
+            templates_dir=config_templates_dir,
+            themes_dir=config_themes_dir,
+            title_font=title_font,
+            theme=theme,
+            command_name=command_name,
+        )
+
         usecli_config_status = self._write_usecli_config(
             config_path, config_content, force
         )

{usecli-0.1.37 → usecli-0.1.39}/src/usecli/cli/templates/usecli.config.toml.j2

@@ -2,6 +2,7 @@
 title = "{{ title | default('My CLI') }}"
 title_file = "{{ title_file | default('') }}"
 title_font = "{{ title_font | default('big') }}"
+command_name = "{{ command_name | default('usecli') }}"
 description = "{{ description | default('A custom CLI tool') }}"
 commands_dir = "{{ commands_dir | default('cli/commands') }}"
 templates_dir = "{{ templates_dir | default('cli/templates') }}"

{usecli-0.1.37 → usecli-0.1.39}/src/usecli/usecli.config.toml

@@ -2,10 +2,11 @@
 title = "usecli"
 title_file = ""
 title_font = "ansi_shadow"
+command_name = "usecli"
 description = "A custom CLI tool"
-commands_dir = "src/usecli/cli/commands/custom"
-templates_dir = "src/usecli/cli/templates"
-themes_dir = "src/usecli/cli/themes"
+commands_dir = "cli/commands/custom"
+templates_dir = "cli/templates"
+themes_dir = "cli/themes"
 theme = "default"
 hide_init = false
 hide_inspire = false