bl-odoo 0.3.0__py3-none-any.whl → 0.3.1__py3-none-any.whl

bl/__main__.py

@@ -12,15 +12,19 @@ def run():
     parser = argparse.ArgumentParser(
         description="Process a project specification.", formatter_class=argparse.ArgumentDefaultsHelpFormatter
     )
-    parser.add_argument(
-        "-f", "--freeze", const=True, default=None, nargs="?", type=Path, help="Freeze the current state of modules"
-    )
-    parser.add_argument(
+
+    parent_parser = argparse.ArgumentParser(add_help=False)
+    parent_parser.add_argument(
         "-c", "--config", type=Path, help="Path to the project specification file.", default="spec.yaml"
     )
-    parser.add_argument("-z", "--frozen", type=Path, help="Path to the frozen specification file.")
-    parser.add_argument("-j", "--concurrency", type=int, default=28, help="Number of concurrent tasks.")
-    parser.add_argument("-w", "--workdir", type=Path, help="Working directory. Defaults to config directory.")
+    parent_parser.add_argument("-z", "--frozen", type=Path, help="Path to the frozen specification file.")
+    parent_parser.add_argument("-j", "--concurrency", type=int, default=28, help="Number of concurrent tasks.")
+    parent_parser.add_argument("-w", "--workdir", type=Path, help="Working directory. Defaults to config directory.")
+
+    sub = parser.add_subparsers(help="subcommand help", dest="command")
+    build = sub.add_parser("build", parents=[parent_parser], help="build help")
+    freeze = sub.add_parser("freeze", parents=[parent_parser], help="freeze help")
+
     args = parser.parse_args()
 
     project_spec = load_spec_file(args.config, args.frozen, args.workdir)
@@ -28,9 +32,9 @@ def run():
         sys.exit(1)
 
     try:
-        if args.freeze:
+        if args.command == "freeze":
             asyncio.run(freeze_project(project_spec, args.freeze, concurrency=args.concurrency))
-        else:
+        elif args.command == "build":
             asyncio.run(process_project(project_spec, concurrency=args.concurrency))
     except Exception:
         sys.exit(1)

bl/spec_parser.py

@@ -3,7 +3,7 @@ import warnings
 from dataclasses import dataclass
 from enum import Enum
 from pathlib import Path
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional, Type
 
 import yaml
 
@@ -69,6 +69,13 @@ def parse_remote_refspec_from_parts(parts: List[str], frozen_repo: Dict[str, Dic
     return RefspecInfo(remote_key, ref_spec, ref_type, ref_name)
 
 
+def get_with_syntax_check(name, data, key: str, type: Type):
+    result = data.get(key, type())
+    if not isinstance(result, type):
+        raise Exception(f"Key {key} not of proper syntax should be {str(type)} in {name} description")
+    return result
+
+
 def load_spec_file(config: Path, frozen: Path, workdir: Path) -> Optional[ProjectSpec]:
     """
     Loads and parses the project specification from a YAML file.
@@ -115,14 +122,14 @@ def load_spec_file(config: Path, frozen: Path, workdir: Path) -> Optional[Projec
 
     repos: Dict[str, RepoInfo] = {}
     for repo_name, repo_data in data.items():
-        modules = repo_data.get("modules", [])
-        src = repo_data.get("src")
-        remotes = repo_data.get("remotes") or {}
-        merges = repo_data.get("merges") or []
-        shell_commands = repo_data.get("shell_command_after") or None
-        patch_globs_to_apply = repo_data.get("patch_globs") or None
-        target_folder = repo_data.get("target_folder") or None
-        locales = repo_data.get("locales", [])
+        modules = get_with_syntax_check(repo_name, repo_data, "modules", list)
+        src = get_with_syntax_check(repo_name, repo_data, "src", str)
+        remotes = get_with_syntax_check(repo_name, repo_data, "remotes", dict)
+        merges = get_with_syntax_check(repo_name, repo_data, "merges", list)
+        shell_commands = get_with_syntax_check(repo_name, repo_data, "shell_command_after", list)
+        patch_globs_to_apply = get_with_syntax_check(repo_name, repo_data, "patch_globs", list)
+        target_folder = get_with_syntax_check(repo_name, repo_data, "target_folder", str)
+        locales = get_with_syntax_check(repo_name, repo_data, "locales", list)
 
         frozen_repo = frozen_mapping.get(repo_name, {})
 

bl/spec_processor.py

@@ -4,6 +4,7 @@ import warnings
 from pathlib import Path
 from typing import Dict, List
 
+from rich import progress
 from rich.console import Console
 from rich.live import Live
 from rich.progress import BarColumn, MofNCompleteColumn, Progress, SpinnerColumn, TaskID, TextColumn

bl/utils.py

@@ -14,14 +14,14 @@ english_env["LANG"] = "en_US.UTF-8"
 
 def get_module_path(workdir: Path, module_name: str, module_spec: RepoInfo) -> Path:
     """Returns the path to the module directory."""
-    if module_name == "odoo" and module_spec.target_folder is None:
+    if module_name == "odoo" and not module_spec.target_folder:
         warnings.warn(
             "importing 'odoo' without a 'target_folder' "
             + "property is deprecated. Use target_folder: 'src/' in spec.yaml.",
             DeprecationWarning,
         )
         return workdir / "src/"
-    elif module_spec.target_folder is not None:
+    elif module_spec.target_folder:
         return workdir / module_spec.target_folder
     else:
         return workdir / "external-src" / module_name
@@ -36,6 +36,8 @@ async def run_git(*args: str, cwd: Optional[Path] = None) -> tuple[int, str, str
     """Executes a git command asynchronously."""
     proc = await asyncio.create_subprocess_exec(
         "git",
+        "--git-dir",
+        ".git/",
         *args,
         stdout=asyncio.subprocess.PIPE,
         stderr=asyncio.subprocess.PIPE,

{bl_odoo-0.3.0.dist-info → bl_odoo-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bl-odoo
-Version: 0.3.0
+Version: 0.3.1
 Summary: A command-line tool for managing Odoo dependencies.
 Author-email: Your Name <your.email@example.com>
 License-Expression: MIT

bl_odoo-0.3.1.dist-info/RECORD

@@ -0,0 +1,13 @@
+bl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bl/__main__.py,sha256=ypl02Cl-9NF9823xjdHVQa3aA9lHtnKAJFrtwmP9vbc,1643
+bl/freezer.py,sha256=wUYNd0zKU-0OGdIXSLJol-_xJmxSSkXvzV_VbF2HJyg,2512
+bl/spec_parser.py,sha256=dVvaK4fhtut5_vI3sm7g5oGk0hc_vFAvDfnVDVTf_64,5457
+bl/spec_processor.py,sha256=KsgNX-IAizLZ_22WcFKJAeCJKd98clDZb4qQ0kclqOs,17893
+bl/types.py,sha256=h14FXDVCrYRxY7lYTEu8jhdrEHr1PvSNyZRIHm33CTk,2158
+bl/utils.py,sha256=ZAdvXjNqDhICoZU8IZ5QQnmA5ILdYFbjaEeieyuo2GI,1622
+bl_odoo-0.3.1.dist-info/licenses/LICENSE,sha256=GTVQl3vH6ht70wJXKC0yMT8CmXKHxv_YyO_utAgm7EA,1065
+bl_odoo-0.3.1.dist-info/METADATA,sha256=6-dmdSbQqzfSmhA-wbIer6Pj36rtRretVUQ88TFSzIA,391
+bl_odoo-0.3.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+bl_odoo-0.3.1.dist-info/entry_points.txt,sha256=fmdGhYYJlP-XByamgaZdM0bo3JK4LJFswU_Nilq6SSw,39
+bl_odoo-0.3.1.dist-info/top_level.txt,sha256=1o4tN3wszdw7U5SnGgdF5P2sTYA0Schf0vKFy9_2D6A,3
+bl_odoo-0.3.1.dist-info/RECORD,,

bl_odoo-0.3.0.dist-info/RECORD

@@ -1,13 +0,0 @@
-bl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bl/__main__.py,sha256=v1d-voJ7N1QBLGJJh8JdrTxXtzf0JFHQv4RUBxlCkcg,1428
-bl/freezer.py,sha256=wUYNd0zKU-0OGdIXSLJol-_xJmxSSkXvzV_VbF2HJyg,2512
-bl/spec_parser.py,sha256=nZTwMh_ja4Mc7CKqB7-5cwECHrP15xd1S8zb_LW79BU,4953
-bl/spec_processor.py,sha256=yejkFFig_Yfbv1Ail1xTpteFv-f7dE7gasF_YU1oTXs,17867
-bl/types.py,sha256=h14FXDVCrYRxY7lYTEu8jhdrEHr1PvSNyZRIHm33CTk,2158
-bl/utils.py,sha256=JNLsxgJgWaa71Xs62gcoOwJnPjNHkrW0q9HFB0vQ60E,1600
-bl_odoo-0.3.0.dist-info/licenses/LICENSE,sha256=GTVQl3vH6ht70wJXKC0yMT8CmXKHxv_YyO_utAgm7EA,1065
-bl_odoo-0.3.0.dist-info/METADATA,sha256=VRKm91QHoxE_y5hSphmULSNRdjzvyvcSfBbQ5iRwafs,391
-bl_odoo-0.3.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-bl_odoo-0.3.0.dist-info/entry_points.txt,sha256=fmdGhYYJlP-XByamgaZdM0bo3JK4LJFswU_Nilq6SSw,39
-bl_odoo-0.3.0.dist-info/top_level.txt,sha256=1o4tN3wszdw7U5SnGgdF5P2sTYA0Schf0vKFy9_2D6A,3
-bl_odoo-0.3.0.dist-info/RECORD,,