create-pywire-app 0.1.1__tar.gz → 0.1.3__tar.gz

{create_pywire_app-0.1.1 → create_pywire_app-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: create-pywire-app
-Version: 0.1.1
+Version: 0.1.3
 Summary: Init wizard for new pywire projects
 License-File: LICENSE
 Requires-Python: >=3.11
@@ -17,12 +17,28 @@ Description-Content-Type: text/markdown
 
 Quick start wizard for new pywire projects.
 
-## Usage
+<!-- INSTALL_MESSAGE_TEMPLATE_START -->
+## 🚀 Quick Start
+
+If you already have [uv](https://docs.astral.sh/uv/) installed, you can get started instantly:
 
 ```bash
 uvx create-pywire-app
 ```
 
+If you don't have `uv` installed or aren't sure, use our installer script which handles the setup for you:
+
+### macOS / Linux
+```bash
+curl -fsSL pywire.dev/install | sh
+```
+
+### Windows (PowerShell)
+```powershell
+irm pywire.dev/install.ps1 | iex
+```
+<!-- INSTALL_MESSAGE_TEMPLATE_END -->
+
 <!-- SUPPORT_MESSAGE_TEMPLATE_START -->
 ## ❤️ Support pywire
 

{create_pywire_app-0.1.1 → create_pywire_app-0.1.3}/README.md

@@ -2,12 +2,28 @@
 
 Quick start wizard for new pywire projects.
 
-## Usage
+<!-- INSTALL_MESSAGE_TEMPLATE_START -->
+## 🚀 Quick Start
+
+If you already have [uv](https://docs.astral.sh/uv/) installed, you can get started instantly:
 
 ```bash
 uvx create-pywire-app
 ```
 
+If you don't have `uv` installed or aren't sure, use our installer script which handles the setup for you:
+
+### macOS / Linux
+```bash
+curl -fsSL pywire.dev/install | sh
+```
+
+### Windows (PowerShell)
+```powershell
+irm pywire.dev/install.ps1 | iex
+```
+<!-- INSTALL_MESSAGE_TEMPLATE_END -->
+
 <!-- SUPPORT_MESSAGE_TEMPLATE_START -->
 ## ❤️ Support pywire
 

{create_pywire_app-0.1.1 → create_pywire_app-0.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "create-pywire-app"
-version = "0.1.1"
+version = "0.1.3"
 description = "Init wizard for new pywire projects"
 readme = "README.md"
 requires-python = ">=3.11"

{create_pywire_app-0.1.1 → create_pywire_app-0.1.3}/src/create_pywire_app/main.py

@@ -1,3 +1,5 @@
+import argparse
+import importlib.metadata
 import os
 import subprocess
 import sys
@@ -25,6 +27,13 @@ LOGO = r"""
 """
 
 
+def get_version() -> str:
+    try:
+        return importlib.metadata.version("create-pywire-app")
+    except importlib.metadata.PackageNotFoundError:
+        return "0.0.0"
+
+
 class TemplateRenderer:
     """Handles template loading and rendering using Jinja2."""
 
@@ -113,6 +122,7 @@ class ProjectGenerator:
         self._generate_gitignore()
         self._generate_main()
         self._generate_error_page()
+        self._generate_vscode_settings()
 
         # Generate template-specific files
         if self.template == "counter":
@@ -150,10 +160,19 @@ class ProjectGenerator:
         """Generate .gitignore."""
         self.renderer.copy_static("common/.gitignore", self.project_path / ".gitignore")
 
+    def _generate_vscode_settings(self) -> None:
+        """Generate VS Code settings."""
+        vscode_dir = self.project_path / ".vscode"
+        vscode_dir.mkdir(exist_ok=True)
+        self.renderer.copy_static("common/extensions.json", vscode_dir / "extensions.json")
+
     def _generate_main(self) -> None:
         """Generate main.py."""
         template_name = "main-path.py.j2" if self.routing_strategy == "path" else "main-explicit.py.j2"
-        content = self.renderer.render(f"common/{template_name}", {})
+        context = {
+            "pages_dir": "src/pages" if self.use_src else "pages",
+        }
+        content = self.renderer.render(f"common/{template_name}", context)
         (self.app_root / "main.py").write_text(content)
 
     def _generate_error_page(self) -> None:
@@ -260,15 +279,31 @@ class ProjectGenerator:
 def main():
     console.clear()
 
-    # Check for local override for testing
+    # Parse arguments
+    parser = argparse.ArgumentParser(description="Create a new PyWire application")
+    parser.add_argument(
+        "--pywire-version", help="Specify a specific version of pywire to install"
+    )
+    args = parser.parse_args()
+
+    # Check for local override for testing (highest priority)
     use_local = os.environ.get("USE_LOCAL_PYWIRE") == "1"
-    pywire_dep = "pywire"
+
     if use_local:
         pywire_dep = "pywire @ /Users/rholmdahl/projects/pywire-workspace/pywire"
-        console.print("[yellow]WARNING: Using local pywire dependency[/yellow]")
+        # We don't warn yet, wait until after LOGO
+    elif args.pywire_version:
+        pywire_dep = f"pywire=={args.pywire_version}"
+    else:
+        pywire_dep = "pywire"  # Latest
+
+    tool_version = get_version()
 
     console.print(LOGO)
-    console.print("[dim]v0.1.0 • The Python Web Framework[/dim]\n")
+    console.print(f"[dim]v{tool_version} • The Python Web Framework[/dim]\n")
+
+    if use_local:
+        console.print("[yellow]WARNING: Using local pywire dependency[/yellow]")
 
     try:
         # Project Location
@@ -341,6 +376,7 @@ def main():
             generator.generate()
 
             # Initialize git repo
+            git_initialized = False
             try:
                 subprocess.run(
                     ["git", "init"],
@@ -349,8 +385,33 @@ def main():
                     capture_output=True,
                     text=True,
                 )
+                git_initialized = True
             except (FileNotFoundError, subprocess.CalledProcessError):
                 pass  # Silently skip if git is not available
+            if git_initialized:
+                try:
+                    subprocess.run(
+                        ["git", "add", "."],
+                        cwd=project_path,
+                        check=True,
+                        capture_output=True,
+                        text=True,
+                    )
+                    subprocess.run(
+                        ["git", "commit", "-m", "feat: initial project structure"],
+                        cwd=project_path,
+                        check=True,
+                        capture_output=True,
+                        text=True,
+                    )
+                except subprocess.CalledProcessError as e:
+                    console.print(
+                        "[yellow]![/yellow] Git commit skipped (configure user.name/email to enable)."
+                    )
+                    if e.stderr:
+                        console.print(e.stderr)
+                except FileNotFoundError:
+                    console.print("[yellow]![/yellow] Git not found, skipping commit")
 
             console.print("[green]✓[/green] Project structure created")
 
@@ -377,32 +438,69 @@ def main():
             except FileNotFoundError:
                 console.print("[yellow]![/yellow] uv not found, skipping sync")
 
-        # Success message
-        console.print()
+        next_action = questionary.select(
+            "What would you like to do next?",
+            choices=[
+                questionary.Choice("Start development server", value="start"),
+                questionary.Choice("Show instructions and exit", value="instructions"),
+            ],
+            pointer=">",
+        ).unsafe_ask()
 
-        commands = [f"cd {project_location}"]
-        if not sync_success:
-            commands.append("uv sync")
-        commands.append("pywire dev")
+        should_show_instructions = next_action == "instructions"
+        if next_action == "start":
+            try:
+                subprocess.run(
+                    ["uv", "run", "pywire", "dev"],
+                    cwd=project_path,
+                    check=True,
+                )
+                return
+            except subprocess.CalledProcessError:
+                console.print("[red]✗[/red] Failed to start the dev server")
+                should_show_instructions = True
+            except FileNotFoundError:
+                console.print("[yellow]![/yellow] uv not found, cannot start server")
+                should_show_instructions = True
+
+        if should_show_instructions:
+            console.print()
+
+            is_windows = os.name == "nt"
+            commands = [f"cd {project_location}"]
+            if not sync_success:
+                commands.append("uv sync")
+            if is_windows:
+                activate_cmd = r".venv\Scripts\activate"
+            else:
+                activate_cmd = "source .venv/bin/activate"
+            commands.extend(
+                [
+                    activate_cmd,
+                    "pywire dev",
+                ]
+            )
 
-        cmd_text = "\n    ".join(commands)
+            cmd_text = "\n    ".join(commands)
 
-        console.print(
-            Panel(
-                Markdown(
-                    f"""
+            console.print(
+                Panel(
+                    Markdown(
+                        f"""
 # System Online 🟢
 
 Run the following commands to enter the environment:
 
     {cmd_text}
+
+> **Tip:** Install the **PyWire** extension (id: `pywire.pywire`) in VS Code for syntax highlighting and snippets.
             """
-                ),
-                border_style="cyan",
-                title="Initialization Complete",
-                title_align="left",
+                    ),
+                    border_style="cyan",
+                    title="Initialization Complete",
+                    title_align="left",
+                )
             )
-        )
     except KeyboardInterrupt:
         console.print("\n[bold red]System Aborted.[/bold red]")
         sys.exit(1)

create_pywire_app-0.1.3/src/create_pywire_app/templates/common/extensions.json

@@ -0,0 +1,5 @@
+{
+  "recommendations": [
+    "pywire.pywire"
+  ]
+}

{create_pywire_app-0.1.1 → create_pywire_app-0.1.3}/src/create_pywire_app/templates/common/main-explicit.py.j2

@@ -3,7 +3,7 @@ from pywire import PyWire
 # Create application instance
 app = PyWire(
     path_based_routing=False,
-    pages_dir="pages",
+    pages_dir="{{ pages_dir }}",
     enable_pjax=True,
     debug=True,
 )

{create_pywire_app-0.1.1 → create_pywire_app-0.1.3}/src/create_pywire_app/templates/common/main-path.py.j2

@@ -2,7 +2,7 @@ from pywire import PyWire
 
 # Create application instance
 app = PyWire(
-    pages_dir="pages",
+    pages_dir="{{ pages_dir }}",
     enable_pjax=True,
     debug=True,
 )