bard-api 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee48d71ea32a1a05c4a540cdab7b8127f94e9366cfcc259a829f2843d0ce8fe2
-  data.tar.gz: f3baa8c04d7acf644692c9cc5dbd6dc143504c22d1e4b8380134d4cb29217728
+  metadata.gz: 4d4da564c789355e60c447afcd4509dab027ae176561da244b95b31787df786b
+  data.tar.gz: b6307c6ee310ce199ee18b8760e846272cf7c66276cb3d5d5a64ecf60d580f5e
 SHA512:
-  metadata.gz: 0ca7e1d49a6dfac34bf2c55e01f6e2dbb4d287ca003301a371a092ae57e3ab4e62110d694ee8d9863053fe32fbff97bd2834338128c8b8afd47fafe88d4e36c7
-  data.tar.gz: 5b1167e219a79526de91876267bf769ad895c6aaf8cea1df2e5c6fe316307a05e33b29da3f5c39748037e5027b978d82b4da7e2647f10a6c301b535414fbae55
+  metadata.gz: d0c3651eaa2dd8ad9ba27693f942d7b9f29acbc72d9104d012d24bfa3b8179ea13531c000bd7c7d9b883a9b70a9d99fcda5235ddeb03773c7b3bd6c57ba5a496
+  data.tar.gz: c8e8658f60a5327f7e6770c457501c2b73769b17842ad73830c7ce81159736be48542fda169bf6bd500db6698e5088af772d52cf0c4f6c15c88b722d7ce7170b

data/lib/bard/api/app.rb

@@ -2,6 +2,7 @@
 
 require "rack"
 require "json"
+require "bundler"
 require_relative "auth"
 require "bard/backup"
 
@@ -25,17 +26,38 @@ module Bard
           @deploy_runner ||= method(:spawn_detached_deploy)
         end
 
+        # with_unbundled_env is essential: this worker runs under the app's bundle
+        # (RUBYOPT=-rbundler/setup, BUNDLE_GEMFILE). Inherited into the deploy, that makes every
+        # ruby command — bundle install included — crash at startup the moment git pull lands a
+        # lockfile with not-yet-installed gems. The deploy must start from a clean env.
         def spawn_detached_deploy(command)
-          pid = Process.spawn(
-            "systemd-run", "--user", "--scope", "--collect", "--quiet", "bash", "-lc", command,
-            :in => "/dev/null", %i[out err] => ["log/bard-deploy.log", "a"],
-          )
-          Process.detach(pid)
+          Bundler.with_unbundled_env do
+            pid = Process.spawn(
+              "systemd-run", "--user", "--scope", "--collect", "--quiet", "bash", "-lc", command,
+              :in => "/dev/null", %i[out err] => ["log/bard-deploy.log", "a"],
+            )
+            Process.detach(pid)
+          end
         end
       end
 
       DEPLOY_LOCK = "tmp/bard-deploy.lock"
-      DEPLOY_COMMAND = "flock -n #{DEPLOY_LOCK} -c 'git pull --ff-only origin master && bin/setup'"
+      DEPLOYED_SHA = "tmp/bard-deployed.sha"
+      FAILED_SHA = "tmp/bard-deploy-failed.sha"
+      DEPLOY_LOG = "log/bard-deploy.log"
+      # How long a failed sha short-circuits re-deploy: long enough to end the caller's poll loop
+      # without a re-spawn, short enough that a fresh `bard deploy` run can retry the same sha.
+      FAILED_COOLDOWN = 60
+
+      # Record the deployed sha only after bin/setup fully succeeds — a bare `git pull` advances
+      # HEAD before the bundle/migrate/restart run, so HEAD alone would read as "done" too early.
+      # On any failure, stamp the attempted sha so we don't re-spawn (and restart Puma) on every
+      # poll; the marker is written inside the flock, so it's on disk before the lock releases.
+      DEPLOY_COMMAND =
+        "flock -n #{DEPLOY_LOCK} -c '" \
+          "rm -f #{FAILED_SHA}; " \
+          "git pull --ff-only origin master && bin/setup && git rev-parse HEAD > #{DEPLOYED_SHA} " \
+          "|| git rev-parse origin/master > #{FAILED_SHA}'"
 
       def call(env)
         request = Rack::Request.new(env)
@@ -126,12 +148,42 @@ module Bard
         return json_response(200, { status: "noop", sha: sha }) if target == sha
         return json_response(409, { status: "deploying", sha: sha }) if deploy_in_progress?
 
+        # A prior attempt at this exact sha just failed. Report it instead of re-spawning the
+        # deploy on every poll (which would restart Puma every few seconds and never converge).
+        if target == failed_sha && recently_failed?
+          return json_response(500, {
+            status: "failed",
+            sha: sha,
+            error: "deploy failed on the server; see #{DEPLOY_LOG}",
+            log: deploy_log_tail,
+          })
+        end
+
         self.class.deploy_runner.call(DEPLOY_COMMAND)
         json_response(202, { status: "deploying", sha: sha })
       end
 
+      # The last FULLY deployed sha (bin/setup succeeded), not merely where git HEAD points.
+      # Absent marker => nothing has completed yet, so it can never match the requested sha and
+      # the caller keeps polling until bin/setup writes it — or times out on a real failure.
       def current_sha
-        `git rev-parse HEAD`.chomp
+        return "" unless File.exist?(DEPLOYED_SHA)
+        File.read(DEPLOYED_SHA).chomp
+      end
+
+      # The sha whose deploy most recently failed (bin/setup or the git pull errored out).
+      def failed_sha
+        return "" unless File.exist?(FAILED_SHA)
+        File.read(FAILED_SHA).chomp
+      end
+
+      def recently_failed?
+        File.exist?(FAILED_SHA) && (Time.now - File.mtime(FAILED_SHA)) < FAILED_COOLDOWN
+      end
+
+      def deploy_log_tail(lines = 30)
+        return "" unless File.exist?(DEPLOY_LOG)
+        File.readlines(DEPLOY_LOG).last(lines).join
       end
 
       def deploy_in_progress?

data/lib/bard/api/version.rb

@@ -2,6 +2,6 @@
 
 module Bard
   module Api
-    VERSION = "0.6.0"
+    VERSION = "0.6.2"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bard-api
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Micah Geisel
 bindir: exe
 cert_chain: []
-date: 2026-07-09 00:00:00.000000000 Z
+date: 2026-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt