boring-backup 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90fcf205730a58bf45284b04cd2a7be2604158b5bcd983c2bd3bdaada0fb06c0
-  data.tar.gz: b17bae14e94295a24d68da3592b3baa238bc1a10fb76bcad464ae515bd7cc46c
+  metadata.gz: 851d7814c77a411800884379a85ae1feeffb5c8183d3b524ab3851f1fc7d1dde
+  data.tar.gz: e54bf1a64c28d237753b4eaa5c4bd7114c067a6b6f957b73ad4526f5332fc393
 SHA512:
-  metadata.gz: 0317b2fbf1d5768a0b0cfe28e351817d51065579dca37007d6236956c07f474c529297237358c36d4cd572d017bcb1f79209b5c5c4827fb036b169bb2ebc1339
-  data.tar.gz: a3481f64a9c95894830fb1bc92964c154a79796febe716c8e8c27ea09b5de110ce0613386adcdf3703d619a8794730a7470dd09189d504b55cc682b64bea3695
+  metadata.gz: 682eb6a513c065b1078ca528bebb9ea5cbc83924a873d47965e5ca463c8d94210a8f6e020242e45ea6fb8817e8c23e8c51a999070c1d5f2c5c63cf0b9ecc605a
+  data.tar.gz: 7afd54ae737169eb4f44d4bfd575acd64b13177b8c1d77d33260d217742934cbe053822cd5ebf4a64aa00a92cbfa16751553042f8a4ff1e7da6861f245f99045

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+## [0.6.0] - 2026-07-23
+
+- `bb doctor` - improved scheduler checks (now supports `sidekiq-crosidekiq-cron`)
+- support `PG*` env vars
+- support for Cloudflare R2 using their S3-compatible API
+
 ## [0.5.0] - 2026-07-14
 
 - **`aws-sdk-s3` is no longer a dependency of the gem.** apps using the `:s3` store must add `gem

data/README.md

@@ -21,12 +21,18 @@ gem install boring-backup
 The gem requires `pg_dump` to be installed on the machine that is running it.
 
 Storage backends bring their own dependencies, which are not installed by default. To use
-the `:s3` store, add the AWS SDK to your `Gemfile` as well:
+the `:s3` and `:r2` stores, add the AWS SDK to your `Gemfile` as well:
 
 ```bash
 bundle add aws-sdk-s3
 ```
 
+Run the install command to set up the initializer:
+
+```bash
+bundle exec bb install
+```
+
 ## Usage
 
 ### Automatic
@@ -69,6 +75,8 @@ All configuration options can be edited in the initializer:
 # config/initializers/boring-backup.rb
 
 BoringBackup.configure do |config|
+  config.sentinel_key = '12345678-abcd-1234-abcd-abcdef123456'
+
   config.register(:s3) do |store|
     store.bucket = Settings.aws.bucket
     store.region = Settings.aws.region
@@ -76,6 +84,13 @@ BoringBackup.configure do |config|
     store.secret_access_key = Settings.aws.secret_access_key
   end
 
+  config.register(:r2) do |store|
+    store.endpoint = Settings.r2.endpoint
+    store.bucket = Settings.r2.bucket
+    store.access_key_id = Settings.r2.access_key_id
+    store.secret_access_key = Settings.r2.secret_access_key
+  end
+
   config.notifier :slack do |slack|
     slack.webhook_url = 'https://hooks.slack.com/services/whatever'
   end
@@ -108,12 +123,10 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/gmitre
 
 ## Wishlist
 
-- [ ] S3-compatible backends
+- [X] S3-compatible backends
+- [X] doctor command
 - [ ] file backend
-- [ ] email notifier
-- [ ] SMS notifier
 - [ ] restore command
-- [ ] test command
 - [ ] encryption
 - [ ] delete stale
 

data/lib/boring_backup/cli.rb

@@ -140,7 +140,7 @@ module BoringBackup
     def check_line(check, width)
       mark, colour = CHECK_MARKS.fetch(check.status)
 
-      "#{pastel.decorate(mark, colour)} #{pastel.bold(check.name.ljust(width))}  #{pastel.dim(check.detail.to_s)}"
+      "#{pastel.decorate(mark, colour)} #{pastel.bold(check.name.to_s.ljust(width))}  #{pastel.dim(check.detail.to_s)}"
     end
 
     def doctor_verdict(result)
@@ -210,19 +210,12 @@ module BoringBackup
       clear_line
     end
 
-    def env_store?
-      !ENV["AWS_S3_BUCKET"].to_s.empty?
-    end
-
     def configured_store_summary
-      return "S3 — s3://#{ENV["AWS_S3_BUCKET"]} (from ENV)" if env_store?
-
       "S3 — #{INITIALIZER}" if File.exist?(INITIALIZER)
     end
 
     def configure_store
       return if File.exist?(INITIALIZER)
-      return if env_store? && prompt.yes?("Use the S3 bucket already in ENV (#{ENV["AWS_S3_BUCKET"]})?")
 
       prompt.select("Where should backups go?") do |menu|
         menu.choice "S3 (or S3-compatible: R2, MinIO, Spaces)", :s3
@@ -236,12 +229,7 @@ module BoringBackup
 
     def write_initializer(store)
       unless store
-        if File.exist?(INITIALIZER)
-          say_status :identical, INITIALIZER, :blue
-        else
-          say_status :skip, "#{INITIALIZER} not needed — the S3 store reads its config from ENV", :blue
-        end
-
+        say_status :identical, INITIALIZER, :blue
         return
       end
 

data/lib/boring_backup/commands/backup.rb

@@ -57,7 +57,7 @@ module BoringBackup::Commands
             store.backup!(@key, reader)
           rescue => e
             # *always* return a Result, even if unexpected. Add store name for debugging.
-            BoringBackup::Stores::Result.new(success: false, error: e, store: store.class.name, key: @key)
+            BoringBackup::Stores::Result.new(success: false, error: e, store: store.name, key: @key)
           ensure
             reader.close
           end

data/lib/boring_backup/commands/doctor.rb

@@ -1,6 +1,7 @@
 module BoringBackup::Commands
   Check = Struct.new(:name, :status, :detail, keyword_init: true) do
     def failed? = status == :fail
+    def ok? = status == :ok
   end
 
   DoctorResult = Struct.new(:checks, keyword_init: true) do
@@ -10,8 +11,8 @@ module BoringBackup::Commands
   end
 
   class Doctor
-    RECURRING = "config/recurring.yml"
-
+    SOLID_QUEUE_SCHEDULE_FILE = "config/recurring.yml"
+    SIDEKIQ_CRON_SCHEDULE_FILE = "config/schedule.yml"
     def self.execute = new.execute
 
     def execute
@@ -21,7 +22,7 @@ module BoringBackup::Commands
         database_resolved,
         stores_registered,
         *config.stores.flat_map { |store| store_checks(store) },
-        schedule_registered
+        *scheduler_checks
       ]
 
       DoctorResult.new(checks: checks.compact)
@@ -103,29 +104,26 @@ module BoringBackup::Commands
       [check(store.name, :fail, e.message)]
     end
 
-    def schedule_registered
-      return check("schedule", :skip, "no #{RECURRING} — using cron or another scheduler?") unless File.exist?(RECURRING)
+    def scheduler_checks
+      checks = [solid_queue_check, sidekiq_cron_check].compact
 
-      unless File.read(RECURRING, mode: "r:UTF-8").include?("BoringBackup::BackupJob")
-        return check("schedule", :fail, "#{RECURRING} does not run BoringBackup::BackupJob")
+      if checks.none?(&:ok?)
+        [check("scheduler detected", :skip, "no schedulers detected. Make sure BackupJob is executed in a cron or within a scheduler.")]
+      else
+        checks.select(&:ok?)
       end
+    end
 
-      unless backup_job_loadable?
-        return check("schedule", :fail, "BoringBackup::BackupJob won't load — is activejob in the Gemfile?")
+    def solid_queue_check
+      if File.exist?(SOLID_QUEUE_SCHEDULE_FILE) && File.read(SOLID_QUEUE_SCHEDULE_FILE, mode: "r:UTF-8").include?("BoringBackup::BackupJob")
+        check("scheduler detected", :ok, "solid-queue: #{SOLID_QUEUE_SCHEDULE_FILE}")
       end
-
-      check("schedule", :ok, "#{RECURRING} runs BoringBackup::BackupJob")
     end
 
-    def backup_job_loadable?
-      return false unless defined?(::ActiveJob)
-
-      Object.const_get("ActiveJob::Base")
-      require "boring_backup/jobs/backup_job"
-
-      true
-    rescue LoadError, NameError
-      false
+    def sidekiq_cron_check
+      if File.exist?(SIDEKIQ_CRON_SCHEDULE_FILE) && File.read(SIDEKIQ_CRON_SCHEDULE_FILE, mode: "r:UTF-8").include?("BoringBackup::BackupJob")
+        check("scheduler detected", :ok, "sidekiq-cron: #{SIDEKIQ_CRON_SCHEDULE_FILE}")
+      end
     end
 
     def config

data/lib/boring_backup/configuration.rb

@@ -69,6 +69,7 @@ module BoringBackup
       store =
         case store_type.to_sym
         when :s3 then build_s3_store
+        when :r2 then build_r2_store
         else raise BoringBackup::ConfigurationError, "unknown store type: #{store_type}"
         end
 
@@ -100,13 +101,22 @@ module BoringBackup
         "the :s3 store needs the aws-sdk-s3 gem. Add `gem \"aws-sdk-s3\"` to your Gemfile."
     end
 
