solid_backup 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09416cd05590f787149f5de85fd0094cb124edeebd4a86a41bc943c1c3ea40bb'
-  data.tar.gz: 31565779742aef8295c71134d01f0f78eaf578950800ca7d4f62f612512eafc6
+  metadata.gz: 195e930fb3a17dcfc67ad285b28ccdcd4dd7bcb3fc659a7bc85c4f7e1ab915e6
+  data.tar.gz: 1db537f2585f0548b73444e8f3661b811ea040a4ac306ed0a46eae3e9783c544
 SHA512:
-  metadata.gz: 427730d383e49058a091bc569950f8ea857aa3d135d6b5a2815aad687662a09fa7dcf3a4a3031e0ffaa7975f4a3920c09666244fa7a6a55aa8ae52e01d400469
-  data.tar.gz: 94306f1e4b34f84e2fa516d905187c6b74290dd33f7476704cdd6d8040514b91aaa49859c0778b2fd7fbeacd5c7fe4671ab22a3f0d9163ef96b88df87a580709
+  metadata.gz: ed4aba930756d2f3b32ad5571a5d84095497e9f63b3952f212350258608dc5f2ed0af100d19764d25d69146606560976d38630906bae695412a87c7b0b7befdb
+  data.tar.gz: 4189596b8c2468d089306a01d11ce08d3f8dd42e036a0eeb96e2e4837205cd4987011ca8d4102b70708848766140021d32cc19619681ce9c800d270958fbfab7

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Solid Backup
 
+## 0.3.0
+
+- `destination` is the directory where backup files will be placed, not a
+  %-encoded template.
+- New `expiration:` option can be set to determine backup expiration policy;
+  currently only `SolidBackup::Expiration::Age.new(maximum: ...)` and
+  `SolidBackup::Expiration::None.new` are supported.
+
 ## 0.2.2
 
 - Don't call `SolidBackup` too early to avoid errors caused by Rails not being

data/README.md

@@ -28,11 +28,12 @@ will lack backups due to omission. There are three database backup modes:
 
 Modes other than `SolidBackup::Backup::None` take the following parameters:
 
-- `destination` - a `strftime` template used to generate backup file names; the
-                  directory under which the files are placed must already exist
-                  and be writeable.
+- `destination` - the directory where backup files will be held; it must already
+                  exist and be writeable.
 - `interval_in_minutes` - the number of minutes to the beginning of the next
                           backup after the previous one finished.
+- `expiration` - backup expiration policy; expired backups are automatically
+                 removed.
 
 Additionally, `SolidBackup::Backup::API` takes the following parameters:
 
@@ -52,10 +53,19 @@ SolidBackup.configure do |config|
     # Back up the primary database using the SQLite backup API.
     production.backup "primary",
                       SolidBackup::Backup::API,
-                      destination: "storage/backups/primary_%Y%m%dT%H%M%S.sqlite3",
-                      interval_in_minutes: 15, # Start the next backup 15 minutes after the previous one.
-                      step: 100,               # Back up in 100-page increments.
-                      wait: 0.1                # Wait 0.1 seconds if a lock interrupts a backup step.
+                      destination: "storage/backups",
+
+                      # Start the next backup 15 minutes after the previous one.
+                      interval_in_minutes: 15,
+
+                      # Back up in 100-page increments.
+                      step: 100,
+
+                      # Wait 0.1 seconds if a lock interrupts a backup step.
+                      wait: 0.1,
+
+                      # Remove backups older than 30 days.
+                      expiration: SolidBackup::Expiration::Age.new(maximum: 30.days)
 
     # Don't back up the cache database.
     production.backup "cache", SolidBackup::Backup::None
@@ -63,8 +73,13 @@ SolidBackup.configure do |config|
     # Back up the queue database using VACUUM INTO.
     production.backup "queue",
                       SolidBackup::Backup::VacuumInto,
