brainiac-github 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac4e54b24a8bb52bf92a37bfe86acb8d6e16f76c646811dfdb586be8921e4ad3
-  data.tar.gz: 0c31ee9574f36510100bb08094b884aa3eb81917b89c149ae8fb814fbc6aa7de
+  metadata.gz: df22ea85b48c5fd4960ad4e8bb28c3e59f551839c2cbc900dc065edc74039ed3
+  data.tar.gz: d8708dd8352a97e01bac35eb65ddb13ab7aea6249876987d4e73fd89328f97ee
 SHA512:
-  metadata.gz: 26615c5fd5c52574cd4a9739fa8d2179eb834ed91d805f7f02e7881cee59f3cc2952fce2751b7441ef97fe013e9db1809a026bb987ef7e5108c47b9e738d0185
-  data.tar.gz: c43852a07188be9a2ae9f8158eb15b91a3c4083dfdc0abab4a0514b1a3b7a755520f4bbde5e8be59919c1a71fc0aa1883c8334c673a7783334f8cd14766eeb19
+  metadata.gz: 241be88652dfaf39203b734d212d6b91e641017a3344cd4c8cabdad2332e1262f8e848e12680ca0612d43c9e44db6c124c9d1e6e76aecc5c625a4f30b8cff499
+  data.tar.gz: 5096d8be04c2c469770b93e5c998502cd545cb78553f64ec40e621d84f8d03c0d5e3ec9263c77237db1bc92cdb7396cb2ddff4b626be6230ca279b3f91676a14

data/lib/brainiac/plugins/github/handler.rb

@@ -105,11 +105,21 @@ module Brainiac
 
             return [200, { status: "ignored", reason: "no worktree" }.to_json] unless worktree && File.directory?(worktree)
 
+            # Pull latest changes into worktree
+            system("git", "pull", "--ff-only", chdir: worktree)
+
+            # Try to redeploy to ephemeral Belt environment if one exists
+            ephemeral_redeployed = maybe_redeploy_ephemeral_belt_env(
+              card_info: card_info, card_number: card_number, worktree: worktree,
+              base_branch: pr.dig("base", "ref")
+            )
+
+            # Also emit the hook for other plugins (e.g., brainiac-fizzy persistent env redeploy)
             results = Brainiac.emit(:pr_synchronized, card_number: card_number, card_info: card_info,
                                                       worktree: worktree, pull_request: pr, branch: branch)
 
-            if results.any?
-              [200, { status: "processed", action: "pr_sync", card: card_number }.to_json]
+            if ephemeral_redeployed || results.any?
+              [200, { status: "processed", action: "pr_sync", card: card_number, ephemeral_redeployed: ephemeral_redeployed }.to_json]
             else
               [200, { status: "ignored", reason: "no deployment plugin" }.to_json]
             end
@@ -648,6 +658,12 @@ module Brainiac
 
           def process_merged_pr(card_info, card_number, branch, pull_request, pr_url, pr_title, project_key, project_config, repo_path)
             mark_work_item_merged(card_number)
+
+            # Destroy ephemeral Belt environment BEFORE worktree cleanup (infrastructure lives in worktree)
+            maybe_destroy_ephemeral_belt_env(
+              card_info: card_info, card_number: card_number, project_key: project_key
+            )
+
             cleanup_work_item_worktrees(card_number, repo_path: repo_path,
                                                      primary_worktree: card_info["worktree"], primary_branch: branch)
 
@@ -864,6 +880,71 @@ module Brainiac
 
             [200, { status: "processed", action: "prod_deploy", closed_cards: closed_cards.map { |c| c[:number] }, project: project_key }.to_json]
           end
+
+          # Destroy ephemeral Belt environment on PR merge.
+          # Must be called BEFORE worktree cleanup since infrastructure lives in the worktree.
+          def maybe_destroy_ephemeral_belt_env(card_info:, card_number:, project_key:)
+            unless defined?(BeltConfig) && defined?(BeltEnvironment)
+              LOG.debug "[EphemeralEnv] Belt utilities not available — skipping env destruction"
+              return
+            end
+
+            env_name = BeltConfig.ephemeral_env_for_card(card_number)
+            worktree = card_info&.dig("worktree")
+
+            unless ephemeral_env_present?(worktree: worktree, env_name: env_name)
+              LOG.debug "[EphemeralEnv] No ephemeral env '#{env_name}' found for card ##{card_number}"
+              return
+            end
+
+            unless worktree && File.directory?(worktree)
+              LOG.warn "[EphemeralEnv] Cannot destroy '#{env_name}' — worktree not found"
+              return
+            end
+
+            LOG.info "[EphemeralEnv] Destroying ephemeral environment '#{env_name}' for card ##{card_number}"
+            BeltEnvironment.destroy_environment(worktree: worktree, env_name: env_name)
+          rescue StandardError => e
+            LOG.error "[EphemeralEnv] Error destroying ephemeral env: #{e.message}"
+          end
+
+          # Redeploy to ephemeral Belt environment on PR sync (new commits pushed).
+          # Only redeploys if an ephemeral env already exists for this card.
+          def maybe_redeploy_ephemeral_belt_env(card_info:, card_number:, worktree:, base_branch: nil)
+            return false unless defined?(BeltConfig) && defined?(BeltEnvironment)
+            return false unless belt_app_worktree?(worktree)
+
+            env_name = BeltConfig.ephemeral_env_for_card(card_number)
+
+            unless ephemeral_env_present?(worktree: worktree, env_name: env_name)
+              LOG.debug "[EphemeralEnv] No ephemeral env '#{env_name}' for card ##{card_number} — skipping redeploy"
+              return false
+            end
+
+            LOG.info "[EphemeralEnv] Redeploying to ephemeral environment '#{env_name}' (PR sync)"
+
+            frontend_only = BeltEnvironment.frontend_only_changes?(worktree: worktree, base_branch: base_branch)
+            BeltEnvironment.deploy(worktree: worktree, env_name: env_name, frontend_only: frontend_only)
+            true
+          rescue StandardError => e
+            LOG.error "[EphemeralEnv] Error redeploying ephemeral env: #{e.message}"
+            false
+          end
+
+          # belt_app? lives on BeltEnvironment (via BeltHelpers), not on this Handler module.
+          def belt_app_worktree?(worktree)
+            BeltEnvironment.respond_to?(:belt_app?) && BeltEnvironment.belt_app?(worktree)
+          end
+
+          # Worktree infrastructure/<env>/ is the source of truth; tracking JSON is a fallback.
+          def ephemeral_env_present?(worktree:, env_name:)
+            if BeltEnvironment.respond_to?(:environment_configured?) &&
+               BeltEnvironment.environment_configured?(worktree: worktree, env_name: env_name)
+              return true
+            end
+
+            BeltConfig.ephemeral_env?(env_name)
+          end
         end
       end
     end

data/lib/brainiac/plugins/github/version.rb

@@ -3,7 +3,7 @@
 module Brainiac
   module Plugins
     module Github
-      VERSION = "0.2.9"
+      VERSION = "0.3.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brainiac-github
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Andy Davis