+    def build_r2_store
+      require_relative "stores/r2"
+
+      BoringBackup::Stores::R2.new
+    rescue LoadError
+      raise BoringBackup::ConfigurationError,
+        "the :r2 store needs the aws-sdk-s3 gem. Add `gem \"aws-sdk-s3\"` to your Gemfile."
+    end
+
     def pg_env
       {
-        "PGHOST" => (pg_host || db_config[:host])&.to_s,
-        "PGPORT" => (pg_port || db_config[:port])&.to_s,
-        "PGUSER" => (pg_user || db_config[:username])&.to_s,
-        "PGPASSWORD" => (pg_password || db_config[:password])&.to_s,
-        "PGDATABASE" => (pg_database || db_config[:database])&.to_s
+        "PGHOST" => (pg_host || db_config[:host] || ENV["PGHOST"])&.to_s,
+        "PGPORT" => (pg_port || db_config[:port] || ENV["PGPORT"])&.to_s,
+        "PGUSER" => (pg_user || db_config[:username] || ENV["PGUSER"])&.to_s,
+        "PGPASSWORD" => (pg_password || db_config[:password] || ENV["PGPASSWORD"])&.to_s,
+        "PGDATABASE" => (pg_database || db_config[:database] || ENV["PGDATABASE"])&.to_s
       }.compact
     end
 

