chore: bump version and update CHANGELOG.md [skip ci]

Reviewed-on: #10

.flowconfig

@@ -2,3 +2,5 @@
 	remote = origin
 	branches = main
 	initialized = true
+	version = 2
+	remote-type = gitea

.gitea/workflows/publish-pypi.yaml

@@ -0,0 +1,37 @@
+name: Publish to PyPI
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  Publish-to-PyPI:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v7
+        with:
+          fetch-depth: 0
+
+      - name: Configure git
+        run: |
+          git config --global user.name "gitea-actions"
+          git config --global user.email "actions@git.jonathanteran.dev"
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+
+      - name: "Set up Python"
+        uses: actions/setup-python@v6
+        with:
+          python-version-file: ".python-version"
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v8.3.2
+
+      - name: Bump version
+        run: |
+          uv run git-flow tag --token="${{ secrets.GITEA_TOKEN }}"
+
+      - name: Build and publish
+        run: |
+          uv build
+          uv publish --token="${{ secrets.PYPI_TOKEN }}"

.gitignore

@@ -1,5 +1,14 @@
+# Bitbucket token
 .repository-token
 
-**/__pycache__/
+# Virtual environment
+venv/
+
+# Build folders and artifacts
+dist/
 build/
+**/__pycache__/
 **/*.egg-info/
+
+# MacOS
+.DS_Store

.python-version

@@ -0,0 +1 @@
+3.14

CHANGELOG.md

@@ -1,3 +1,368 @@
+## v1.17.6 - 2026-07-09
+
+- **bugfix**:  actualizo versiones de checkout, setup-python, clonar depth completo [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (4666503)
+
+---
+
+
+## v0.1.0-main - 2026-07-09
+
+- **bugfix**:  usar https por defecto como esquema si se detecta ssh [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (5989699)
+- **feature**:  usar esquema de remoto para host de api gitea [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (ecfe058)
+- **bugfix**:  agregar setup previo a ejecucion de git tag [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (1cc2de0)
+- **bugfix**:  arreglo acceso a secretos [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (d456565)
+- **bugfix**:  agrego fetch-depth a checkout [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (ad8984c)
+- **bugfix**:  agrego log de git luego del checkout [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (bf6a0e8)
+- **bugfix**:  cambio version de action setup-uv [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (cb74242)
+- **feature**:  agrego workflow para subir paquete a pypi [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (e94ee2c)
+
+---
+
+
+## v0.1.0-main - 2026-07-09
+
+- **bugfix**:  agregar setup previo a ejecucion de git tag [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (1cc2de0)
+- **bugfix**:  arreglo acceso a secretos [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (d456565)
+- **bugfix**:  agrego fetch-depth a checkout [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (ad8984c)
+- **bugfix**:  agrego log de git luego del checkout [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (bf6a0e8)
+- **bugfix**:  cambio version de action setup-uv [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (cb74242)
+- **feature**:  agrego workflow para subir paquete a pypi [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (e94ee2c)
+
+---
+
+
+## v1.17.5 - 2026-06-03
+
+- **bugfix**:  allow commits not compliant with conventional commits in changelog generation [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (3ff9f76)
+
+---
+
+
+## v1.17.4 - 2026-05-24
+
+- **bugfix**:  use rest of branch name instead of ticket for pr title generation [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (094bc1a)
+
+---
+
+
+## v1.17.3 - 2026-05-22
+
+- **bugfix**:  dont close branches on merges between environments [[jteran](mailto:jteran@renatre.org.ar)] (8ee0129)
+
+---
+
+
+## v1.17.2 - 2026-05-22
+
+- **bugfix**:  change pr title on merges between environments [[jteran](mailto:jteran@renatre.org.ar)] (de124ba)
+
+---
+
+
+## v1.17.1 - 2026-05-20
+
+- **bugfix**:  dont push environment branches since they are already created on remote [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (04c9a4b)
+
+---
+
+
+## v1.17.0 - 2026-05-20
+
+- **feature**:  allow merges between environments [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (5806aea)
+
+---
+
+
+## v1.16.1 - 2026-05-20
+
+- **bugfix**:  arreglo split de branch para armar correctamente el titulo del PR [[jteran](mailto:jteran@renatre.org.ar)] (a0d3028)
+
+---
+
+
+## v1.16.0 - 2026-05-20
+
+- **feature**:  agrego soporte para especificar tickets en nombre e rama [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (f389118)
+
+---
+
+
+## v1.15.0 - 2026-05-17
+
+- **feature**:  include revlist count in version tag when skipping bump [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (d275ac0)
+
+---
+
+
+## v1.14.0 - 2026-02-11
+
+- **feature**:  actualizar nombre de proyecto en uv.lock [[jteran](mailto:jteran@renatre.org.ar)] (9cd0b25)
+
+---
+
+
+## v1.13.1 - 2026-02-11
+
+- **bugfix**:  test pipeline change [[jteran](mailto:jteran@renatre.org.ar)] (f2eb5af)
+
+---
+
+
+## v1.13.0 - 2026-02-11
+
+- **feature**:  actualizo nombre y descripcion del proyecto [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (41d6957)
+
+---
+
+
+## v1.12.3 - 2026-02-11
+
+- **bugfix**:  taggeo todos los commits localmente, incluso en ci [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (5d23bb6)
+
+---
+
+
+## v1.12.2 - 2026-02-10
+
+- **bugfix**:  test pipeline change [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (98bf7e7)
+
+---
+
+
+## v1.12.1 - 2026-02-10
+
+- **bugfix**:  agrego paso de build al pipeline [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (ade86f1)
+
+---
+
+
+## v1.12.0 - 2026-02-10
+
+- **feature**:  cambio pipelines para usar uv package manager [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (0f700b0)
+
+---
+
+
+## v1.11.0 - 2025-12-22
+
+- **feature**:  al agrupar release, mergear cambios en rama group [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (726c73a)
+- **feature**:  usar commit message cuando el pr solo tiene un commit [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (057b32a)
+- **feature**:  eliminar prompt de ticket en creacion de rama [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (c0e2e59)
+- **feature**:  deshacer rebase cuando este falla en el pasaje de cambios [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (77e338d)
+- **bugfix**:  uso titulo personalizado de PR [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (1aa2263)
+
+---
+
+
+## v1.10.0 - 2025-12-15
+
+- **feature**:  agrego opcion para cambiar a rama objetivo y obtener cambios [[jteran](mailto:jteran@renatre.org.ar)] (df8998a)
+- **feature**:  agrego opcion para personalizar nombre de PR [[jteran](mailto:jteran@renatre.org.ar)] (c87b141)
+
+---
+
+
+## v1.9.1 - 2025-12-15
+
+- **bugfix**:  uso rama actual cuando esta es un entorno [[jteran](mailto:jteran@renatre.org.ar)] (c54cb95)
+
+---
+
+
+## v1.9.0 - 2025-12-15
+
+- **bugfix**:  uso env actual en vez de rama actual para listar ramas [[jteran](mailto:jteran@renatre.org.ar)] (5d33b29)
+- **feature**:  listar ramas de todos los entornos con flag --all, y del entorno actual por defecto [[jteran](mailto:jteran@renatre.org.ar)] (104b321)
+- **feature**:  agrego opcion para listar ramas wip [[jteran](mailto:jteran@renatre.org.ar)] (774cf9a)
+- **refactor**:  cambio opcion para listar ramas trash [[jteran](mailto:jteran@renatre.org.ar)] (74c333a)
+- **bugfix**:  elimino : extra de comando new [[jteran](mailto:jteran@renatre.org.ar)] (499babc)
+
+---
+
+
+## v1.8.0 - 2025-12-15
+
+- **feature**:  agrego opcion para incluir ticket en nombre de rama [[jteran](mailto:jteran@renatre.org.ar)] (01e938e)
+- **feature**:  mostrar warning si la rama actual no es un entorno configurado [[jteran](mailto:jteran@renatre.org.ar)] (97b4a56)
+- **feature**:  hacer pull en rama actual antes de crear nueva rama [[jteran](mailto:jteran@renatre.org.ar)] (24be501)
+
+---
+
+
+## v1.7.5 - 2025-12-14
+
+- **bugfix**:  verificar si la rama grupo trackea una rama remota antes de hacer pull [[jteran](mailto:jteran@renatre.org.ar)] (0d95a97)
+- **bugfix**:  capturo interrupion por teclado para no mostrar stack trace [[jteran](mailto:jteran@renatre.org.ar)] (0af5102)
+
+---
+
+
+## v1.7.4 - 2025-12-14
+
+- **bugfix**:  generación de PR de ramas release [[jteran](mailto:jteran@renatre.org.ar)] (b24b22a)
+
+---
+
+
+## v1.7.3 - 2025-12-14
+
+- **bugfix**:  listado de ramas para elegir grupo release no devolvia resultados [[jteran](mailto:jteran@renatre.org.ar)] (5600e5e)
+
+---
+
+
+## v1.7.2 - 2025-12-11
+
+- **bugfix**:  al hacer un release, cambio a la rama grupo si esta disponible [[jteran](mailto:jteran@renatre.org.ar)] (44b8efd)
+
+---
+
+
+## v1.7.1 - 2025-12-11
+
+- **bugfix**:  cambio la forma en la que se obtiene el first fork point entre 2 ramas [[jteran](mailto:jteran@renatre.org.ar)] (7b4fb34)
+
+---
+
+
+## v1.7.0 - 2025-12-11
+
+- **feature**:  muestro el listado de commits a pasar al siguiente entorno en release [[jteran](mailto:jteran@renatre.org.ar)] (2e65cb7)
+
+---
+
+
+## v1.6.4 - 2025-12-10
+
+- **bugfix**:  cambio la lista de commits a mostrar en el merge [[jteran](mailto:jteran@renatre.org.ar)] (4e089dc)
+
+---
+
+
+## v1.6.3 - 2025-12-04
+
+- **bugfix**:  revertir guion entre version y entorno, agregar guion a sufijo [[jteran](mailto:jteran@renatre.org.ar)] (7ce6add)
+- **bugfix**:  agrego guion entre version y nombre de entorno [[jteran](mailto:jteran@renatre.org.ar)] (053b8b1)
+
+---
+
+
+## v1.6.3- - 2025-12-04
+
+- **bugfix**:  agrego guion entre version y nombre de entorno [[jteran](mailto:jteran@renatre.org.ar)] (053b8b1)
+
+---
+
+
+## v1.6.2 - 2025-12-04
+
+- **bugfix**:  crear changelog cuando no existe [[jteran](mailto:jteran@renatre.org.ar)] (0c8e7bb)
+
+---
+
+
+## v1.6.1 - 2025-11-29
+
+### Commits
+
+- **bugfix**:  arreglo mensaje de confirmacion de squash, muevo prompt de commit message antes del squash [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (f1f6e67)
+- **bugfix**:  cambio default en confirmacion para agrupar release [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (83df7e9)
+
+---
+
+
+## v1.6.0 - 2025-11-29
+
+### Commits
+
+- **feature**:  agrego opcion para agrupar ramas release [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (c47afff)
+
+---
+
+
+## v1.5.2 - 2025-11-28
+
+### Commits
+
+- **bugfix**:  arreglo split de ramas de flow.branches [[jteran](mailto:jteran@renatre.org.ar)] (2ad7471)
+- **bugfix**:  arreglo iteracion de items de flowconfig en set_config [[jteran](mailto:jteran@renatre.org.ar)] (5c3a317)
+- **docs**:  agrego venv a lista de carpetas ignoradas [[jteran](mailto:jteran@renatre.org.ar)] (50979e2)
+
+---
+
+
+## v1.5.1 - 2025-11-27
+
+### Commits
+
+- **refactor**:  muevo constantes a modulo git_flow para centralizar uso [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (29757cc)
+- **bugfix**:  ignorar carpetas generadas en build de lsp [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (7f857fd)
+
+---
+
+
+## v1.5.0 - 2025-11-27
+
+### Commits
+
+- **feature**:  modifico formato de listado de ramas [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (7177084)
+
+---
+
+
+## v1.4.0 - 2025-11-23
+
+### Commits
+
+- **feature**:  agrego comando branch para listar ramas [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (c74f1a3)
+- **feature**:  agrego soporte para parametros repetidos en llamadas a Git [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (eafb3f1)
+
+---
+
+
+## v1.3.0 - 2025-11-23
+
+### Commits
+
+- **feature**:  agrego comando release, elimino codigo no utilizado [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (43d7e5a)
+
+---
+
+
+## v1.2.0 - 2025-11-22
+
+### Commits
+
+- **bugfix**:  deshabilito check en merge --abort al buscar conflictos [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (34aba71)
+- **feature**:  agregando descripcion a ejecucion de comandos importantes en new, tag y merge [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (4135a78)
+- **feature**:  agregando descripcion a ejecucion de comandos importantes en init y commit [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (faea8c2)
+- **bugfix**:  cambiando tipo de print para agregar soporte de titulos [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (11e2a9d)
+- **bugfix**:  descartar output cuando el comando git se ejecuta con _run [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (d133c48)
+- **feature**:  muevo opciones para check y print a metodos para ejecutar git [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (7346cfd)
+
+---
+
+
+## v1.1.5 - 2025-11-21
+
+### Commits
+
+- **bugfix**:  creo tag en el commit que actualiza el changelog [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (222c819)
+- **style**:  ignorar carpeta dist/ [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (0e75a8e)
+
+---
+
+
+## v1.1.4 - 2025-11-21
+
+### Commits
+
+- **bugfix**:  separar etapa de lectura y escritura de changelog [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (bf829a1)
+- **bugfix**:  agrego http:// como protocolo soportado para pipelines [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (8f79a6a)
+
+---
+
+
 ## Saturday,  8 de November de 2025, 00:28
 
 - Autor: [bitbucket-pipelines](mailto:commits-noreply@bitbucket.org)

README.md

@@ -1,3 +1,93 @@
 # Git Flow
 
-Herramienta para establecer un workflow y versionar un repositorio
+Herramienta para establecer un workflow siguiendo [Conventional Commits
+(CC)](https://www.conventionalcommits.org), [Conventional Branch
+(CB)](https://conventional-branch.github.io/), y [SemVer](https://semver.org/).
+
+Esta diseñada para facilitar la creación de commits y branches en un formato estandar, que permite
+derivar versiones automaticamente de los merges sobre ramas principales.
+
+## Instalación
+
+Para instalar Git Flow, se sugiere utilizar [pipx](https://github.com/pypa/pipx) (seguir la
+documentación para instalarlo). Una vez instalado `pipx`, simplemente clonamos el repositorio en una
+carpeta local, y lo instalamos:
+
+```sh
+cd ~/Downloads
+git clone git@bitbucket.org:sushi2717/git-flow.git
+cd git-flow
+pipx install .
+```
+
+Luego podemos verificar que se haya instalado correctamente ejecutando: `git-flow -h`
+
+Para actualizarlo, hacemos un pull de los cambios recientes del repositorio, y hacemos el upgrade
+mediante `pipx`:
+
+```sh
+cd ~/Downloads/git-flow
+git pull
+pipx upgrade git-flow
+```
+
+## Configuración
+
+Para poder usar la herramienta en un repositorio, necesitamos inicializarlo:
+
+```sh
+git-flow init
+```
+
+El comando solicitará 2 opciones:
+
+- **Ramas principales**: Ramas que representan los entornos principales del proyecto. Por ejemplo:
+  `dev,test,prod`.
+- **Remoto** (opcional): Nombre del remoto que se usará para crear PRs, y taggear merges
+  automáticamente. Por el momento, se soportan los siguientes remotos:
+
+    - [x] Bitbucket
+    - [x] Github
+    - [x] Gitea
+
+  La configuración del remoto requiere tener un Access Token para poder crear los PRs automáticamente.
+  El mismo se puede crear desde el repositorio al que se quiere dar acceso: *"Repository settings" >
+  "Access Tokens" > "Create access token"*. El token necesita permiso para *Write* en *Pull Requests*.
+
+  Luego se debe guardar el token dentro del repositorio a configurar, en el archivo
+  `.repository-token`. De no especificarse, los merges y tags se harán de forma local.
+
+## Utilización
+
+Git Flow cuenta con 5 comandos principales para guiar el workflow (ver `git-flow <command> -h` para
+más información):
+
+- `new`: Crea una nueva rama siguiendo CB.
+- `commit`: Crea un commit siguiendo CC.
+- `merge`: Mergea la rama actual a una de las ramas principales.
+- `tag`: Crea un tag sobre el ultimo merge siguiendo SemVer.
+- `release`: Prepara la rama actual para pasarse al siguiente entorno configurado
+
+El workflow para el cual se penso la herramienta es el siguiente:
+
+1. Sobre la primer rama principal configurada (por ejemplo, `dev`), se crea una nueva rama con
+   `git-flow new`
+2. Se realizan cambios y se commitean los mismos con `git-flow commit` (se repite hasta que se
+   considere que la rama esté lista para mergear)
+3. Se ejecuta `git-flow merge` para mergear la rama al entorno que corresponda (en este caso,
+   `dev`). En caso de tener un remoto configurado, el comando crea un PR para integrar el cambio. Si
+   no, simplemente se ejecuta un `git merge` simple.
+4. Para versionar este último merge, se ejecuta `git-flow tag`, ya sea localmente o desde un
+   pipeline para que se ejecute en cada merge.
+5. Una vez que la rama fue correctamente integrada a un entorno (por ejemplo, `dev`), se usa
+   `git-flow release` para crear una nueva rama para integrar unicamente los cambios de esa rama
+   sobre el siguiente entorno (por ejemplo, `test`). Si la rama original era
+   `feature/my-new-feature`, se crea la rama `release/test/feature/my-new-feature` sobre `test` que
+   tiene los cambios de la rama original.
+
+## Taggeo automático por pipeline
+
+Éste repositorio utiliza Git Flow para el taggeo automático usando pipelines, se puede ver el
+archivo `bitbucket-pipelines.yml` como ejemplo. El comando `git-flow tag` soporta el pasaje del
+token mediante la opción `--token=<TOKEN>`. Ver la sección [Configuración](#configuracion) para las
+instrucciones de como generar este token. El mismo necesita scope `write:repository:bitbucket`.

bitbucket-pipelines.yml

@@ -1,13 +1,14 @@
-image: python:3.12
+image: python:3.14
 
 pipelines:
   branches:
     'main':
       - step:
-          name: "Tag main"
+          name: "Tag and publish package"
           caches:
             - pip
           script:
-            - cd $BITBUCKET_CLONE_DIR
+            - pip install uv
-            - pip install .
+            - uv run git-flow tag --token=$BEARER
-            - git-flow tag --token=$BEARER
+            - uv build
+            - uv publish --token=$PYPI_TOKEN

pyproject.toml

@@ -3,12 +3,12 @@ requires = ["setuptools >= 80", "setuptools-scm[simple] >= 8" ]
 build-backend = "setuptools.build_meta"
 
 [project]
-name = "git-flow"
+name = "git-flow-envs"
-description = "Git workflow automation to follow best practices"
+description = "Git workflow automation to follow best practices when working with multiple environments"
 dynamic = ["version"]
-requires-python = ">= 3.12"
+requires-python = ">= 3.14"
 dependencies = [
-    "requests"
+    "requests", "typer"
 ]
 authors = [
   {name = "Alan Facundo Biglieri", email = "abiglieri@renatre.org.ar"},

pyrightconfig.json

@@ -0,0 +1,6 @@
+{
+  "exclude": [
+    "build",
+    "**/*.egg-info"
+  ]
+}

