bard-api 0.6.1 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 563830ec8c572c92d9ccfe0baacef1e2e24746600e7a8d8508a3fe2819c6650e
-  data.tar.gz: f015d645e8d3bee75b1975b496ae53a93dc7e3bceeb2f21489a954e142862209
+  metadata.gz: e51131122902484d133bcaaf0ca3f01abea607acf01b6b89a7459ad99a5afe45
+  data.tar.gz: 713e9aac75181d545f6807259a8031c96064b58fc6c02d32e1bdea5f870cc154
 SHA512:
-  metadata.gz: 9f49e14b5cb6ab5b9a56c7b5f138d17c725ccdea8c995f9e9e811580ff0cb7801a65c77ce3ee7a6bc8e93cbc4dfb5748702c858873488e9551da8bc63356a518
-  data.tar.gz: ccfa6aec43edc4d1f30b23cb92b837e9535ef46f1e3b997791bcd0d0a25bb38b736682ef5a468d28652297b670cd0b80d6ebb8f30a8c9444bd446589d25b4290
+  metadata.gz: 8294f16c4750b0e560ecb26477a24527dbb29a229cec6e200fd6494d2d31b88bccbd3f0041516aeb1db87d36c1361e7bae678a0d66035aead9d92e86983f2716
+  data.tar.gz: 445de7f208e078a97efe9ec981556d585540003828c60d07de236ea736edae2433e6f9bc0afee3949a1c56267c407761822186328f427fb157cb05ee4780c75d

data/lib/bard/api/app.rb

@@ -32,7 +32,10 @@ module Bard
         # lockfile with not-yet-installed gems. The deploy must start from a clean env.
         def spawn_detached_deploy(command)
           Bundler.with_unbundled_env do
+            # A Passenger web worker is spawned without a login session, so it has no XDG_RUNTIME_DIR;
+            # systemd-run --user needs it to find the (linger-backed) user bus at $XDG_RUNTIME_DIR/bus.
             pid = Process.spawn(
+              { "XDG_RUNTIME_DIR" => "/run/user/#{Process.uid}" },
               "systemd-run", "--user", "--scope", "--collect", "--quiet", "bash", "-lc", command,
               :in => "/dev/null", %i[out err] => ["log/bard-deploy.log", "a"],
             )
@@ -43,9 +46,21 @@ module Bard
 
       DEPLOY_LOCK = "tmp/bard-deploy.lock"
       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.
-      DEPLOY_COMMAND = "flock -n #{DEPLOY_LOCK} -c 'git pull --ff-only origin master && bin/setup && git rev-parse HEAD > #{DEPLOYED_SHA}'"
+      # 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)
@@ -136,6 +151,17 @@ 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
@@ -148,6 +174,21 @@ module Bard
         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?
         File.open(DEPLOY_LOCK, File::RDWR | File::CREAT, 0o644) do |lock|
           acquired = lock.flock(File::LOCK_EX | File::LOCK_NB)

data/lib/bard/api/version.rb

@@ -2,6 +2,6 @@
 
 module Bard
   module Api
-    VERSION = "0.6.1"
+    VERSION = "0.6.3"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bard-api
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.3
 platform: ruby
 authors:
 - Micah Geisel
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 3.6.2
 specification_version: 4
 summary: REST API for BARD-managed Rails projects
 test_files: []