data/lib/boring_backup/notifiers/sentinel.rb

@@ -52,11 +52,11 @@ module BoringBackup::Notifiers
     private
 
     def normalized_host
-      uri = URI.parse(host)
+      return host if host.include?("://")
 
-      return host if uri.is_a?(URI::HTTP)
+      scheme = LOCAL_HOSTS.include?(host.split(":").first) ? "http" : "https"
 
-      "#{LOCAL_HOSTS.include?(uri.scheme) ? "http" : "https"}://#{host}"
+      "#{scheme}://#{host}"
     end
 
     def post(body)

data/lib/boring_backup/stores/r2.rb

@@ -0,0 +1,20 @@
+require "aws-sdk-s3"
+require_relative "s3"
+
+module BoringBackup::Stores
+  class R2 < S3
+    def name = :r2
+
+    def region
+      value = super
+
+      value.to_s.empty? ? "auto" : value
+    end
+
+    def validate!
+      super
+
+      raise BoringBackup::ConfigurationError, "endpoint is not configured" if endpoint.to_s.empty?
+    end
+  end
+end

data/lib/boring_backup/stores/s3.rb

@@ -18,11 +18,10 @@ module BoringBackup::Stores
       snow
     ].freeze
 
-    attr_accessor :bucket, :region, :access_key_id, :secret_access_key, :part_size, :thread_count
+    attr_accessor :bucket, :region, :access_key_id, :secret_access_key, :part_size, :thread_count, :endpoint
     attr_writer :storage_class
 
     def initialize
-      @bucket = ENV["AWS_S3_BUCKET"]
       @region = ENV["AWS_REGION"]
       @access_key_id = ENV["AWS_ACCESS_KEY_ID"]
       @secret_access_key = ENV["AWS_SECRET_ACCESS_KEY"]
@@ -37,10 +36,10 @@ module BoringBackup::Stores
       value.empty? ? nil : value.to_sym
     end
 
-    def name = "s3"
+    def name = :s3
 
     def description
-      [bucket.to_s.empty? ? "no bucket" : "s3://#{bucket}", region].compact.join(" ")
+      [bucket.to_s.empty? ? "no bucket" : "#{name}://#{bucket}", region].compact.join(" ")
     end
 
     # Prefer Aws::S3::TransferManager for streaming uploads if available.
@@ -73,13 +72,13 @@ module BoringBackup::Stores
         raise BoringBackup::DumpTooSmallError, "backup too small: #{BoringBackup.utils.human_size(bytes)} < min_size (#{BoringBackup.utils.human_size(config.min_size)})"
       end
 
-      Result.new(success: true, store: :s3, bytes:, key:, duration:)
+      Result.new(success: true, store: name, bytes:, key:, duration:)
     rescue => e
       duration = Process.clock_gettime(Process::CLOCK_MONOTONIC) - started
 
       cleanup!(key) if upload_attempted
 
-      Result.new(success: false, error: e, store: :s3, bytes:, key:, duration:)
+      Result.new(success: false, error: e, store: name, bytes:, key:, duration:)
     end
 
     def validate!
@@ -116,9 +115,10 @@ module BoringBackup::Stores
 
     def s3_config
       {
-        region: region,
-        access_key_id: access_key_id,
-        secret_access_key: secret_access_key
+        endpoint:,
+        region:,
+        access_key_id:,
+        secret_access_key:
       }.compact
     end
   end

data/lib/boring_backup/stores/store.rb

@@ -1,7 +1,7 @@
 module BoringBackup::Stores
   class Store
     def name
-      self.class.name.split("::").last.downcase
+      self.class.name.split("::").last.downcase.to_sym
     end
 
     def description

data/lib/boring_backup/version.rb

@@ -1,3 +1,3 @@
 module BoringBackup
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boring-backup
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Georgi Mitrev
@@ -91,6 +91,7 @@ files:
 - lib/boring_backup/notifiers/stdout.rb
 - lib/boring_backup/plugins/rails.rb
 - lib/boring_backup/stores.rb
+- lib/boring_backup/stores/r2.rb
 - lib/boring_backup/stores/result.rb
 - lib/boring_backup/stores/s3.rb
 - lib/boring_backup/stores/store.rb