src/git_flow/__init__.py

@@ -6,6 +6,7 @@ BRANCH_TYPES = [
     "bugfix",
     "hotfix",
     "chore",
+    "docs",
 ]
 
 COMMIT_TYPES = [
@@ -17,9 +18,12 @@ COMMIT_TYPES = [
     "docs",
     "style",
     "test",
-    "wip"
+    "wip",
 ]
 
+WIP_BRANCH_PREFIX = "wip/"
+TRASH_BRANCH_PREFIX = "trash/"
+
 # Commits con estos valores incrementan el componente correspondiente
 SEMVER_MAJOR = 3
 SEMVER_MINOR = 2
@@ -45,3 +49,7 @@ SUPPORTED_REMOTE_APIS = [
 ]
 
 REPOSITORY_TOKEN_FILENAME = ".repository-token"
+
+FLOWCONFIG_FILENAME = ".flowconfig"
+
+FLOWCONFIG_VERSION = 2

src/git_flow/changelog.py

@@ -16,8 +16,6 @@ class Changelog:
 
         return f"""## {title} - {now.strftime("%F")}
 
-### Commits
-
 """
 
     def generate_content(self, base: str, branch: str):
@@ -30,11 +28,15 @@ class Changelog:
             message = Git("show", commit, patch=False, format="%s").firstline()
             email = Git("show", commit, patch=False, format="%ae").firstline()
             username = email[: email.index("@")]
+            description = message
+
+            if ":" in message:
                 index = message.index(":")
                 commit_type = message[:index]
                 commit_message = message[index + 1 :]
+                description = f"**{commit_type}**: {commit_message}"
 
-            content += f"- **{commit_type}**: {commit_message} [[{username}](mailto:{email})] ({commit})\n"
+            content += f"- {description} [[{username}](mailto:{email})] ({commit})\n"
 
         return content
 
@@ -54,7 +56,8 @@ class Changelog:
 
     def _prepend(self, content: str):
         if isfile(self.FILENAME):
-            with open(self.FILENAME, "rw") as f:
+            with open(self.FILENAME, "r") as f:
                 content += f.read()
-                f.seek(0)
+
+        with open(self.FILENAME, "w") as f:
             f.write(content)

src/git_flow/command/base.py

@@ -1,28 +1,17 @@
-from argparse import Namespace, ArgumentParser
-from abc import ABC, abstractmethod
-import os
-from os.path import isfile
-
 from git_flow import (
     BRANCH_TYPES,
     REPOSITORY_TOKEN_FILENAME,
+    FLOWCONFIG_FILENAME,
+    FLOWCONFIG_VERSION,
     GitFlowError,
 )
-from git_flow.git import FLOWCONFIG_FILE, Git
+from git_flow.git import Git
 from git_flow.remote.base import RemoteAPI
 from git_flow.remote.bitbucket import BitbucketRemoteAPI
 from git_flow.remote.github import GithubRemoteAPI
-
+from git_flow.remote.gitea import GiteaRemoteAPI
-COLOR_BLACK = "\033[30m"
+from git_flow.io import *
-COLOR_RED = "\033[31m"
+from os.path import isfile
-COLOR_GREEN = "\033[32m"
-COLOR_YELLOW = "\033[33m"
-COLOR_BLUE = "\033[34m"
-COLOR_5 = "\033[35m"
-COLOR_6 = "\033[36m"
-COLOR_7 = "\033[37m"
-COLOR_BLACK_BOLD = "\033[1;30m"
-COLOR_RESET = "\033[0m"
 
 TYPE_SUCCESS = 0
 TYPE_WARNING = 1
@@ -30,103 +19,11 @@ TYPE_ERROR = 2
 TYPE_INFO = 3
 
 
-class Command(ABC):
+flowconfig = Git.get_config(FLOWCONFIG_FILENAME) if isfile(FLOWCONFIG_FILENAME) else {}
-    @abstractmethod
+environments = flowconfig["flow.branches"].split(",") if "flow.branches" in flowconfig else []
-    def name(self) -> str:
-        pass
 
-    @abstractmethod
+def ensure_initialized():
-    def description(self) -> str:
+    initialized = flowconfig["flow.initialized"] if flowconfig else None
-        pass
-
-    @abstractmethod
-    def run(self, args: Namespace = Namespace()):
-        pass
-
-    def __init__(self) -> None:
-        self.flowconfig = (
-            Git.get_config(FLOWCONFIG_FILE) if isfile(FLOWCONFIG_FILE) else {}
-        )
-
-    def success(self, msg: str):
-        self._print(TYPE_SUCCESS, msg)
-
-    def warning(self, msg: str):
-        self._print(TYPE_WARNING, msg)
-
-    def error(self, msg: str):
-        self._print(TYPE_ERROR, msg)
-
-    def info(self, msg: str):
-        self._print(TYPE_INFO, msg)
-
-    def prompt(
-        self,
-        prompt: str,
-        default: str | None = None,
-        persistent: bool = False,
-        strip: bool = True,
-    ) -> str:
-        onetime = not persistent
-
-        while onetime or persistent:
-            if default:
-                prompt += f" [{default}]"
-
-            prompt += ": "
-            result = input(prompt)
-            result = result.strip() if strip else result
-
-            if result:
-                return result
-            elif default is not None:
-                return default
-            elif persistent:
-                self.error("Debe ingresar un valor no vacío.")
-            else:
-                return result
-
-    def confirm(self, question: str, default: bool = True):
-        suffix = " [Y/n]: " if default else " [y/N]: "
-        answer = input(question + suffix)
-
-        return default if len(answer) == 0 else answer.startswith("y")
-
-    def choice(self, prompt: str, options: list[str]):
-        print(prompt)
-
-        for i, option in enumerate(options):
-            print(f"\t{i+1}. {option}")
-
-        selection = None
-
-        while selection is None:
-            answer = input(f"Seleccione una opción [1-{len(options)}] o escribala: ")
-
-            if answer.isdigit():
-                answer = int(answer)
-
-                if 1 <= answer and answer <= len(options):
-                    selection = options[answer - 1]
-
-                    if not self.confirm(
-                        f"Seleccionó la opción {answer} ({selection}), ¿es correcto?"
-                    ):
-                        selection = None
-                else:
-                    self.error(f"La opción {answer} está fuera del rango permitido.")
-            elif answer in options:
-                selection = answer
-            else:
-                self.error(f"La opción '{answer}' es inválida.")
-
-        return selection
-
-    def setup_parser(self, parser: ArgumentParser) -> ArgumentParser:
-        return parser
-
-    def ensure_initialized(self):
-        initialized = self.flowconfig["flow.initialized"] if self.flowconfig else None
 
     if not initialized:
         raise GitFlowError(
@@ -137,28 +34,28 @@ class Command(ABC):
             f"El valor de `flow.initialized` ({initialized}) es inválido."
         )
 
-    def ensure_right_branch(self):
+    version = int(flowconfig.get("flow.version", "1"))
+
+    if version != FLOWCONFIG_VERSION:
+        raise GitFlowError(
+            f"La versión del flowconfig ({version}) no es compatible con esta versión de git-flow ({FLOWCONFIG_VERSION}). "
+            f"Debe reinicializar el repositorio."
+        )
+
+
+def ensure_right_branch():
     branch = Git.get_current_branch()
 
     if branch == "HEAD":
         raise GitFlowError("No se encuentra parado sobre una rama.")
-        elif self.confirm(f"Se encuentra sobre la rama '{branch}'. ¿Es correcto?"):
+    elif confirm(f"Se encuentra sobre la rama '{branch}'. ¿Es correcto?"):
         return branch
     else:
         raise GitFlowError("Ejecución cancelada.")
 
-    def ensure_repository_token(self):
-        if not os.path.isfile(REPOSITORY_TOKEN_FILENAME):
-            raise GitFlowError(
-                "No existe un token para el repositorio en " + REPOSITORY_TOKEN_FILENAME
-            )
 
-        with open(REPOSITORY_TOKEN_FILENAME) as f:
+def get_branch_env_and_type(branch: str) -> tuple[str, str]:
-            return f.readline().strip()
-
-    def get_branch_env_and_type(self, branch: str) -> tuple[str, str]:
     components = branch.split("/")
-        target_branches = self.flowconfig["flow.branches"].split(" ")
 
     if len(components) == 2:
         if components[0] not in BRANCH_TYPES:
@@ -166,13 +63,13 @@ class Command(ABC):
                 f"Branch inválida, el tipo '{components[0]}' no es válido."
             )
 
-            return (target_branches[0], components[0])
+        return (environments[0], components[0])
     elif len(components) == 4:
