Compare commits
98
Commits
v1.10.0
...
0782cfb041
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0782cfb041 | ||
|
|
320d40a211 | ||
|
|
a5a753f429 | ||
|
|
4968667dad | ||
|
|
79ae88b012 | ||
|
|
4666503f32 | ||
|
|
4c089eb8da | ||
|
|
dc858d026f | ||
|
|
5989699f08 | ||
|
|
ecfe058f8d | ||
|
|
ffe813bf06 | ||
|
|
6cd6771241 | ||
|
|
1cc2de0b75 | ||
|
|
0e669019f4 | ||
|
|
d456565b2f | ||
|
|
74a78d30a1 | ||
|
|
ad8984cb28 | ||
|
|
53b02f1f8f | ||
|
|
bf6a0e8443 | ||
|
|
12351e64ba | ||
|
|
cb742425c1 | ||
|
|
bd47b40aff | ||
|
|
e94ee2ccc7 | ||
|
|
069c62b697 | ||
|
|
c18ca454c0 | ||
|
|
0fcf53bcb5 | ||
|
|
f9dddbc4d6 | ||
|
|
c7888c74f1 | ||
|
|
87c5ba81c4 | ||
|
|
a10e9fe4fe | ||
|
|
c93833769b | ||
|
|
c536deb54d | ||
|
|
3ff9f76a6c | ||
|
|
1c319beff4 | ||
|
|
f885c27e08 | ||
|
|
094bc1a698 | ||
|
|
9b0d7d6166 | ||
|
|
f52edf03e0 | ||
|
|
8ee01290ef | ||
|
|
9c89f4d638 | ||
|
|
8d35610c00 | ||
|
|
de124baf1a | ||
|
|
2676f41def | ||
|
|
22fd68c5b6 | ||
|
|
04c9a4b449 | ||
|
|
417021b36e | ||
|
|
be245114d5 | ||
|
|
184b135886 | ||
|
|
acc0e8666a | ||
|
|
5806aeab27 | ||
|
|
23eb9df482 | ||
|
|
538c9130dc | ||
|
|
a0d3028904 | ||
|
|
59b9e1c419 | ||
|
|
8793248dbe | ||
|
|
f389118515 | ||
|
|
5a7ed03801 | ||
|
|
5f7db6cf5d | ||
|
|
8929438fbf | ||
|
|
d35dab9046 | ||
|
|
d275ac08f3 | ||
|
|
9b5584bbfe | ||
|
|
9ccffd502d | ||
|
|
0ac04aee84 | ||
|
|
9ffefafad0 | ||
|
|
fec30cd1e8 | ||
|
|
e87571af8b | ||
|
|
e504887f2f | ||
|
|
9cd0b2514b | ||
|
|
7d246fd4a2 | ||
|
|
e9ef77d9fc | ||
|
|
f2eb5af5f2 | ||
|
|
7c938f207f | ||
|
|
d571267966 | ||
|
|
41d6957901 | ||
|
|
81a0578830 | ||
|
|
d035c02cf7 | ||
|
|
5d23bb6e8c | ||
|
|
04c1b47551 | ||
|
|
5b91c44c41 | ||
|
|
98bf7e7f9c | ||
|
|
c7d25203c7 | ||
|
|
7ac8376247 | ||
|
|
8b8b9337ac | ||
|
|
da8b27ce88 | ||
|
|
ade86f1350 | ||
|
|
1eee08f60d | ||
|
|
f20f8c811c | ||
|
|
0f700b026a | ||
|
|
9564339218 | ||
|
|
dfd96e62bb | ||
|
|
65c901e5b8 | ||
|
|
5759f67aa2 | ||
|
|
726c73af39 | ||
|
|
057b32a2f9 | ||
|
|
c0e2e596aa | ||
|
|
77e338dcc8 | ||
|
|
1aa2263a38 |
@@ -2,3 +2,5 @@
|
|||||||
remote = origin
|
remote = origin
|
||||||
branches = main
|
branches = main
|
||||||
initialized = true
|
initialized = true
|
||||||
|
version = 2
|
||||||
|
remote-type = gitea
|
||||||
|
|||||||
@@ -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 }}"
|
||||||
@@ -9,3 +9,6 @@ dist/
|
|||||||
build/
|
build/
|
||||||
**/__pycache__/
|
**/__pycache__/
|
||||||
**/*.egg-info/
|
**/*.egg-info/
|
||||||
|
|
||||||
|
# MacOS
|
||||||
|
.DS_Store
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
3.14
|
||||||
+156
@@ -1,3 +1,159 @@
|
|||||||
|
## 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
|
## 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 cambiar a rama objetivo y obtener cambios [[jteran](mailto:jteran@renatre.org.ar)] (df8998a)
|
||||||
|
|||||||
@@ -47,11 +47,12 @@ El comando solicitará 2 opciones:
|
|||||||
automáticamente. Por el momento, se soportan los siguientes remotos:
|
automáticamente. Por el momento, se soportan los siguientes remotos:
|
||||||
|
|
||||||
- [x] Bitbucket
|
- [x] Bitbucket
|
||||||
- [ ] Github: planeado
|
- [x] Github
|
||||||
|
- [x] Gitea
|
||||||
|
|
||||||
La configuración del remoto requiere tener un API Token para poder crear los PRs automáticamente.
|
La configuración del remoto requiere tener un Access Token para poder crear los PRs automáticamente.
|
||||||
El mismo se puede crear desde: *"Atlassian Account Settings" > "Security" > "Create and Manage API
|
El mismo se puede crear desde el repositorio al que se quiere dar acceso: *"Repository settings" >
|
||||||
Tokens" > "Create API Tokens with scopes"*. El token necesita el scope `write:pullrequest:bitbucket`
|
"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
|
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.
|
`.repository-token`. De no especificarse, los merges y tags se harán de forma local.
|
||||||
|
|||||||
@@ -1,13 +1,14 @@
|
|||||||
image: python:3.12
|
image: python:3.14
|
||||||
|
|
||||||
pipelines:
|
pipelines:
|
||||||
branches:
|
branches:
|
||||||
'main':
|
'main':
|
||||||
- step:
|
- step:
|
||||||
name: "Tag main"
|
name: "Tag and publish package"
|
||||||
caches:
|
caches:
|
||||||
- pip
|
- pip
|
||||||
script:
|
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
|
||||||
|
|||||||
+4
-4
@@ -3,12 +3,12 @@ requires = ["setuptools >= 80", "setuptools-scm[simple] >= 8" ]
|
|||||||
build-backend = "setuptools.build_meta"
|
build-backend = "setuptools.build_meta"
|
||||||
|
|
||||||
[project]
|
[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"]
|
dynamic = ["version"]
|
||||||
requires-python = ">= 3.12"
|
requires-python = ">= 3.14"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"requests"
|
"requests", "typer", "rich", "questionary"
|
||||||
]
|
]
|
||||||
authors = [
|
authors = [
|
||||||
{name = "Alan Facundo Biglieri", email = "abiglieri@renatre.org.ar"},
|
{name = "Alan Facundo Biglieri", email = "abiglieri@renatre.org.ar"},
|
||||||
|
|||||||
@@ -50,14 +50,6 @@ SUPPORTED_REMOTE_APIS = [
|
|||||||
|
|
||||||
REPOSITORY_TOKEN_FILENAME = ".repository-token"
|
REPOSITORY_TOKEN_FILENAME = ".repository-token"
|
||||||
|
|
||||||
COLOR_BLACK = "\033[30m"
|
FLOWCONFIG_FILENAME = ".flowconfig"
|
||||||
COLOR_RED = "\033[31m"
|
|
||||||
COLOR_GREEN = "\033[32m"
|
FLOWCONFIG_VERSION = 2
|
||||||
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_WHITE_BOLD = "\033[1;37m"
|
|
||||||
COLOR_RESET = "\033[0m"
|
|
||||||
|
|||||||
@@ -28,11 +28,15 @@ class Changelog:
|
|||||||
message = Git("show", commit, patch=False, format="%s").firstline()
|
message = Git("show", commit, patch=False, format="%s").firstline()
|
||||||
email = Git("show", commit, patch=False, format="%ae").firstline()
|
email = Git("show", commit, patch=False, format="%ae").firstline()
|
||||||
username = email[: email.index("@")]
|
username = email[: email.index("@")]
|
||||||
|
description = message
|
||||||
|
|
||||||
|
if ":" in message:
|
||||||
index = message.index(":")
|
index = message.index(":")
|
||||||
commit_type = message[:index]
|
commit_type = message[:index]
|
||||||
commit_message = message[index + 1 :]
|
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
|
return content
|
||||||
|
|
||||||
|
|||||||
+108
-172
@@ -1,127 +1,29 @@
|
|||||||
from argparse import Namespace, ArgumentParser
|
|
||||||
from abc import ABC, abstractmethod
|
|
||||||
from os.path import isfile
|
|
||||||
|
|
||||||
from git_flow import (
|
from git_flow import (
|
||||||
BRANCH_TYPES,
|
BRANCH_TYPES,
|
||||||
COLOR_BLUE,
|
|
||||||
COLOR_GREEN,
|
|
||||||
COLOR_RED,
|
|
||||||
COLOR_RESET,
|
|
||||||
COLOR_YELLOW,
|
|
||||||
REPOSITORY_TOKEN_FILENAME,
|
REPOSITORY_TOKEN_FILENAME,
|
||||||
|
FLOWCONFIG_FILENAME,
|
||||||
|
FLOWCONFIG_VERSION,
|
||||||
GitFlowError,
|
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.base import RemoteAPI
|
||||||
from git_flow.remote.bitbucket import BitbucketRemoteAPI
|
from git_flow.remote.bitbucket import BitbucketRemoteAPI
|
||||||
from git_flow.remote.github import GithubRemoteAPI
|
from git_flow.remote.github import GithubRemoteAPI
|
||||||
|
from git_flow.remote.gitea import GiteaRemoteAPI
|
||||||
|
from git_flow.io import *
|
||||||
|
from os.path import isfile
|
||||||
|
|
||||||
TYPE_SUCCESS = 0
|
from typing import Optional
|
||||||
TYPE_WARNING = 1
|
import rich
|
||||||
TYPE_ERROR = 2
|
import rich.panel
|
||||||
TYPE_INFO = 3
|
import questionary
|
||||||
|
|
||||||
|
|
||||||
class Command(ABC):
|
flowconfig = Git.get_config(FLOWCONFIG_FILENAME) if isfile(FLOWCONFIG_FILENAME) else {}
|
||||||
flowconfig: dict[str, str]
|
environments = flowconfig["flow.branches"].split(",") if "flow.branches" in flowconfig else []
|
||||||
|
|
||||||
@abstractmethod
|
def ensure_initialized():
|
||||||
def name(self) -> str:
|
initialized = flowconfig["flow.initialized"] if flowconfig else None
|
||||||
pass
|
|
||||||
|
|
||||||
@abstractmethod
|
|
||||||
def description(self) -> str:
|
|
||||||
pass
|
|
||||||
|
|
||||||
@abstractmethod
|
|
||||||
def run(self, args: Namespace = Namespace()):
|
|
||||||
pass
|
|
||||||
|
|
||||||
def init(self):
|
|
||||||
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:
|
if not initialized:
|
||||||
raise GitFlowError(
|
raise GitFlowError(
|
||||||
@@ -132,45 +34,28 @@ class Command(ABC):
|
|||||||
f"El valor de `flow.initialized` ({initialized}) es inválido."
|
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()
|
branch = Git.get_current_branch()
|
||||||
|
|
||||||
if branch == "HEAD":
|
if branch == "HEAD":
|
||||||
raise GitFlowError("No se encuentra parado sobre una rama.")
|
raise GitFlowError("No se encuentra parado sobre una rama.")
|
||||||
elif self.confirm(f"Se encuentra sobre la rama '{branch}'. ¿Es correcto?"):
|
elif io_confirm(f"Se encuentra sobre la rama '{branch}'. ¿Es correcto?"):
|
||||||
return branch
|
return branch
|
||||||
else:
|
else:
|
||||||
raise GitFlowError("Ejecución cancelada.")
|
raise GitFlowError("Ejecución cancelada.")
|
||||||
|
|
||||||
def ensure_repository_token(self):
|
|
||||||
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:
|
def get_branch_env_and_type(branch: str) -> tuple[str, str]:
|
||||||
return f.readline().strip()
|
|
||||||
|
|
||||||
def ensure_clean_worktree(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 get_branch_env_and_type(self, branch: str) -> tuple[str, str]:
|
|
||||||
components = branch.split("/")
|
components = branch.split("/")
|
||||||
target_branches = self.flowconfig["flow.branches"].split(",")
|
|
||||||
|
|
||||||
if len(components) == 2:
|
if len(components) == 2:
|
||||||
if components[0] not in BRANCH_TYPES:
|
if components[0] not in BRANCH_TYPES:
|
||||||
@@ -178,13 +63,13 @@ class Command(ABC):
|
|||||||
f"Branch inválida, el tipo '{components[0]}' no es válido."
|
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:
|
elif len(components) == 4:
|
||||||
target_branches = target_branches[1:]
|
valid_environments = environments[1:]
|
||||||
|
|
||||||
if (
|
if (
|
||||||
components[0] != "release"
|
components[0] != "release"
|
||||||
or components[1] not in target_branches
|
or components[1] not in valid_environments
|
||||||
or components[2] not in BRANCH_TYPES
|
or components[2] not in BRANCH_TYPES
|
||||||
):
|
):
|
||||||
raise GitFlowError(
|
raise GitFlowError(
|
||||||
@@ -196,41 +81,92 @@ class Command(ABC):
|
|||||||
else:
|
else:
|
||||||
raise GitFlowError("Branch inválido: " + branch)
|
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:
|
||||||
|
io_warning("Existen cambios en tu entorno de trabajo sin commitear.")
|
||||||
|
else:
|
||||||
|
raise GitFlowError("No se puede continuar con cambios pendientes.")
|
||||||
|
|
||||||
|
if not io_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.")
|
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)
|
return BitbucketRemoteAPI(repository, token)
|
||||||
elif host == "github.com":
|
elif remote_type == "github":
|
||||||
return GithubRemoteAPI(repository, token)
|
return GithubRemoteAPI(repository, token)
|
||||||
else:
|
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()
|
||||||
|
|
||||||
|
def io_error(message: str, title: Optional[str] = None):
|
||||||
|
_io_status(message, "❌ Error: ", "red", title)
|
||||||
|
|
||||||
|
def io_warning(message: str, title: Optional[str] = None):
|
||||||
|
_io_status(message, "⚠️ Warning: ", "yellow", title)
|
||||||
|
|
||||||
|
def io_info(message: str, title: Optional[str] = None):
|
||||||
|
_io_status(message, "ℹ️ Info: ", "blue", title)
|
||||||
|
|
||||||
|
def io_success(message: str, title: Optional[str] = None):
|
||||||
|
_io_status(message, "✅ Success: ", "green", title)
|
||||||
|
|
||||||
|
def _io_status(message: str, prefix: str, style: str, title: Optional[str] = None):
|
||||||
|
if title:
|
||||||
|
rich.print(rich.panel.Panel(message, title=prefix + title, style=style, expand=False, title_align="left"))
|
||||||
|
else:
|
||||||
|
rich.print(f"[{style}]{prefix}{message}[/{style}]")
|
||||||
|
|
||||||
|
def io_confirm(question: str, default: bool = True) -> bool:
|
||||||
|
return questionary.confirm(question, default=default, auto_enter=False).ask()
|
||||||
|
|
||||||
|
def io_choice(prompt: str, options: list[str]) -> str:
|
||||||
|
return questionary.select(prompt, options, instruction="Usar flechas").ask()
|
||||||
|
|
||||||
|
def io_prompt(message: str, default: str = "", persistent: bool = False, strip: bool = False, validator = None) -> str:
|
||||||
|
if persistent and not validator:
|
||||||
|
validator = lambda s: len(s.strip()) > 0
|
||||||
|
|
||||||
|
value = questionary.text(message, default, validate=validator).ask()
|
||||||
|
|
||||||
|
return value.strip() if strip else value
|
||||||
+104
-81
@@ -1,117 +1,140 @@
|
|||||||
from argparse import ArgumentParser, Namespace
|
from git_flow import (
|
||||||
from git_flow import COLOR_WHITE_BOLD, COLOR_GREEN, COLOR_RED, COLOR_RESET, TRASH_BRANCH_PREFIX, WIP_BRANCH_PREFIX, GitFlowError
|
TRASH_BRANCH_PREFIX,
|
||||||
from git_flow.command.base import Command
|
WIP_BRANCH_PREFIX,
|
||||||
|
GitFlowError,
|
||||||
|
)
|
||||||
|
from git_flow.command.base import *
|
||||||
from git_flow.git import Git
|
from git_flow.git import Git
|
||||||
|
from typing import Annotated
|
||||||
|
import typer
|
||||||
|
|
||||||
BRANCH_FORMAT = "%(refname:short)"
|
BRANCH_FORMAT = "%(refname:short)"
|
||||||
|
|
||||||
|
app = typer.Typer()
|
||||||
|
|
||||||
class BranchCommand(Command):
|
|
||||||
def name(self) -> str:
|
|
||||||
return "branch"
|
|
||||||
|
|
||||||
def description(self) -> str:
|
@app.command()
|
||||||
return """Lista ramas del repositorio, agrupandolas por entorno objetivo"""
|
def branch(
|
||||||
|
environment: Annotated[
|
||||||
def setup_parser(self, parser: ArgumentParser) -> ArgumentParser:
|
str | None,
|
||||||
parser.add_argument(
|
typer.Argument(
|
||||||
"environment",
|
help="Entorno de las ramas a listar. Por defecto, es el entorno actual."
|
||||||
nargs="?",
|
),
|
||||||
help="Entorno de las ramas a listar. Por defecto, es el entorno actual.",
|
] = None,
|
||||||
)
|
trash: Annotated[
|
||||||
|
bool,
|
||||||
parser.add_argument(
|
typer.Option(
|
||||||
"--trash",
|
|
||||||
action="store_true",
|
|
||||||
help=f"Listar ramas en la 'papelera de reciclaje' (ramas que empiezan con '{TRASH_BRANCH_PREFIX}')"
|
help=f"Listar ramas en la 'papelera de reciclaje' (ramas que empiezan con '{TRASH_BRANCH_PREFIX}')"
|
||||||
)
|
),
|
||||||
|
] = False,
|
||||||
parser.add_argument(
|
wip: Annotated[
|
||||||
"--wip",
|
bool,
|
||||||
action="store_true",
|
typer.Option(
|
||||||
help=f"Listar ramas 'en progreso' (ramas que empiezan con '{WIP_BRANCH_PREFIX}')"
|
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()
|
||||||
|
|
||||||
parser.add_argument(
|
current_branch = Git.get_current_branch()
|
||||||
"--all",
|
|
||||||
action="store_true",
|
|
||||||
help=f"Listar ramas de todos los entornos"
|
|
||||||
)
|
|
||||||
|
|
||||||
return parser
|
if current_branch in environments:
|
||||||
|
current_environment = current_branch
|
||||||
def run(self, args: Namespace = Namespace()):
|
|
||||||
self.ensure_initialized()
|
|
||||||
|
|
||||||
self.current_branch = Git.get_current_branch()
|
|
||||||
self.environments = self.flowconfig["flow.branches"].split(",")
|
|
||||||
|
|
||||||
if self.current_branch in self.environments:
|
|
||||||
current_environment = self.current_branch
|
|
||||||
else:
|
else:
|
||||||
(current_environment, _) = self.get_branch_env_and_type(self.current_branch)
|
current_environment, _ = get_branch_env_and_type(current_branch)
|
||||||
|
|
||||||
if args.trash:
|
if trash:
|
||||||
self.show_branches(TRASH_BRANCH_PREFIX)
|
show_branches(TRASH_BRANCH_PREFIX, current_branch)
|
||||||
elif args.wip:
|
elif wip:
|
||||||
self.show_branches(WIP_BRANCH_PREFIX)
|
show_branches(WIP_BRANCH_PREFIX, current_branch)
|
||||||
elif args.all:
|
elif all:
|
||||||
self.show_envs()
|
show_envs(environments, current_branch)
|
||||||
self.show_all_branches()
|
show_all_branches(environments, current_branch)
|
||||||
elif args.environment is None:
|
elif environment is None:
|
||||||
self.show_envs()
|
show_envs(environments, current_branch)
|
||||||
self.show_env_branches(current_environment)
|
show_env_branches(current_environment, environments, current_branch)
|
||||||
elif args.environment in self.environments:
|
elif environment in environments:
|
||||||
self.show_envs()
|
show_envs(environments, current_branch)
|
||||||
self.show_env_branches(args.environment)
|
show_env_branches(environment, environments, current_branch)
|
||||||
else:
|
else:
|
||||||
raise GitFlowError(f"'{args.environment}' no es un entorno válido.")
|
raise GitFlowError(f"'{environment}' no es un entorno válido.")
|
||||||
|
|
||||||
def show_branches(self, prefix: str):
|
|
||||||
branches = self.get_branches(prefix)
|
def show_branches(branch_prefix: str, current_branch: str):
|
||||||
|
branches = get_branches(branch_prefix)
|
||||||
|
|
||||||
if not branches:
|
if not branches:
|
||||||
print("No hay ramas a mostrar.")
|
print("No hay ramas a mostrar.")
|
||||||
return
|
return
|
||||||
|
|
||||||
for branch in branches:
|
for branch in branches:
|
||||||
prefix = (COLOR_RED + "*") if branch == self.current_branch else " "
|
is_current = branch == current_branch
|
||||||
print(prefix + " " + branch + COLOR_RESET)
|
prefix = "*" if is_current else " "
|
||||||
|
console.print(prefix + " " + branch, style="green" if is_current else None)
|
||||||
|
|
||||||
def get_branches(self, prefix: str):
|
|
||||||
return Git("for-each-ref", "refs/heads/" + prefix, format=BRANCH_FORMAT).lines()
|
|
||||||
|
|
||||||
def show_all_branches(self):
|
def get_branches(branch_prefix: str):
|
||||||
for environment in self.environments:
|
return Git("for-each-ref", "refs/heads/" + branch_prefix, format=BRANCH_FORMAT).lines()
|
||||||
self.show_env_branches(environment, len(self.environments) > 1)
|
|
||||||
|
|
||||||
trash = len(self.get_branches(TRASH_BRANCH_PREFIX))
|
|
||||||
|
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:
|
if trash:
|
||||||
print()
|
print()
|
||||||
print(COLOR_WHITE_BOLD + "Papelera: " + COLOR_RESET + str(trash) + " rama" + ("" if trash == 1 else "s"))
|
console.print(
|
||||||
|
"[bold]Papelera:[/bold] "
|
||||||
|
+ str(trash)
|
||||||
|
+ " rama"
|
||||||
|
+ ("" if trash == 1 else "s")
|
||||||
|
)
|
||||||
|
|
||||||
def show_envs(self):
|
|
||||||
print(COLOR_WHITE_BOLD + "Entornos" + COLOR_RESET)
|
def show_envs(environments: list[str], current_branch: str):
|
||||||
for environment in self.environments:
|
console.print("Entornos", style="bold")
|
||||||
prefix = (COLOR_GREEN + "*") if environment == self.current_branch else " "
|
for environment in environments:
|
||||||
print(prefix + " " + environment + COLOR_RESET)
|
is_current = environment == current_branch
|
||||||
|
prefix = "*" if is_current else " "
|
||||||
|
console.print(prefix + " " + environment, style="green" if is_current else None)
|
||||||
print()
|
print()
|
||||||
|
|
||||||
def show_env_branches(self, environment: str, show_env: bool = False):
|
|
||||||
is_first_env = environment == self.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()
|
|
||||||
|
|
||||||
print(COLOR_WHITE_BOLD + (environment if show_env else "Ramas") + COLOR_RESET)
|
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:
|
if not branches:
|
||||||
print("No hay ramas a mostrar.")
|
print("No hay ramas a mostrar.")
|
||||||
return
|
return
|
||||||
|
|
||||||
for branch in branches:
|
for branch in branches:
|
||||||
prefix = (COLOR_GREEN + "*") if branch == self.current_branch else " "
|
is_current = branch == current_branch
|
||||||
print(prefix + " " + branch + COLOR_RESET)
|
prefix = "*" if is_current else " "
|
||||||
|
console.print(prefix + " " + branch, style="green" if is_current else None)
|
||||||
|
|||||||
@@ -1,32 +1,27 @@
|
|||||||
from argparse import Namespace
|
import typer
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from git_flow import COMMIT_TYPES, TRASH_BRANCH_PREFIX, WIP_BRANCH_PREFIX, 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.git import Git
|
||||||
|
import git_flow.command.base as base
|
||||||
|
|
||||||
|
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"""
|
||||||
|
base.ensure_initialized()
|
||||||
|
branch = base.ensure_right_branch()
|
||||||
|
|
||||||
def description(self) -> str:
|
if not _has_files_staged():
|
||||||
return """Crea un commit siguiendo el formato de Conventional Commits"""
|
base.io_warning("No hay cambios en el indice para commitear.")
|
||||||
|
if base.io_confirm("¿Desea agregar la carpeta actual?"):
|
||||||
def run(self, args: Namespace = Namespace()):
|
|
||||||
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", ".").exec(print="Agregando cambios")
|
Git("add", ".").exec(print="Agregando cambios")
|
||||||
else:
|
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 = base.io_choice("Tipo de commit", COMMIT_TYPES)
|
||||||
commit_message = self.prompt(
|
commit_message = base.io_prompt(
|
||||||
"Mensaje (máximo recomendado: 100 caracteres)", persistent=True
|
"Mensaje (máximo recomendado: 100 caracteres)", persistent=True
|
||||||
)
|
)
|
||||||
message = commit_type + ": " + commit_message
|
message = commit_type + ": " + commit_message
|
||||||
@@ -38,16 +33,23 @@ class CommitCommand(Command):
|
|||||||
if commit_type != "wip":
|
if commit_type != "wip":
|
||||||
suffix = datetime.now().strftime("%Y%m%dT%H%M")
|
suffix = datetime.now().strftime("%Y%m%dT%H%M")
|
||||||
Git("switch", original_branch).exec(print="Volviendo a rama original")
|
Git("switch", original_branch).exec(print="Volviendo a rama original")
|
||||||
Git("merge", branch, squash=True).exec(print="Squasheando commits WIP en uno solo")
|
Git("merge", branch, squash=True).exec(
|
||||||
|
print="Squasheando commits WIP en uno solo"
|
||||||
|
)
|
||||||
Git("commit", m=message).exec(print="Creando commit final de rama WIP")
|
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")
|
Git(
|
||||||
|
"branch", branch, TRASH_BRANCH_PREFIX + branch + "/" + suffix, move=True
|
||||||
|
).exec(print="Backup de rama WIP")
|
||||||
else:
|
else:
|
||||||
if commit_type == "wip":
|
if commit_type == "wip":
|
||||||
Git("switch", WIP_BRANCH_PREFIX + branch, create=True).exec(print="Creando nueva rama WIP")
|
Git("switch", WIP_BRANCH_PREFIX + branch, create=True).exec(
|
||||||
|
print="Creando nueva rama WIP"
|
||||||
|
)
|
||||||
|
|
||||||
Git("commit", m=message).exec(print="Creando commit")
|
Git("commit", m=message).exec(print="Creando commit")
|
||||||
|
|
||||||
def _has_files_staged(self):
|
|
||||||
|
def _has_files_staged():
|
||||||
status = Git.status()
|
status = Git.status()
|
||||||
|
|
||||||
if not status:
|
if not status:
|
||||||
|
|||||||
@@ -1,86 +1,90 @@
|
|||||||
from argparse import Namespace
|
import typer
|
||||||
from git_flow import GitFlowError
|
|
||||||
from git_flow.command.base import Command
|
from git_flow import FLOWCONFIG_FILENAME, FLOWCONFIG_VERSION, GitFlowError
|
||||||
from git_flow.git import FLOWCONFIG_FILE, Git
|
from git_flow.git import 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 = {
|
flowconfig = {
|
||||||
|
"flow.version": str(FLOWCONFIG_VERSION),
|
||||||
"flow.initialized": "true",
|
"flow.initialized": "true",
|
||||||
"flow.branches": ",".join(branches),
|
"flow.branches": ",".join(branches),
|
||||||
}
|
}
|
||||||
|
|
||||||
if remote:
|
if remote and remote_type:
|
||||||
flowconfig["flow.remote"] = remote
|
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()
|
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():
|
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()
|
Git("init").exec()
|
||||||
|
|
||||||
def _ensure_not_already_initialized(self):
|
|
||||||
if not self.flowconfig:
|
def _ensure_not_already_initialized():
|
||||||
|
if not flowconfig:
|
||||||
return
|
return
|
||||||
elif self.flowconfig.get("flow.initialized") == "true":
|
elif flowconfig.get("flow.initialized") == "true":
|
||||||
raise GitFlowError("El repositorio ya fue inicializado para usar git-flow")
|
raise GitFlowError("El repositorio ya fue inicializado para usar git-flow")
|
||||||
else:
|
else:
|
||||||
raise GitFlowError("Valor de 'flow.initialized' es inválido")
|
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):
|
if not all(branches):
|
||||||
raise GitFlowError("No puede ingresar una rama vacia")
|
raise GitFlowError("No puede ingresar una rama vacia")
|
||||||
|
|
||||||
return branches
|
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 = None
|
||||||
|
remote_type = None
|
||||||
|
|
||||||
if self.confirm("¿Configurar repositorio remoto?"):
|
if confirm("¿Configurar repositorio remoto?"):
|
||||||
remotes = Git("remote").lines(print="Listando remotos disponibles")
|
remotes = Git("remote").lines(print="Listando remotos disponibles")
|
||||||
|
|
||||||
if not remotes:
|
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)",
|
"Ingrese la URL del repositorio (e.g. https://github.com/user/repo.git)",
|
||||||
persistent=True,
|
persistent=True,
|
||||||
)
|
)
|
||||||
@@ -89,19 +93,22 @@ class InitCommand(Command):
|
|||||||
elif len(remotes) == 1:
|
elif len(remotes) == 1:
|
||||||
remote = remotes[0]
|
remote = remotes[0]
|
||||||
else:
|
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()
|
existing_branches = Git.get_branches()
|
||||||
|
|
||||||
if not all(map(lambda b: b in existing_branches, 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:
|
for branch in branches:
|
||||||
if branch not in existing_branches:
|
if branch not in existing_branches:
|
||||||
|
|||||||
@@ -1,57 +1,73 @@
|
|||||||
from argparse import Namespace
|
import typer
|
||||||
from git_flow import GitFlowError
|
from git_flow import GitFlowError
|
||||||
from git_flow.changelog import Changelog
|
from git_flow.changelog import Changelog
|
||||||
from git_flow.command.base import Command
|
import git_flow.command.base as base
|
||||||
from git_flow.git import Git
|
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"""
|
||||||
|
base.ensure_initialized()
|
||||||
|
|
||||||
def run(self, args: Namespace = Namespace()):
|
branch = base.ensure_right_branch()
|
||||||
self.ensure_initialized()
|
|
||||||
|
|
||||||
branch = self.ensure_right_branch()
|
if branch in base.environments:
|
||||||
(target, _) = self.get_branch_env_and_type(branch)
|
if branch == base.environments[-1]:
|
||||||
|
raise GitFlowError("No se puede hacer un merge del último entorno.")
|
||||||
|
|
||||||
if "flow.remote" in self.flowconfig:
|
base.io_info(
|
||||||
remote = self.flowconfig["flow.remote"]
|
"""Está por hacer un merge de 2 entornos que puede implicar muchos cambios en el proyecto.""",
|
||||||
token = self.ensure_repository_token()
|
"Merge de entornos",
|
||||||
self.run_remote(remote, token, branch, target)
|
)
|
||||||
|
|
||||||
|
if not base.io_confirm("¿Desea continuar?"):
|
||||||
|
raise GitFlowError("Ejecución abortada")
|
||||||
|
|
||||||
|
target = base.environments[base.environments.index(branch) + 1]
|
||||||
else:
|
else:
|
||||||
self.run_local(branch, target)
|
target, _ = base.get_branch_env_and_type(branch)
|
||||||
|
|
||||||
def run_remote(self, remote: str, token: str, branch: str, target: str):
|
if "flow.remote" in base.flowconfig:
|
||||||
self.ensure_clean_worktree(True)
|
remote = base.flowconfig["flow.remote"]
|
||||||
|
token = base.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):
|
||||||
|
base.ensure_clean_worktree(True)
|
||||||
|
|
||||||
Git("switch", target).exec(print="Cambiando a rama destino")
|
Git("switch", target).exec(print="Cambiando a rama destino")
|
||||||
Git("pull").exec(print="Obteniendo ultimos cambios del remoto")
|
Git("pull").exec(print="Obteniendo ultimos cambios del remoto")
|
||||||
Git("switch", "-").exec(print="Volviendo a rama a mergear")
|
Git("switch", "-").exec(print="Volviendo a rama a mergear")
|
||||||
|
|
||||||
self.check_merge_conflicts(target)
|
check_merge_conflicts(target)
|
||||||
self.show_commits_to_merge(target)
|
show_commits_to_merge(target)
|
||||||
|
|
||||||
if self.confirm(f"¿Crear PR de '{branch}' a '{target}'?"):
|
if base.io_confirm(f"¿Crear PR de '{branch}' a '{target}'?"):
|
||||||
|
if branch not in base.environments:
|
||||||
Git("push", remote, branch, set_upstream=True).exec(
|
Git("push", remote, branch, set_upstream=True).exec(
|
||||||
print="Subiendo rama al remoto para crear PR"
|
print="Subiendo rama al remoto para crear PR"
|
||||||
)
|
)
|
||||||
|
|
||||||
self.create_pull_request(token, branch, target)
|
create_pull_request(token, branch, target)
|
||||||
|
|
||||||
def run_local(self, branch: str, target: str):
|
|
||||||
self.ensure_clean_worktree(False)
|
|
||||||
self.check_merge_conflicts(target)
|
|
||||||
self.show_commits_to_merge(target)
|
|
||||||
|
|
||||||
if self.confirm(f"¿Mergear rama '{branch}' a '{target}'?"):
|
def run_local(branch: str, target: str):
|
||||||
|
base.ensure_clean_worktree(False)
|
||||||
|
check_merge_conflicts(target)
|
||||||
|
show_commits_to_merge(target)
|
||||||
|
|
||||||
|
if base.io_confirm(f"¿Mergear rama '{branch}' a '{target}'?"):
|
||||||
Git("switch", target).exec(print="Cambiando a rama destino")
|
Git("switch", target).exec(print="Cambiando a rama destino")
|
||||||
Git("merge", branch, ff=False).exec(print="Mergeando")
|
Git("merge", branch, ff=False).exec(print="Mergeando")
|
||||||
|
|
||||||
def show_commits_to_merge(self, target):
|
|
||||||
|
def show_commits_to_merge(target):
|
||||||
commits = Git("log", target + "..", format="%s").lines()
|
commits = Git("log", target + "..", format="%s").lines()
|
||||||
|
|
||||||
if not commits:
|
if not commits:
|
||||||
@@ -62,7 +78,8 @@ class MergeCommand(Command):
|
|||||||
for commit in commits:
|
for commit in commits:
|
||||||
print("- " + commit)
|
print("- " + commit)
|
||||||
|
|
||||||
def check_merge_conflicts(self, target: str):
|
|
||||||
|
def check_merge_conflicts(target: str):
|
||||||
merge_conflicts = Git("merge", target, ff=False, commit=False).code(
|
merge_conflicts = Git("merge", target, ff=False, commit=False).code(
|
||||||
print="Realizando merge de prueba para verificar conflictos"
|
print="Realizando merge de prueba para verificar conflictos"
|
||||||
)
|
)
|
||||||
@@ -70,31 +87,60 @@ class MergeCommand(Command):
|
|||||||
Git("merge", abort=True).exec(print="Abortando merge de prueba", check=False)
|
Git("merge", abort=True).exec(print="Abortando merge de prueba", check=False)
|
||||||
|
|
||||||
if merge_conflicts:
|
if merge_conflicts:
|
||||||
self.error(f"La rama actual tiene conflictos con {target}")
|
base.io_error(f"La rama actual tiene conflictos con {target}.\n"
|
||||||
self.info(
|
f"Se recomienda mergear {target} a la rama actual, resolver los conflictos localmente, y ejecutar nuevamente este comando", "Conflictos de merge")
|
||||||
f"""Se recomienda mergear {target} a la rama actual, resolver los conflictos localmente, y ejecutar nuevamente este comando"""
|
|
||||||
)
|
|
||||||
raise GitFlowError("Ejecución abortada.")
|
raise GitFlowError("Ejecución abortada.")
|
||||||
else:
|
else:
|
||||||
self.success("No se detectaron merge conflicts.")
|
base.io_success("No se detectaron merge conflicts.")
|
||||||
|
|
||||||
def create_pull_request(self, token: str, branch: str, target: str):
|
|
||||||
|
def create_pull_request(token: str, branch: str, target: str):
|
||||||
changelog = Changelog()
|
changelog = Changelog()
|
||||||
title = self.prompt("[Opcional] Ingrese un titulo para el PR")
|
commits = Git("log", target + "..", format="%s").lines()
|
||||||
title = title or branch.replace("/", ": ").replace("-", " ")
|
title = commits[0] if len(commits) == 1 else _get_pr_title_from_branch(branch)
|
||||||
|
|
||||||
if title.startswith("release: "):
|
base.panel("Título del PR", title)
|
||||||
title = title[title.index(' ', title.index(' ') + 1) + 1:]
|
|
||||||
|
|
||||||
message = self.get_remote_api(token).create_pull_request(
|
if base.io_confirm("¿Desea cambiar el título del PR?", False):
|
||||||
|
title = base.io_prompt("Título del PR", persistent=True)
|
||||||
|
|
||||||
|
message = base.get_remote_api(token).create_pull_request(
|
||||||
branch,
|
branch,
|
||||||
target,
|
target,
|
||||||
branch.replace("/", ": ").replace("-", " "),
|
title,
|
||||||
changelog.generate_content(target, branch),
|
changelog.generate_content(target, branch),
|
||||||
|
branch not in base.environments
|
||||||
)
|
)
|
||||||
|
|
||||||
self.success(message)
|
base.io_success(message, "Rama creada")
|
||||||
|
|
||||||
if self.confirm("¿Desea cambiar a la rama objetivo y bajar los cambios?"):
|
if base.io_confirm("¿Desea cambiar a la rama objetivo y bajar los cambios?"):
|
||||||
Git("switch", target).exec(print="Cambiando a rama objetivo")
|
Git("switch", target).exec(print="Cambiando a rama objetivo")
|
||||||
Git("pull").exec(print="Obteniendo cambios")
|
Git("pull").exec(print="Obteniendo cambios")
|
||||||
|
|
||||||
|
def _get_pr_title_from_branch(branch: str) -> str:
|
||||||
|
if branch in base.environments:
|
||||||
|
target = base.environments[base.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 base.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("-", " ")
|
||||||
|
]))
|
||||||
|
|||||||
+30
-32
@@ -1,57 +1,55 @@
|
|||||||
from argparse import Namespace
|
import typer
|
||||||
from git_flow import BRANCH_TYPES
|
from git_flow import BRANCH_TYPES
|
||||||
from git_flow.command.base import Command
|
import git_flow.command.base as base
|
||||||
from git_flow.git import Git
|
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:
|
base.ensure_initialized()
|
||||||
return """Crea una nueva rama siguiendo conventional branches"""
|
branch = base.ensure_right_branch()
|
||||||
|
|
||||||
def run(self, args: Namespace = Namespace()):
|
if branch not in base.environments:
|
||||||
self.ensure_initialized()
|
base.io_warning("La rama actual no corresponde a un entorno configurado.")
|
||||||
branch = self.ensure_right_branch()
|
|
||||||
envs = self.flowconfig["flow.branches"].split(",")
|
|
||||||
|
|
||||||
if branch not in envs:
|
base.io_info("Se creará una nueva rama de trabajo sobre la rama actual.\n"
|
||||||
self.warning("La rama actual no corresponde a un entorno configurado.")
|
"Debe seleccionar el tipo de cambio a realizar.", title="Tipo de cambio")
|
||||||
|
|
||||||
self.info("Se creará una nueva rama de trabajo sobre la rama actual.")
|
branch_type = base.io_choice("Tipos de cambio", BRANCH_TYPES)
|
||||||
self.info("Debe seleccionar el tipo de cambio a realizar.")
|
ticket = _get_optional_ticket()
|
||||||
|
new_branch = _get_unique_branch_name(branch_type, ticket)
|
||||||
|
|
||||||
branch_type = self.choice("Tipos de cambio", BRANCH_TYPES)
|
if "flow.remote" in base.flowconfig and Git.get_tracking_branch(branch):
|
||||||
new_branch = self._get_unique_branch_name(branch_type)
|
|
||||||
|
|
||||||
if "flow.remote" in self.flowconfig and Git.get_tracking_branch(branch):
|
|
||||||
Git("pull").exec(print="Actualizando rama actual")
|
Git("pull").exec(print="Actualizando rama actual")
|
||||||
|
|
||||||
if self.confirm(f"¿Crear rama '{new_branch}' sobre la rama actual?"):
|
if base.io_confirm(f"¿Crear rama '{new_branch}' sobre la rama actual?"):
|
||||||
Git("switch", new_branch, create=True).exec(print="Creando nueva rama")
|
Git("switch", new_branch, create=True).exec(print="Creando nueva rama")
|
||||||
|
|
||||||
def _get_unique_branch_name(self, branch_type: str) -> str:
|
def _get_optional_ticket() -> Optional[str]:
|
||||||
self.info(
|
return base.io_prompt(
|
||||||
f"Ingrese las palabras clave que describan el cambio de tipo '{branch_type}'."
|
"Ticket que respalda el cambio (en formato ABC-123)",
|
||||||
|
validator=lambda x: len(x.strip()) == 0 or base.is_valid_ticket(x)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def _get_unique_branch_name(branch_type: str, ticket: Optional[str]) -> str:
|
||||||
|
base.io_info(f"Ingrese las palabras clave que describan el cambio de tipo '{branch_type}'.\n"
|
||||||
|
"Las mismas se utilizaran para generar el nombre de la rama.", title="Nombre de rama")
|
||||||
branch = None
|
branch = None
|
||||||
branches = Git.get_branches()
|
branches = Git.get_branches()
|
||||||
|
|
||||||
while branch is None:
|
while branch is None:
|
||||||
keywords = self.prompt(
|
keywords = base.io_prompt("Palabras clave", persistent=True)
|
||||||
"Palabras clave del cambio (por ejemplo: 'create worker form')",
|
|
||||||
persistent=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
ticket = self.prompt("[Opcional] Ingrese el ID del ticket (por ejemplo ABC-123 o #123)")
|
|
||||||
ticket = ticket[1:] if ticket.startswith("#") else ticket
|
|
||||||
keywords = ticket + ' ' + keywords
|
|
||||||
keywords = filter(lambda k: len(k) > 0, keywords.split(" "))
|
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:
|
if branch in branches:
|
||||||
self.error(
|
base.io_error(
|
||||||
f"La rama '{branch}' ya existe, cambie las palabras claves para generar otra"
|
f"La rama '{branch}' ya existe, cambie las palabras claves para generar otra"
|
||||||
)
|
)
|
||||||
branch = None
|
branch = None
|
||||||
|
|||||||
@@ -1,42 +1,30 @@
|
|||||||
from argparse import ArgumentParser, Namespace
|
|
||||||
from git_flow import COMMIT_TYPES, GitFlowError
|
from git_flow import COMMIT_TYPES, GitFlowError
|
||||||
from git_flow.command.base import Command
|
from git_flow.command.base import *
|
||||||
from git_flow.git import Git
|
from git_flow.git import Git
|
||||||
|
from typing import Optional
|
||||||
|
import typer
|
||||||
|
|
||||||
|
app = typer.Typer()
|
||||||
|
|
||||||
|
|
||||||
class ReleaseCommand(Command):
|
@app.command()
|
||||||
def name(self) -> str:
|
def release(group: Optional[str] = None):
|
||||||
return "release"
|
"""Realiza el merge de la rama, o crea el PR para hacerlo si tiene un remoto configurado"""
|
||||||
|
ensure_initialized()
|
||||||
|
|
||||||
def description(self) -> str:
|
branch = ensure_right_branch()
|
||||||
return """Realiza el merge de la rama, o crea el PR para hacerlo si tiene un remoto configurado"""
|
env, _ = get_branch_env_and_type(branch)
|
||||||
|
|
||||||
def setup_parser(self, parser: ArgumentParser) -> ArgumentParser:
|
if env == environments[-1]:
|
||||||
parser.add_argument(
|
|
||||||
"--group",
|
|
||||||
nargs="?",
|
|
||||||
help="Agrupar release",
|
|
||||||
)
|
|
||||||
|
|
||||||
return parser
|
|
||||||
|
|
||||||
def run(self, args: Namespace = Namespace()):
|
|
||||||
self.ensure_initialized()
|
|
||||||
|
|
||||||
branch = self.ensure_right_branch()
|
|
||||||
envs = self.flowconfig["flow.branches"].split(",")
|
|
||||||
(env, _) = self.get_branch_env_and_type(branch)
|
|
||||||
|
|
||||||
if env == envs[-1]:
|
|
||||||
raise GitFlowError(
|
raise GitFlowError(
|
||||||
"No se puede hacer release de una rama en el ultimo entorno."
|
"No se puede hacer release de una rama en el ultimo entorno."
|
||||||
)
|
)
|
||||||
|
|
||||||
has_remote = "flow.remote" in self.flowconfig
|
has_remote = "flow.remote" in flowconfig
|
||||||
|
|
||||||
self.ensure_clean_worktree(has_remote)
|
ensure_clean_worktree(has_remote)
|
||||||
|
|
||||||
next_env = envs[envs.index(env) + 1]
|
next_env = environments[environments.index(env) + 1]
|
||||||
next_branch = (
|
next_branch = (
|
||||||
branch.replace(f"/{env}/", f"/{next_env}/")
|
branch.replace(f"/{env}/", f"/{next_env}/")
|
||||||
if branch.startswith("release/")
|
if branch.startswith("release/")
|
||||||
@@ -54,11 +42,14 @@ class ReleaseCommand(Command):
|
|||||||
for commit in commits:
|
for commit in commits:
|
||||||
print("- " + commit)
|
print("- " + commit)
|
||||||
|
|
||||||
group = args.group
|
grouping = group is not None
|
||||||
|
|
||||||
if not group:
|
if not group:
|
||||||
if self.confirm("¿Desea agrupar este release con otra rama?", False):
|
if confirm("¿Desea agrupar este release con otra rama?", False):
|
||||||
group = self.choice("Grupo release: ", Git.get_branches("release/" + next_env + "/"))
|
grouping = True
|
||||||
|
group = choice(
|
||||||
|
"Grupo release: ", Git.get_branches("release/" + next_env + "/")
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
group = next_env
|
group = next_env
|
||||||
|
|
||||||
@@ -67,14 +58,13 @@ class ReleaseCommand(Command):
|
|||||||
Git("pull").exec(print="Sincronizando cambios la rama objetivo")
|
Git("pull").exec(print="Sincronizando cambios la rama objetivo")
|
||||||
Git("switch", "-").exec(print="Volviendo a la rama original")
|
Git("switch", "-").exec(print="Volviendo a la rama original")
|
||||||
|
|
||||||
if len(commits) > 1 and self.confirm(
|
if len(commits) > 1 and confirm(
|
||||||
f"¿Desea reemplazar los {len(commits)} commits de la rama por uno solo?",
|
f"¿Desea reemplazar los {len(commits)} commits de la rama por uno solo?", False
|
||||||
False
|
|
||||||
):
|
):
|
||||||
self.info("Debe ingresar el mensaje del commit a crear.")
|
info("Debe ingresar el mensaje del commit a crear.")
|
||||||
|
|
||||||
commit_type = self.choice("Tipo de commit", COMMIT_TYPES[:-1])
|
commit_type = choice("Tipo de commit", COMMIT_TYPES[:-1])
|
||||||
commit_message = self.prompt(
|
commit_message = prompt(
|
||||||
"Mensaje (máximo recomendado: 100 caracteres)", persistent=True
|
"Mensaje (máximo recomendado: 100 caracteres)", persistent=True
|
||||||
)
|
)
|
||||||
message = commit_type + ": " + commit_message
|
message = commit_type + ": " + commit_message
|
||||||
@@ -82,13 +72,20 @@ class ReleaseCommand(Command):
|
|||||||
Git("switch", next_branch, base, create=True).exec(
|
Git("switch", next_branch, base, create=True).exec(
|
||||||
print="Creando rama release en base"
|
print="Creando rama release en base"
|
||||||
)
|
)
|
||||||
Git("merge", branch, squash=True).exec(
|
Git("merge", branch, squash=True).exec(print="Squasheando commits en uno solo")
|
||||||
print="Squasheando commits en uno solo"
|
|
||||||
)
|
|
||||||
Git("commit", m=message).exec(print="Creando commit único")
|
Git("commit", m=message).exec(print="Creando commit único")
|
||||||
else:
|
else:
|
||||||
Git("switch", next_branch, create=True).exec(print="Creando rama release")
|
Git("switch", next_branch, create=True).exec(print="Creando rama release")
|
||||||
|
|
||||||
Git("rebase", base, next_branch, onto=group).exec(
|
status = Git("rebase", base, next_branch, onto=group).code(
|
||||||
print="Moviendo cambios hacia el siguiente ambiente"
|
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"
|
||||||
|
)
|
||||||
|
|||||||
+34
-32
@@ -1,4 +1,3 @@
|
|||||||
from argparse import ArgumentParser, Namespace
|
|
||||||
from git_flow import (
|
from git_flow import (
|
||||||
COMMIT_TYPE_INCREMENT,
|
COMMIT_TYPE_INCREMENT,
|
||||||
SEMVER_MAJOR,
|
SEMVER_MAJOR,
|
||||||
@@ -8,38 +7,42 @@ from git_flow import (
|
|||||||
GitFlowError,
|
GitFlowError,
|
||||||
)
|
)
|
||||||
from git_flow.changelog import Changelog
|
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 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()
|
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.")
|
raise GitFlowError("Solo se pueden taggear commits en ramas principales.")
|
||||||
|
|
||||||
branch = Git("show", self.get_last_merge_commit() + "^2", patch=False, format="%h").firstline()
|
branch = Git(
|
||||||
|
"show", get_last_merge_commit() + "^2", patch=False, format="%h"
|
||||||
|
).firstline()
|
||||||
base = Git.get_first_fork_point(branch, target)
|
base = Git.get_first_fork_point(branch, target)
|
||||||
commits = Git("log", base + ".." + branch, format="%s").lines()
|
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:
|
if not next_tag:
|
||||||
self.info(
|
info(
|
||||||
"Los cambios realizados no implican un salto de versión, se mantiene la anterior."
|
"Los cambios realizados no implican un salto de versión, se mantiene la anterior."
|
||||||
)
|
)
|
||||||
return
|
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")
|
||||||
|
|
||||||
changelog = Changelog()
|
changelog = Changelog()
|
||||||
|
|
||||||
changelog.update(next_tag, base, branch)
|
changelog.update(next_tag, base, branch)
|
||||||
@@ -49,22 +52,19 @@ class TagCommand(Command):
|
|||||||
|
|
||||||
if ci:
|
if ci:
|
||||||
Git("push").exec(print="Subiendo commit al remoto para taggearlo")
|
Git("push").exec(print="Subiendo commit al remoto para taggearlo")
|
||||||
self.success(self.get_remote_api(token).create_tag(next_tag, tag_commit))
|
success(get_remote_api(token).create_tag(next_tag, tag_commit))
|
||||||
else:
|
|
||||||
Git("tag", next_tag, tag_commit).exec(print="Creando tag localmente")
|
Git("tag", next_tag, tag_commit).exec(print="Creando tag localmente")
|
||||||
|
|
||||||
def get_token_and_ci(self, args: Namespace):
|
|
||||||
|
def get_token_and_ci(token: Optional[str]):
|
||||||
try:
|
try:
|
||||||
return (self.ensure_repository_token(), False)
|
return (ensure_repository_token(), False)
|
||||||
except GitFlowError:
|
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(
|
commit = Git(
|
||||||
"log", first_parent=True, merges=True, max_count=1, format="%h"
|
"log", first_parent=True, merges=True, max_count=1, format="%h"
|
||||||
).firstline()
|
).firstline()
|
||||||
@@ -74,19 +74,19 @@ class TagCommand(Command):
|
|||||||
|
|
||||||
return commit
|
return commit
|
||||||
|
|
||||||
def check_not_tagged(self, commit: str):
|
|
||||||
|
def check_not_tagged(commit: str):
|
||||||
tag = Git("describe", commit, tags=True, exact_match=True).firstline(check=False)
|
tag = Git("describe", commit, tags=True, exact_match=True).firstline(check=False)
|
||||||
|
|
||||||
if tag:
|
if tag:
|
||||||
raise GitFlowError("El commit a taggear 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
|
increment = SEMVER_SKIP
|
||||||
for commit in commits:
|
for commit in commits:
|
||||||
commit_type = commit[: commit.index(":")]
|
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}"
|
tag = Git.get_current_tag() or f"v0.0.0-{branch}"
|
||||||
|
|
||||||
@@ -103,5 +103,7 @@ class TagCommand(Command):
|
|||||||
patch = 0
|
patch = 0
|
||||||
elif increment == SEMVER_PATCH:
|
elif increment == SEMVER_PATCH:
|
||||||
patch += 1
|
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}"
|
return None if increment == SEMVER_SKIP else f"v{major}.{minor}.{patch}{suffix}"
|
||||||
|
|||||||
+11
-25
@@ -1,16 +1,9 @@
|
|||||||
import subprocess
|
import subprocess
|
||||||
|
|
||||||
from git_flow import GitFlowError
|
from git_flow import FLOWCONFIG_FILENAME
|
||||||
from git_flow.io import *
|
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 Git:
|
||||||
class Status:
|
class Status:
|
||||||
worktree: str
|
worktree: str
|
||||||
@@ -44,7 +37,7 @@ class Git:
|
|||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def flow_config(*args, **kwargs):
|
def flow_config(*args, **kwargs):
|
||||||
return Git("config", *args, file=FLOWCONFIG_FILE, **kwargs)
|
return Git("config", *args, file=FLOWCONFIG_FILENAME, **kwargs)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def get_current_branch():
|
def get_current_branch():
|
||||||
@@ -88,7 +81,9 @@ class Git:
|
|||||||
except subprocess.CalledProcessError:
|
except subprocess.CalledProcessError:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def __init__(self, subcommand: str, *args: str, **kwargs: str | int | bool | list[str] | None) -> None:
|
def __init__(
|
||||||
|
self, subcommand: str, *args: str, **kwargs: str | int | bool | list[str] | None
|
||||||
|
) -> None:
|
||||||
self.command = ["git", subcommand]
|
self.command = ["git", subcommand]
|
||||||
|
|
||||||
for option, value in kwargs.items():
|
for option, value in kwargs.items():
|
||||||
@@ -144,17 +139,8 @@ class Git:
|
|||||||
|
|
||||||
return process
|
return process
|
||||||
|
|
||||||
|
|
||||||
def _run(self, print: str | None = None, check: bool = True):
|
def _run(self, print: str | None = None, check: bool = True):
|
||||||
process = subprocess.run(self.command, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
|
return self._get(print, check)
|
||||||
|
|
||||||
if print is not None:
|
|
||||||
self._print_process("", "", title=print)
|
|
||||||
|
|
||||||
if check:
|
|
||||||
process.check_returncode()
|
|
||||||
|
|
||||||
return process
|
|
||||||
|
|
||||||
def _print_process(self, stdout: str, stderr: str, title: str):
|
def _print_process(self, stdout: str, stderr: str, title: str):
|
||||||
command = []
|
command = []
|
||||||
@@ -168,12 +154,12 @@ class Git:
|
|||||||
|
|
||||||
command.append(arg)
|
command.append(arg)
|
||||||
|
|
||||||
title = title or "Ejecutando"
|
text = f"[green]$ {" ".join(command)}[/green]"
|
||||||
print(COLOR_YELLOW + "| " + title + COLOR_RESET)
|
|
||||||
print(COLOR_YELLOW + "| $ " + " ".join(command) + COLOR_RESET)
|
|
||||||
|
|
||||||
for line in stdout.splitlines():
|
for line in stdout.splitlines():
|
||||||
print(COLOR_YELLOW + "| " + COLOR_RESET + "[out] " + line)
|
text += "\n" + line
|
||||||
|
|
||||||
for line in stderr.splitlines():
|
for line in stderr.splitlines():
|
||||||
print(COLOR_YELLOW + "| " + COLOR_RED + "[err] " + line + COLOR_RESET)
|
text += "\n[red]" + line + "[/red]"
|
||||||
|
|
||||||
|
panel(title or "Ejecutando", text)
|
||||||
|
|||||||
+41
-42
@@ -1,56 +1,55 @@
|
|||||||
import sys
|
from rich.console import Console
|
||||||
|
from rich.prompt import Prompt, Confirm
|
||||||
|
from rich.panel import Panel
|
||||||
|
|
||||||
from git_flow import COLOR_BLACK_BOLD, COLOR_BLUE, COLOR_GREEN, COLOR_RED, COLOR_RESET, COLOR_YELLOW
|
console = Console(highlight=False)
|
||||||
|
|
||||||
def confirm(prompt, default: bool = True):
|
|
||||||
user_input = input(prompt + (" [Y/n]: " if default else " [y/N]: "))
|
|
||||||
|
|
||||||
return default if len(user_input) == 0 else user_input.startswith("y")
|
|
||||||
|
|
||||||
|
|
||||||
def choose(prompt: str, options: list[str]):
|
def success(msg: str):
|
||||||
print(prompt)
|
console.print(f":white_check_mark: [green]{msg}[/green]")
|
||||||
|
|
||||||
for i, option in enumerate(options):
|
|
||||||
print(f"\t{i+1}. {option}")
|
|
||||||
|
|
||||||
selection = None
|
def warning(msg: str):
|
||||||
|
console.print(f":warning: [yellow]{msg}[/yellow]")
|
||||||
|
|
||||||
while selection is None:
|
|
||||||
user_input = input(f"Seleccione una opción [1-{len(options)}] o escribala: ")
|
|
||||||
|
|
||||||
if user_input.isdigit():
|
def error(msg: str):
|
||||||
user_input = int(user_input)
|
console.print(f":x: [red]{msg}[/red]")
|
||||||
|
|
||||||
if 1 <= user_input and user_input <= len(options):
|
|
||||||
selection = options[user_input - 1]
|
|
||||||
|
|
||||||
if not confirm(
|
def info(msg: str):
|
||||||
f"Seleccionó la opción {user_input} ({selection}), ¿es correcto?"
|
console.print(f":information: [blue]{msg}[/blue]")
|
||||||
):
|
|
||||||
selection = None
|
|
||||||
|
def panel(title: str, text: str):
|
||||||
|
console.print(Panel(text, title=title, expand=False, title_align="left"))
|
||||||
|
|
||||||
|
|
||||||
|
def prompt(
|
||||||
|
prompt: str,
|
||||||
|
default: str | None = 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:
|
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}")
|
|
||||||
|
|||||||
+18
-76
@@ -1,90 +1,32 @@
|
|||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
|
|
||||||
import locale
|
import typer
|
||||||
from argparse import Namespace, ArgumentParser
|
|
||||||
|
|
||||||
from git_flow import GitFlowError
|
from git_flow import GitFlowError
|
||||||
from git_flow.command.base import Command
|
import git_flow.command.base as base
|
||||||
from git_flow.command.branch import BranchCommand
|
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
|
|
||||||
from git_flow.command.merge import MergeCommand
|
|
||||||
from git_flow.command.new import NewCommand
|
|
||||||
from git_flow.command.release import ReleaseCommand
|
|
||||||
from git_flow.command.tag import TagCommand
|
|
||||||
from git_flow.io import *
|
|
||||||
|
|
||||||
|
|
||||||
REPOSITORY_TOKEN_PATH = ".repository-token"
|
REPOSITORY_TOKEN_PATH = ".repository-token"
|
||||||
LOCALE = "es_AR.UTF-8"
|
LOCALE = "es_AR.UTF-8"
|
||||||
|
|
||||||
|
|
||||||
class GitFlowCommand(Command):
|
app = typer.Typer()
|
||||||
commands: tuple[Command, ...]
|
app.add_typer(init.app)
|
||||||
|
app.add_typer(new.app)
|
||||||
def __init__(self, *args: Command) -> None:
|
app.add_typer(commit.app)
|
||||||
self.commands = args
|
app.add_typer(merge.app)
|
||||||
|
app.add_typer(tag.app)
|
||||||
def name(self) -> str:
|
app.add_typer(release.app)
|
||||||
return "git-flow"
|
app.add_typer(branch.app)
|
||||||
|
|
||||||
def description(self) -> str:
|
|
||||||
return """Git flow es una herramienta para automatizar un workflow siguiendo conventional commits, conventional branch y semver."""
|
|
||||||
|
|
||||||
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(), description=command.description()
|
|
||||||
)
|
|
||||||
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:
|
|
||||||
command.init()
|
|
||||||
return command.run(args)
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
try:
|
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(),
|
|
||||||
ReleaseCommand(),
|
|
||||||
BranchCommand()
|
|
||||||
)
|
|
||||||
try:
|
|
||||||
command.run()
|
|
||||||
except GitFlowError as e:
|
|
||||||
command.error(str(e))
|
|
||||||
except Exception as e:
|
|
||||||
command.error("Ocurrió un error inesperado: " + str(e))
|
|
||||||
except KeyboardInterrupt as e:
|
|
||||||
print()
|
print()
|
||||||
command.error("Ejecución abortada")
|
except GitFlowError as e:
|
||||||
|
base.io_error(str(e), title="Git Flow")
|
||||||
return
|
except Exception as e:
|
||||||
|
base.io_error(str(e), title="Inesperado")
|
||||||
|
except KeyboardInterrupt as e:
|
||||||
if __name__ == "__main__":
|
base.io_error("Ejecución abortada")
|
||||||
main()
|
|
||||||
|
|||||||
+11
-28
@@ -12,42 +12,24 @@ class RemoteAPI(ABC):
|
|||||||
@staticmethod
|
@staticmethod
|
||||||
def parse(remote: str):
|
def parse(remote: str):
|
||||||
url = Git("remote", "get-url", remote).firstline()
|
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@"):
|
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("@")
|
at_pos = url.index("@")
|
||||||
colon_pos = url.index(":")
|
colon_pos = url.index(":")
|
||||||
|
schema = "ssh://"
|
||||||
host = url[at_pos+1:colon_pos]
|
host = url[at_pos+1:colon_pos]
|
||||||
repository = url[colon_pos+1:]
|
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:]
|
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
|
@abstractmethod
|
||||||
def create_pull_request(
|
def create_pull_request(
|
||||||
@@ -56,6 +38,7 @@ class RemoteAPI(ABC):
|
|||||||
destination: str,
|
destination: str,
|
||||||
title: str | None = None,
|
title: str | None = None,
|
||||||
description: str | None = None,
|
description: str | None = None,
|
||||||
|
close_source_branch: bool = True
|
||||||
) -> str:
|
) -> str:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ class BitbucketRemoteAPI(RemoteAPI):
|
|||||||
destination: str,
|
destination: str,
|
||||||
title: str | None = None,
|
title: str | None = None,
|
||||||
description: str | None = None,
|
description: str | None = None,
|
||||||
|
close_source_branch: bool = True
|
||||||
):
|
):
|
||||||
request = requests.post(
|
request = requests.post(
|
||||||
self.get_endpoint("/pullrequests"),
|
self.get_endpoint("/pullrequests"),
|
||||||
@@ -21,7 +22,7 @@ class BitbucketRemoteAPI(RemoteAPI):
|
|||||||
"description": description,
|
"description": description,
|
||||||
"source": {"branch": {"name": source}},
|
"source": {"branch": {"name": source}},
|
||||||
"destination": {"branch": {"name": destination}},
|
"destination": {"branch": {"name": destination}},
|
||||||
"close_source_branch": True,
|
"close_source_branch": close_source_branch,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -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,
|
||||||
|
}
|
||||||
@@ -1,9 +1,10 @@
|
|||||||
|
import requests
|
||||||
from git_flow import GitFlowError
|
from git_flow import GitFlowError
|
||||||
from git_flow.remote.base import RemoteAPI
|
from git_flow.remote.base import RemoteAPI
|
||||||
|
|
||||||
|
|
||||||
class GithubRemoteAPI(RemoteAPI):
|
class GithubRemoteAPI(RemoteAPI):
|
||||||
API_ENDPOINT = "https://github.com"
|
API_ENDPOINT = "https://api.github.com/repos"
|
||||||
|
|
||||||
def create_pull_request(
|
def create_pull_request(
|
||||||
self,
|
self,
|
||||||
@@ -11,11 +12,35 @@ class GithubRemoteAPI(RemoteAPI):
|
|||||||
destination: str,
|
destination: str,
|
||||||
title: str | None = None,
|
title: str | None = None,
|
||||||
description: str | None = None,
|
description: str | None = None,
|
||||||
|
close_source_branch: bool = True
|
||||||
) -> str:
|
) -> 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:
|
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:
|
def get_endpoint(self, resource: str) -> str:
|
||||||
return GithubRemoteAPI.API_ENDPOINT
|
return f"{GithubRemoteAPI.API_ENDPOINT}/{self.repository}{resource}"
|
||||||
|
|||||||
@@ -0,0 +1,218 @@
|
|||||||
|
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 = "questionary" },
|
||||||
|
{ name = "requests" },
|
||||||
|
{ name = "rich" },
|
||||||
|
{ name = "typer" },
|
||||||
|
]
|
||||||
|
|
||||||
|
[package.metadata]
|
||||||
|
requires-dist = [
|
||||||
|
{ name = "questionary" },
|
||||||
|
{ name = "requests" },
|
||||||
|
{ name = "rich" },
|
||||||
|
{ 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 = "prompt-toolkit"
|
||||||
|
version = "3.0.52"
|
||||||
|
source = { registry = "https://pypi.org/simple" }
|
||||||
|
dependencies = [
|
||||||
|
{ name = "wcwidth" },
|
||||||
|
]
|
||||||
|
sdist = { url = "https://files.pythonhosted.org/packages/a1/96/06e01a7b38dce6fe1db213e061a4602dd6032a8a97ef6c1a862537732421/prompt_toolkit-3.0.52.tar.gz", hash = "sha256:28cde192929c8e7321de85de1ddbe736f1375148b02f2e17edd840042b1be855", size = 434198, upload-time = "2025-08-27T15:24:02.057Z" }
|
||||||
|
wheels = [
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/84/03/0d3ce49e2505ae70cf43bc5bb3033955d2fc9f932163e84dc0779cc47f48/prompt_toolkit-3.0.52-py3-none-any.whl", hash = "sha256:9aac639a3bbd33284347de5ad8d68ecc044b91a762dc39b7c21095fcd6a19955", size = 391431, upload-time = "2025-08-27T15:23:59.498Z" },
|
||||||
|
]
|
||||||
|
|
||||||
|
[[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 = "questionary"
|
||||||
|
version = "2.1.1"
|
||||||
|
source = { registry = "https://pypi.org/simple" }
|
||||||
|
dependencies = [
|
||||||
|
{ name = "prompt-toolkit" },
|
||||||
|
]
|
||||||
|
sdist = { url = "https://files.pythonhosted.org/packages/f6/45/eafb0bba0f9988f6a2520f9ca2df2c82ddfa8d67c95d6625452e97b204a5/questionary-2.1.1.tar.gz", hash = "sha256:3d7e980292bb0107abaa79c68dd3eee3c561b83a0f89ae482860b181c8bd412d", size = 25845, upload-time = "2025-08-28T19:00:20.851Z" }
|
||||||
|
wheels = [
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/3c/26/1062c7ec1b053db9e499b4d2d5bc231743201b74051c973dadeac80a8f43/questionary-2.1.1-py3-none-any.whl", hash = "sha256:a51af13f345f1cdea62347589fbb6df3b290306ab8930713bfae4d475a7d4a59", size = 36753, upload-time = "2025-08-28T19:00:19.56Z" },
|
||||||
|
]
|
||||||
|
|
||||||
|
[[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" },
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "wcwidth"
|
||||||
|
version = "0.8.2"
|
||||||
|
source = { registry = "https://pypi.org/simple" }
|
||||||
|
sdist = { url = "https://files.pythonhosted.org/packages/34/74/c6428f875774288bec1396f5bfcbc2d925700a4dad61727fd5f2b12f249d/wcwidth-0.8.2.tar.gz", hash = "sha256:91fbef97204b96a3d4d421609b80340b760cf33e26da123ff243d76b1fda8dda", size = 1466253, upload-time = "2026-06-29T18:11:11.601Z" }
|
||||||
|
wheels = [
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/96/42/3e5985a0a7e57de470b320c6d6a1a67c844f6737a587f3d44dd13d1819e7/wcwidth-0.8.2-py3-none-any.whl", hash = "sha256:d63947694a0539a1d51e01eda7caf800c291020e6cdd7e28ad7b14dd33ad4f85", size = 323166, upload-time = "2026-06-29T18:11:09.888Z" },
|
||||||
|
]
|
||||||
Reference in New Issue
Block a user