-                      destination: "storage/backups/queue_%Y%m%dT%H%M%S.sqlite3",
-                      interval_in_minutes: 60 # Start the next backup 60 minutes after the previous one.
+                      destination: "storage/backups",
+
+                      # Start the next backup 60 minutes after the previous one.
+                      interval_in_minutes: 60,
+
+                      # Remove backups older than 12 hours.
+                      expiration: SolidBackup::Expiration::Age.new(maximum: 12.hours)
   end
 end
 ```

data/lib/solid_backup/backup/api.rb

@@ -13,9 +13,9 @@ class SolidBackup::Backup::API < SolidBackup::Backup
   def do_perform(backup_path)
     with_connection do |connection|
       source = connection.raw_connection
-      destination = SQLite3::Database.new(backup_path)
+      target = SQLite3::Database.new(backup_path)
 
-      backup = SQLite3::Backup.new(destination, "main", source, "main")
+      backup = SQLite3::Backup.new(target, "main", source, "main")
 
       loop do
         result = backup.step(step)
@@ -32,7 +32,7 @@ class SolidBackup::Backup::API < SolidBackup::Backup
       end
 
       backup.finish
-      destination.close
+      target.close
     end
   end
 end

data/lib/solid_backup/backup/none.rb

@@ -7,19 +7,19 @@
 # - destination and interval_in_minutes - to allow nil values
 class SolidBackup::Backup::None < SolidBackup::Backup
   def initialize(database:)
-    super(database:, destination: nil, interval_in_minutes: 0)
+    super(database:, destination: nil, interval_in_minutes: 0, expiration: nil)
   end
 
   def tick
   end
 
-  def perform
-  end
-
   private
 
   attr_writer :destination, :interval_in_minutes
 
+  def perform
+  end
+
   def do_perform(backup_path)
   end
 end

data/lib/solid_backup/backup.rb

@@ -4,10 +4,11 @@ module SolidBackup
   class Backup
     attr_reader :database
 
-    def initialize(database:, destination:, interval_in_minutes:)
+    def initialize(database:, destination:, interval_in_minutes:, expiration:)
       self.database = database
       self.destination = destination
       self.interval_in_minutes = interval_in_minutes
+      self.expiration = expiration
 
       reset_countdown
     end
@@ -19,23 +20,34 @@ module SolidBackup
 
       if countdown <= 0
         perform
+        remove_expired_backups
         reset_countdown
       end
     end
 
+    private
+
+    attr_accessor :countdown, :expiration
+    attr_writer :database
+    attr_reader :destination, :interval_in_minutes
+
     def perform
       ActiveSupport::Notifications.instrument("backup.solid_backup", database:) do
         lock do
-          do_perform(Time.now.utc.strftime(destination.to_s))
+          do_perform(Time.now.utc.strftime((destination / file_name_pattern).to_s))
         end
       end
     end
 
-    private
-
-    attr_accessor :countdown
-    attr_writer :database
-    attr_reader :destination, :interval_in_minutes
+    def remove_expired_backups
+      files = destination.children.select(&:file?)
+      expiration.select_expired(files) do |pathname|
+        Time.strptime(pathname.basename.to_s, file_name_pattern)
+      rescue ArgumentError
+      end.each do |pathname|
+        pathname.unlink
+      end
+    end
 
     def interval_in_minutes=(value)
       if !value.is_a?(Integer) || value <= 0
@@ -49,17 +61,16 @@ module SolidBackup
 
     def destination=(value)
       value = Pathname(value)
-      directory = value.dirname
 
-      if !directory.directory?
-        raise "invalid backup configuration for #{database}: destination directory #{directory} must exist"
+      if !value.directory?
+        raise "invalid backup configuration for #{database}: destination directory #{value} must exist"
       end
 
-      test_path = directory / "solid_backup.txt"
+      test_path = value / "solid_backup.txt"
       begin
         test_path.write("Solid Backup Test")
       rescue Errno::EACCES
-        raise "invalid backup configuration for #{database}: destination directory #{directory} must be writeable"
+        raise "invalid backup configuration for #{database}: destination directory #{value} must be writeable"
       ensure
         test_path.unlink
       end
@@ -79,10 +90,14 @@ module SolidBackup
       ActiveRecord::Base.connection_handler.establish_connection(database.to_sym)
     end
 
+    def file_name_pattern
+      "#{database}_%Y%m%dT%H%M%S.sqlite3"
+    end
+
     delegate :with_connection, to: :connection_pool
 
     def lock
-      path = destination.dirname / ".solid_backup.#{database}.lock"
+      path = destination / ".solid_backup.#{database}.lock"
 
       File.open(path, File::RDWR | File::CREAT) do |f|
         if f.flock(File::LOCK_EX | File::LOCK_NB)

data/lib/solid_backup/expiration.rb

@@ -0,0 +1,25 @@
+module SolidBackup::Expiration
+  class None
+    def select_expired(pathnames)
+      []
+    end
+  end
+
+  class Age
+    def initialize(maximum:)
+      self.maximum = maximum
+    end
+
+    def select_expired(pathnames)
+      threshold = maximum.ago
+      pathnames.select do |pathname|
+        timestamp = yield(pathname)
+        timestamp && timestamp < threshold
+      end
+    end
+
+    private
+
+    attr_accessor :maximum
+  end
+end

data/lib/solid_backup/generators/install_generator.rb

@@ -15,8 +15,9 @@ module SolidBackup
             <<~CODE.chomp
               production.backup #{db_config.name.inspect},
                                 SolidBackup::Backup::API,
-                                destination: "storage/backups/#{db_config.name}_%Y%m%dT%H%M%S.sqlite3",
+                                destination: "storage/backups",
                                 interval_in_minutes: 60,
+                                expiration: SolidBackup::Expiration::Age.new(maximum: 24.hours),
                                 step: 100,
                                 wait: 0.1
             CODE

data/lib/solid_backup/version.rb

@@ -1,3 +1,3 @@
 module SolidBackup
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/lib/solid_backup.rb

@@ -6,6 +6,7 @@ require "solid_backup/backup/api"
 require "solid_backup/backup/vacuum_into"
 require "solid_backup/configuration"
 require "solid_backup/configuration/environment"
+require "solid_backup/expiration"
 require "solid_backup/version"
 require "solid_backup/railtie"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solid_backup
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Greg Navis
@@ -110,6 +110,7 @@ files:
 - lib/solid_backup/backup/vacuum_into.rb
 - lib/solid_backup/configuration.rb
 - lib/solid_backup/configuration/environment.rb
+- lib/solid_backup/expiration.rb
 - lib/solid_backup/generators/install_generator.rb
 - lib/solid_backup/railtie.rb
 - lib/solid_backup/version.rb