-            target_branches = target_branches[1:]
+        valid_environments = environments[1:]
 
         if (
             components[0] != "release"
-                or components[1] not in target_branches
+            or components[1] not in valid_environments
             or components[2] not in BRANCH_TYPES
         ):
             raise GitFlowError(
@@ -184,41 +81,60 @@ class Command(ABC):
     else:
         raise GitFlowError("Branch inválido: " + branch)
 
-    def get_remote_api(self, token: str) -> RemoteAPI:
+
-        if "flow.remote" not in self.flowconfig:
+def ensure_repository_token():
+    if not isfile(REPOSITORY_TOKEN_FILENAME):
+        raise GitFlowError(
+            "No existe un token para el repositorio en " + REPOSITORY_TOKEN_FILENAME
+        )
+
+    with open(REPOSITORY_TOKEN_FILENAME) as f:
+        return f.readline().strip()
+
+
+def ensure_clean_worktree(has_remote: bool):
+    status = Git.status()
+
+    if not status:
+        return
+
+    not_empty = any(map(lambda s: s.index != " " or s.worktree != " ", status))
+
+    if not_empty:
+        if not has_remote:
+            warning("Existen cambios en tu entorno de trabajo sin commitear.")
+        else:
+            raise GitFlowError("No se puede continuar con cambios pendientes.")
+
+        if not confirm("¿Desea continuar?", False):
+            raise GitFlowError("Ejecución abortada")
+
+
+def get_remote_api(token: str) -> RemoteAPI:
+    if "flow.remote" not in flowconfig:
         raise GitFlowError("El repositorio no tiene configurado un remoto.")
 
-        [host, repository] = RemoteAPI.parse(self.flowconfig["flow.remote"])
+    remote_type = flowconfig.get("flow.remote-type", "").lower()
+    [schema, host, repository] = RemoteAPI.parse(flowconfig["flow.remote"])
 
-        if host == "bitbucket.org":
+    if remote_type == "gitea":
+        return GiteaRemoteAPI(("https://" if schema == "ssh://" else schema) + host, repository, token)
+    elif remote_type == "bitbucket":
         return BitbucketRemoteAPI(repository, token)
-        elif host == "github.com":
+    elif remote_type == "github":
         return GithubRemoteAPI(repository, token)
     else:
-            raise GitFlowError("El host del repositorio remoto es inválido")
+        raise GitFlowError("El tipo del remoto es inválido")
 
-    def _print(self, type: int, msg: str):
-        print(self._get_color(type) + self._get_tag(type) + " " + msg + COLOR_RESET)
 
-    def _get_color(self, type: int) -> str:
+def is_valid_ticket(ticket: str) -> bool:
-        if type == TYPE_SUCCESS:
+    """Check if the specified string is a valid ticket number (ABC-123)"""
-            return COLOR_GREEN
+    components = ticket.split("-")
-        elif type == TYPE_WARNING:
-            return COLOR_YELLOW
-        elif type == TYPE_ERROR:
-            return COLOR_RED
-        elif type == TYPE_INFO:
-            return COLOR_BLUE
-        return ""
 
-    def _get_tag(self, type: int) -> str:
+    if len(components) != 2:
-        if type == TYPE_SUCCESS:
+        return False
-            return "[success]"
-        elif type == TYPE_WARNING:
-            return "[warning]"
-        elif type == TYPE_ERROR:
-            return "[error]"
-        elif type == TYPE_INFO:
-            return "[info]"
     
-        return ""
+    ticket_project = components[0]
+    ticket_number = components[1]
+
+    return ticket_project.isalpha() and ticket_project.isupper() and ticket_number.isnumeric()

src/git_flow/command/branch.py

@@ -0,0 +1,140 @@
+from git_flow import (
+    TRASH_BRANCH_PREFIX,
+    WIP_BRANCH_PREFIX,
+    GitFlowError,
+)
+from git_flow.command.base import *
+from git_flow.git import Git
+from typing import Annotated
+import typer
+
+BRANCH_FORMAT = "%(refname:short)"
+
+app = typer.Typer()
+
+
+@app.command()
+def branch(
+    environment: Annotated[
+        str | None,
+        typer.Argument(
+            help="Entorno de las ramas a listar. Por defecto, es el entorno actual."
+        ),
+    ] = None,
+    trash: Annotated[
+        bool,
+        typer.Option(
+            help=f"Listar ramas en la 'papelera de reciclaje' (ramas que empiezan con '{TRASH_BRANCH_PREFIX}')"
+        ),
+    ] = False,
+    wip: Annotated[
+        bool,
+        typer.Option(
+            help=f"Listar ramas 'en progreso' (ramas que empiezan con '{WIP_BRANCH_PREFIX}')"
+        ),
+    ] = False,
+    all: Annotated[
+        bool, typer.Option(help="Listar ramas de todos los entornos")
+    ] = False,
+):
+    """Lista ramas del repositorio, agrupandolas por entorno objetivo"""
+    ensure_initialized()
+
+    current_branch = Git.get_current_branch()
+
+    if current_branch in environments:
+        current_environment = current_branch
+    else:
+        current_environment, _ = get_branch_env_and_type(current_branch)
+
+    if trash:
+        show_branches(TRASH_BRANCH_PREFIX, current_branch)
+    elif wip:
+        show_branches(WIP_BRANCH_PREFIX, current_branch)
+    elif all:
+        show_envs(environments, current_branch)
+        show_all_branches(environments, current_branch)
+    elif environment is None:
+        show_envs(environments, current_branch)
+        show_env_branches(current_environment, environments, current_branch)
+    elif environment in environments:
+        show_envs(environments, current_branch)
+        show_env_branches(environment, environments, current_branch)
+    else:
+        raise GitFlowError(f"'{environment}' no es un entorno válido.")
+
+
+def show_branches(branch_prefix: str, current_branch: str):
+    branches = get_branches(branch_prefix)
+
+    if not branches:
+        print("No hay ramas a mostrar.")
+        return
+
+    for branch in branches:
+        is_current = branch == current_branch
+        prefix = "*" if is_current else " "
+        console.print(prefix + " " + branch, style="green" if is_current else None)
+
+
+def get_branches(branch_prefix: str):
+    return Git("for-each-ref", "refs/heads/" + branch_prefix, format=BRANCH_FORMAT).lines()
+
+
+def show_all_branches(environments: list[str], current_branch: str):
+    for environment in environments:
+        show_env_branches(
+            environment, environments, current_branch, len(environments) > 1
+        )
+
+    trash = len(get_branches(TRASH_BRANCH_PREFIX))
+
+    if trash:
+        print()
+        console.print(
+            "[bold]Papelera:[/bold] "
+            + str(trash)
+            + " rama"
+            + ("" if trash == 1 else "s")
+        )
+
+
+def show_envs(environments: list[str], current_branch: str):
+    console.print("Entornos", style="bold")
+    for environment in environments:
+        is_current = environment == current_branch
+        prefix = "*" if is_current else " "
+        console.print(prefix + " " + environment, style="green" if is_current else None)
+    print()
+
+
+def show_env_branches(
+    environment: str,
+    environments: list[str],
+    current_branch: str,
+    show_env: bool = False,
+):
+    is_first_env = environment == environments[0]
+    pattern = (
+        "refs/heads/" if is_first_env else "refs/heads/release/" + environment + "/"
+    )
+    pattern += "*/*"
+    exclude = (
+        ["refs/heads/" + TRASH_BRANCH_PREFIX, "refs/heads/release/"]
+        if is_first_env
+        else []
+    )
+    branches = Git(
+        "for-each-ref", pattern, exclude=exclude, format=BRANCH_FORMAT
+    ).lines()
+
+    console.print(environment if show_env else "Ramas", style="bold")
+
+    if not branches:
+        print("No hay ramas a mostrar.")
+        return
+
+    for branch in branches:
+        is_current = branch == current_branch
+        prefix = "*" if is_current else " "
+        console.print(prefix + " " + branch, style="green" if is_current else None)

src/git_flow/command/commit.py

@@ -1,53 +1,55 @@
-from argparse import Namespace
+import typer
 from datetime import datetime
-from git_flow import COMMIT_TYPES, GitFlowError
+from git_flow import COMMIT_TYPES, TRASH_BRANCH_PREFIX, WIP_BRANCH_PREFIX, GitFlowError
-from git_flow.command.base import Command
 from git_flow.git import Git
+from git_flow.command.base import *
+
+app = typer.Typer()
 
 
-class CommitCommand(Command):
+@app.command()
-    def name(self) -> str:
+def commit():
-        return "commit"
+    """Crea un commit siguiendo el formato de Conventional Commits"""
+    ensure_initialized()
+    branch = ensure_right_branch()
 
-    def description(self) -> str:
+    if not _has_files_staged():
-        return """Crea un commit siguiendo el formato de Conventional Commits"""
+        warning("No hay cambios en el indice para commitear.")
-
+        if confirm("¿Desea agregar la carpeta actual?"):
-    def run(self, args: Namespace = Namespace()):
+            Git("add", ".").exec(print="Agregando cambios")
-        self.ensure_initialized()
-        branch = self.ensure_right_branch()
-
-        if not self._has_files_staged():
-            self.warning("No hay cambios en el indice para commitear.")
-            if self.confirm("¿Desea agregar la carpeta actual (`git add .`)?"):
-                Git("add", ".").exec()
         else:
-                raise GitFlowError(
+            raise GitFlowError("Debe agregar algún cambio al indice para continuar.")
-                    "Debe agregar algún cambio al indice para continuar."
-                )
 
-        commit_type = self.choice("Tipo de commit", COMMIT_TYPES)
+    commit_type = choice("Tipo de commit", COMMIT_TYPES)
-        commit_message = self.prompt(
+    commit_message = prompt(
         "Mensaje (máximo recomendado: 100 caracteres)", persistent=True
     )
     message = commit_type + ": " + commit_message
 
-        if branch.startswith("wip/"):
+    if branch.startswith(WIP_BRANCH_PREFIX):
-            original_branch = branch.removeprefix("wip/")
+        original_branch = branch.removeprefix(WIP_BRANCH_PREFIX)
-            Git("commit", m=message).exec()
+        Git("commit", m=message).exec(print="Creando commit en rama WIP")
 
         if commit_type != "wip":
             suffix = datetime.now().strftime("%Y%m%dT%H%M")
-                Git("switch", original_branch).exec()
+            Git("switch", original_branch).exec(print="Volviendo a rama original")
-                Git("merge", branch, squash=True).exec()
+            Git("merge", branch, squash=True).exec(
-                Git("commit", m=message).exec()
+                print="Squasheando commits WIP en uno solo"
-                Git("branch", branch, "trash/" + branch + "/" + suffix, move=True).exec()
+            )
+            Git("commit", m=message).exec(print="Creando commit final de rama WIP")
+            Git(
+                "branch", branch, TRASH_BRANCH_PREFIX + branch + "/" + suffix, move=True
+            ).exec(print="Backup de rama WIP")
     else:
         if commit_type == "wip":
-                Git("switch", "wip/" + branch, create=True).exec()
+            Git("switch", WIP_BRANCH_PREFIX + branch, create=True).exec(
+                print="Creando nueva rama WIP"
+            )
 
-            Git("commit", m=message).exec()
+        Git("commit", m=message).exec(print="Creando commit")
 
-    def _has_files_staged(self):
+
+def _has_files_staged():
     status = Git.status()
 
     if not status:

src/git_flow/command/init.py

@@ -1,115 +1,122 @@
-from argparse import Namespace
+import typer
-import os
+
-from git_flow import GitFlowError
+from git_flow import FLOWCONFIG_FILENAME, FLOWCONFIG_VERSION, GitFlowError
-from git_flow.command.base import Command
+from git_flow.git import Git
-from git_flow.git import FLOWCONFIG_FILE, Git
+from git_flow.command.base import *
+
+app = typer.Typer()
 
 
-class InitCommand(Command):
+@app.command()
-    def name(self) -> str:
+def init():
-        return "init"
+    """Inicializa el repositorio para utilizar git-flow"""
 
-    def description(self) -> str:
+    _ensure_is_repository()
-        return """Inicializa el repositorio para utilizar git-flow"""
+    _ensure_not_already_initialized()
 
-    def run(self, args: Namespace = Namespace()):
+    branches = _setup_flow_branches()
-        self._ensure_is_repository()
+    (remote, remote_type) = _setup_flow_remote()
-        self._ensure_not_already_initialized()
-
-        branches = self._setup_flow_branches()
-        remote = self._setup_flow_remote()
 
     flowconfig = {
+        "flow.version": str(FLOWCONFIG_VERSION),
         "flow.initialized": "true",
         "flow.branches": ",".join(branches),
     }
 
-        if remote:
+    if remote and remote_type:
         flowconfig["flow.remote"] = remote
+        flowconfig["flow.remote-type"] = remote_type
 
-        Git.set_config(flowconfig, FLOWCONFIG_FILE)
+    Git.set_config(flowconfig, FLOWCONFIG_FILENAME)
-        Git("add", FLOWCONFIG_FILE).exec()
+    Git("add", FLOWCONFIG_FILENAME).exec()
     Git("commit", message="feature: initialize git-flow").exec()
 
-        self._ensure_all_flow_branches_exist(branches, remote)
+    _ensure_all_flow_branches_exist(branches, remote)
 
-    def _ensure_is_repository(self):
+
+def _ensure_is_repository():
     if not Git.is_repository():
-            self.warning("El directorio actual no es un repositorio.")
+        warning("El directorio actual no es un repositorio.")
 
-            if not self.confirm("¿Desea inicializarlo?"):
+        if not confirm("¿Desea inicializarlo?"):
-                raise GitFlowError(
+            raise GitFlowError("No se puede continuar sin inicializar el repositorio")
-                    "No se puede continuar sin inicializar el repositorio"
-                )
 
         Git("init").exec()
 
-    def _ensure_not_already_initialized(self):
-        if os.path.isfile(FLOWCONFIG_FILE):
-            flowconfig = Git.get_config(FLOWCONFIG_FILE)
 
-            if flowconfig["flow.initialized"] == "true":
+def _ensure_not_already_initialized():
-                raise GitFlowError(
+    if not flowconfig:
-                    "El repositorio ya fue inicializado para usar git-flow"
+        return
-                )
+    elif flowconfig.get("flow.initialized") == "true":
+        raise GitFlowError("El repositorio ya fue inicializado para usar git-flow")
     else:
         raise GitFlowError("Valor de 'flow.initialized' es inválido")
 
-    def _setup_flow_branches(self):
+
-        self.info(
+def _setup_flow_branches():
-            """Ingrese las ramas que representan los entornos de deploy del proyecto en
+    panel(
-            orden creciente de cercanía al entorno productivo, y separados por coma.
+        "Configuración de entornos",
-            Por ejemplo: "dev,test,prod"."""
+        """Ingrese las ramas que representan los entornos de deploy del proyecto
+en orden creciente de cercanía al entorno productivo, y separados por
+coma. Por ejemplo: "dev, test, prod".""",
     )
 
-        branches = list(
+    branches = list(map(lambda b: b.strip(), prompt("Ramas", "main").split(",")))
-            map(lambda b: b.strip(), self.prompt("Ramas", "main").split(","))
-        )
 
     if not all(branches):
         raise GitFlowError("No puede ingresar una rama vacia")
 
     return branches
 
-    def _setup_flow_remote(self):
+
-        self.info(
+def _setup_flow_remote():
-            """Puede elegir o crear un repositorio remoto para generar automáticamente PRs"""
+    panel(
+        "Configuración de remoto",
+        "Puede configurar un repositorio remoto para generar PRs automáticamente",
     )
 
     remote = None
+    remote_type = None
 
-        if self.confirm("¿Configurar repositorio remoto?"):
+    if confirm("¿Configurar repositorio remoto?"):
-            remotes = Git("remote").lines()
+        remotes = Git("remote").lines(print="Listando remotos disponibles")
 
         if not remotes:
-                self.info("No tiene ningún repositorio remoto, se creará uno.")
+            info("No tiene ningún repositorio remoto, se creará uno.")
 
-                url = self.prompt(
+            url = prompt(
                 "Ingrese la URL del repositorio (e.g. https://github.com/user/repo.git)",
                 persistent=True,
             )
             remote = "origin"
-                Git("remote", "add", remote, url).exec()
+            Git("remote", "add", remote, url).exec(print="Agregando remoto")
         elif len(remotes) == 1:
             remote = remotes[0]
         else:
-                self.info("Tiene más de un remoto, seleccione el que va a utilizar.")
+            info("Tiene más de un remoto, seleccione el que va a utilizar.")
-                remote = self.choice("Remoto", remotes)
+            remote = choice("Remoto", remotes)
 
-        return remote
+        remote_type = choice("Tipo de remoto:", ["bitbucket", "github", "gitea"])
 
-    def _ensure_all_flow_branches_exist(self, branches: list[str], remote: str|None):
+    return (remote, remote_type)
+
+
+def _ensure_all_flow_branches_exist(branches: list[str], remote: str | None):
     existing_branches = Git.get_branches()
 
     if not all(map(lambda b: b in existing_branches, branches)):
-            self.warning("Algunas de las ramas de entornos expecificadas no existen.")
+        warning("Algunas de las ramas de entornos expecificadas no existen.")
-            self.info("Debe indicar sobre que rama se crearán las ramas de entorno.")
+        info("Debe indicar sobre que rama se crearán las ramas de entorno.")
 
-            target_branch = self.choice("Rama", existing_branches)
+        target_branch = choice("Rama", existing_branches)
 
         for branch in branches:
             if branch not in existing_branches:
-                    Git("branch", branch, target_branch).exec()
+                Git("branch", branch, target_branch).exec(
+                    print="Creando rama inexistente"
+                )
 
                 if remote:
-                        Git("push", remote, branch, set_upstream=True).exec()
+                    Git("push", remote, branch, set_upstream=True).exec(
+                        print="Creando rama en remoto"
+                    )

src/git_flow/command/merge.py

@@ -1,73 +1,74 @@
-from argparse import Namespace
+import typer
 from git_flow import GitFlowError
 from git_flow.changelog import Changelog
-from git_flow.command.base import Command
+from git_flow.command.base import *
 from git_flow.git import Git
 
+app = typer.Typer()
 
-class MergeCommand(Command):
-    def name(self) -> str:
-        return "merge"
 
-    def description(self) -> str:
+@app.command()
-        return """Realiza el merge de la rama, o crea el PR para hacerlo si tiene un remoto configurado"""
+def merge():
+    """Realiza el merge de la rama, o crea el PR para hacerlo si tiene un remoto configurado"""
+    ensure_initialized()
 
-    def run(self, args: Namespace = Namespace()):
+    branch = ensure_right_branch()
-        self.ensure_initialized()
 
-        branch = self.ensure_right_branch()
+    if branch in environments:
-        (target, _) = self.get_branch_env_and_type(branch)
+        if branch == environments[-1]:
-        base = Git.get_first_fork_point(branch, target)
+            raise GitFlowError("No se puede hacer un merge del último entorno.")
 
-        if "flow.remote" in self.flowconfig:
+        panel(
-            remote = self.flowconfig["flow.remote"]
+            "Merge de entornos",
-            token = self.ensure_repository_token()
+            """Está por hacer un merge de 2 entornos que puede implicar muchos cambios en el proyecto.""",
-            self.run_remote(remote, token, base, branch, target)
+        )
-        else:
-            self.run_local(base, branch, target)
 
-    def run_remote(self, remote: str, token: str, base: str, branch: str, target: str):
+        if not confirm("¿Desea continuar?"):
-        self.check_pending_changes(True)
-
-        Git("switch", target).exec()
-        Git("pull").exec()
-        Git("switch", "-").exec()
-
-        self.check_merge_conflicts(target)
-        self.show_commits_to_merge(base)
-
-        Git("push", remote, branch, set_upstream=True).exec()
-
-        self.create_pull_request(token, base, branch, target)
-
-    def run_local(self, base: str, branch: str, target: str):
-        self.check_pending_changes(False)
-        self.check_merge_conflicts(target)
-        self.show_commits_to_merge(base)
-
-        if self.confirm(f"Mergear rama '{target}' <= '{branch}'?"):
-            Git("switch", target).exec()
-            Git("merge", branch, ff=False).exec()
-
-    def check_pending_changes(self, has_remote: bool):
-        status = Git.status()
-
-        if not status:
-            return
-
-        not_empty = any(map(lambda s: s.index != " " or s.worktree != " ", status))
-
-        if not_empty:
-            if not has_remote:
-                self.warning("Existen cambios en tu entorno de trabajo sin commitear.")
-            else:
-                raise GitFlowError("No se puede continuar con cambios pendientes.")
-
-            if not self.confirm("¿Desea continuar?", False):
             raise GitFlowError("Ejecución abortada")
 
-    def show_commits_to_merge(self, base):
+        target = environments[environments.index(branch) + 1]
-        commits = Git("log", base + "..", format="%s").lines()
+    else:
+        target, _ = get_branch_env_and_type(branch)
+
+    if "flow.remote" in flowconfig:
+        remote = flowconfig["flow.remote"]
+        token = ensure_repository_token()
+        run_remote(remote, token, branch, target)
+    else:
+        run_local(branch, target)
+
+
+def run_remote(remote: str, token: str, branch: str, target: str):
+    ensure_clean_worktree(True)
+
+    Git("switch", target).exec(print="Cambiando a rama destino")
+    Git("pull").exec(print="Obteniendo ultimos cambios del remoto")
+    Git("switch", "-").exec(print="Volviendo a rama a mergear")
+
+    check_merge_conflicts(target)
+    show_commits_to_merge(target)
+
+    if confirm(f"¿Crear PR de '{branch}' a '{target}'?"):
+        if branch not in environments:
+            Git("push", remote, branch, set_upstream=True).exec(
+                print="Subiendo rama al remoto para crear PR"
+            )
+
+        create_pull_request(token, branch, target)
+
+
+def run_local(branch: str, target: str):
+    ensure_clean_worktree(False)
+    check_merge_conflicts(target)
+    show_commits_to_merge(target)
+
+    if confirm(f"¿Mergear rama '{branch}' a '{target}'?"):
+        Git("switch", target).exec(print="Cambiando a rama destino")
+        Git("merge", branch, ff=False).exec(print="Mergeando")
+
+
+def show_commits_to_merge(target):
+    commits = Git("log", target + "..", format="%s").lines()
 
     if not commits:
         raise GitFlowError("No hay cambios a mergear.")
@@ -77,27 +78,71 @@ class MergeCommand(Command):
     for commit in commits:
         print("- " + commit)
 
-    def check_merge_conflicts(self, target: str):
+
-        merge_conflicts = Git("merge", target, ff=False, commit=False).code() != 0
+def check_merge_conflicts(target: str):
+    merge_conflicts = Git("merge", target, ff=False, commit=False).code(
+        print="Realizando merge de prueba para verificar conflictos"
+    )
+
+    Git("merge", abort=True).exec(print="Abortando merge de prueba", check=False)
 
     if merge_conflicts:
-            Git("merge", abort=True).exec()
+        error(f"La rama actual tiene conflictos con {target}")
-            self.error(f"La rama actual tiene conflictos con {target}")
+        info(
-            self.info(
             f"""Se recomienda mergear {target} a la rama actual, resolver los conflictos localmente, y ejecutar nuevamente este comando"""
         )
         raise GitFlowError("Ejecución abortada.")
     else:
-            self.success("No se detectaron merge conflicts.")
+        success("No se detectaron merge conflicts.")
 
-    def create_pull_request(self, token: str, base: str, branch: str, target: str):
+
+def create_pull_request(token: str, branch: str, target: str):
     changelog = Changelog()
+    commits = Git("log", target + "..", format="%s").lines()
+    title = commits[0] if len(commits) == 1 else _get_pr_title_from_branch(branch)
 
-        message = self.get_remote_api(token).create_pull_request(
+    panel("Título del PR", title)
+
+    if confirm("¿Desea cambiar el título del PR?", False):
+        title = prompt("Título del PR")
+
+    message = get_remote_api(token).create_pull_request(
         branch,
         target,
-            branch.replace("/", ": ").replace("-", " "),
+        title,
-            changelog.generate_content(base, branch),
+        changelog.generate_content(target, branch),
+        branch not in environments
     )
 
-        self.success(message)
+    success(message)
+
+    if confirm("¿Desea cambiar a la rama objetivo y bajar los cambios?"):
+        Git("switch", target).exec(print="Cambiando a rama objetivo")
+        Git("pull").exec(print="Obteniendo cambios")
+
+def _get_pr_title_from_branch(branch: str) -> str:
+    if branch in environments:
+        target = environments[environments.index(branch) + 1]
+        return f"Sincronización de entorno {branch} a {target}"
+
+    components = branch.split("/") # <type>/<desc> or release/<env>/<type>/<desc>
+    branch_type = components[-2]
+    branch_desc = components[-1]
+
+    # detect if branch description has ticket as prefix: <desc> = ABC-123-my-branch-name
+    branch_ticket = None
+    first_dash = branch_desc.find("-")
+    second_dash = branch_desc.find("-", first_dash + 1)
+
+    if first_dash >= 0 and second_dash >= 0:
+        maybe_ticket = branch_desc[:second_dash]
+        if is_valid_ticket(maybe_ticket):
+            branch_ticket = maybe_ticket
+            branch_desc = branch_desc[second_dash+1:]
+
+    return " ".join(filter(None, [
+        f"[Pasaje a {components[1]}]" if len(components) == 4 else None,
+        branch_type + ":",
+        branch_ticket,
+        branch_desc.replace("-", " ")
+    ]))

src/git_flow/command/new.py

@@ -1,47 +1,62 @@
-from argparse import Namespace
+import typer
 from git_flow import BRANCH_TYPES
-from git_flow.command.base import Command
+from git_flow.command.base import *
 from git_flow.git import Git
+from typing import Optional
+
+app = typer.Typer()
 
 
-class NewCommand(Command):
+@app.command()
-    def name(self) -> str:
+def new():
-        return "new"
+    """Crea una nueva rama siguiendo Conventional Branches"""
 
-    def description(self) -> str:
+    ensure_initialized()
-        return """Crea una nueva rama siguiendo conventional branches"""
+    branch = ensure_right_branch()
 
-    def run(self, args: Namespace = Namespace()):
+    if branch not in environments:
-        self.ensure_initialized()
+        warning("La rama actual no corresponde a un entorno configurado.")
-        self.ensure_right_branch()
 
-        self.info("Se creará una nueva rama de trabajo sobre la rama actual.")
+    info("Se creará una nueva rama de trabajo sobre la rama actual.")
-        self.info("Debe seleccionar el tipo de cambio a realizar.")
+    info("Debe seleccionar el tipo de cambio a realizar.")
 
-        branch_type = self.choice("Tipos de cambio", BRANCH_TYPES)
+    branch_type = choice("Tipos de cambio", BRANCH_TYPES)
-        new_branch = self._get_unique_branch_name(branch_type)
+    ticket = _get_optional_ticket()
+    new_branch = _get_unique_branch_name(branch_type, ticket)
 
-        if self.confirm(f"¿Crear rama '{new_branch}' sobre la rama actual?"):
+    if "flow.remote" in flowconfig and Git.get_tracking_branch(branch):
-            Git("switch", new_branch, create=True).exec()
+        Git("pull").exec(print="Actualizando rama actual")
 
-    def _get_unique_branch_name(self, branch_type: str) -> str:
+    if confirm(f"¿Crear rama '{new_branch}' sobre la rama actual?"):
-        self.info(
+        Git("switch", new_branch, create=True).exec(print="Creando nueva rama")
-            f"Ingrese las palabras clave que describan el cambio de tipo '{branch_type}'."
+
-        )
+def _get_optional_ticket() -> Optional[str]:
+    ticket = prompt("[Opcional] Ticket que respalda el cambio (en formato ABC-123)")
+
+    if not ticket:
+        return None
+    if not is_valid_ticket(ticket):
+        warning("Formato de ticket inválido, ignorando.")
+        return None
+    
+    return ticket
+
+def _get_unique_branch_name(branch_type: str, ticket: Optional[str]) -> str:
+    info(f"Ingrese las palabras clave que describan el cambio de tipo '{branch_type}'.")
     branch = None
     branches = Git.get_branches()
 
     while branch is None:
-            keywords = self.prompt(
+        keywords = prompt(
             "Palabras clave del cambio (por ejemplo: 'create worker form')",
             persistent=True,
         )
 
         keywords = filter(lambda k: len(k) > 0, keywords.split(" "))
-            branch = branch_type + "/" + "-".join(keywords)
+        branch = branch_type + "/" + (ticket + "-" if ticket else "") + "-".join(keywords)
 
         if branch in branches:
-                self.error(
+            error(
                 f"La rama '{branch}' ya existe, cambie las palabras claves para generar otra"
             )
             branch = None

src/git_flow/command/release.py

@@ -0,0 +1,91 @@
+from git_flow import COMMIT_TYPES, GitFlowError
+from git_flow.command.base import *
+from git_flow.git import Git
+from typing import Optional
+import typer
+
+app = typer.Typer()
+
+
+@app.command()
+def release(group: Optional[str] = None):
+    """Realiza el merge de la rama, o crea el PR para hacerlo si tiene un remoto configurado"""
+    ensure_initialized()
+
+    branch = ensure_right_branch()
+    env, _ = get_branch_env_and_type(branch)
+
+    if env == environments[-1]:
+        raise GitFlowError(
+            "No se puede hacer release de una rama en el ultimo entorno."
+        )
+
+    has_remote = "flow.remote" in flowconfig
+
+    ensure_clean_worktree(has_remote)
+
+    next_env = environments[environments.index(env) + 1]
+    next_branch = (
+        branch.replace(f"/{env}/", f"/{next_env}/")
+        if branch.startswith("release/")
+        else f"release/{next_env}/{branch}"
+    )
+
+    base = Git.get_first_fork_point(branch, env)
+    commits = Git("log", base + "..", format="%s").lines()
+
+    if not commits:
+        raise GitFlowError("No hay cambios a mergear.")
+
+    print("Cambios a pasar al proximo entorno:")
+
+    for commit in commits:
+        print("- " + commit)
+
+    grouping = group is not None
+
+    if not group:
+        if confirm("¿Desea agrupar este release con otra rama?", False):
+            grouping = True
+            group = choice(
+                "Grupo release: ", Git.get_branches("release/" + next_env + "/")
+            )
+        else:
+            group = next_env
+
+    if has_remote and Git.get_tracking_branch(group):
+        Git("switch", group).exec(print="Cambiando a la rama objetivo")
+        Git("pull").exec(print="Sincronizando cambios la rama objetivo")
+        Git("switch", "-").exec(print="Volviendo a la rama original")
+
+    if len(commits) > 1 and confirm(
+        f"¿Desea reemplazar los {len(commits)} commits de la rama por uno solo?", False
+    ):
+        info("Debe ingresar el mensaje del commit a crear.")
+
+        commit_type = choice("Tipo de commit", COMMIT_TYPES[:-1])
+        commit_message = prompt(
+            "Mensaje (máximo recomendado: 100 caracteres)", persistent=True
+        )
+        message = commit_type + ": " + commit_message
+
+        Git("switch", next_branch, base, create=True).exec(
+            print="Creando rama release en base"
+        )
+        Git("merge", branch, squash=True).exec(print="Squasheando commits en uno solo")
+        Git("commit", m=message).exec(print="Creando commit único")
+    else:
+        Git("switch", next_branch, create=True).exec(print="Creando rama release")
+
+    status = Git("rebase", base, next_branch, onto=group).code(
+        print="Moviendo cambios hacia el siguiente ambiente"
+    )
+
+    if status:
+        Git("rebase", abort=True).exec(print="Deshaciendo cambios por conflictos")
+        raise GitFlowError("Error al realizar pasaje de cambios a rama objetivo")
+    elif grouping:
+        Git("switch", group).exec(print="Cambiando a rama objetivo")
+        Git("merge", next_branch, ff_only=True).exec(
+            print="Mergeando cambios de la nueva rama"
+        )

src/git_flow/command/tag.py

@@ -1,4 +1,3 @@
-from argparse import ArgumentParser, Namespace
 from git_flow import (
     COMMIT_TYPE_INCREMENT,
     SEMVER_MAJOR,
@@ -8,67 +7,64 @@ from git_flow import (
     GitFlowError,
 )
 from git_flow.changelog import Changelog
-from git_flow.command.base import Command
+from git_flow.command.base import *
 from git_flow.git import Git
+from typing import Optional
+import typer
+
+app = typer.Typer()
 
 
-class TagCommand(Command):
+@app.command()
-    def name(self) -> str:
+def tag(token: Optional[str] = None):
-        return "tag"
+    """Crea un nuevo tag para el último merge."""
+    ensure_initialized()
 
-    def description(self) -> str:
-        return """Crea un nuevo tag para el último merge."""
-
-    def run(self, args: Namespace = Namespace()):
-        self.ensure_initialized()
-
-        envs = self.flowconfig["flow.branches"].split(",")
     target = Git.get_current_branch()
 
-        if target not in envs:
+    if target not in environments:
         raise GitFlowError("Solo se pueden taggear commits en ramas principales.")
 
-        merge_commit = self.get_last_merge_commit()
+    branch = Git(
-
+        "show", get_last_merge_commit() + "^2", patch=False, format="%h"
-        self.check_not_tagged(merge_commit)
+    ).firstline()
-
-        branch = Git("show", merge_commit + "^2", patch=False, format="%h").firstline()
     base = Git.get_first_fork_point(branch, target)
     commits = Git("log", base + ".." + branch, format="%s").lines()
-        next_tag = self.get_next_tag_from_commits(commits, target)
+    next_tag = get_next_tag_from_commits(commits, target)
 
     if not next_tag:
-            self.info(
+        info(
             "Los cambios realizados no implican un salto de versión, se mantiene la anterior."
         )
         return
 
-        (token, ci) = self.get_token_and_ci(args)
+    token, ci = get_token_and_ci(token)
+
+    if not token:
+        raise GitFlowError("No hay token disponible")
 
-        if ci:
-            message = self.get_remote_api(token).create_tag(next_tag, merge_commit)
     changelog = Changelog()
 
-            self.success(message)
     changelog.update(next_tag, base, branch)
-            Git("add", Changelog.FILENAME).exec()
+    Git("add", Changelog.FILENAME).exec(print="Agregando nuevo CHANGELOG.md")
-            Git("commit", message=Changelog.COMMIT_MESSAGE).exec()
+    Git("commit", message=Changelog.COMMIT_MESSAGE).exec(print="Creando commit")
-            Git("push").exec()
+    tag_commit = Git("show", "HEAD", patch=False, format="%h").firstline()
-        else:
-            Git("tag", next_tag, merge_commit).exec()
 
-    def get_token_and_ci(self, args: Namespace):
+    if ci:
+        Git("push").exec(print="Subiendo commit al remoto para taggearlo")
+        success(get_remote_api(token).create_tag(next_tag, tag_commit))
+
+    Git("tag", next_tag, tag_commit).exec(print="Creando tag localmente")
+
+
+def get_token_and_ci(token: Optional[str]):
     try:
-            return (self.ensure_repository_token(), False)
+        return (ensure_repository_token(), False)
-        except GitFlowError as e:
+    except GitFlowError:
-            return (args.token, True)
+        return (token, True)
 
-    def setup_parser(self, parser: ArgumentParser) -> ArgumentParser:
-        parser.add_argument("--token")
 
-        return parser
+def get_last_merge_commit():
-
-    def get_last_merge_commit(self):
     commit = Git(
         "log", first_parent=True, merges=True, max_count=1, format="%h"
     ).firstline()
@@ -78,28 +74,24 @@ class TagCommand(Command):
 
     return commit
 
-    def check_not_tagged(self, commit: str):
+
-        tag = (
+def check_not_tagged(commit: str):
-            Git("describe", commit, tags=True, exact_match=True)
+    tag = Git("describe", commit, tags=True, exact_match=True).firstline(check=False)
-            .without_checking()
-            .firstline()
-        )
 
     if tag:
-            raise GitFlowError("El ultimo merge ya tiene tag: " + tag)
+        raise GitFlowError("El commit a taggear ya tiene tag: " + tag)
 
-    def get_next_tag_from_commits(self, commits: list[str], branch: str) -> str | None:
+
+def get_next_tag_from_commits(commits: list[str], branch: str) -> str | None:
     increment = SEMVER_SKIP
     for commit in commits:
         commit_type = commit[: commit.index(":")]
-            increment = max(
+        increment = max(increment, COMMIT_TYPE_INCREMENT.get(commit_type, SEMVER_SKIP))
-                increment, COMMIT_TYPE_INCREMENT.get(commit_type, SEMVER_SKIP)
-            )
 
     tag = Git.get_current_tag() or f"v0.0.0-{branch}"
 
     until_dash = tag.index("-") if "-" in tag else None
-        suffix = tag[until_dash + 1 :] if until_dash is not None else ""
+    suffix = tag[until_dash:] if until_dash is not None else ""
     [major, minor, patch] = map(int, tag[1:until_dash].split("."))
 
     if increment == SEMVER_MAJOR:
@@ -111,5 +103,7 @@ class TagCommand(Command):
         patch = 0
     elif increment == SEMVER_PATCH:
         patch += 1
+    elif increment == SEMVER_SKIP:
+        suffix = "-r" + Git("rev-list", "HEAD", count=True).firstline()
 
     return None if increment == SEMVER_SKIP else f"v{major}.{minor}.{patch}{suffix}"

src/git_flow/git.py

@@ -1,15 +1,9 @@
 import subprocess
 
+from git_flow import FLOWCONFIG_FILENAME
 from git_flow.io import *
 
 
-FLOWCONFIG_FILE = ".flowconfig"
-
-CHANGELOG_FILE = "CHANGELOG.md"
-
-BUMP_VERSION = "chore: bump version and update CHANGELOG.md [skip ci]"
-
-
 class Git:
     class Status:
         worktree: str
@@ -22,7 +16,6 @@ class Git:
             self.file = line[3:].strip("\n")
 
     command: list[str]
-    check_returncode: bool = True
 
     @staticmethod
     def get_config(file: str | None = None):
@@ -39,20 +32,20 @@ class Git:
 
     @staticmethod
     def set_config(config: dict[str, str], file: str | None = None):
-        for key, value in config:
+        for key, value in config.items():
             Git("config", key, value, file=file).exec()
 
     @staticmethod
     def flow_config(*args, **kwargs):
-        return Git("config", *args, file=FLOWCONFIG_FILE, **kwargs)
+        return Git("config", *args, file=FLOWCONFIG_FILENAME, **kwargs)
 
     @staticmethod
     def get_current_branch():
         return Git("rev-parse", "HEAD", abbrev_ref=True).firstline()
 
     @staticmethod
-    def get_branches():
+    def get_branches(prefix: str = ""):
-        return Git._get_references("heads")
+        return Git._get_references("heads/" + prefix)
 
     @staticmethod
     def status():
@@ -60,37 +53,37 @@ class Git:
 
     @staticmethod
     def get_current_tag():
-        return Git("describe", abbrev="0", tags=True).without_checking().firstline()
+        return Git("describe", abbrev="0", tags=True).firstline(check=False)
 
     @staticmethod
     def get_first_fork_point(branch: str, env: str):
-        boundary_commits = list(
+        # Lista de commits alcanzables por el entorno (por ejemplo, dev),
-            filter(
+        env_commits = Git("rev-list", env + "..." + branch, first_parent=True).lines()
-                lambda c: c.startswith("-"),  # boundary commits
-                Git(
-                    "rev-list", env + "..." + branch, topo_order=True, boundary=True
-                ).lines(),
-            )
-        )
 
-        if not boundary_commits:
+        if not env_commits:
             raise RuntimeError("No se encontro un commit base para realizar el rebase.")
 
-        return boundary_commits[-1].removeprefix("-")
+        return Git("show", env_commits[-1] + "^", patch=False, format="%h").firstline()
 
     @staticmethod
     def _get_references(kind: str):
-        prefix = "refs/" + kind + "/"
+        prefix = "refs/" + kind
-        return list(map(
+        return Git("for-each-ref", prefix + "**", format="%(refname:short)").lines()
-            lambda r: r.removeprefix(prefix),
-            Git("for-each-ref", prefix + "*", format="%(refname)").lines(),
-        ))
 
     @staticmethod
     def is_repository() -> bool:
         return Git("rev-parse", is_inside_work_tree=True).code() == 0
 
-    def __init__(self, subcommand: str, *args: str, **kwargs: str | int | bool | None) -> None:
+    @staticmethod
+    def get_tracking_branch(branch: str) -> str | None:
+        try:
+            return Git("rev-parse", branch + "@{upstream}", abbrev_ref=True).firstline()
+        except subprocess.CalledProcessError:
+            return None
+
+    def __init__(
+        self, subcommand: str, *args: str, **kwargs: str | int | bool | list[str] | None
+    ) -> None:
         self.command = ["git", subcommand]
 
         for option, value in kwargs.items():
@@ -104,6 +97,9 @@ class Git:
                     self.command.append(prefix + option)
             elif value is None:
                 continue
+            elif isinstance(value, list):
+                for v in value:
+                    self.command.append("--" + option + "=" + v)
             else:
                 value = value if isinstance(value, str) else str(value)
 
@@ -115,44 +111,48 @@ class Git:
 
         self.command += args
 
-    def lines(self, strip: bool = True):
+    def lines(self, strip: bool = True, **kwargs):
-        process = subprocess.run(self.command, capture_output=True, text=True)
+        process = self._get(**kwargs)
-
-        self.__print_process(process.stdout, process.stderr)
-
-        if self.check_returncode:
-            process.check_returncode()
-
         lines = process.stdout.splitlines()
 
         return lines if not strip else list(map(lambda l: l.strip(), lines))
 
-    def firstline(self):
+    def firstline(self, **kwargs: bool):
-        lines = self.lines()
+        lines = self.lines(**kwargs)
 
         return lines[0] if lines else ""
 
-    def exec(self):
+    def code(self, **kwargs):
+        return self._run(check=False, **kwargs).returncode
+
+    def exec(self, **kwargs):
+        self._run(**kwargs)
+
+    def _get(self, print: str | None = None, check: bool = True):
         process = subprocess.run(self.command, capture_output=True, text=True)
 
-        self.__print_process(process.stdout, process.stderr)
+        if print is not None:
+            self._print_process(process.stdout, process.stderr, print)
 
-        if self.check_returncode:
+        if check:
             process.check_returncode()
 
-    def code(self):
+        return process
-        process = subprocess.run(self.command, capture_output=True, text=True)
 
-        self.__print_process(process.stdout, process.stderr)
+    def _run(self, print: str | None = None, check: bool = True):
+        process = subprocess.run(
+            self.command, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL
+        )
 
-        return process.returncode
+        if print is not None:
+            self._print_process("", "", title=print)
 
-    def without_checking(self):
+        if check:
-        self.check_returncode = False
+            process.check_returncode()
 
-        return self
+        return process
 
-    def __print_process(self, stdout: str, stderr: str):
+    def _print_process(self, stdout: str, stderr: str, title: str):
         command = []
 
         for arg in self.command:
@@ -164,10 +164,12 @@ class Git:
 
             command.append(arg)
 
-        print(COLOR_YELLOW + "> " + " ".join(command) + COLOR_RESET)
+        text = f"[yellow]$ {" ".join(command)}[/yellow]"
 
         for line in stdout.splitlines():
-            print(COLOR_BLUE + "< " + line + COLOR_RESET)
+            text += "\n\\[out] " + line
 
         for line in stderr.splitlines():
-            print(COLOR_RED + "! " + line + COLOR_RESET)
+            text += "\n[red]\\[err][/red] " + line
+
+        panel(title or "Ejecutando", text)

src/git_flow/io.py

@@ -1,64 +1,55 @@
-import sys
+from rich.console import Console
+from rich.prompt import Prompt, Confirm
+from rich.panel import Panel
+
+console = Console(highlight=False)
 
 
-COLOR_BLACK = '\033[30m'
+def success(msg: str):
-COLOR_RED = '\033[31m'
+    console.print(f":white_check_mark: [green]{msg}[/green]")
-COLOR_GREEN = '\033[32m'
-COLOR_YELLOW = '\033[33m'
-COLOR_BLUE = '\033[34m'
-COLOR_BLACK_BOLD = '\033[1;30m'
-COLOR_RESET = '\033[0m'
 
 
-def confirm(prompt, default: bool = True):
+def warning(msg: str):
-    user_input = input(prompt + (" [Y/n]: " if default else " [y/N]: "))
+    console.print(f":warning: [yellow]{msg}[/yellow]")
-
-    return default if len(user_input) == 0 else user_input.startswith("y")
 
 
-def choose(prompt: str, options: list[str]):
+def error(msg: str):
-    print(prompt)
+    console.print(f":x: [red]{msg}[/red]")
 
-    for i, option in enumerate(options):
-        print(f"\t{i+1}. {option}")
 
-    selection = None
+def info(msg: str):
+    console.print(f":information: [blue]{msg}[/blue]")
 
-    while selection is None:
-        user_input = input(f"Seleccione una opción [1-{len(options)}] o escribala: ")
 
-        if user_input.isdigit():
+def panel(title: str, text: str):
-            user_input = int(user_input)
+    console.print(Panel(text, title=title, expand=False, title_align="left"))
 
-            if 1 <= user_input and user_input <= len(options):
-                selection = options[user_input - 1]
 
-                if not confirm(
+def prompt(
-                    f"Seleccionó la opción {user_input} ({selection}), ¿es correcto?"
+    prompt: str,
-                ):
+    default: str | None = None,
-                    selection = None
+    persistent: bool = False,
+    strip: bool = True,
+) -> str:
+    onetime = not persistent
+
+    while onetime or persistent:
+        result = Prompt.ask(prompt)
+        result = result.strip() if strip else result
+
+        if result:
+            return result
+        elif default is not None:
+            return default
+        elif persistent:
+            error("Debe ingresar un valor no vacío.")
         else:
-                print_error(f"La opción {user_input} está fuera del rango permitido.")
+            return result
-        elif user_input in options:
-            selection = user_input
-        else:
-            print_error(f"La opción '{user_input}' es inválida.")
-
-    return selection
 
 
-def print_error(message: str):
+def confirm(question: str, default: bool = True):
-    print(f"{COLOR_RED}[err] {message}{COLOR_RESET}", file=sys.stderr)
+    return Confirm.ask(question, default=default)
 
 
-def print_warning(message: str):
+def choice(prompt: str, options: list[str]):
-    print(f"{COLOR_YELLOW}[wrn] {message}{COLOR_RESET}")
+    return Prompt.ask(prompt, choices=options)
-
-def print_success(message: str):
-    print(f"{COLOR_GREEN}[ok!] {message}{COLOR_RESET}")
-
-def print_info(message: str):
-    print(f"{COLOR_BLUE}[inf] {message}{COLOR_RESET}")
-
-def print_debug(message: str):
-    print(f"{COLOR_BLACK_BOLD}[dbg] {message}{COLOR_RESET}")

src/git_flow/main.py

@@ -1,518 +1,32 @@
 #!/usr/bin/env python3
 
-import os
+import typer
-import sys
-import datetime
-import requests
-import locale
-from argparse import Namespace, ArgumentParser
 
 from git_flow import GitFlowError
-from git_flow.changelog import Changelog
+from git_flow.command.base import *
-from git_flow.command.base import Command
+from git_flow.command import init, new, commit, merge, tag, release, branch
-from git_flow.command.commit import CommitCommand
+
-from git_flow.command.init import InitCommand
+REPOSITORY_TOKEN_PATH = ".repository-token"
-from git_flow.command.merge import MergeCommand
+LOCALE = "es_AR.UTF-8"
-from git_flow.command.new import NewCommand
-from git_flow.command.tag import TagCommand
-from git_flow.git import BUMP_VERSION, Git
-from git_flow.io import *
 
 
-REPOSITORY_TOKEN_PATH=".repository-token"
+app = typer.Typer()
-LOCALE = 'es_AR.UTF-8'
+app.add_typer(init.app)
-
+app.add_typer(new.app)
-class GitFlowCommand(Command):
+app.add_typer(commit.app)
-    commands: tuple[Command, ...]
+app.add_typer(merge.app)
-
+app.add_typer(tag.app)
-    def __init__(self, *args: Command) -> None:
+app.add_typer(release.app)
-        self.commands = args
+app.add_typer(branch.app)
-
-    def name(self) -> str:
-        return "git-flow"
-
-    def description(self) -> str:
-        return """Git flow es un workflow automatizado siguiendo conventional commits, semver, y
-        deploys aislados a distintos entornos."""
-
-    def setup_parser(self, parser: ArgumentParser) -> ArgumentParser:
-        subparsers = parser.add_subparsers(title="comandos", dest="command", required=True)
-
-        for command in self.commands:
-            subparser = subparsers.add_parser(command.name())
-            command.setup_parser(subparser)
-
-        return parser
-
-    def get_parser(self) -> ArgumentParser:
-        parser = ArgumentParser(self.name(), description=self.description())
-
-        return self.setup_parser(parser)
-
-    def run(self, args: Namespace = Namespace()):
-        args = self.get_parser().parse_args()
-
-        for command in self.commands:
-            if command.name() == args.command:
-                return command.run(args)
 
 
 def main():
     try:
-        locale.setlocale(locale.LC_ALL, LOCALE)
+        app()
-    except locale.Error as e:
-        print_warning(f"No se pudo configurar el locale '{LOCALE}': {e}")
-
-    command = GitFlowCommand(
-        InitCommand(),
-        NewCommand(),
-        CommitCommand(),
-        MergeCommand(),
-        TagCommand(),
-    )
-    try:
-        command.run()
     except GitFlowError as e:
-        command.error(str(e))
+        error(str(e))
     except Exception as e:
-        command.error("Ocurrió un error inesperado: " + str(e))
+        error("Ocurrió un error inesperado: " + str(e))
-
+    except KeyboardInterrupt as e:
-    return
+        print()
-
+        error("Ejecución abortada")
-    args = sys.argv
-
-    if len(args) < 2:
-        print_error("missing command")
-        return
-
-    command = args[1]
-
-    try:
-        if command == "tag":
-            tag_command()
-        elif command == "release":
-            release_command()
-        elif command == "help":
-            help_command()
-        else:
-            help_command(command)
-    except Exception as e:
-        print_error(f"Ocurrio un error al ejecutar el comando: {e}")
-
-
-
-BRANCH_TYPES = [
-    "feature",
-    "refactor",
-    "bugfix",
-    "hotfix",
-    "perf",
-    "docs",
-    "typo",
-    "testing",
-    "breaking",
-]
-
-BRANCH_TYPES_INCREMENT = {
-    "feature": "minor",
-    "refactor": "minor",
-    "bugfix": "patch",
-    "hotfix": "patch",
-    "perf": "minor",
-    "docs": "patch",
-    "typo": "patch",
-    "testing": "patch",
-    "breaking": "major",
-}
-
-COMMIT_TYPES = [
-    "feature",
-    "bugfix",
-    "hotfix",
-    "refactor",
-    "perf",
-    "docs",
-    "typo",
-    "testing",
-    "ignore",
-    "wip"
-]
-
-DEFAULT_REMOTE = "origin"
-
-
-def parse_url(url: str) -> list[str]:
-    if "@" in url:
-        # git@github.com:username/repository.git
-        start = url.find("@") + 1
-        end = url.find(":")
-        service = url[start : end]
-        start = end + 1
-        end = url.find(".git") if ".git" in url else len(url)
-        repository = url[start : end]
-    elif "://" in url:
-        # https://github.com/username/repository.git
-        start = url.index("://") + 3
-        end = url.index("/", start)
-        service = url[start : end]
-        start = end + 1
-        end = url.find(".git") if ".git" in url else len(url)
-        repository = url[start : end]
-    else:
-        raise RuntimeError("Invalid url: " + url)
-
-    # Esto permite utilizar un Host ficticio si tenemos 2 cuentas de bitbucket (personal y trabajo)
-    if service.endswith(".bitbucket.org"):
-        service = "bitbucket.org"
-
-    return [service, repository]
-
-
-def get_branch_env_and_type(branch: str) -> tuple[str, str]:
-    components = branch.split("/")
-    target_branches = Git.flow_config("flow.branches").firstline().split(" ")
-
-    if len(components) == 2:
-        if components[0] not in BRANCH_TYPES:
-            raise ValueError(f"Branch inválida, el tipo '{components[0]}' no es válido.")
-
-        return (target_branches[0], components[0])
-    elif len(components) == 4:
-        target_branches = target_branches[1:]
-
-        if (
-            components[0] != "release"
-            or components[1] not in target_branches
-            or components[2] not in BRANCH_TYPES
-        ):
-            raise ValueError(
-                "Branch release inválido, debe tener el siguiente formato: "
-                "release/<env>/<type>/<name>, pero es: " + branch
-            )
-
-        return (components[1], components[2])
-    else:
-        raise ValueError("Branch inválido: " + branch)
-
-
-def tag_command():
-    ensure_initialized()
-    ci = len(sys.argv) == 3 # ./git-flow tag <BEARER>
-    token = sys.argv[2] if ci else None
-
-    if token is None:
-        with open(REPOSITORY_TOKEN_PATH, "r") as file:
-            token = file.readline().strip()
-
-    output = Git("log", first_parent=True, merges=True, max_count=1, format="%H,%s").lines()
-
-    if not output:
-        print_error("No hay merges a taggear")
-        return
-
-    output = output[0]
-    pos = output.index(',')
-    commit = output[:pos]
-    message = output[pos+1:]
-    merged_branch = None
-
-    output = Git("describe", commit, tags=True, exact_match=True).without_checking().firstline()
-
-    if output:
-        print_error("El ultimo merge ya tiene tag: " + output)
-        return
-
-    if message.startswith("Merged in "):
-        merged_branch = message.removeprefix("Merged in ")
-        merged_branch = merged_branch[:merged_branch.index(' ')]
-    elif message.startswith("Merge branch '"):
-        merged_branch = message.removeprefix("Merge branch '")
-        merged_branch = merged_branch[:merged_branch.index("'")]
-    else:
-        print_error("No se pudo obtener el nombre de la rama mergeada")
-        return
-
-    remote = Git.flow_config("flow.remote").firstline()
-    branch = Git.get_current_branch()
-    last_version = Git.get_current_tag() or "v1.0.0"
-    from_major = 1
-    until_dash = last_version.index("-") if "-" in last_version else None
-    [major, minor, patch] = map(int, last_version[from_major:until_dash].split("."))
-
-    (_, merged_branch_type) = get_branch_env_and_type(merged_branch)
-    increment = BRANCH_TYPES_INCREMENT[merged_branch_type]
-
-    if increment == "major":
-        major = major + 1
-        minor = 0
-        patch = 0
-    elif increment == "minor":
-        minor = minor + 1
-        patch = 0
-    elif increment == "patch":
-        patch = patch + 1
-
-    last_branch = Git.flow_config("flow.branches").firstline().split(" ")[-1]
-    suffix = "-" + branch if branch != last_branch else ""
-    new_version = f"v{major}.{minor}.{patch}" + suffix
-
-    if ci:
-        url = Git("remote", "get-url", remote).firstline()
-
-        if url:
-            [service, repository] = parse_url(url)
-            create_tag(service, repository, token, new_version, commit)
-
-        merged_commit = Git("show", "HEAD^2", patch=False, format="%H").firstline()
-        if update_changelog(merged_commit, branch):
-            Git("add", Changelog.FILENAME).exec()
-            Git("commit", message=BUMP_VERSION).exec()
-            Git("push").exec()
-    else:
-        Git("tag", new_version, commit).exec()
-
-
-def release_command():
-    ensure_initialized()
-
-    branch = ensure_right_branch()
-    env_branches = Git.flow_config("flow.branches").firstline().split(" ")
-    (env, _) = get_branch_env_and_type(branch)
-
-    if env == env_branches[-1]:
-        raise RuntimeError("No se puede hacer release de una rama en el ultimo entorno.")
-
-    base = Git.get_first_fork_point(branch, env)
-    next_env = env_branches[env_branches.index(env) + 1]
-    next_branch = branch.replace(f"/{env}/", f"/{next_env}/") if branch.startswith("release/") else f"release/{next_env}/{branch}"
-
-    Git("switch", next_branch, create=True).exec()
-    commits = int(Git("rev-list", base + ".." + next_branch, count=True).firstline())
-
-    if commits > 1 and confirm(f"Desea reemplazar los {commits} commits de la rama por uno solo?"):
-        Git("reset", base, soft=True).exec()
-        commit_type = choose("Tipo de commit", COMMIT_TYPES[:-1]) # Solo permitir commits NO wip
-        Git("commit", m=commit_type + ": " + get_commit_message()).exec()
-
-    Git("rebase", base, next_branch, onto=next_env).exec()
-
-
-def help_command(name: str|None = None):
-    if name is not None:
-        print_error(f"Comando inválido: {name}")
-
-    script = sys.argv[0]
-
-    print(f"""USO:
-    {script} <COMANDO>
-
-COMANDOS:
-    init     inicializa el repositorio por única vez para utilizar git-flow
-    new      crea una nueva rama para realizar cambios
-    commit   crea un commit siguiendo el formato de Conventional Commit
-    merge    actualiza el changelog y crea un nuevo PR para mergear la rama
-    tag      crea un nuevo tag para el ultimo merge
-    release  crea una nueva rama release para pasar la rama actual al siguiente entorno
-    help     muestra este texto de ayuda""", file=sys.stderr)
-
-
-def ensure_initialized():
-    initialized = Git.flow_config("flow.initialized").firstline()
-
-    if initialized == "":
-        raise RuntimeError("El repositorio no fue inicializado, antes de continuar ejecute `git flow init`.")
-    elif initialized != "true":
-        raise RuntimeError(f"El valor de `flow.initialized` ({initialized}) es inválido.")
-
-
-def get_commit_message():
-    message = None
-
-    while message is None:
-        message = input("Mensaje (recomendado: 100 caracteres): ").strip()
-
-        if not message:
-            print_error("El mensaje no puede ser vacío.")
-            message = None
-
-    return message
-
-
-def ensure_right_branch():
-    branch = Git.get_current_branch()
-
-    if branch != "HEAD":
-        if confirm(f"Se encuentra sobre la rama '{branch}'. ¿Es correcto?"):
-            return branch
-
-    raise RuntimeError("Abortando operación")
-
-
-def get_base_branch(branch: str):
-    if branch.startswith("release/"):
-        start = len("release/")
-        end = branch.index("/", start)
-        return branch[start:end]
-    else:
-        return Git.flow_config("flow.branches").firstline().split(" ")[0]
-
-
-def get_unique_branch_name(branch_type):
-    print_info(f"Ingrese las palabras clave que describan el cambio de tipo '{branch_type}'.")
-    branch = None
-    branches = Git.get_branches()
-
-    while branch is None:
-        keywords = input("Palabras clave (por ej. 'edit worker form'): ")
-
-        if len(keywords) == 0:
-            print_error("Debe ingresar al menos una palabra clave.")
-        else:
-            keywords = list(filter(lambda k: len(k) > 0, keywords.split(" ")))
-            branch = branch_type + "/" + "-".join(keywords)
-
-            if branch in branches:
-                print_error(
-                    f"La rama '{branch}' ya existe, cambie las palabras claves para generar otra"
-                )
-                branch = None
-
-    return branch
-
-
-def update_changelog(branch: str, target: str):
-    last_commit = Git("show", "HEAD", no_patch=True, format="%s").firstline()
-
-    if last_commit == BUMP_VERSION:
-        return False
-    else:
-        content = generate_changelog_entry(branch, target)
-
-        if os.path.isfile(Changelog.FILENAME):
-            with open(Changelog.FILENAME, "r") as changelog:
-                content = content + changelog.read()
-
-        with open(Changelog.FILENAME, "w") as changelog:
-            changelog.write(content)
-
-
-        return True
-
-
-def get_changelog_header_lines(branch: str):
-    name = Git("config", "user.name").firstline()
-    email = Git("config", "user.email").firstline()
-
-    now = datetime.datetime.now()
-    weekday = now.strftime("%A").capitalize()
-    month = now.strftime("%B").capitalize()
-    timestamp = now.strftime(f"{weekday}, %e de {month} de %Y, %H:%M")
-
-    return [
-        f"## {timestamp}",
-        "",
-        f"- Autor: [{name}](mailto:{email})",
-        f"- Rama: `{branch}`",
-        "",
-        "### Commits",
-        ""
-    ]
-
-def get_changelog_content_lines(branch: str, target: str):
-    lines = []
-    base = Git.get_first_fork_point(branch, target)
-    commits = Git("log", base + ".." + branch, first_parent=True, format="%h", merges=False).lines()
-
-    for commit in commits:
-        message = Git("show", commit, patch=False, format="%s").firstline()
-        email = Git("show", commit, patch=False, format="%ae").firstline()
-        username = email[:email.index('@')]
-
-        if message == BUMP_VERSION:
-            continue
-
-        index = message.index(":")
-        commit_type = message[:index]
-        commit_message = message[index+1:]
-
-        lines.append(f"- **{commit_type}**: {commit_message} [[{username}](mailto:{email})] ({commit})")
-
-    return lines
-
-def get_changelog_footer_lines():
-    return [
-        "",
-        "---",
-        "",
-        ""
-    ]
-
-def generate_changelog_entry(branch: str, target: str):
-    entry_lines = get_changelog_header_lines(branch)
-    entry_lines += get_changelog_content_lines(branch, target)
-    entry_lines += get_changelog_footer_lines()
-
-    return "\n".join(entry_lines)
-
-
-def create_pull_request(service: str, repository: str, source: str, destination: str):
-    endpoint = get_api_endpoint(service, repository, "/pullrequests")
-    title = source.replace("/", ": ").replace("-", " ")
-    description = "\n".join(get_changelog_content_lines(source, destination))
-    headers = get_headers()
-
-    json = {
-        "title": title,
-        "description": description,
-        "source": {"branch": {"name": source}},
-        "destination": {"branch": {"name": destination}},
-        "close_source_branch": True
-    }
-
-    request = requests.post(endpoint, headers=headers, json=json)
-
-    if request.ok:
-        json = request.json()
-        print_success("PR creado exitosamente: " + json['links']['html']['href'])
-    else:
-        print_error("Ocurrió un error al crear el PR: " + request.text)
-
-
-def create_tag(service: str, repository: str, token: str, tag: str, commit: str):
-    endpoint = get_api_endpoint(service, repository, "/refs/tags")
-    headers = get_headers(token)
-    json = {
-        "name": tag,
-        "target": {
-            "hash": commit
-        }
-    }
-
-    response = requests.post(endpoint, headers=headers, json=json)
-
-    if response.ok:
-        print("Tag creado exitosamente.")
-    else:
-        print_error("Ocurrió un error al crear el tag: " + response.text)
-
-
-def get_headers(token: str | None = None):
-    if not token:
-        with open(REPOSITORY_TOKEN_PATH) as file:
-            token = file.readline().strip()
-
-    return {
-        "Accept": "application/json",
-        "Content-Type": "application/json",
-        "Authorization": "Bearer " + token,
-    }
-
-
-def get_api_endpoint(service: str, repository: str, path: str):
-    if service == "bitbucket.org":
-        return "https://api.bitbucket.org/2.0/repositories/" + repository + path
-
-    return ""
-
-if __name__ == "__main__":
-    main()

src/git_flow/remote/base.py

@@ -12,42 +12,24 @@ class RemoteAPI(ABC):
     @staticmethod
     def parse(remote: str):
         url = Git("remote", "get-url", remote).firstline()
-        invalid_url_error = GitFlowError(f"La URL del remoto {remote} es inválida: {url}")
-        url_type = None
 
         if url.startswith("git@"):
-            url_type = "ssh"
-        elif url.startswith("http://") or url.startswith("https://"):
-            url_type = "https"
-        else:
-            raise invalid_url_error
-
-        if url_type == "ssh":
-            # git@host:user/repo[.git]
             at_pos = url.index("@")
             colon_pos = url.index(":")
+            schema = "ssh://"
             host = url[at_pos+1:colon_pos]
             repository = url[colon_pos+1:]
-        else:
+        elif url.startswith("http://") or url.startswith("https://"):
-            # https://host/user/repo[.git]
+            start_pos = url.index("://") + 3
-            host_start = url.index("://") + 3
+            uri_start = url.index("/", start_pos)
-            uri_start = url.index("/", host_start)
+            schema = url[:start_pos]
-            host = url[host_start:uri_start]
+            host = url[start_pos:uri_start]
             repository = url[uri_start+1:]
+        else:
+            raise GitFlowError(f"La URL del remoto {remote} es inválida: {url}")
 
-        # Esto permite configurar hosts "imaginarios" para permitir el uso de multiples claves ssh
+        repository = repository.removesuffix(".git")
-        if host.endswith(".bitbucket.org"):
+        return [schema, host, repository]
-            host = "bitbucket.org"
-        elif host.endswith(".github.com"):
-            host = "github.com"
-
-        if host not in SUPPORTED_REMOTE_APIS:
-            raise GitFlowError("El host del repositorio remoto es inválido")
-
-        repository.removesuffix(".git")
-
-        return [host, repository]
-
 
     @abstractmethod
     def create_pull_request(
@@ -56,6 +38,7 @@ class RemoteAPI(ABC):
         destination: str,
         title: str | None = None,
         description: str | None = None,
+        close_source_branch: bool = True
     ) -> str:
         pass
 

src/git_flow/remote/bitbucket.py

@@ -12,6 +12,7 @@ class BitbucketRemoteAPI(RemoteAPI):
         destination: str,
         title: str | None = None,
         description: str | None = None,
+        close_source_branch: bool = True
     ):
         request = requests.post(
             self.get_endpoint("/pullrequests"),
@@ -21,7 +22,7 @@ class BitbucketRemoteAPI(RemoteAPI):
                 "description": description,
                 "source": {"branch": {"name": source}},
                 "destination": {"branch": {"name": destination}},
-                "close_source_branch": True,
+                "close_source_branch": close_source_branch,
             },
         )
 

src/git_flow/remote/gitea.py

@@ -0,0 +1,55 @@
+import requests
+from git_flow import GitFlowError
+from git_flow.remote.base import RemoteAPI
+
+
+class GiteaRemoteAPI(RemoteAPI):
+    def __init__(self, base_url: str, repository: str, token: str) -> None:
+        super().__init__(repository, token)
+        self.base_url = base_url
+
+    def create_pull_request(
+        self,
+        source: str,
+        destination: str,
+        title: str | None = None,
+        description: str | None = None,
+        close_source_branch: bool = True
+    ) -> str:
+        response = requests.post(
+            self.get_endpoint("/pulls"),
+            headers=self.get_headers(),
+            json={
+                "title": title,
+                "body": description,
+                "head": source,
+                "base": destination,
+            },
+        )
+
+        if response.ok:
+            return "PR creado exitosamente: " + response.json()["html_url"]
+        else:
+            raise GitFlowError("Ocurrió un error al crear el PR: " + response.text)
+
+    def create_tag(self, tag: str, commit: str) -> str:
+        response = requests.post(
+            self.get_endpoint("/tags"),
+            headers=self.get_headers(),
+            json={"tag_name": tag, "target": commit},
+        )
+
+        if response.ok:
+            return "Tag creado exitosamente: " + tag
+        else:
+            raise GitFlowError("Ocurrió un error al crear el tag: " + response.text)
+
+    def get_endpoint(self, resource: str) -> str:
+        return f"{self.base_url}/api/v1/repos/{self.repository}{resource}"
+    
+    def get_headers(self):
+        return {
+            "Accept": "application/json",
+            "Content-Type": "application/json",
+            "Authorization": "token " + self.token,
+        }

src/git_flow/remote/github.py

@@ -1,9 +1,10 @@
+import requests
 from git_flow import GitFlowError
 from git_flow.remote.base import RemoteAPI
 
 
 class GithubRemoteAPI(RemoteAPI):
-    API_ENDPOINT = "https://github.com"
+    API_ENDPOINT = "https://api.github.com/repos"
 
     def create_pull_request(
         self,
@@ -11,11 +12,35 @@ class GithubRemoteAPI(RemoteAPI):
         destination: str,
         title: str | None = None,
         description: str | None = None,
+        close_source_branch: bool = True
     ) -> str:
-        raise GitFlowError("not implemented yet!")
+        response = requests.post(
+            self.get_endpoint("/pulls"),
+            headers=self.get_headers(),
+            json={
+                "title": title,
+                "body": description,
+                "head": source,
+                "base": destination,
+            },
+        )
+
+        if response.ok:
+            return "PR creado exitosamente: " + response.json()["html_url"]
+        else:
+            raise GitFlowError("Ocurrió un error al crear el PR: " + response.text)
 
     def create_tag(self, tag: str, commit: str) -> str:
-        raise GitFlowError("not implemented yet!")
+        response = requests.post(
+            self.get_endpoint("/git/refs"),
+            headers=self.get_headers(),
+            json={"ref": f"refs/tags/{tag}", "sha": commit},
+        )
+
+        if response.ok:
+            return "Tag creado exitosamente: " + tag
+        else:
+            raise GitFlowError("Ocurrió un error al crear el tag: " + response.text)
 
     def get_endpoint(self, resource: str) -> str:
-        return GithubRemoteAPI.API_ENDPOINT
+        return f"{GithubRemoteAPI.API_ENDPOINT}/{self.repository}{resource}"

uv.lock

@@ -0,0 +1,181 @@
+version = 1
+revision = 3
+requires-python = ">=3.14"
+
+[[package]]
+name = "annotated-doc"
+version = "0.0.4"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/57/ba/046ceea27344560984e26a590f90bc7f4a75b06701f653222458922b558c/annotated_doc-0.0.4.tar.gz", hash = "sha256:fbcda96e87e9c92ad167c2e53839e57503ecfda18804ea28102353485033faa4", size = 7288, upload-time = "2025-11-10T22:07:42.062Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/1e/d3/26bf1008eb3d2daa8ef4cacc7f3bfdc11818d111f7e2d0201bc6e3b49d45/annotated_doc-0.0.4-py3-none-any.whl", hash = "sha256:571ac1dc6991c450b25a9c2d84a3705e2ae7a53467b5d111c24fa8baabbed320", size = 5303, upload-time = "2025-11-10T22:07:40.673Z" },
+]
+
+[[package]]
+name = "certifi"
+version = "2026.1.4"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/e0/2d/a891ca51311197f6ad14a7ef42e2399f36cf2f9bd44752b3dc4eab60fdc5/certifi-2026.1.4.tar.gz", hash = "sha256:ac726dd470482006e014ad384921ed6438c457018f4b3d204aea4281258b2120", size = 154268, upload-time = "2026-01-04T02:42:41.825Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/e6/ad/3cc14f097111b4de0040c83a525973216457bbeeb63739ef1ed275c1c021/certifi-2026.1.4-py3-none-any.whl", hash = "sha256:9943707519e4add1115f44c2bc244f782c0249876bf51b6599fee1ffbedd685c", size = 152900, upload-time = "2026-01-04T02:42:40.15Z" },
+]
+
+[[package]]
+name = "charset-normalizer"
+version = "3.4.4"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/13/69/33ddede1939fdd074bce5434295f38fae7136463422fe4fd3e0e89b98062/charset_normalizer-3.4.4.tar.gz", hash = "sha256:94537985111c35f28720e43603b8e7b43a6ecfb2ce1d3058bbe955b73404e21a", size = 129418, upload-time = "2025-10-14T04:42:32.879Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/2a/35/7051599bd493e62411d6ede36fd5af83a38f37c4767b92884df7301db25d/charset_normalizer-3.4.4-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:da3326d9e65ef63a817ecbcc0df6e94463713b754fe293eaa03da99befb9a5bd", size = 207746, upload-time = "2025-10-14T04:41:33.773Z" },
+    { url = "https://files.pythonhosted.org/packages/10/9a/97c8d48ef10d6cd4fcead2415523221624bf58bcf68a802721a6bc807c8f/charset_normalizer-3.4.4-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8af65f14dc14a79b924524b1e7fffe304517b2bff5a58bf64f30b98bbc5079eb", size = 147889, upload-time = "2025-10-14T04:41:34.897Z" },
+    { url = "https://files.pythonhosted.org/packages/10/bf/979224a919a1b606c82bd2c5fa49b5c6d5727aa47b4312bb27b1734f53cd/charset_normalizer-3.4.4-cp314-cp314-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:74664978bb272435107de04e36db5a9735e78232b85b77d45cfb38f758efd33e", size = 143641, upload-time = "2025-10-14T04:41:36.116Z" },
+    { url = "https://files.pythonhosted.org/packages/ba/33/0ad65587441fc730dc7bd90e9716b30b4702dc7b617e6ba4997dc8651495/charset_normalizer-3.4.4-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:752944c7ffbfdd10c074dc58ec2d5a8a4cd9493b314d367c14d24c17684ddd14", size = 160779, upload-time = "2025-10-14T04:41:37.229Z" },
+    { url = "https://files.pythonhosted.org/packages/67/ed/331d6b249259ee71ddea93f6f2f0a56cfebd46938bde6fcc6f7b9a3d0e09/charset_normalizer-3.4.4-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:d1f13550535ad8cff21b8d757a3257963e951d96e20ec82ab44bc64aeb62a191", size = 159035, upload-time = "2025-10-14T04:41:38.368Z" },
+    { url = "https://files.pythonhosted.org/packages/67/ff/f6b948ca32e4f2a4576aa129d8bed61f2e0543bf9f5f2b7fc3758ed005c9/charset_normalizer-3.4.4-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ecaae4149d99b1c9e7b88bb03e3221956f68fd6d50be2ef061b2381b61d20838", size = 152542, upload-time = "2025-10-14T04:41:39.862Z" },
+    { url = "https://files.pythonhosted.org/packages/16/85/276033dcbcc369eb176594de22728541a925b2632f9716428c851b149e83/charset_normalizer-3.4.4-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:cb6254dc36b47a990e59e1068afacdcd02958bdcce30bb50cc1700a8b9d624a6", size = 149524, upload-time = "2025-10-14T04:41:41.319Z" },
+    { url = "https://files.pythonhosted.org/packages/9e/f2/6a2a1f722b6aba37050e626530a46a68f74e63683947a8acff92569f979a/charset_normalizer-3.4.4-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:c8ae8a0f02f57a6e61203a31428fa1d677cbe50c93622b4149d5c0f319c1d19e", size = 150395, upload-time = "2025-10-14T04:41:42.539Z" },
+    { url = "https://files.pythonhosted.org/packages/60/bb/2186cb2f2bbaea6338cad15ce23a67f9b0672929744381e28b0592676824/charset_normalizer-3.4.4-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:47cc91b2f4dd2833fddaedd2893006b0106129d4b94fdb6af1f4ce5a9965577c", size = 143680, upload-time = "2025-10-14T04:41:43.661Z" },
+    { url = "https://files.pythonhosted.org/packages/7d/a5/bf6f13b772fbb2a90360eb620d52ed8f796f3c5caee8398c3b2eb7b1c60d/charset_normalizer-3.4.4-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:82004af6c302b5d3ab2cfc4cc5f29db16123b1a8417f2e25f9066f91d4411090", size = 162045, upload-time = "2025-10-14T04:41:44.821Z" },
+    { url = "https://files.pythonhosted.org/packages/df/c5/d1be898bf0dc3ef9030c3825e5d3b83f2c528d207d246cbabe245966808d/charset_normalizer-3.4.4-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:2b7d8f6c26245217bd2ad053761201e9f9680f8ce52f0fcd8d0755aeae5b2152", size = 149687, upload-time = "2025-10-14T04:41:46.442Z" },
+    { url = "https://files.pythonhosted.org/packages/a5/42/90c1f7b9341eef50c8a1cb3f098ac43b0508413f33affd762855f67a410e/charset_normalizer-3.4.4-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:799a7a5e4fb2d5898c60b640fd4981d6a25f1c11790935a44ce38c54e985f828", size = 160014, upload-time = "2025-10-14T04:41:47.631Z" },
+    { url = "https://files.pythonhosted.org/packages/76/be/4d3ee471e8145d12795ab655ece37baed0929462a86e72372fd25859047c/charset_normalizer-3.4.4-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:99ae2cffebb06e6c22bdc25801d7b30f503cc87dbd283479e7b606f70aff57ec", size = 154044, upload-time = "2025-10-14T04:41:48.81Z" },
+    { url = "https://files.pythonhosted.org/packages/b0/6f/8f7af07237c34a1defe7defc565a9bc1807762f672c0fde711a4b22bf9c0/charset_normalizer-3.4.4-cp314-cp314-win32.whl", hash = "sha256:f9d332f8c2a2fcbffe1378594431458ddbef721c1769d78e2cbc06280d8155f9", size = 99940, upload-time = "2025-10-14T04:41:49.946Z" },
+    { url = "https://files.pythonhosted.org/packages/4b/51/8ade005e5ca5b0d80fb4aff72a3775b325bdc3d27408c8113811a7cbe640/charset_normalizer-3.4.4-cp314-cp314-win_amd64.whl", hash = "sha256:8a6562c3700cce886c5be75ade4a5db4214fda19fede41d9792d100288d8f94c", size = 107104, upload-time = "2025-10-14T04:41:51.051Z" },
+    { url = "https://files.pythonhosted.org/packages/da/5f/6b8f83a55bb8278772c5ae54a577f3099025f9ade59d0136ac24a0df4bde/charset_normalizer-3.4.4-cp314-cp314-win_arm64.whl", hash = "sha256:de00632ca48df9daf77a2c65a484531649261ec9f25489917f09e455cb09ddb2", size = 100743, upload-time = "2025-10-14T04:41:52.122Z" },
+    { url = "https://files.pythonhosted.org/packages/0a/4c/925909008ed5a988ccbb72dcc897407e5d6d3bd72410d69e051fc0c14647/charset_normalizer-3.4.4-py3-none-any.whl", hash = "sha256:7a32c560861a02ff789ad905a2fe94e3f840803362c84fecf1851cb4cf3dc37f", size = 53402, upload-time = "2025-10-14T04:42:31.76Z" },
+]
+
+[[package]]
+name = "click"
+version = "8.3.3"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "colorama", marker = "sys_platform == 'win32'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/bb/63/f9e1ea081ce35720d8b92acde70daaedace594dc93b693c869e0d5910718/click-8.3.3.tar.gz", hash = "sha256:398329ad4837b2ff7cbe1dd166a4c0f8900c3ca3a218de04466f38f6497f18a2", size = 328061, upload-time = "2026-04-22T15:11:27.506Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/ae/44/c1221527f6a71a01ec6fbad7fa78f1d50dfa02217385cf0fa3eec7087d59/click-8.3.3-py3-none-any.whl", hash = "sha256:a2bf429bb3033c89fa4936ffb35d5cb471e3719e1f3c8a7c3fff0b8314305613", size = 110502, upload-time = "2026-04-22T15:11:25.044Z" },
+]
+
+[[package]]
+name = "colorama"
+version = "0.4.6"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/d8/53/6f443c9a4a8358a93a6792e2acffb9d9d5cb0a5cfd8802644b7b1c9a02e4/colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44", size = 27697, upload-time = "2022-10-25T02:36:22.414Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", size = 25335, upload-time = "2022-10-25T02:36:20.889Z" },
+]
+
+[[package]]
+name = "git-flow-envs"
+source = { editable = "." }
+dependencies = [
+    { name = "requests" },
+    { name = "typer" },
+]
+
+[package.metadata]
+requires-dist = [
+    { name = "requests" },
+    { name = "typer" },
+]
+
+[[package]]
+name = "idna"
+version = "3.11"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/6f/6d/0703ccc57f3a7233505399edb88de3cbd678da106337b9fcde432b65ed60/idna-3.11.tar.gz", hash = "sha256:795dafcc9c04ed0c1fb032c2aa73654d8e8c5023a7df64a53f39190ada629902", size = 194582, upload-time = "2025-10-12T14:55:20.501Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/0e/61/66938bbb5fc52dbdf84594873d5b51fb1f7c7794e9c0f5bd885f30bc507b/idna-3.11-py3-none-any.whl", hash = "sha256:771a87f49d9defaf64091e6e6fe9c18d4833f140bd19464795bc32d966ca37ea", size = 71008, upload-time = "2025-10-12T14:55:18.883Z" },
+]
+
+[[package]]
+name = "markdown-it-py"
+version = "4.2.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "mdurl" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/06/ff/7841249c247aa650a76b9ee4bbaeae59370dc8bfd2f6c01f3630c35eb134/markdown_it_py-4.2.0.tar.gz", hash = "sha256:04a21681d6fbb623de53f6f364d352309d4094dd4194040a10fd51833e418d49", size = 82454, upload-time = "2026-05-07T12:08:28.36Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/b3/81/4da04ced5a082363ecfa159c010d200ecbd959ae410c10c0264a38cac0f5/markdown_it_py-4.2.0-py3-none-any.whl", hash = "sha256:9f7ebbcd14fe59494226453aed97c1070d83f8d24b6fc3a3bcf9a38092641c4a", size = 91687, upload-time = "2026-05-07T12:08:27.182Z" },
+]
+
+[[package]]
+name = "mdurl"
+version = "0.1.2"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/d6/54/cfe61301667036ec958cb99bd3efefba235e65cdeb9c84d24a8293ba1d90/mdurl-0.1.2.tar.gz", hash = "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba", size = 8729, upload-time = "2022-08-14T12:40:10.846Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/b3/38/89ba8ad64ae25be8de66a6d463314cf1eb366222074cfda9ee839c56a4b4/mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8", size = 9979, upload-time = "2022-08-14T12:40:09.779Z" },
+]
+
+[[package]]
+name = "pygments"
+version = "2.20.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/c3/b2/bc9c9196916376152d655522fdcebac55e66de6603a76a02bca1b6414f6c/pygments-2.20.0.tar.gz", hash = "sha256:6757cd03768053ff99f3039c1a36d6c0aa0b263438fcab17520b30a303a82b5f", size = 4955991, upload-time = "2026-03-29T13:29:33.898Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/f4/7e/a72dd26f3b0f4f2bf1dd8923c85f7ceb43172af56d63c7383eb62b332364/pygments-2.20.0-py3-none-any.whl", hash = "sha256:81a9e26dd42fd28a23a2d169d86d7ac03b46e2f8b59ed4698fb4785f946d0176", size = 1231151, upload-time = "2026-03-29T13:29:30.038Z" },
+]
+
+[[package]]
+name = "requests"
+version = "2.32.5"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "certifi" },
+    { name = "charset-normalizer" },
+    { name = "idna" },
+    { name = "urllib3" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/c9/74/b3ff8e6c8446842c3f5c837e9c3dfcfe2018ea6ecef224c710c85ef728f4/requests-2.32.5.tar.gz", hash = "sha256:dbba0bac56e100853db0ea71b82b4dfd5fe2bf6d3754a8893c3af500cec7d7cf", size = 134517, upload-time = "2025-08-18T20:46:02.573Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/1e/db/4254e3eabe8020b458f1a747140d32277ec7a271daf1d235b70dc0b4e6e3/requests-2.32.5-py3-none-any.whl", hash = "sha256:2462f94637a34fd532264295e186976db0f5d453d1cdd31473c85a6a161affb6", size = 64738, upload-time = "2025-08-18T20:46:00.542Z" },
+]
+
+[[package]]
+name = "rich"
+version = "15.0.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "markdown-it-py" },
+    { name = "pygments" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/c0/8f/0722ca900cc807c13a6a0c696dacf35430f72e0ec571c4275d2371fca3e9/rich-15.0.0.tar.gz", hash = "sha256:edd07a4824c6b40189fb7ac9bc4c52536e9780fbbfbddf6f1e2502c31b068c36", size = 230680, upload-time = "2026-04-12T08:24:00.75Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/82/3b/64d4899d73f91ba49a8c18a8ff3f0ea8f1c1d75481760df8c68ef5235bf5/rich-15.0.0-py3-none-any.whl", hash = "sha256:33bd4ef74232fb73fe9279a257718407f169c09b78a87ad3d296f548e27de0bb", size = 310654, upload-time = "2026-04-12T08:24:02.83Z" },
+]
+
+[[package]]
+name = "shellingham"
+version = "1.5.4"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/58/15/8b3609fd3830ef7b27b655beb4b4e9c62313a4e8da8c676e142cc210d58e/shellingham-1.5.4.tar.gz", hash = "sha256:8dbca0739d487e5bd35ab3ca4b36e11c4078f3a234bfce294b0a0291363404de", size = 10310, upload-time = "2023-10-24T04:13:40.426Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/e0/f9/0595336914c5619e5f28a1fb793285925a8cd4b432c9da0a987836c7f822/shellingham-1.5.4-py2.py3-none-any.whl", hash = "sha256:7ecfff8f2fd72616f7481040475a65b2bf8af90a56c89140852d1120324e8686", size = 9755, upload-time = "2023-10-24T04:13:38.866Z" },
+]
+
+[[package]]
+name = "typer"
+version = "0.25.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "annotated-doc" },
+    { name = "click" },
+    { name = "rich" },
+    { name = "shellingham" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/e4/51/9aed62104cea109b820bbd6c14245af756112017d309da813ef107d42e7e/typer-0.25.1.tar.gz", hash = "sha256:9616eb8853a09ffeabab1698952f33c6f29ffdbceb4eaeecf571880e8d7664cc", size = 122276, upload-time = "2026-04-30T19:32:16.964Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/3f/f9/2b3ff4e56e5fa7debfaf9eb135d0da96f3e9a1d5b27222223c7296336e5f/typer-0.25.1-py3-none-any.whl", hash = "sha256:75caa44ed46a03fb2dab8808753ffacdbfea88495e74c85a28c5eefcf5f39c89", size = 58409, upload-time = "2026-04-30T19:32:18.271Z" },
+]
+
+[[package]]
+name = "urllib3"
+version = "2.6.3"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/c7/24/5f1b3bdffd70275f6661c76461e25f024d5a38a46f04aaca912426a2b1d3/urllib3-2.6.3.tar.gz", hash = "sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed", size = 435556, upload-time = "2026-01-07T16:24:43.925Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/39/08/aaaad47bc4e9dc8c725e68f9d04865dbcb2052843ff09c97b08904852d84/urllib3-2.6.3-py3-none-any.whl", hash = "sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4", size = 131584, upload-time = "2026-01-07T16:24:42.685Z" },
+]