gOdoo-cli 0.3.4__tar.gz → 0.3.5__tar.gz

{godoo_cli-0.3.4 → godoo_cli-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: godoo-cli
-Version: 0.3.4
+Version: 0.3.5
 Summary: Wrapper around Odoo-Bin with some convinience RPC functions.
 Home-page: https://github.com/OpenJKSoftware/gOdoo
 License: LGPL-3

{godoo_cli-0.3.4 → godoo_cli-0.3.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "gOdoo-cli"
-version = "0.3.4"
+version = "0.3.5"
 description = "Wrapper around Odoo-Bin with some convinience RPC functions."
 authors = ["Joshua Kreuder <Joshua_Kreuder@outlook.com>"]
 license = "LGPL-3"
@@ -9,7 +9,7 @@ packages = [{include = "godoo_cli",  from = "src"}]
 repository = "https://github.com/OpenJKSoftware/gOdoo"
 keywords = ["odoo", "godoo","devcontainer"]
 
-[tool.poetry_bumpversion.file."src/godoo_cli/__init__.py"]
+[tool.poetry_bumpversion.file."src/godoo_cli/version.py"]
 
 [tool.poetry.scripts]
 godoo = "godoo_cli:launch_cli"

{godoo_cli-0.3.4 → godoo_cli-0.3.5}/setup.py

@@ -40,7 +40,7 @@ entry_points = \
 
 setup_kwargs = {
     'name': 'godoo-cli',
-    'version': '0.3.4',
+    'version': '0.3.5',
     'description': 'Wrapper around Odoo-Bin with some convinience RPC functions.',
     'long_description': '# gOdoo Dev Environment\n\n![OdooLogo](https://raw.githubusercontent.com/OpenJKSoftware/gOdoo/main/assets/odoo_logo.png)\n![ComposeLogo](https://raw.githubusercontent.com/docker/compose/v2/logo.png)\n\n[<img src="https://raw.githubusercontent.com/OpenJKSoftware/gOdoo/main/assets/godoo-main-cli.png" width="1000"/>](image.png)\n\n**gOdoo** is short for **go Odoo**. \\\nIt is a [Vscode Devcontainer](https://code.visualstudio.com/docs/remote/containers) Environment for [Odoo](https://odoo.com/)\nwith Python CLI `godoo` convenience wrapper around `odoo-bin`.\n\nThis repository is the base source for the Python package [godoo-cli](https://pypi.org/project/godoo-cli/) and serves as\nan all batteries included development environment.\n\nMade Possible by: [WEMPE Elektronic GmbH](https://wetech.de)\n\n# gOdoo-cli\n\nPython package that provides `godoo` command line interface around `odoo-bin`.\n\nIt\'s build with [Typer](https://github.com/tiangolo/typer) to provide some convenience Wrappers for Odoo development and\nDeployment.\n\nMost flags can be configured by Env variables. \\\nUse `godoo --help` to find out more. HINT: Install tab-completion with `godoo --install-completion`\n\n# Docker\n\nThis workspace also contains Docker and Docker-Compose files. \\\n\nThey are used to provide either easy Odoo instances where the source is pulled according to\n[ODOO_MANIFEST.yml](./ODOO_MANIFEST.yml), or as a all batteries included devcontainer for VScode.\n\n## Requirements\n\n- [Docker Compose](https://github.com/docker/compose)\n- [Traefik](https://doc.traefik.io/traefik/) container running with docker provider and "traefik" named docker network.\n  Example: [Traefik Devproxy](https://github.com/joshkreud/traefik_devproxy)\n- SSH Agent running. (check `echo $SSH_AUTH_SOCK`)\\\n  This gets passed trough in the Buildprocess to clone Thirdparty repos.\n\n## Just wanna have a quick and easy Odoo Instance?\n\n```bash\ngit clone https://github.com/OpenJKSoftware/gOdoo\ncd godoo\n. scripts/container_requirements.sh # Check Requirements\ndocker-compose build\ndocker-compose up\n# wait......\n# wait a bit mode ...\n# just a little bit longer ..\n# There we go.\n# Odoo should be reachable on \'https://godoo.docker.localhost\' assuming you didn\'t change .env TRAEFIK_HOST_RULE or COMPOSE_PROJECT_NAME\n```\n\n# Devcontainer\n\n## Features\n\n- All batteries included [Devcontainer](https://code.visualstudio.com/docs/remote/containers) with postgres service\n  Container and local DNS resolvig managed by [Traefik](https://doc.traefik.io/traefik/).\n- Easy fully working Odoo instance by `docker-compose up` with https access.\n- `godoo` CLI wrapper around Odoo. (Most flags can be configured by Environment Variables and are already preconfigured\n  in the Containers. See [.env.sample](./.env.sample))\n- `odoo-bin` is added to PATH and can thus be invoked from every folder.\n- Odoo will run in Proxy_Mode behind a Traefik reverse proxy for easy access on\n  `https://$COMPOSE_PROJECT_NAME.docker.localhost`\n- [Odoo Pylint plugin](https://github.com/OCA/pylint-odoo) preconfigured in vscode\n- Preinstalled vscode Extensions Highlights:\n  - [SQL Tools](https://marketplace.visualstudio.com/items?itemName=mtxr.sqltools) with preconfigured connection for\n    easy Database access in the Sidebar.\n  - [Docker Extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-docker) controls\n    container host.\n  - [Odoo Snippets](https://marketplace.visualstudio.com/items?itemName=mstuttgart.odoo-snippets)\n  - [Odoo Developments](https://marketplace.visualstudio.com/items?itemName=scapigliato.vsc-odoo-development) can Grab\n    Odoo Model information from a running Server\n  - [Todo Tree](https://marketplace.visualstudio.com/items?itemName=Gruntfuggly.todo-tree)\n\n## Usage\n\n1. For Docker on windows: Clone the repo into the WSL2 Filesystem for better IO performance\n2. Have [Traefik](https://github.com/traefik/traefik) Running on `docker.localhost`\n   [Example](https://github.com/joshkreud/traefik_devproxy) \\\n   There must be a Docker network called `traefik` that can reach traefik.\n3. Open Devcontianer:\n   - If you have the Devcontainer CLI: `devcontainer open .`\n   - If not open the workspace in Local Vscode. In the Command pallete search for `Reopen in container`\n4. From **within the container** start Odoo using one of the following commands:\n   - You can enable godoo tab-completion by `godoo --install-completion`\n   - `make` -> Loads Odoo + Workspace Addons\n   - `make bare` -> Loads Odoo with ony `web` installed.\n   - `make kill` -> Search for `odoo-bin` processes and kill them\n   - `make reset` -> Drops DB, deletes config file and datafolder\n   - The full init script is available via "`godoo`". (See --help for Options)\n5. Open Odoo `https://$COMPOSE_PROJECT_NAME.docker.localhost`\\\n   For example `COMPOSE_PROJECT_NAME=godoo` --> [https://godoo.docker.localhost](https://godoo.docker.localhost)\n6. Login with `admin:admin`\n7. Profit!\n\n### Access to Odoo and Thirdparty addon Source\n\nYou can access the Odoo source by opening the VsCode workspace [full.code-workspace](full.code-workspace) from within\nthe Container. This will open a [Multi-Root Workspace](https://code.visualstudio.com/docs/editor/multi-root-workspaces).\nReally waiting for https://github.com/microsoft/vscode-remote-release/issues/3665 here.\n\n## Reset Devcontainer Data\n\nWhen you screwed up so bad its time to just start Over godoo has you covered:\n\n### Automatic Reset\n\nThere are 3 Options to reset the Dev Env.\n\n1. From **Outside** the Container run `make reset` in the project root to delete docker volumes and restart the\n   container. (Vscode will prompt to reconnect if still open)\n2. From **Outside** the Container run `make reset-hard` in the project root to force rebuild the main Odoo container and\n   then do the same as `make reset`\n3. From **Inside** the Container run `make reset` to drop the DB and delete varlib and the bootstrap flag, which is way\n   quicker than the other options.\n\n### Manual Reset\n\n1. Close vscode\n2. Remove `app` and `db` container from docker.\n3. Remove volumes: `db, odoo_thirdparty, odoo_web, vscode_extensions`\n4. Restart Devcontainer\n\n## Python Debugging\n\n### VsCode Debugging\n\nDebugging doesn\'t reliably work with\n[Odoo Multiprocess](https://www.odoo.com/documentation/14.0/developer/misc/other/cmdline.html#multiprocessing) mode\nenabled. \\\nThe container ships with a Vscode Debug profile, that sets `--workers 0` to allow for Debugging Breakpoints. See [.vscode/launch.json](./.vscode/launch.json)\n\n### Interactive Shell\n\nUse `godoo shell` to enter an interactive shell on the Database.\n\n# Odoo Modules\n\n## Third Party Modules (manifest.yml)\n\nThe `godoo` bootstrap function, will download some modules using git. \\\nWhich Repos to download is specified in `ODOO_MANIFEST.yml` ([Default](./ODOO_MANIFEST.yml)) \\\nNot all of the cloned addons are automatically installed. \\\nInstall them via the Apps Page in Odoo using `godoo rpc modules install` or using `odoo-bin`.\\\nModules downloaded on the Odoo Marketplace can be dropped as a `.zip` archive in [./thirdparty](./thirdparty)\n',
     'author': 'Joshua Kreuder',

godoo_cli-0.3.5/src/godoo_cli/__init__.py

@@ -0,0 +1,2 @@
+from .cli import launch_cli
+from .version import __version__

godoo_cli-0.3.5/src/godoo_cli/cli.py

@@ -0,0 +1,95 @@
+"""Main CLI."""
+from pathlib import Path
+from types import SimpleNamespace
+from typing import Optional
+
+import typer
+from dotenv import load_dotenv
+
+from .commands import (
+    bootstrap_odoo,
+    get_source,
+    get_source_file,
+    install_module_dependencies,
+    launch_odoo,
+    odoo_shell,
+    odoo_test,
+    rpc_cli_app,
+    set_odoo_config,
+    uninstall_modules,
+)
+from .helpers.system import set_logging
+from .version import __version__
+
+
+def main_callback(
+    ctx: typer.Context,
+    odoo_main_path: Path = typer.Option(
+        ...,
+        envvar="ODOO_MAIN_FOLDER",
+        help="folder with odoo-bin",
+        rich_help_panel="Paths",
+    ),
+    odoo_conf_path: Path = typer.Option(
+        ...,
+        envvar="ODOO_CONF_PATH",
+        help="odoo.conf path",
+        rich_help_panel="Paths",
+    ),
+    workspace_addon_path: Path = typer.Option(
+        ...,
+        envvar="ODOO_WORKSPACE_ADDON_LOCATION",
+        help="path to dev workspace addons",
+        rich_help_panel="Paths",
+    ),
+    bootstrap_flag_location: Path = typer.Option(
+        ...,
+        envvar="ODOO_BOOTSTRAP_FLAG",
+        help="Location of the Bootstrap indicator file",
+        rich_help_panel="Paths",
+    ),
+    source_download_archive: Optional[bool] = typer.Option(
+        False,
+        "--source-download-archive",
+        envvar="SOURCE_CLONE_ARCHIVE",
+        help="When using a HTTPs Repo Url for Github we can download a snapshop without the Repo history",
+    ),
+    verbose: Optional[bool] = typer.Option(False, "--verbose", help="Verbose Logging with Error stacktraces"),
+):
+    ctx.obj = SimpleNamespace(
+        odoo_main_path=odoo_main_path,
+        odoo_conf_path=odoo_conf_path,
+        workspace_addon_path=workspace_addon_path,
+        bootstrap_flag_location=bootstrap_flag_location,
+        source_download_archive=source_download_archive,
+    )
+    set_logging(verbose=verbose)
+
+
+def main_cli():
+    load_dotenv(".env", override=True)
+
+    help_text = f"gOdoo CLI version: [bold green]{__version__}[/bold green]"
+    app = typer.Typer(callback=main_callback, no_args_is_help=True, rich_markup_mode="rich", help=help_text)
+    # Nested Subcommands
+    app.add_typer(
+        typer_instance=rpc_cli_app(),
+        name="rpc",
+    )
+
+    # Normal Subcommands
+    app.command("launch")(launch_odoo)
+    app.command("bootstrap")(bootstrap_odoo)
+    app.command("test")(odoo_test)
+    app.command("config")(set_odoo_config)
+    app.command("source-get-file")(get_source_file)
+    app.command("source-get-depends")(install_module_dependencies)
+    app.command("source-get")(get_source)
+    app.command("shell")(odoo_shell)
+    app.command("uninstall")(uninstall_modules)
+    return app
+
+
+def launch_cli():
+    app = main_cli()
+    app()

{godoo_cli-0.3.4 → godoo_cli-0.3.5}/src/godoo_cli/commands/bootstrap.py

@@ -129,27 +129,67 @@ def _boostrap_command(
 def bootstrap_odoo(
     ctx: typer.Context,
     thirdparty_addon_path: Path = typer.Option(
-        ..., envvar="ODOO_THIRDPARTY_LOCATION", help="folder that contains thirdparty repos like OCA"
+        ...,
+        envvar="ODOO_THIRDPARTY_LOCATION",
+        help="folder that contains thirdparty repos like OCA",
+    ),
+    db_host: str = typer.Option(
+        ...,
+        envvar="ODOO_DB_HOST",
+        help="db hostname",
+        rich_help_panel="Database Options",
+    ),
+    db_filter: str = typer.Option(
+        ...,
+        envvar="ODOO_DB_FILTER",
+        help="database filter for odoo_conf",
+        rich_help_panel="Database Options",
+    ),
+    db_name: str = typer.Option(
+        ...,
+        envvar="ODOO_MAIN_DB",
+        help="launch database name",
+        rich_help_panel="Database Options",
+    ),
+    db_user: str = typer.Option(
+        ...,
+        envvar="ODOO_DB_USER",
+        help="db user",
+        rich_help_panel="Database Options",
+    ),
+    db_password: str = typer.Option(
+        ...,
+        envvar="ODOO_DB_PASSWORD",
+        help="db password",
+        rich_help_panel="Database Options",
+    ),
+    db_port: str = typer.Option(
+        ...,
+        envvar="ODOO_DB_PORT",
+        help="db host port",
+        rich_help_panel="Database Options",
     ),
-    db_host: str = typer.Option(..., envvar="ODOO_DB_HOST", help="db hostname"),
-    db_filter: str = typer.Option(..., envvar="ODOO_DB_FILTER", help="database filter for odoo_conf"),
-    db_name: str = typer.Option(..., envvar="ODOO_MAIN_DB", help="launch database name"),
-    db_user: str = typer.Option(..., envvar="ODOO_DB_USER", help="db user"),
-    db_password: str = typer.Option(..., envvar="ODOO_DB_PASSWORD", help="db password"),
-    db_port: str = typer.Option(..., envvar="ODOO_DB_PORT", help="db host port"),
     extra_cmd_args: List[str] = typer.Option(None, help="extra agruments to pass to odoo-bin"),
-    install_base: bool = typer.Option(True, help="install base,web modules"),
-    install_workspace_modules: bool = typer.Option(True, help="install all modules found in workspace_path"),
-    multithread_worker_count: int = typer.Option(9, help="count of worker threads. will enable proxy_mode if >0"),
+    multithread_worker_count: int = typer.Option(5, help="count of worker threads. will enable proxy_mode if >0"),
     languages: str = typer.Option("de_DE,en_US", help="languages to load by default"),
-    update_source: bool = typer.Option(True, help="Update Odoo Source and Thirdparty Addons"),
-    addons_remove_unspecified: bool = typer.Option(
-        True, help="Cleanup/Remove unspecified Addons if 'update_source' is true"
+    no_install_base: bool = typer.Option(
+        False, "--no-install-base", help="dont install [bold]base[/bold] and [bold]web[/bold] module"
+    ),
+    no_install_workspace_modules: bool = typer.Option(
+        False,
+        "--no-install-workspace-modules",
+        help="dont automatically install modules found in [bold cyan]--workspace_path[/bold cyan]",
+    ),
+    no_update_source: bool = typer.Option(False, "--no-update-source", help="Update Odoo Source and Thirdparty Addons"),
+    no_addons_remove_unspecified: bool = typer.Option(
+        False,
+        "--no-addons-remove-unspecified",
+        help="don't remove unspecified addons if not '[bold cyan]--no-update-source[/bold cyan]'",
     ),
 ):
     """Bootstrap Odoo."""
-    if update_source:
-        get_source(ctx=ctx, remove_unspecified_addons=addons_remove_unspecified)
+    if not no_update_source:
+        get_source(ctx=ctx, remove_unspecified_addons=not no_addons_remove_unspecified)
 
     addon_paths = get_addon_paths(
         odoo_main_repo=ctx.obj.odoo_main_path,
@@ -169,8 +209,8 @@ def bootstrap_odoo(
         db_password=db_password,
         db_port=db_port,
         extra_cmd_args=extra_cmd_args,
-        install_base=install_base,
-        install_workspace_modules=install_workspace_modules,
+        install_base=not no_install_base,
+        install_workspace_modules=not no_install_workspace_modules,
         multithread_worker_count=multithread_worker_count,
         languages=languages,
     )

{godoo_cli-0.3.4 → godoo_cli-0.3.5}/src/godoo_cli/commands/launch.py

@@ -54,21 +54,32 @@ def _launch_command(
 @typer_unpacker
 def launch_odoo(
     ctx: typer.Context,
-    launch: bool = typer.Option(True, help="Launch after Bootstrap"),
-    odoo_demo: bool = typer.Option(False, help="Load Demo Data"),
-    dev_mode: bool = typer.Option(False, help="Pass --dev xml,qweb,reload to odoo"),
-    install_modules: bool = typer.Option(True, help="Install Modules"),
-    install_workspace_addons: bool = typer.Option(True, help="Install Workspace addons"),
-    update_source: bool = typer.Option(True, help="Git Pull Addons"),
-    addons_remove_unspecified: bool = typer.Option(True, help="Cleanup/Remove unspecified Addons"),
-    load_data_path: List[Path] = typer.Option(None, help="Starts Async Importer Job with provided path(s)"),
+    odoo_demo: bool = typer.Option(False, "--odoo-demo", help="Load Demo Data"),
+    dev_mode: bool = typer.Option(False, "--dev-mode", help="Pass --dev xml,qweb,reload to odoo"),
+    no_launch: bool = typer.Option(False, "--no-launch", help="Launch after Bootstrap"),
+    no_install_base: bool = typer.Option(
+        False, "--no-install-base", help="dont install [bold]base[/bold] and [bold]web[/bold] module"
+    ),
+    no_install_workspace_addons: bool = typer.Option(
+        False, "--no-install-workspace-addons", help="Install Workspace addons"
+    ),
+    no_update_source: bool = typer.Option(False, "--no-update-source", help="Update Odoo Source and Thirdparty Addons"),
+    no_addons_remove_unspecified: bool = typer.Option(
+        False,
+        "--no-addons-remove-unspecified",
+        help="don't remove unspecified addons if not '[bold cyan]--no-update-source[/bold cyan]'",
+    ),
+    load_data_path: List[Path] = typer.Option(
+        None,
+        help="Starts Async Importer Job with provided path(s). [bold red]Must provide options from godoo rpc[/bold red]",
+    ),
     extra_args: List[str] = typer.Option([], help="Extra args to Pass to odoo Launch"),
     extra_bootstrap_args: List[str] = typer.Option([], help="Extra args to Pass to odoo Bootstrap"),
     log_file_path: Path = typer.Option(None, dir_okay=False, writable=True, help="Logfile Path"),
     multithread_worker_count: int = typer.Option(9, help="count of worker threads. will enable proxy_mode if >0"),
 ):
     """
-    Bootstrap Odoo and Launch with set options.
+    Launch Odoo, Bootstrap if bootstrapflag is not present.
     """
     LOGGER.info("Starting godoo Init Script")
 
@@ -90,13 +101,13 @@ def launch_odoo(
         ret = bootstrap_odoo(
             ctx=ctx,
             extra_cmd_args=_extra_bootstrap_args,
-            install_base=install_modules,
-            install_workspace_modules=install_workspace_addons and install_modules,
+            no_install_base=no_install_base,
+            no_install_workspace_modules=no_install_workspace_addons or no_install_base,
             multithread_worker_count=multithread_worker_count,
-            update_source=update_source,
-            addons_remove_unspecified=addons_remove_unspecified,
+            no_update_source=no_update_source,
+            no_addons_remove_unspecified=no_addons_remove_unspecified,
         )
-        install_workspace_addons = False
+        no_install_workspace_addons = False
         bootstraped = ret == 0
         if not bootstraped:
             LOGGER.error("godoo Launch Failed. Bootstrap unsuccessfull. Aborting Launch...")
@@ -110,12 +121,11 @@ def launch_odoo(
             "--dev xml,qweb" if load_data_path else "--dev xml,qweb,reload"
         )  # Prevent server restart if Importer threads will be spawned.
 
-    if bootstraped and not launch:
+    if bootstraped and no_launch:
         return typer_retuner(ret)
 
-    rpc_callback(ctx)  # Add RPC Options using Defaults and Envvars
-
     if load_data_path:
+        rpc_callback(ctx)  # Add RPC Options using Defaults and Envvars
         LOGGER.info("Starting Data Importer Thread for: '%s'", ", ".join(map(str, load_data_path)))
         loader_thread = threading.Thread(
             target=import_to_odoo,
@@ -130,7 +140,7 @@ def launch_odoo(
         odoo_conf_path=ctx.obj.odoo_conf_path,
         extra_cmd_args=extra_odoo_args,
         workspace_addon_path=ctx.obj.workspace_addon_path,
-        upgrade_workspace_modules=install_workspace_addons,
+        upgrade_workspace_modules=no_install_workspace_addons,
     )
     LOGGER.info("Launching Odoo")
     return typer_retuner(run_cmd(cmd_string).returncode)

{godoo_cli-0.3.4 → godoo_cli-0.3.5}/src/godoo_cli/commands/rpc/cli.py

@@ -7,10 +7,15 @@ from .translations import dump_translations
 
 
 def rpc_cli_app():
-    app = typer.Typer(no_args_is_help=True, callback=rpc_callback)
+    app = typer.Typer(
+        no_args_is_help=True,
+        callback=rpc_callback,
+        help="Functions that act on a running Odoo instance via RPC.",
+    )
 
     app.add_typer(
-        typer_instance=modules_cli_app(), name="modules", help="Wrapper around Odoo modules. (Install/upgrade, etc)"
+        typer_instance=modules_cli_app(),
+        name="modules",
     )
     app.command("import", help="Imports all files in a Folder according to a regex or a specific file")(import_to_odoo)
     app.command(help="Upgrades or Installs Modules in Odoo via RPC.")

{godoo_cli-0.3.4 → godoo_cli-0.3.5}/src/godoo_cli/commands/rpc/cli_callbacks.py

@@ -14,21 +14,25 @@ def rpc_callback(
         ...,
         envvar="ODOO_RPC_HOST",
         help="Odoo RPC Host",
+        rich_help_panel="RPC Options",
     ),
     odoo_main_db: str = typer.Option(
         ...,
         envvar="ODOO_MAIN_DB",
         help="Odoo Database for RPC Calls",
+        rich_help_panel="RPC Options",
     ),
     odoo_rpc_user: str = typer.Option(
         ...,
         envvar="ODOO_RPC_USER",
         help="User for RPC login",
+        rich_help_panel="RPC Options",
     ),
     odoo_rpc_password: str = typer.Option(
         ...,
         envvar="ODOO_RPC_PASSWORD",
         help="Password RPC Login Password",
+        rich_help_panel="RPC Options",
     ),
 ):
     ctx.obj.odoo_rpc_host = odoo_rpc_host

{godoo_cli-0.3.4 → godoo_cli-0.3.5}/src/godoo_cli/commands/rpc/modules.py

@@ -102,7 +102,11 @@ def install_modules(
 
 
 def modules_cli_app():
-    app = typer.Typer(callback=rpc_callback, no_args_is_help=True)
+    app = typer.Typer(
+        callback=rpc_callback,
+        no_args_is_help=True,
+        help="Wrapper around Odoo modules. (Install/upgrade, etc)",
+    )
 
     app.command(name="install")(install_modules)
     return app

{godoo_cli-0.3.4 → godoo_cli-0.3.5}/src/godoo_cli/commands/shell.py

@@ -15,7 +15,7 @@ def uninstall_modules(
     module_list: List[str] = typer.Argument(..., help="List of Modules to uninstall"),
 ):
     """
-    Uninstall Given Modules from Odoo via shell.
+    Uninstall given Modules from Odoo via shell.
     """
     module_list_str = str(list(module_list))
     uninstall_cmd = f"env['ir.module.module'].search([('name','in',{module_list_str})]).filtered(lambda m: m.state not in ['uninstallable','uninstalled']).button_immediate_uninstall()"

{godoo_cli-0.3.4 → godoo_cli-0.3.5}/src/godoo_cli/commands/source_get.py

@@ -101,6 +101,7 @@ def install_module_dependencies(
         help="Modules to check for dependencies (can use all for all available addons)",
     ),
 ):
+    """Install dependencies from __manifest__.py in specified modules."""
     odoo_addon_paths = get_addon_paths(
         odoo_main_repo=ctx.obj.odoo_main_path,
         workspace_addon_path=ctx.obj.workspace_addon_path,
@@ -122,9 +123,7 @@ def get_source_file(
     file_path: str = typer.Option(..., help="Relative Filepath in Repository"),
     save_path: Path = typer.Option(..., file_okay=True, dir_okay=False, help="Where to write the file"),
 ):
-    """Get Raw file from git remote.
-    Either from the Odoo Repo defined in manifest file or from a custom Git remote.
-    """
+    """Get Raw file from manifest git remotes or specific git remote."""
 
     if not repo_url and not manifest_yml:
         raise ValueError("Need to provide either manifest_yml or repo_url")
@@ -148,7 +147,7 @@ def get_source(
     ctx: typer.Context,
     update_mode: UpdateMode = typer.Argument(UpdateMode.all, help="What to Update"),
     manifest_yml: Path = typer.Option(
-        ..., envvar="ODOO_MANIFEST", help="Git.yml file, that specified what to download with wich prefix"
+        ..., envvar="ODOO_MANIFEST", help="manifest.yml file, that specifies which repos to download."
     ),
     thirdparty_addon_path: Path = typer.Option(
         ..., envvar="ODOO_THIRDPARTY_LOCATION", help="Root folder of the Thirdparty addon repos"
@@ -157,17 +156,18 @@ def get_source(
         ..., envvar="ODOO_THIRDPARTY_ZIP_LOCATION", help="Source folder, where to look for Addon zips"
     ),
     add_compare_comments: bool = typer.Option(
-        False, help="Wether to add github.com three dot compare links as comments."
+        False, "--add-compare-comments", help="Wether to add github.com three dot compare links as comments."
     ),
     remove_unspecified_addons: bool = typer.Option(
-        False, help="Remove Addon folders that are not in YML or thirdparty.zip"
+        False, "--remove-unspecified-addons", help="Remove Addon folders that are not in YML or thirdparty.zip"
     ),
     force_fetch: bool = typer.Option(
         False,
+        "--force-fetch",
         help="Forces origin fetch, regardless of current branch or commit sha (may be slow)",
     ),
 ):
-    """Update Odoo Source and Thirdparty source."""
+    """Download/Unzip Odoo Source and thirdparty addons."""
     LOGGER.info("Updating Source Repos")
     zip_addon_path = get_zip_addon_path(thirdparty_addon_path)
 

{godoo_cli-0.3.4 → godoo_cli-0.3.5}/src/godoo_cli/commands/test.py

@@ -47,6 +47,7 @@ def odoo_test(
     ),
     odoo_log_level: str = typer.Option("test", help="Log level"),
 ):
+    """Bootstrap or Launch odoo in Testing Mode."""
     workspace_addon_path = ctx.obj.workspace_addon_path
 
     test_modules = _test_modules_special_cases(test_modules, workspace_addon_path)
@@ -85,12 +86,12 @@ def odoo_test(
 
     ret = launch_odoo(
         ctx=ctx,
-        install_workspace_addons=False,
+        no_install_workspace_addons=True,
         extra_args=launch_args,
         extra_bootstrap_args=bootstrap_args,
-        launch=False,
+        no_launch=True,
         multithread_worker_count=0,
         odoo_demo=True,
-        update_source=False,
+        no_update_source=True,
     )
     return typer_retuner(ret)

godoo_cli-0.3.5/src/godoo_cli/version.py

@@ -0,0 +1 @@
+__version__ = "0.3.5"

godoo_cli-0.3.4/src/godoo_cli/__init__.py

@@ -1,2 +0,0 @@
-__version__ = "0.3.4"
-from .cli import launch_cli

godoo_cli-0.3.4/src/godoo_cli/cli.py

@@ -1,78 +0,0 @@
-"""Main CLI."""
-from pathlib import Path
-from types import SimpleNamespace
-
-import typer
-from dotenv import load_dotenv
-
-from .commands import (
-    bootstrap_odoo,
-    get_source,
-    get_source_file,
-    install_module_dependencies,
-    launch_odoo,
-    odoo_shell,
-    odoo_test,
-    rpc_cli_app,
-    set_odoo_config,
-    uninstall_modules,
-)
-from .helpers.system import set_logging
-
-
-def main_callback(
-    ctx: typer.Context,
-    odoo_main_path: Path = typer.Option(..., envvar="ODOO_MAIN_FOLDER", help="folder with odoo-bin"),
-    odoo_conf_path: Path = typer.Option(..., envvar="ODOO_CONF_PATH", help="odoo.conf path"),
-    workspace_addon_path: Path = typer.Option(
-        ..., envvar="ODOO_WORKSPACE_ADDON_LOCATION", help="path to dev workspace addons"
-    ),
-    bootstrap_flag_location: Path = typer.Option(
-        ..., envvar="ODOO_BOOTSTRAP_FLAG", help="Location of the Bootstrap indicator file"
-    ),
-    source_download_archive: bool = typer.Option(
-        False,
-        envvar="SOURCE_CLONE_ARCHIVE",
-        help="When using a HTTPs Repo Url for Github we can download a snapshop without the Repo history",
-    ),
-    verbose: bool = typer.Option(False),
-):
-    ctx.obj = SimpleNamespace(
-        odoo_main_path=odoo_main_path,
-        odoo_conf_path=odoo_conf_path,
-        workspace_addon_path=workspace_addon_path,
-        bootstrap_flag_location=bootstrap_flag_location,
-        source_download_archive=source_download_archive,
-    )
-    set_logging(verbose=verbose)
-
-
-def main_cli():
-    load_dotenv(".env", override=True)
-
-    app = typer.Typer(callback=main_callback, no_args_is_help=True)
-    # Nested Subcommands
-    app.add_typer(
-        typer_instance=rpc_cli_app(),
-        name="rpc",
-        help="Commands that act on a running Odoo instance through RPC",
-    )
-
-    # Normal Subcommands
-    app.command("config", help="Set odoo.conf options")(set_odoo_config)
-    app.command("launch", help="Launch Odoo, Bootstrap if bootstrapflag is not present")(launch_odoo)
-    app.command("bootstrap", help="Bootstrap Odoo")(bootstrap_odoo)
-    app.command("source-get-file", help="Get Raw file from odoo git remote or specific git remote.")(get_source_file)
-    app.command("source-get-depends", help="Install dependencies from __manifest__.py in specified modules")(
-        install_module_dependencies
-    )
-    app.command("source-get", help="Download/Unzip Odoo Source and thirdparty addons.")(get_source)
-    app.command("test", help="Bootstrap or Launch odoo in Testing Mode")(odoo_test)
-    app.command("shell", help="Start interactive Odoo shell")(odoo_shell)
-    app.command("uninstall", help="Uninstall Modules")(uninstall_modules)
-    return app
-
-
-def launch_cli():
-    app = main_cli()
-    app()