bard-api 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e51131122902484d133bcaaf0ca3f01abea607acf01b6b89a7459ad99a5afe45
-  data.tar.gz: 713e9aac75181d545f6807259a8031c96064b58fc6c02d32e1bdea5f870cc154
+  metadata.gz: d007a479b7de5d4e3508479577848275fc7a9cdf50b73df55767eb09d1318f6c
+  data.tar.gz: 3f5580a11475da6bfe7676027a4e571599731f325acc92a19f8afff134babcb5
 SHA512:
-  metadata.gz: 8294f16c4750b0e560ecb26477a24527dbb29a229cec6e200fd6494d2d31b88bccbd3f0041516aeb1db87d36c1361e7bae678a0d66035aead9d92e86983f2716
-  data.tar.gz: 445de7f208e078a97efe9ec981556d585540003828c60d07de236ea736edae2433e6f9bc0afee3949a1c56267c407761822186328f427fb157cb05ee4780c75d
+  metadata.gz: a6e68bfb8c288f7c8dd4a1027bd44b511a30917f1e60cdbee3f5df7d05cbab6ca566e3eb94a7affd433924c15b2b808e4a95ebbbd88e1eef8d42335b7e396e19
+  data.tar.gz: 40d72eaa6bc942c5aa16f1afc2d325012afd18d2effb4cc085a016b28d29da0d1721e0da0c8034af9b9684311dd8f7dd1f34ce685b822b3ac97381808a6cb7e0

data/lib/bard/api/app.rb

@@ -26,22 +26,32 @@ module Bard
           @deploy_runner ||= method(:spawn_detached_deploy)
         end
 
-        # with_unbundled_env is essential: this worker runs under the app's bundle
+        # The deploy must start from a clean env: 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.
+        # ruby command — bin/setup and bundle install included — crash at startup the moment
+        # git pull lands a lockfile with not-yet-installed gems.
         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}" },
+              deploy_env,
               "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
+
+        # with_unbundled_env alone isn't enough: it restores Bundler::ORIGINAL_ENV, and under
+        # Passenger RUBYOPT=-rbundler/setup is injected before the app boots, so it's part of
+        # ORIGINAL_ENV and survives the scrub (took brianporter.com down on 2026-07-15). Strip
+        # the bundler vars explicitly — nil values remove them from the spawned env.
+        # XDG_RUNTIME_DIR: a Passenger web worker is spawned without a login session, so it's
+        # unset; systemd-run --user needs it to find the (linger-backed) user bus.
+        def deploy_env
+          bundler_vars = ENV.keys.grep(/\A(BUNDLE_|BUNDLER_)/) + %w[RUBYOPT RUBYLIB]
+          bundler_vars.to_h { |key| [key, nil] }
+            .merge("XDG_RUNTIME_DIR" => "/run/user/#{Process.uid}")
+        end
       end
 
       DEPLOY_LOCK = "tmp/bard-deploy.lock"
@@ -56,11 +66,15 @@ module Bard
       # 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.
+      # Then roll the tree back to the pre-pull sha: code sitting ahead of its installed gems is
+      # a time bomb — the next app-process respawn (e.g. an nginx reload) can't boot and the
+      # site 500s until someone intervenes. Better to keep running the old code.
       DEPLOY_COMMAND =
         "flock -n #{DEPLOY_LOCK} -c '" \
           "rm -f #{FAILED_SHA}; " \
+          "before=$(git rev-parse HEAD); " \
           "git pull --ff-only origin master && bin/setup && git rev-parse HEAD > #{DEPLOYED_SHA} " \
-          "|| git rev-parse origin/master > #{FAILED_SHA}'"
+          "|| { git rev-parse origin/master > #{FAILED_SHA}; git reset --hard \"$before\"; }'"
 
       def call(env)
         request = Rack::Request.new(env)

data/lib/bard/api/version.rb

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

metadata

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