bard-api 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60efdcaa06460e992d61dcf738ee45a2f45c1c681c7a7ad79fa16691f73af1f6
-  data.tar.gz: a2dceba794d6160e4f7d19a97c2e632e6d4a3bf92ae8667e6c3578d4bafa16cd
+  metadata.gz: ee48d71ea32a1a05c4a540cdab7b8127f94e9366cfcc259a829f2843d0ce8fe2
+  data.tar.gz: f3baa8c04d7acf644692c9cc5dbd6dc143504c22d1e4b8380134d4cb29217728
 SHA512:
-  metadata.gz: 994347c9042e652d6099d584ce4d599d19338bb295ca7fabb73087e6f29b042bc7853cbe51b0e8749cd85378d0edce97175096b6a37d541670b235f4e8fb8ced
-  data.tar.gz: 46c4672f58864f00c677369e7ac5cfbbed64285aef40096a2538b4ff5af305d34160a81ce7c6e92a0996bef7f6fc7f891f56eba3addb563850372c747b92fc78
+  metadata.gz: 0ca7e1d49a6dfac34bf2c55e01f6e2dbb4d287ca003301a371a092ae57e3ab4e62110d694ee8d9863053fe32fbff97bd2834338128c8b8afd47fafe88d4e36c7
+  data.tar.gz: 5b1167e219a79526de91876267bf769ad895c6aaf8cea1df2e5c6fe316307a05e33b29da3f5c39748037e5027b978d82b4da7e2647f10a6c301b535414fbae55

data/README.md

@@ -11,19 +11,20 @@ The bard-api gem enables BARD Tracker to manage Rails applications through a RES
 
 ## Usage
 
-### Mounting in Rails
+### Mounting
 
-Add to your `config/routes.rb`:
+With `bard-rails` this mounts automatically at `/bard` — nothing to do. Otherwise add to your
+`config/routes.rb`:
 
 ```ruby
-mount Bard::Api::App.new => "/bard-api"
+mount Bard::Api::App.new => "/bard"
 ```
 
-This makes the API available at `/bard-api/*` endpoints.
+Either way the API is served at `/bard/*`.
 
 ### Endpoints
 
-#### GET /bard-api/health
+#### GET /bard/health
 
 Health check endpoint (no authentication required).
 
@@ -34,7 +35,7 @@ Health check endpoint (no authentication required).
 }
 ```
 
-#### POST /bard-api/backups
+#### POST /bard/backups
 
 Trigger a backup (requires JWT authentication).
 
@@ -67,7 +68,7 @@ Authorization: Bearer <jwt-token>
 }
 ```
 
-#### GET /bard-api/backups/latest
+#### GET /bard/backups/latest
 
 Get status of most recent backup (requires JWT authentication).
 
@@ -98,7 +99,7 @@ Authorization: Bearer <jwt-token>
 }
 ```
 
-#### GET /bard-api/config
+#### GET /bard/config
 
 Read the project's live backup and uptime configuration (requires JWT authentication). Used by axis to discover what each project actually has deployed.
 

data/lib/bard/api/app.rb

@@ -8,6 +8,35 @@ require "bard/backup"
 module Bard
   module Api
     class App
+      class << self
+        attr_writer :backup_runner, :deploy_runner
+
+        # Runs the backup task out-of-band so the request returns immediately.
+        # Override to wire backups into a project's own job queue.
+        def backup_runner
+          @backup_runner ||= ->(task) { Thread.new { task.call } }
+        end
+
+        # bin/setup restarts Puma via `procsd restart` → `systemctl --user restart`, which
+        # SIGKILLs the app unit's whole cgroup. So the deploy can't run in this worker (or any
+        # plain child of it) — it'd be killed mid-deploy. We run it in its own systemd --user
+        # scope: a separate cgroup that survives the restart.
+        def deploy_runner
+          @deploy_runner ||= method(:spawn_detached_deploy)
+        end
+
+        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)
+        end
+      end
+
+      DEPLOY_LOCK = "tmp/bard-deploy.lock"
+      DEPLOY_COMMAND = "flock -n #{DEPLOY_LOCK} -c 'git pull --ff-only origin master && bin/setup'"
+
       def call(env)
         request = Rack::Request.new(env)
         method = request.request_method
@@ -22,6 +51,8 @@ module Bard
           latest_backup(request)
         when ["GET", "/config"]
           config(request)
+        when ["POST", "/deploy"]
+          create_deploy(request)
         else
           not_found
         end
@@ -40,13 +71,30 @@ module Bard
           s3 = payload["s3"].transform_keys(&:to_sym)
           project_name = Bard::Config.current.project_name
 
-          backup = Bard::Backup.create!(
-            type: :s3,
-            path: "bard-backup/#{project_name}",
-            **s3,
-          )
+          self.class.backup_runner.call(-> { run_backup(project_name, s3) })
 
-          json_response(200, backup.as_json)
+          json_response(202, { status: "started" })
+        end
+      end
+
+      def run_backup(project_name, s3)
+        Bard::Backup.create!(
+          type: :s3,
+          path: "bard-backup/#{project_name}",
+          **s3,
+        )
+      rescue => e
+        log_backup_error(e)
+      end
+
+      def log_backup_error(error)
+        message = "[bard-api] backup failed: #{error.class}: #{error.message}"
+        if defined?(Rails) && Rails.respond_to?(:logger) && Rails.logger
+          Rails.logger.error(message)
+          Rails.logger.error(error.backtrace.join("\n")) if error.backtrace
+        else
+          warn message
+          warn error.backtrace.join("\n") if error.backtrace
         end
       end
 
@@ -65,6 +113,35 @@ module Bard
         end
       end
 
+      # Unauthenticated on purpose: it can only fast-forward prod to origin/master (master IS prod)
+      # and is a no-op when already there.
+      #
+      # bin/setup restarts Puma, so we can't run the deploy in this worker thread — the restart
+      # would kill it mid-flight. We hand off to an out-of-band process (its own systemd scope,
+      # see .deploy_runner), serialize concurrent deploys with an flock, and return 202
+      # immediately. The caller polls until HEAD == sha.
+      def create_deploy(request)
+        target = JSON.parse(request.body.read)["sha"]
+        sha = current_sha
+        return json_response(200, { status: "noop", sha: sha }) if target == sha
+        return json_response(409, { status: "deploying", sha: sha }) if deploy_in_progress?
+
+        self.class.deploy_runner.call(DEPLOY_COMMAND)
+        json_response(202, { status: "deploying", sha: sha })
+      end
+
+      def current_sha
+        `git rev-parse HEAD`.chomp
+      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)
+          lock.flock(File::LOCK_UN) if acquired
+          !acquired
+        end
+      end
+
       def serialize_config(bard_config)
         backup = bard_config.backup
         production = bard_config.targets[:production]
@@ -74,7 +151,7 @@ module Bard
             enabled: backup.enabled?,
             bard_managed: backup.bard?,
             self_managed: backup.self_managed?,
-            encryption_enabled: !!bard_config.encrypt,
+            encryption_enabled: !!backup.encrypt,
             destinations: backup.destinations.map { |d| { name: d[:name], type: d[:type] } },
           },
           servers: production ? { production: { pings: production.ping } } : {},

data/lib/bard/api/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bard-api
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Micah Geisel
 bindir: exe
 cert_chain: []
-date: 2026-05-16 00:00:00.000000000 Z
+date: 2026-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt
@@ -71,14 +71,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement