magic-pocket-cli 0.4.0__tar.gz → 0.5.0__tar.gz

{magic_pocket_cli-0.4.0 → magic_pocket_cli-0.5.0}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: magic-pocket-cli
-Version: 0.4.0
+Version: 0.5.0
 Summary: CLI and deploy tools for magic-pocket.
 Requires-Python: >=3.10
 Requires-Dist: awscrt>=0.19.0
 Requires-Dist: click>=8.1.7
 Requires-Dist: deepdiff>=6.7.1
 Requires-Dist: jinja2>=3.1.3
-Requires-Dist: magic-pocket>=0.4.0
+Requires-Dist: magic-pocket>=0.5.0
 Requires-Dist: pathspec>=1.0.4
 Requires-Dist: python-on-whales>=0.68.0
 Requires-Dist: pyyaml>=6.0.1

{magic_pocket_cli-0.4.0 → magic_pocket_cli-0.5.0}/pocket_cli/resources/neon.py

@@ -230,6 +230,25 @@ class Neon:
                 if branch["name"] == self.context.branch_name:
                     return Branch(**branch)
 
+    @cached_property
+    def parent_branch(self) -> Branch | None:
+        """branch を新規作成する際の親ブランチ。
+
+        context.parent_branch_name が未指定なら None (= create_branch が parent_id を
+        送らず Neon の default ブランチから分岐)。指定があるのに project 内に該当
+        ブランチが無い場合はエラー (黙って default 分岐すると事故になるため)。
+        """
+        if not self.context.parent_branch_name:
+            return None
+        if self.project:
+            for branch in self.get("branches").json()["branches"]:
+                if branch["name"] == self.context.parent_branch_name:
+                    return Branch(**branch)
+        raise ValueError(
+            f"Neon parent branch '{self.context.parent_branch_name}' not found "
+            f"in project '{self.context.project_name}'"
+        )
+
     @cached_property
     def database(self) -> Database | None:
         if self.branch:
@@ -293,7 +312,9 @@ class Neon:
         pass
 
     def create(self):
-        self.create_branch()
+        # parent_branch_name 指定時はその親から分岐。未指定なら parent_branch=None で
+        # 従来通り Neon default ブランチから分岐する。
+        self.create_branch(self.parent_branch)
         self.ensure_role()
         self.ensure_database()
 

{magic_pocket_cli-0.4.0 → magic_pocket_cli-0.5.0}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name = "magic-pocket-cli"
-version = "0.4.0"
+version = "0.5.0"
 description = "CLI and deploy tools for magic-pocket."
 requires-python = ">=3.10"
 dependencies = [
-    "magic-pocket>=0.4.0",
+    "magic-pocket>=0.5.0",
     "click>=8.1.7",
     "jinja2>=3.1.3",
     "python-on-whales>=0.68.0",