fastogram 0.0.2__tar.gz → 0.0.4__tar.gz

{fastogram-0.0.2 → fastogram-0.0.4}/Makefile

@@ -1,15 +1,28 @@
 # Fastogram CLI - Makefile for maintainers
 
+BUMP ?= patch
+VERSION ?=
+
 .PHONY: sync
 sync:
 	python scripts/sync_template.py
 
+.PHONY: bump-version
+bump-version:
+	python scripts/bump_version.py $(if $(VERSION),--version $(VERSION),--bump $(BUMP))
+
 .PHONY: build
 build:
 	rm -rf dist
 	uv build
 
-.PHONY: publish
-publish: build
+.PHONY: upload
+upload:
 	@test -f .pypi-token || (echo "Create .pypi-token with your PyPI token (see .pypi-token.example)"; exit 1)
 	uv tool run twine upload -u __token__ -p $$(cat .pypi-token) dist/*
+
+.PHONY: publish
+publish:
+	$(MAKE) bump-version BUMP=$(BUMP) VERSION="$(VERSION)"
+	$(MAKE) build
+	$(MAKE) upload

{fastogram-0.0.2 → fastogram-0.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastogram
-Version: 0.0.2
+Version: 0.0.4
 Summary: Opinionated FastAPI + Aiogram project generator (FastGram template)
 Author-email: Abubeker Afdel <ibnuafdel@gmail.com>
 License: MIT
@@ -44,7 +44,9 @@ python manage.py run --reload
 
 ```bash
 fastogram new my-bot              # Create ./my-bot/
-fastogram new my-bot -d ~/code   # Create ~/code/my-bot/
+fastogram new .                   # Scaffold in current directory (ignores .venv)
+fastogram new . --force           # Scaffold in a non-empty current directory
+fastogram new my-bot -d ~/code    # Create ~/code/my-bot/
 ```
 
 ---
@@ -72,8 +74,15 @@ The sync copies FastGram → `src/fastogram/templates/fastgram/`, excluding `.gi
 # 1. Create .pypi-token with your PyPI API token (from pypi.org/manage/account/token/)
 echo "pypi-your-token-here" > .pypi-token
 
-# 2. Publish
+# 2. Publish (defaults to patch bump: 0.0.3 -> 0.0.4)
 make publish
+
+# Publish with a minor or major bump
+make publish BUMP=minor
+make publish BUMP=major
+
+# Publish with an explicit version
+make publish VERSION=1.2.3
 ```
 
 `.pypi-token` is in `.gitignore` — it will never be committed.

{fastogram-0.0.2 → fastogram-0.0.4}/README.md

@@ -35,7 +35,9 @@ python manage.py run --reload
 
 ```bash
 fastogram new my-bot              # Create ./my-bot/
-fastogram new my-bot -d ~/code   # Create ~/code/my-bot/
+fastogram new .                   # Scaffold in current directory (ignores .venv)
+fastogram new . --force           # Scaffold in a non-empty current directory
+fastogram new my-bot -d ~/code    # Create ~/code/my-bot/
 ```
 
 ---
@@ -63,8 +65,15 @@ The sync copies FastGram → `src/fastogram/templates/fastgram/`, excluding `.gi
 # 1. Create .pypi-token with your PyPI API token (from pypi.org/manage/account/token/)
 echo "pypi-your-token-here" > .pypi-token
 
-# 2. Publish
+# 2. Publish (defaults to patch bump: 0.0.3 -> 0.0.4)
 make publish
+
+# Publish with a minor or major bump
+make publish BUMP=minor
+make publish BUMP=major
+
+# Publish with an explicit version
+make publish VERSION=1.2.3
 ```
 
 `.pypi-token` is in `.gitignore` — it will never be committed.

{fastogram-0.0.2 → fastogram-0.0.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "fastogram"
-version = "0.0.2"
+version = "0.0.4"
 description = "Opinionated FastAPI + Aiogram project generator (FastGram template)"
 readme = "README.md"
 requires-python = ">=3.10"

fastogram-0.0.4/scripts/bump_version.py

@@ -0,0 +1,77 @@
+#!/usr/bin/env python3
+"""Bump the package version in pyproject.toml."""
+
+from __future__ import annotations
+
+import argparse
+import re
+import sys
+from pathlib import Path
+
+
+VERSION_RE = re.compile(r'(?m)^(version\s*=\s*")(\d+)\.(\d+)\.(\d+)(")$')
+VALID_BUMPS = {"patch", "minor", "major"}
+
+
+def parse_args() -> argparse.Namespace:
+    parser = argparse.ArgumentParser(
+        description="Bump Fastogram package version in pyproject.toml."
+    )
+    parser.add_argument(
+        "--bump",
+        choices=sorted(VALID_BUMPS),
+        default="patch",
+        help="Which semver segment to increment. Default: patch",
+    )
+    parser.add_argument(
+        "--version",
+        help="Set an explicit version like 1.2.3 instead of incrementing",
+    )
+    parser.add_argument(
+        "--file",
+        default="pyproject.toml",
+        help="Path to pyproject.toml. Default: ./pyproject.toml",
+    )
+    return parser.parse_args()
+
+
+def compute_next_version(current: str, bump: str) -> str:
+    major, minor, patch = map(int, current.split("."))
+    if bump == "major":
+        return f"{major + 1}.0.0"
+    if bump == "minor":
+        return f"{major}.{minor + 1}.0"
+    return f"{major}.{minor}.{patch + 1}"
+
+
+def main() -> int:
+    args = parse_args()
+    pyproject_path = Path(args.file)
+    text = pyproject_path.read_text(encoding="utf-8")
+    match = VERSION_RE.search(text)
+    if not match:
+        print("Error: could not find a simple X.Y.Z version in pyproject.toml.", file=sys.stderr)
+        return 1
+
+    current_version = ".".join(match.group(i) for i in range(2, 5))
+
+    if args.version:
+        if not re.fullmatch(r"\d+\.\d+\.\d+", args.version):
+            print("Error: --version must be in X.Y.Z format.", file=sys.stderr)
+            return 1
+        next_version = args.version
+    else:
+        next_version = compute_next_version(current_version, args.bump)
+
+    if next_version == current_version:
+        print(f"Version unchanged: {current_version}")
+        return 0
+
+    updated = VERSION_RE.sub(rf"\g<1>{next_version}\g<5>", text, count=1)
+    pyproject_path.write_text(updated, encoding="utf-8")
+    print(f"Bumped version: {current_version} -> {next_version}")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())

{fastogram-0.0.2 → fastogram-0.0.4}/src/fastogram/cli.py

@@ -10,6 +10,7 @@ from pathlib import Path
 # Template lives inside the package (bundled at pip install time)
 _PACKAGE_ROOT = Path(__file__).resolve().parent
 _TEMPLATE_DIR = _PACKAGE_ROOT / "templates" / "fastgram"
+_IGNORED_EXISTING_ENTRIES = {".venv"}
 
 
 def _normalize_project_name(raw: str) -> str:
@@ -45,7 +46,22 @@ def _copy_and_customize(
             )
 
 
-def cmd_new(project_name: str | None = None, target_dir: str | None = None) -> int:
+def _blocking_entries(dest: Path, force: bool) -> list[Path]:
+    if force or not dest.exists():
+        return []
+
+    return [
+        entry
+        for entry in dest.iterdir()
+        if entry.name not in _IGNORED_EXISTING_ENTRIES
+    ]
+
+
+def cmd_new(
+    project_name: str | None = None,
+    target_dir: str | None = None,
+    force: bool = False,
+) -> int:
     """Create a new FastGram project."""
     if not _TEMPLATE_DIR.exists():
         print(
@@ -54,11 +70,26 @@ def cmd_new(project_name: str | None = None, target_dir: str | None = None) -> i
         )
         return 1
 
-    slug = _normalize_project_name(project_name or "fastgram-app")
-    dest = Path(target_dir or ".").resolve() / slug
+    use_cwd = project_name == "." or project_name == ""
+    base = Path(target_dir or ".").resolve()
+
+    if use_cwd:
+        dest = base
+        slug = base.name or "fastgram-app"
+    else:
+        slug = _normalize_project_name(project_name or "fastgram-app")
+        dest = base / slug
 
-    if dest.exists() and any(dest.iterdir()):
-        print(f"Error: Directory already exists and is not empty: {dest}", file=sys.stderr)
+    blocking_entries = _blocking_entries(dest, force)
+    if blocking_entries:
+        print(
+            (
+                f"Error: Directory already exists and is not empty: {dest}\n"
+                "Hint: `.venv` is ignored automatically. "
+                "Use `--force` to scaffold into a non-empty directory."
+            ),
+            file=sys.stderr,
+        )
         return 1
 
     _copy_and_customize(_TEMPLATE_DIR, dest, slug)
@@ -66,7 +97,8 @@ def cmd_new(project_name: str | None = None, target_dir: str | None = None) -> i
     print(f"Created project: {dest}")
     print()
     print("Next steps:")
-    print(f"  cd {slug}")
+    if not use_cwd:
+        print(f"  cd {dest.name}")
     print("  uv sync")
     print("  # Edit .env with your TELEGRAM_BOT_TOKEN")
     print("  python manage.py setup")
@@ -87,8 +119,8 @@ def main() -> None:
     new_parser.add_argument(
         "project_name",
         nargs="?",
-        default="fastgram-app",
-        help="Project name (e.g. my-telegram-bot). Default: fastgram-app",
+        default=".",
+        help='Project name (e.g. my-bot). Use "." to scaffold in current directory',
     )
     new_parser.add_argument(
         "-d",
@@ -97,14 +129,21 @@ def main() -> None:
         default=".",
         help="Directory to create the project in. Default: current directory",
     )
+    new_parser.add_argument(
+        "--force",
+        action="store_true",
+        help="Scaffold into a non-empty directory",
+    )
 
     args = parser.parse_args()
     if args.command == "new":
-        sys.exit(cmd_new(args.project_name, args.target_dir))
+        sys.exit(cmd_new(args.project_name, args.target_dir, args.force))
     else:
         parser.print_help()
         print()
         print("Examples:")
-        print("  fastogram new my-bot")
+        print("  fastogram new my-bot          # Create ./my-bot/")
+        print("  fastogram new .               # Scaffold in current directory")
+        print("  fastogram new . --force       # Scaffold into a non-empty directory")
         print("  fastogram new my-bot -d ~/projects")
         sys.exit(0)