Correctly report component instance versions

Author: simu

commodore/component/__init__.py

@@ -143,7 +143,7 @@ def class_file(self) -> P:
     def defaults_file(self) -> P:
         return self.alias_defaults_file(self.name)
 
-    def alias_directory(self, alias: str) -> P:
+    def _alias_path(self, alias: str) -> P:
         if alias not in self._aliases:
             raise ValueError(
                 f"alias {alias} for component {self.name} has not been registered"
@@ -154,6 +154,10 @@ def alias_directory(self, alias: str) -> P:
         # alias's multi-dependency. The assert makes mypy happy. We disable bandit's
         # "assert_used" lint, since we don't rely on this assertion for correctness.
         assert apath  # nosec B101
+        return apath
+
+    def alias_directory(self, alias: str) -> P:
+        apath = self._alias_path(alias)
         return apath / self._aliases[alias][1]
 
     def alias_class_file(self, alias: str) -> P:
@@ -165,6 +169,17 @@ def alias_defaults_file(self, alias: str) -> P:
     def has_alias(self, alias: str):
         return alias in self._aliases
 
+    def alias_info(self, alias: str) -> tuple[str, str, MultiDependency]:
+        if alias not in self._aliases:
+            raise ValueError(
+                f"alias {alias} for component {self.name} has not been registered"
+            )
+        return self._aliases[alias]
+
+    def alias_repo(self, alias: str) -> GitRepo:
+        apath = self._alias_path(alias)
+        return GitRepo(None, apath)
+
     @property
     def lib_files(self) -> Iterable[P]:
         # NOTE(sg): Usage of yield makes the whole function return a generator.

commodore/config.py

@@ -64,13 +64,15 @@ def pretty_print(self, name: str) -> str:
 
 
 class InstanceVersionInfo(VersionInfo):
-    def __init__(self, component: Component):
+    def __init__(self, name: str, component: Component):
+        version, path, dep = component.alias_info(name)
+        arepo = component.alias_repo(name)
         super().__init__(
-            component.repo_url,
-            component.version or component.repo.default_version,
-            component.repo.head_sha,
-            component.repo.head_short_sha,
-            path=component.sub_path,
+            dep.url,
+            version,
+            arepo.head_sha,
+            arepo.head_short_sha,
+            path=path,
         )
         self.component = component.name
 
@@ -406,7 +408,7 @@ def verify_component_aliases(
 
     def get_component_alias_versioninfos(self) -> dict[str, InstanceVersionInfo]:
         return {
-            a: InstanceVersionInfo(self._components[cn])
+            a: InstanceVersionInfo(a, self._components[cn])
             for a, cn in self._component_aliases.items()
         }