bard-api 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee48d71ea32a1a05c4a540cdab7b8127f94e9366cfcc259a829f2843d0ce8fe2
-  data.tar.gz: f3baa8c04d7acf644692c9cc5dbd6dc143504c22d1e4b8380134d4cb29217728
+  metadata.gz: 563830ec8c572c92d9ccfe0baacef1e2e24746600e7a8d8508a3fe2819c6650e
+  data.tar.gz: f015d645e8d3bee75b1975b496ae53a93dc7e3bceeb2f21489a954e142862209
 SHA512:
-  metadata.gz: 0ca7e1d49a6dfac34bf2c55e01f6e2dbb4d287ca003301a371a092ae57e3ab4e62110d694ee8d9863053fe32fbff97bd2834338128c8b8afd47fafe88d4e36c7
-  data.tar.gz: 5b1167e219a79526de91876267bf769ad895c6aaf8cea1df2e5c6fe316307a05e33b29da3f5c39748037e5027b978d82b4da7e2647f10a6c301b535414fbae55
+  metadata.gz: 9f49e14b5cb6ab5b9a56c7b5f138d17c725ccdea8c995f9e9e811580ff0cb7801a65c77ce3ee7a6bc8e93cbc4dfb5748702c858873488e9551da8bc63356a518
+  data.tar.gz: ccfa6aec43edc4d1f30b23cb92b837e9535ef46f1e3b997791bcd0d0a25bb38b736682ef5a468d28652297b670cd0b80d6ebb8f30a8c9444bd446589d25b4290

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,26 @@ 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"
+      # 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}'"
 
       def call(env)
         request = Rack::Request.new(env)
@@ -130,8 +140,12 @@ module Bard
         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
 
       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.1"
   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.1
 platform: ruby
 authors:
 - Micah Geisel
 bindir: exe
 cert_chain: []
-date: 2026-07-09 00:00:00.000000000 Z
+date: 1980-01-02 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: 3.6.2
+rubygems_version: 4.0.6
 specification_version: 4
 summary: REST API for BARD-managed Rails projects
 test_files: []