genesis-devtools 0.2.1__tar.gz → 0.2.2__tar.gz

genesis_devtools-0.2.2/ChangeLog

@@ -0,0 +1,7 @@
+CHANGES
+=======
+
+0.2.2
+-----
+
+* Added new path from env variable dependency (#43)

{genesis_devtools-0.2.1 → genesis_devtools-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: genesis-devtools
-Version: 0.2.1
+Version: 0.2.2
 Summary: Tools to manager life cycle of Genesis projects.
 Home-page: https://github.com/infraguys/genesis_devtools
 Author: Genesis Corporation

{genesis_devtools-0.2.1 → genesis_devtools-0.2.2}/genesis_devtools/builder/dependency.py

@@ -75,6 +75,82 @@ class LocalPathDependency(base.AbstractDependency):
         return cls(path, img_dest)
 
 
+class LocalEnvPathDependency(base.AbstractDependency):
+    """Local path dependency item."""
+
+    def __init__(
+        self,
+        env_path: str,
+        img_dest: str,
+        work_dir: str,
+        optional: bool = False,
+    ) -> None:
+        super().__init__()
+        self._env_path = env_path
+        self._img_dest = img_dest
+        self._optional = optional
+        self._work_dir = work_dir
+        self._local_path = None
+        self._path = None
+
+    @property
+    def img_dest(self) -> str | None:
+        """Destination for the image."""
+        return self._img_dest
+
+    @property
+    def local_path(self) -> str | None:
+        """Local path to the dependency."""
+        return self._local_path
+
+    def fetch(self, output_dir: str) -> None:
+        """Fetch the dependency."""
+        path = os.environ.get(self._env_path)
+        if not path or not os.path.exists(path):
+            if not self._optional:
+                raise ValueError(
+                    f"Environment variable {self._env_path} not found"
+                )
+            return
+
+        self._path = path
+
+        if not os.path.isabs(path):
+            path = os.path.join(self._work_dir, path)
+
+        if os.path.isdir(path):
+            name = os.path.basename(path)
+            shutil.copytree(path, os.path.join(output_dir, name))
+            self._local_path = os.path.join(output_dir, name)
+        else:
+            shutil.copy(path, output_dir)
+            self._local_path = os.path.join(output_dir, os.path.basename(path))
+
+    def __str__(self):
+        return f"Local path -> {self._path}"
+
+    @classmethod
+    def from_config(
+        cls, dep_config: tp.Dict[str, tp.Any], work_dir: str
+    ) -> "LocalEnvPathDependency":
+        """Create a dependency item from configuration."""
+        if "path" not in dep_config or "env" not in dep_config["path"]:
+            raise ValueError(
+                "Environment variable not found in dependency configuration"
+            )
+
+        env_path = dep_config["path"]["env"]
+        optional = dep_config.get("optional", False)
+        img_dest = dep_config["dst"]
+
+        return cls(
+            env_path=env_path,
+            img_dest=img_dest,
+            optional=optional,
+            work_dir=work_dir,
+        )
+
+
 class HttpDependency(base.AbstractDependency):
     """HTTP dependency item."""
 
@@ -115,7 +191,7 @@ class HttpDependency(base.AbstractDependency):
     @classmethod
     def from_config(
         cls, dep_config: tp.Dict[str, tp.Any], work_dir: str
-    ) -> "LocalPathDependency":
+    ) -> "HttpDependency":
         """Create a dependency item from configuration."""
         if "http" not in dep_config or "src" not in dep_config["http"]:
             raise ValueError("URL not found in dependency configuration")
@@ -170,7 +246,7 @@ class GitDependency(base.AbstractDependency):
     @classmethod
     def from_config(
         cls, dep_config: tp.Dict[str, tp.Any], work_dir: str
-    ) -> "LocalPathDependency":
+    ) -> "GitDependency":
         """Create a dependency item from configuration."""
         if "git" not in dep_config or "src" not in dep_config["git"]:
             raise ValueError(

{genesis_devtools-0.2.1 → genesis_devtools-0.2.2}/genesis_devtools/builder/packer.py

@@ -136,6 +136,13 @@ class PackerBuilder(base.DummyImageBuilder):
         # Data provisioners
         provisioners = []
         for i, dep in enumerate(deps):
+            if not dep.local_path:
+                self._logger.warn(
+                    f"Dependency {dep.img_dest} has no local path "
+                    "and will be skipped"
+                )
+                continue
+
             tmp_dest = os.path.join(
                 "/tmp/", os.path.basename(dep.img_dest) + f"_{i}"
             )

{genesis_devtools-0.2.1 → genesis_devtools-0.2.2}/genesis_devtools/tests/unit/conftest.py

@@ -87,3 +87,23 @@ build:
 """
     cfg = yaml.safe_load(fixture)
     return cfg["build"]
+
+
+@pytest.fixture
+def build_env_config() -> tp.Dict[str, tp.Any]:
+    fixture = """
+build:
+  deps:
+    - dst: /opt/genesis_devtools
+      optional: false
+      path:
+        env: PATH_FROM_ENV
+  elements:
+    - images:
+      - name: genesis-core
+        format: raw
+        profile: ubuntu_24
+        script: images/install.sh
+"""
+    cfg = yaml.safe_load(fixture)
+    return cfg["build"]

{genesis_devtools-0.2.1 → genesis_devtools-0.2.2}/genesis_devtools/tests/unit/test_dependency.py

@@ -113,3 +113,36 @@ class TestDependency:
             assert os.path.exists("/tmp/___deps_dir/genesis_templates")
         finally:
             shutil.rmtree("/tmp/___deps_dir")
+
+    def test_env_path_from_config(
+        self, build_env_config: tp.Dict[str, tp.Any]
+    ) -> None:
+        work_dir = "/tmp/work_dir"
+        dep = deps.LocalEnvPathDependency.from_config(
+            build_env_config["deps"][0],
+            work_dir,
+        )
+
+        assert dep.img_dest == "/opt/genesis_devtools"
+        assert dep._env_path == "PATH_FROM_ENV"
+        assert dep.local_path is None
+
+    def test_env_path_fetch(
+        self, build_env_config: tp.Dict[str, tp.Any]
+    ) -> None:
+        os.makedirs("/tmp/genesis_core_test_dir", exist_ok=True)
+        os.environ["PATH_FROM_ENV"] = "/tmp/genesis_core_test_dir"
+
+        dep = deps.LocalEnvPathDependency.from_config(
+            build_env_config["deps"][0],
+            "/tmp",
+        )
+
+        os.makedirs("/tmp/___deps_dir", exist_ok=True)
+        dep.fetch("/tmp/___deps_dir")
+
+        try:
+            assert os.path.exists("/tmp/___deps_dir/genesis_core_test_dir")
+        finally:
+            shutil.rmtree("/tmp/genesis_core_test_dir")
+            shutil.rmtree("/tmp/___deps_dir")

{genesis_devtools-0.2.1 → genesis_devtools-0.2.2}/genesis_devtools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: genesis-devtools
-Version: 0.2.1
+Version: 0.2.2
 Summary: Tools to manager life cycle of Genesis projects.
 Home-page: https://github.com/infraguys/genesis_devtools
 Author: Genesis Corporation

genesis_devtools-0.2.2/genesis_devtools.egg-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "790bb67", "is_release": false}

genesis_devtools-0.2.1/ChangeLog

@@ -1,7 +0,0 @@
-CHANGES
-=======
-
-0.2.1
------
-
-* Rotation and disk space guard features (#42)

genesis_devtools-0.2.1/genesis_devtools.egg-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "714f58f", "is_release": false}