rocketdoo 1.2__tar.gz → 1.2.2__tar.gz

{rocketdoo-1.2 → rocketdoo-1.2.2}/LICENSE

@@ -57,7 +57,7 @@ If the Library as you received it specifies that a proxy can decide whether futu
 <div Rocketdoo=""></div>
 
 Licencia: LGPL-3.0+
-Versión: "1.2"
+Versión: "1.2.2"
 Autor: Horacio Montaño, Elias Braceras
 Fecha: 16/10/2024
 Descripción: Framework to development Odoo

{rocketdoo-1.2 → rocketdoo-1.2.2}/PKG-INFO

@@ -1,19 +1,31 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: rocketdoo
-Version: 1.2
+Version: 1.2.2
 Summary: This library allows you to build an automated local development environment for Odoo EE and CE.
 Home-page: https://github.com/HDM-soft/rocketdoo.git
 Author: Horacio Montaño and Elias Braceras
 Author-email: horaciomontano@hdmsoft.com.ar
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: copier
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
-# HDMsoft
-[visit our page](https://odoo.hdmsoft.com.ar)
+# HDMSOFT
+
+[Visit our page](https://odoo.hdmsoft.com.ar)
+
+[Official Documentation](https://rocketdoo-docs.readthedocs.io/en/latest/)
 
 ## ROCKETDOO
 
-Base repository for Odoo development.
+Odoo Development Framework
 
 ## Developed by:
 
@@ -21,7 +33,7 @@ Base repository for Odoo development.
    - "Horacio Montaño"
 
 ## Version: 
-   - "1.2"
+   - "1.2.2"
 
 ----------------------------------------------------------------------------------------------------------------------------------------------------------
 
@@ -135,6 +147,10 @@ If you modify your **gitman.yml** file before building with the "build" command,
 
 - If you have any questions or issues with our development environment, you can contact us and submit your inquiry or support ticket by clicking on the link below.
 
- - [Support Link](https://odoo.hdmsoft.com.ar/contactus)
+ - [Support Link](https://odoo.hdmsoft.com.ar/mesa-de-ayuda)
+
+- If you like this project, and you want to collaborate with a donation, you can do it here !!!
 
+ - [Cafecito](https://cafecito.app/horacio1986)
+ - [Patreon](https://cafecito.app/horacio1986)
 

{rocketdoo-1.2 → rocketdoo-1.2.2}/README.md

@@ -1,9 +1,12 @@
-# HDMsoft
-[visit our page](https://odoo.hdmsoft.com.ar)
+# HDMSOFT
+
+[Visit our page](https://odoo.hdmsoft.com.ar)
+
+[Official Documentation](https://rocketdoo-docs.readthedocs.io/en/latest/)
 
 ## ROCKETDOO
 
-Base repository for Odoo development.
+Odoo Development Framework
 
 ## Developed by:
 
@@ -11,7 +14,7 @@ Base repository for Odoo development.
    - "Horacio Montaño"
 
 ## Version: 
-   - "1.2"
+   - "1.2.2"
 
 ----------------------------------------------------------------------------------------------------------------------------------------------------------
 
@@ -125,6 +128,10 @@ If you modify your **gitman.yml** file before building with the "build" command,
 
 - If you have any questions or issues with our development environment, you can contact us and submit your inquiry or support ticket by clicking on the link below.
 
- - [Support Link](https://odoo.hdmsoft.com.ar/contactus)
+ - [Support Link](https://odoo.hdmsoft.com.ar/mesa-de-ayuda)
+
+- If you like this project, and you want to collaborate with a donation, you can do it here !!!
 
+ - [Cafecito](https://cafecito.app/horacio1986)
+ - [Patreon](https://cafecito.app/horacio1986)
 

{rocketdoo-1.2 → rocketdoo-1.2.2}/rocketdoo/config.py

@@ -1,37 +1,79 @@
+import socket
 import sys
 import os
+import subprocess
 import re
 import yaml
 import shutil
 
+def is_port_in_use(port):
+    """Check if a TCP port is currently in use on localhost."""
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+        return s.connect_ex(('localhost', port)) == 0
+
+def is_port_used_by_rocketdoo(port):
+    """Check if the port is used by any running Docker container related to Rocketdoo."""
+    try:
+        output = subprocess.check_output(['docker', 'ps', '--format', '{{.Names}} {{.Ports}}']).decode()
+        for line in output.strip().splitlines():
+            if 'rocketdoo' in line and str(port) in line:
+                return True
+    except Exception as e:
+        print(f"[ERROR] Could not inspect Docker containers: {e}")
+    return False
+
+def validate_port_from_int(port, label):
+    print(f"[DEBUG] Validating {label} port: {port}")
+    
+    if not isinstance(port, int):
+        try:
+            port = int(str(port).strip())
+        except ValueError:
+            print(f"[ERROR] Invalid {label} port. Please ensure it is a valid number.")
+            sys.exit(1)
+
+    if is_port_in_use(port):
+        if is_port_used_by_rocketdoo(port):
+            print(f"[ERROR] Port {port} is already used by another Rocketdoo project ({label}).")
+        else:
+            print(f"[ERROR] Port {port} is already in use by another application ({label}).")
+        sys.exit(1)
+    print(f"[INFO] {label} port {port} is available.")
+    
+# Validate ports for Odoo, VSCode, and Rocketdoo
+odoo_port = os.getenv("COPIER_odoo_port", 8069)
+vsc_port = os.getenv("COPIER_vsc_port", 8888)
+
+validate_port_from_int(odoo_port, "Odoo")
+validate_port_from_int(vsc_port, "VSCode")
 
 docker_compose_path = "docker-compose.yml"
 dockerfile_path = "Dockerfile"
 
 # Function to modify docker-compose.yml
 
-def modificar_docker_compose(edicion):
-    if edicion.lower() == 'ee':
+def modify_docker_compose(edition):
+    if edition.lower() == 'ee':
         try:
             # Read docker compose at first
             with open(docker_compose_path, 'r') as file:
-                contenido = file.readlines()
+                content = file.readlines()
 
             # Modify content memory
-            contenido_modificado = []
-            for linea in contenido:
+            modified_content = []
+            for line in content:
                 # Check if the line has the specific pattern
-                if linea.lstrip().startswith('#- ./enterprise:/usr/lib/python3/dist-packages/odoo/enterprise'):
+                if line.lstrip().startswith('#- ./enterprise:/usr/lib/python3/dist-packages/odoo/enterprise'):
                     # Remove only the '#' symbol that appears after the spaces, without affecting the indentation.
-                    indentacion = len(linea) - len(linea.lstrip())
-                    linea = ' ' * indentacion + linea.lstrip().lstrip('#').lstrip()
-                    contenido_modificado.append(linea)
+                    indentation = len(line) - len(line.lstrip())
+                    line = ' ' * indentation + line.lstrip().lstrip('#').lstrip()
+                    modified_content.append(line)
                 else:
-                    contenido_modificado.append(linea)
+                    modified_content.append(line)
 
             # Writes the modified content back to the file
             with open(docker_compose_path, 'w') as file:
-                file.writelines(contenido_modificado)
+                file.writelines(modified_content)
 
             print("Environment prepared for the Enterprise edition. Be sure to upload your Enterprise folder to the root of the project.")
         except FileNotFoundError:
@@ -40,34 +82,34 @@ def modificar_docker_compose(edicion):
             print(f"Error modifying {docker_compose_path}: {e}")
 
 # Function to modify the odoo.conf file
-def modificar_odoo_conf(edicion):
+def modify_odoo_conf(edition):
     odoo_conf_path = os.path.join("config", "odoo.conf")
     
-    if edicion.lower() == 'ee':
+    if edition.lower() == 'ee':
         # Ensure that the file exists
         if not os.path.exists(odoo_conf_path):
             print(f"The file {odoo_conf_path} does not exist.")
             return
 
         with open(odoo_conf_path, 'r') as file:
-            contenido = file.read()
+            content = file.read()
 
         # Add enterprise path to addons_path
         addons_path = "/usr/lib/python3/dist-packages/odoo/enterprise"
-        contenido_modificado = re.sub(r'(addons_path\s*=\s*)(.*)', r'\1\2,{}'.format(addons_path), contenido)
+        modified_content = re.sub(r'(addons_path\s*=\s*)(.*)', r'\1\2,{}'.format(addons_path), content)
 
         with open(odoo_conf_path, 'w') as file:
-            file.write(contenido_modificado)
+            file.write(modified_content)
 
         print("Modified odoo.conf file to include the Enterprise path.")
 
 # Ask for the odoo edition
-edicion = input("In which Odoo edition will you develop? Community or Enterprise (ce/ee): ").strip().lower()
+edition = input("In which Odoo edition will you develop? Community or Enterprise (ce/ee): ").strip().lower()
 
 # Apply modifications if Enterprise edition
-if edicion == 'ee':
-    modificar_docker_compose(edicion)
-    modificar_odoo_conf(edicion)
+if edition == 'ee':
+    modify_docker_compose(edition)
+    modify_odoo_conf(edition)
 else:
     print("Community Edition Selected")
     
@@ -89,17 +131,17 @@ def get_input(prompt, required=True):
 
 
 
-def manejar_ssh(repos_privados, dockerfile_path):
-    """Maneja las claves SSH según si se utilizan repositorios privados."""
-    if not repos_privados:
+def manage_ssh(private_repos, dockerfile_path):
+    """Handles SSH keys depending on whether private repositories are used."""
+    if not private_repos:
         print("No private repositories will be used. SSH keys will not be modified.")
         return
 
-    ssh_folder = os.path.expanduser("~/.ssh")  # Carpeta del usuario
-    build_context_ssh_folder = os.path.join(os.path.dirname(dockerfile_path), ".ssh")  # Contexto de construcción
+    ssh_folder = os.path.expanduser("~/.ssh")  # User folder
+    build_context_ssh_folder = os.path.join(os.path.dirname(dockerfile_path), ".ssh")  # Construction context
 
     try:
-        # Buscar claves privadas en ~/.ssh
+        # Search for private keys in ~/.ssh
         if not os.path.exists(ssh_folder):
             print(f"The {ssh_folder} folder was not found. Make sure you have SSH keys configured.")
             return
@@ -117,22 +159,22 @@ def manejar_ssh(repos_privados, dockerfile_path):
         for i, key in enumerate(ssh_keys):
             print(f"{i + 1}. {key}")
 
-        key_index = int(get_input("Selecciona el número de la clave que deseas usar: ")) - 1
+        key_index = int(get_input("Select the number of the key you wish to use: ")) - 1
         selected_key = ssh_keys[key_index]
         print(f"You have selected the key: {selected_key}")
 
-        # Crear la carpeta .ssh en el contexto de construcción si no existe
+        # Create the folder .ssh in the context of construction if it doesn`t exist
         if not os.path.exists(build_context_ssh_folder):
             os.makedirs(build_context_ssh_folder)
 
-        # Copiar la clave seleccionada al contexto de construcción
+        # Copy the selected key to the build context
         source_key_path = os.path.join(ssh_folder, selected_key)
         dest_key_path = os.path.join(build_context_ssh_folder, selected_key)
         shutil.copy(source_key_path, dest_key_path)
 
         print(f"Key {selected_key} copied to the construction context: {dest_key_path}")
 
-        # Modificar el Dockerfile para usar la clave copiada
+        # Modify the Dockerfile to use the copied key
         with open(dockerfile_path, "r") as file:
             lines = file.readlines()
 
@@ -162,7 +204,7 @@ def manejar_ssh(repos_privados, dockerfile_path):
 
 
 
-def comentar_lineas():
+def comment_lines():
     """Comment out specific lines in the Dockerfile."""
     copy_line = "COPY ./gitman.yml /usr/lib/python3/dist-packages/odoo/\n"
     gitman_line = "RUN gitman install -r /usr/lib/python3/dist-packages/odoo/\n"
@@ -187,31 +229,31 @@ def comentar_lineas():
 
 
 # Function to validate user input
-def obtener_respuesta_si_no(mensaje):
+def get_answer_yes_no(message):
     while True:
-        respuesta = input(mensaje).strip().lower()
-        if respuesta in ["y", "n"]:
-            return respuesta
+        answer = input(message).strip().lower()
+        if answer in ["y", "n"]:
+            return answer
         else:
             print("Please enter 'y' for yes or 'n' for no.")
     
     
 # Ask if the user wants to use private repositories
-usar_repos_privados = input("Do you want to use private repositories (y/n): ").strip().lower()
+use_private_repos = input("Do you want to use private repositories (y/n): ").strip().lower()
 
 
 # Handle SSH in the Dockerfile based on user response
-manejar_ssh(usar_repos_privados == "y", dockerfile_path)
+manage_ssh(use_private_repos == "y", dockerfile_path)
 
 # Ask if the user wants to user gitman with public repositorie
-usar_gitman = input("Do you want to use third-party repositories (y/n): ").strip().lower()
+use_gitman = input("Do you want to use third-party repositories (y/n): ").strip().lower()
 
-if usar_gitman != "y":
+if use_gitman != "y":
     if os.path.exists("gitman.yml"):
         os.remove("gitman.yml")
 
     print("Not use third-party repositories. Commenting lines of the Dockerfile...")
-    comentar_lineas()
+    comment_lines()
     sys.exit(0)
 
 
@@ -226,7 +268,7 @@ config = {
 }
 
 
-def agregar_repositorio():
+def add_repository():
     """Functions to add new repositories"""
     repo_info = {
         "repo": get_input("Write or paste the repository (URL): "),
@@ -243,7 +285,7 @@ def agregar_repositorio():
 
 
 # Function to modify the odoo.conf file in the config folder
-def modificar_odoo_conf():
+def modify_odoo_conf():
     """Modify the addons_path line in config/odoo.conf by adding the new repositories"""
     try:
         # Path to the odoo.conf file in the config folder
@@ -270,21 +312,21 @@ def modificar_odoo_conf():
             gitman_data = yaml.safe_load(file)
 
         # We extract the values of 'name' from each repository in sources, making sure not to include empty ones.
-        nombres_repositorios = [
+        repositories_name = [
             repo["name"] for repo in gitman_data["sources"] if repo["name"]
         ]
-        print(f"Extracted repositories: {nombres_repositorios}")
+        print(f"Extracted repositories: {repositories_name}")
 
         # If there are no repository names, we do nothing.
-        if not nombres_repositorios:
+        if not repositories_name:
             print("No repositories were found to add.")
             return
 
         # We create the new string for addons_path with the new paths
-        nuevas_rutas = ",".join(
+        new_routes = ",".join(
             [
-                f"/usr/lib/python3/dist-packages/odoo/external_addons/{nombre}"
-                for nombre in nombres_repositorios
+                f"/usr/lib/python3/dist-packages/odoo/external_addons/{name}"
+                for name in repositories_name
             ]
         )
 
@@ -293,27 +335,27 @@ def modificar_odoo_conf():
             lines = file.readlines()
 
         # We look for the line containing addons_path
-        addons_path_encontrado = False
+        addons_path_found = False
         for i, line in enumerate(lines):
             if line.startswith("addons_path ="):
                 # We add the new routes to the existing line, if they are not already there.
-                linea_actual = line.strip().split(" = ")[1]
-                lineas_rutas_existentes = linea_actual.split(",")
+                current_line = line.strip().split(" = ")[1]
+                existing_routes_lines = current_line.split(",")
 
                 # We add the new routes to the existing ones, if they are not already there.
-                rutas_actualizadas = lineas_rutas_existentes + [
-                    ruta
-                    for ruta in nuevas_rutas.split(",")
-                    if ruta not in lineas_rutas_existentes
+                update_routes = existing_routes_lines + [
+                    route
+                    for route in new_routes.split(",")
+                    if route not in existing_routes_lines
                 ]
-                lines[i] = f"addons_path = {','.join(rutas_actualizadas)}\n"
-                addons_path_encontrado = True
+                lines[i] = f"addons_path = {','.join(update_routes)}\n"
+                addons_path_found = True
                 print(f"addons_path line modified: {lines[i]}")
                 break
 
         # If addons_path is not found, we add it at the end
-        if not addons_path_encontrado:
-            lines.append(f"addons_path = {nuevas_rutas}\n")
+        if not addons_path_found:
+            lines.append(f"addons_path = {new_routes}\n")
             print("A new addons_path line was added.")
 
         # Save the changes in the odoo.conf file.
@@ -332,13 +374,13 @@ def modificar_odoo_conf():
 
 # Main to add repositories
 while True:
-    agregar_repositorio()
+    add_repository()
 
     # We ask if the user wants to add more repositories
-    agregar_mas = input("Do you want to add another repository? (y/n): ").strip().lower()
+    add_more = input("Do you want to add another repository? (y/n): ").strip().lower()
 
     # Validating answer
-    if agregar_mas != "y":
+    if add_more != "y":
         print("Finished configuring gitman to third-party repository.")
         break
 
@@ -349,4 +391,4 @@ with open("gitman.yml", "w") as file:
 print("File gitman.yml generated successfully.")
 
 # Calling function to modify odoo.conf
-modificar_odoo_conf()
+modify_odoo_conf()

{rocketdoo-1.2 → rocketdoo-1.2.2}/rocketdoo/rocketdoo.py

@@ -4,7 +4,7 @@ import signal
 import sys
 
 # Define la versión del paquete
-VERSION = "1.2"
+VERSION = "1.2.2"
 
 # Maneja la interrupción con Ctrl+C
 def signal_handler(sig, frame):

{rocketdoo-1.2 → rocketdoo-1.2.2}/rocketdoo.egg-info/PKG-INFO

@@ -1,19 +1,31 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: rocketdoo
-Version: 1.2
+Version: 1.2.2
 Summary: This library allows you to build an automated local development environment for Odoo EE and CE.
 Home-page: https://github.com/HDM-soft/rocketdoo.git
 Author: Horacio Montaño and Elias Braceras
 Author-email: horaciomontano@hdmsoft.com.ar
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: copier
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
-# HDMsoft
-[visit our page](https://odoo.hdmsoft.com.ar)
+# HDMSOFT
+
+[Visit our page](https://odoo.hdmsoft.com.ar)
+
+[Official Documentation](https://rocketdoo-docs.readthedocs.io/en/latest/)
 
 ## ROCKETDOO
 
-Base repository for Odoo development.
+Odoo Development Framework
 
 ## Developed by:
 
@@ -21,7 +33,7 @@ Base repository for Odoo development.
    - "Horacio Montaño"
 
 ## Version: 
-   - "1.2"
+   - "1.2.2"
 
 ----------------------------------------------------------------------------------------------------------------------------------------------------------
 
@@ -135,6 +147,10 @@ If you modify your **gitman.yml** file before building with the "build" command,
 
 - If you have any questions or issues with our development environment, you can contact us and submit your inquiry or support ticket by clicking on the link below.
 
- - [Support Link](https://odoo.hdmsoft.com.ar/contactus)
+ - [Support Link](https://odoo.hdmsoft.com.ar/mesa-de-ayuda)
+
+- If you like this project, and you want to collaborate with a donation, you can do it here !!!
 
+ - [Cafecito](https://cafecito.app/horacio1986)
+ - [Patreon](https://cafecito.app/horacio1986)
 

{rocketdoo-1.2 → rocketdoo-1.2.2}/setup.py

@@ -6,7 +6,7 @@ long_description = (this_directory / "README.md").read_text()
 
 setup(
     name='rocketdoo',
-    version='1.2',
+    version='1.2.2',
     description='This library allows you to build an automated local development environment for Odoo EE and CE.',
     long_description=long_description,
     long_description_content_type='text/markdown',