bibliotech 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4a7f80a171d459f3f2cde01453860cd0a0e5750
-  data.tar.gz: 548aa897f78cef447a4055fca22dd1b9291ef70b
+  metadata.gz: edbcdd1d8fee2ac6fbfbf3c9dcb2d95e6e8ab8dd
+  data.tar.gz: fe1f5a3328dc2b83d7ba317167d4d5dcc56fae71
 SHA512:
-  metadata.gz: 6bbd899f0413760a009a0c394dbef9311c55ed981c75983614b58fc54f4838c3aab03666b61e223e08b4c25a14e3ee8e3288161ab8f332ac198a9cc9fa70fd22
-  data.tar.gz: 40325bbf4b28acf7ba568cea7467eb7934641b0db74c077e61d0e354aea5b7c90fc1900ec6828f72985515a8e9f7adf617a965a2311e37506283bf8b7df97d33
+  metadata.gz: 166cda03abf645d429194b382988be7bfac95e03b96182de7711a3e96891d28b372122971634dd356dc31423baf65886b4b129f7b66c86960352e21d88e83b28
+  data.tar.gz: 37e1d3bb553b164f15e9a8143b58f2e3884a8f9f937a40c7a7c2e35088b70550cf8d64c5482ab1202d204a0aaf27a532ba1a86a74c70bb9bb98ac56749f2769d

data/default_configuration/config.yaml

@@ -7,21 +7,25 @@ backups:
   dir: db_backups
   compress:  gzip   # [ none, gzip, bzip2, 7zip ]
   prefix: backup
-  keep:
-    hourlies: 1
+  retain:
+    periodic:
+      hourlies: 1
   frequency: hourly
 
 log:
-  target: stderr
+  target: log/backups.log
   level: warn
 
 production:
   backups:
-    keep:
-      hourlies:   48
-      dailies:    14
-      weeklies:   8
-      monthlies:  all
+    retain:
+      periodic:
+        hourlies:   48
+        dailies:    14
+        weeklies:   8
+      calendar:
+        monthlies: 12
+        quarterly: all
 
   database_config_env: production
 
@@ -38,6 +42,8 @@ staging:
   host: some.server.com
 
 development:
+  log:
+    target: stderr
   database_config_env: development
   path: "."
   rsa_files:

data/lib/bibliotech/backups/calendar_scheduler.rb

@@ -0,0 +1,91 @@
+require 'bibliotech/backups/scheduler'
+
+module BiblioTech
+  module Backups
+    class CalendarScheduler < Scheduler
+      # pattern is an array with minutes rightmost
+      def initialize(pattern, limit)
+        @pattern = pattern
+        super(name_for(pattern), freq_for(pattern), limit)
+      end
+      attr_accessor :pattern
+
+      def name_for(pattern)
+        example_time = coerce(Time.new, pattern)
+        case pattern.length
+        when 0
+          "every-minute"
+        when 1
+          example_time.strftime('Hourly at :%M')
+        when 2
+          example_time.strftime('Daily at %H:%M')
+        when 3
+          example_time.strftime('Monthly on day %d, at %H:%M')
+        when 4
+          example_time.strftime('Yearly: %b %d, at %H:%M')
+        else
+          raise ArgumentError, "argument out of range"
+        end
+
+      end
+
+      def freq_for(pattern)
+        case pattern.length
+        when 0
+          1
+        when 1
+          60
+        when 2
+          60 * 24
+        when 3
+          60 * 24 * 28
+        when 4
+          60 * 24 * 365
+        else
+          raise ArgumentError, "argument out of range"
+        end
+      end
+
+      def adjustment_index
+        5 - pattern.length
+      end
+
+      # [sec, min, hour, day, month, year, wday, yday, isdst, zone]
+      # new(year, month, day, hour, min, sec, utc_offset)
+      def coerce(time, pat=pattern)
+        existing = time.to_a
+        changeable = existing[((pat.length+1)..5)].reverse
+        values = changeable + pat + [0, time.utc_offset]
+        Time.new(*values) + 1
+      end
+
+      def compute_earliest_time(file_list)
+        exact_time = super
+        time = coerce(exact_time)
+        if time < exact_time
+          time
+        else
+          step_back(time)
+        end
+      end
+
+      def latest_time(file_list)
+        exact_time = super
+        time = coerce(exact_time)
+        if time > exact_time
+          time
+        else
+          step_forward(time)
+        end
+      end
+
+      def step_back(time)
+        coerce(super(time))
+      end
+
+      def step_forward(time)
+        coerce(super(time))
+      end
+    end
+  end
+end

data/lib/bibliotech/backups/prune_list.rb

@@ -11,7 +11,13 @@ module BiblioTech
 
       def list
         files = []
-        Dir.new(path).each do |file|
+        begin
+          dir = Dir.new(path)
+        rescue Errno::ENOENT
+          return []
+        end
+
+        dir.each do |file|
           next if %w{. ..}.include?(file)
           file_record = build_record(file)
           if file_record.nil?

data/lib/bibliotech/backups/scheduler.rb

@@ -35,6 +35,14 @@ module BiblioTech
         file_list.first.timestamp
       end
 
+      def step_back(time)
+        time - freq_seconds
+      end
+
+      def step_forward(time)
+        time + freq_seconds
+      end
+
       # Working from the latest time backwards, mark the closest file to the
       # appropriate frequencies as keepable
       def mark(original_file_list)
@@ -42,19 +50,24 @@ module BiblioTech
 
         time = latest_time(file_list)
         earliest_time = compute_earliest_time(file_list)
+        oldest_file = file_list.last
+
         while time > earliest_time do
           file_list.delete_if do |record|
             record.timestamp > time
           end
 
-          break if file_list.empty?
+          if file_list.empty?
+            oldest_file.in_schedule(name)
+            break
+          end
 
           closest = file_list.first
 
           if (time - closest.timestamp) < freq_seconds
             closest.in_schedule(name)
           end
-          time -= freq_seconds
+          time = step_back(time)
         end
         return original_file_list
       end

data/lib/bibliotech/cli.rb

@@ -3,6 +3,10 @@ require 'bibliotech/application'
 
 module BiblioTech
   class CLI < Thor
+    def self.exit_on_failure?
+      true
+    end
+
     desc "latest", "Outputs the latest DB dump available locally"
     def latest
       app = App.new(:log => { :target => "/dev/null" })
@@ -18,7 +22,7 @@ module BiblioTech
     desc "load FILENAME", "Load a database file from FILE"
     def load(file)
       app = App.new
-      app.import(:backups => { :filename => file })
+      app.import(:backups => { :file => file })
     end
 
     desc "backup", "Create a database backup if needed"

data/lib/bibliotech/command_generator.rb

@@ -26,8 +26,24 @@ module BiblioTech
       end
     end
 
-    def import(options = nil)
-      options = config.merge(options || {})
+    def import(opts = nil)
+      opts ||= {}
+      options = config.merge(opts)
+      unless File.exists?(options.backup_file)
+        filename = options.backup_file
+        opts[:backups] = opts.fetch(:backups){ opts.fetch("backups", {})}
+        opts[:filename] = filename
+
+        options = config.merge(opts)
+
+        if File.exists?(options.backup_file)
+          log.warn { "Actually restoring from #{options.backup_file} - this behavior is deprecated. In future, use explicit path."}
+        else
+          log.fatal{ "Cannot restore from database from missing file #{filename} !"}
+          raise "Missing #{filename}"
+        end
+      end
+
       command = cmd()
       command = Builders::Import.for(options).go(command)
       Builders::FileInput.for(options).go(command).tap do |cmd|

data/lib/bibliotech/config/schedule.rb

@@ -0,0 +1,130 @@
+require 'bibliotech/backups/scheduler'
+require 'bibliotech/backups/calendar_scheduler'
+
+module BiblioTech
+  class Config
+    class Schedules
+      def initialize(config)
+        @config = config
+      end
+      attr_reader :config
+
+      SCHEDULE_SHORTHANDS = {
+        "hourly"      => 60,
+        "hourlies"    => 60,
+        "daily"       => 60 * 24,
+        "dailies"     => 60 * 24,
+        "weekly"      => 60 * 24 * 7,
+        "weeklies"    => 60 * 24 * 7,
+        "monthly"     => 60 * 24 * 30,
+        "monthlies"   => 60 * 24 * 30,
+        "quarterly"   => 60 * 24 * 120,
+        "quarterlies" => 60 * 24 * 120,
+        "yearly"      => 60 * 24 * 365,
+        "yearlies"    => 60 * 24 * 365,
+      }.freeze
+      def regularize_frequency(frequency)
+        Integer( SCHEDULE_SHORTHANDS.fetch(frequency){ frequency } )
+      rescue ArgumentError
+        raise "#{frequency.inspect} is neither a number of minutes or a shorthand. Try:\n  #{SCHEDULE_SHORTHANDS.keys.join(" ")}"
+      end
+
+      def backup_frequency
+        @backup_frequency ||= regularize_frequency(config.local_get(:backup_frequency))
+      end
+
+      def regularize_schedule(freq)
+        regularize_frequency(freq)
+      end
+
+      def schedules
+        config_hash.map do |frequency, limit|
+          next if limit == "none"
+          real_frequency = regularize_schedule(frequency)
+          limit =
+            case limit
+            when "all"
+              nil
+            else
+              Integer(limit)
+            end
+          [frequency, real_frequency, limit]
+        end.compact.map do |config_frequency, regularized, limit|
+          build_scheduler(config_frequency, regularized, limit).tap do |sched|
+            unless sched.frequency % backup_frequency == 0
+              raise "Pruning frequency #{sched.frequency}:#{config_frequency} is not a multiple " +
+              "of backup frequency: #{backup_frequency}:#{config.local_get(:backup_frequency)}"
+            end
+          end
+        end.compact.sort_by do |schedule|
+          schedule.frequency
+        end
+      end
+
+      def get_config_hash(name)
+        value = config.local_get(name)
+        if value.to_s == "none"
+          return {}
+        else
+          return value
+        end
+      end
+    end
+
+    class Periods < Schedules
+      def config_hash
+        hash = {}
+
+        config.optionally{ hash.merge! get_config_hash(:prune_schedule) }
+        config.optionally{ hash.merge! get_config_hash(:legacy_prune_schedule) }
+        hash
+      end
+
+      def build_scheduler(frequency, real_frequency, limit)
+        Backups::Scheduler.new(frequency, real_frequency, limit)
+      end
+    end
+
+    class Calendars < Schedules
+      def config_hash
+        hash = {}
+        config.optionally{ hash = get_config_hash(:prune_calendar) }
+        [:quarterly, :quarterlies, "quarterly", "quarterlies"].each do |qkey|
+          limit = hash.delete(qkey)
+          if limit
+            hash.merge!(
+              :first_quarter => limit,
+              :second_quarter => limit,
+              :third_quarter => limit,
+              :fourth_quarter => limit
+            )
+          end
+        end
+        hash
+      end
+
+      def regularize_schedule(freq)
+        case freq
+        when Array
+          freq
+        when "daily", "dailies", :daily, :dailies
+          [ 0, 00 ]
+        when "monthly", "monthlies", :monthly, :monthlies
+          [ 1, 0, 00 ] # on the 1st, at 0:00
+        when "first_quarter", "first-quarter", :first_quarter
+          [ 1, 1, 0, 00 ] # on the 1st of Jan, at 0:00
+        when "second_quarter", "second-quarter", :second_quarter
+          [ 4, 1, 0, 00 ] # on the 1st of Apr, at 0:00
+        when "third_quarter", "third-quarter", :third_quarter
+          [ 7, 1, 0, 00 ] # on the 1st of Jul, at 0:00
+        when "fourth_quarter", "fourth-quarter", :fourth_quarter
+          [ 10, 1, 0, 00 ] # on the 1st of Oct, at 0:00
+        end
+      end
+
+      def build_scheduler(frequency, schedule_pattern, limit)
+        Backups::CalendarScheduler.new(schedule_pattern, limit)
+      end
+    end
+  end
+end

data/lib/bibliotech/config.rb

@@ -1,4 +1,4 @@
-require 'bibliotech/backups/scheduler'
+require 'bibliotech/config/schedule'
 
 module BiblioTech
   class Config
@@ -20,7 +20,9 @@ module BiblioTech
       :filename             => [ "backups"                , "filename"  ] ,
       :backup_path          => [ "backups"                , "dir"       ] ,
       :compressor           => [ "backups"                , "compress"  ] ,
-      :prune_schedule       => [ "backups"                , "keep"      ] ,
+      :legacy_prune_schedule => [ "backups"                , "keep"      ] ,
+      :prune_schedule        => [ "backups"                , "retain"      , "periodic" ]  ,
+      :prune_calendar        => [ "backups"                , "retain"      , "calendar"  ] ,
       :backup_name          => [ "backups"                , "prefix"    ] ,
       :backup_frequency     => [ "backups"                , "frequency" ] ,
       :db_adapter           => [ "database_config"        , "adapter"   ] ,
@@ -204,60 +206,18 @@ module BiblioTech
       File::join(remote_path(remote), filename)
     end
 
-    SCHEDULE_SHORTHANDS = {
-      "hourly"      => 60,
-      "hourlies"    => 60,
-      "daily"       => 60 * 24,
-      "dailies"     => 60 * 24,
-      "weekly"      => 60 * 24 * 7,
-      "weeklies"    => 60 * 24 * 7,
-      "monthly"     => 60 * 24 * 30,
-      "monthlies"   => 60 * 24 * 30,
-      "quarterly"   => 60 * 24 * 120,
-      "quarterlies" => 60 * 24 * 120,
-      "yearly"      => 60 * 24 * 365,
-      "yearlies"    => 60 * 24 * 365,
-    }
-    def regularize_frequency(frequency)
-      Integer( SCHEDULE_SHORTHANDS.fetch(frequency){ frequency } )
-    rescue ArgumentError
-      raise "#{frequency.inspect} is neither a number of minutes or a shorthand. Try:\n  #{SCHEDULE_SHORTHANDS.keys.join(" ")}"
-    end
-
     def backup_name
       local_get(:backup_name)
     end
 
-    def backup_frequency
-      @backup_frequency ||= regularize_frequency(local_get(:backup_frequency))
-    end
 
     def prune_schedules
-      prune_hash = local_get(:prune_schedule)
-      prune_hash.map do |frequency, limit|
-        next if limit == "none"
-        real_frequency = regularize_frequency(frequency)
-        unless real_frequency % backup_frequency == 0
-          raise "Pruning frequency #{real_frequency}:#{frequency} is not a multiple of backup frequency: #{backup_frequency}:#{local_get(:backup_frequency)}"
-        end
-        limit =
-          case limit
-          when "all"
-            nil
-          else
-            Integer(limit)
-          end
-        [frequency, real_frequency, limit]
-      end.compact.sort_by do |freq_name, frequency, limit|
-        frequency
-      end.tap do |list|
+      list = Periods.new(self).schedules + Calendars.new(self).schedules
         if list.empty?
           require 'pp'
           raise "No backups will be kept by prune schedule: #{prune_hash.pretty_inspect}"
         end
-      end.map do |freq_name, frequency, limit|
-        Backups::Scheduler.new(freq_name, frequency, limit)
-      end
+      list
     end
 
     def database_config

data/spec/bibliotech/backup_pruner_spec.rb

@@ -103,7 +103,6 @@ module BiblioTech
       end
 
       it "should keep 48 hours of backup" do
-        now = Time.now.utc
         (0..47).each do |interval|
           sandbox.new :file => "db_backups/#{pruner.filename_for(Time.now.utc - interval * 60 * 60)}"
         end
@@ -122,7 +121,7 @@ module BiblioTech
           sandbox.new :file => "db_backups/#{pruner.filename_for(now - interval * 60 * 60)}"
         end
 
-        expect(pruner.pruneable.length).to eq(471 - 48 - (14 - 2) - 1) # 2 dailies hourly etc.
+        expect(pruner.pruneable.length).to eq(471 - 48 - (14 - 2) - 2) # 2 dailies hourly etc.
 
         expect(pruner.list.length).to eq(471)
       end

data/spec/bibliotech/backup_scheduler_spec.rb

@@ -26,13 +26,13 @@ module BiblioTech::Backups
         Scheduler.new("hourly", 60, nil)
       end
 
-      context "when there's more than enough backups" do
+      context "when there's superfrequent backups over 12 hours" do
         let(:interval){ 60*60*12 - test_jitter}
         let(:frequency) { 15 }
         let(:test_jitter){ 60 }
 
-        it "should mark 8 files kept" do
-          expect(kept_files.count).to eql 12
+        it "should mark 13 files kept" do
+          expect(kept_files.count).to eql 13
         end
       end
     end
@@ -84,13 +84,13 @@ module BiblioTech::Backups
         end
       end
 
-      context "when there are too few backups" do
+      context "when the total backup interval is too short" do
         let(:interval){ 60*60*4 - test_jitter }
         let(:frequency){ 60*8 }
         let(:test_jitter){ 60 }
 
-        it "should mark 4 files kept" do
-          expect(kept_files.count).to eql 4
+        it "should mark 5 files kept" do
+          expect(kept_files.count).to eql 5
         end
       end
 

data/spec/bibliotech/command_generator/mysql_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'pry'
+require 'file-sandbox'
 
 module BiblioTech
   describe CommandGenerator, "for mysql" do
@@ -16,7 +17,7 @@ module BiblioTech
     let( :password )  { "password123" }
     let( :host     )  { "127.0.0.1"   }
     let( :filename )  { "export.sql"  }
-    let( :path     )  { "/some/path"  }
+    let( :path     )  { "some/path"  }
 
       let :base_config_hash do
       { "database_config" => {
@@ -119,6 +120,8 @@ module BiblioTech
 
 
     describe :import do
+      include FileSandbox
+
       let :command do
         generator.import(options)
       end
@@ -127,38 +130,50 @@ module BiblioTech
         command
       end
 
+
       context 'with username, database, file, and path' do
         let :options do
           { :backups => { :filename => filename, :dir => path }}
         end
 
-        it { expect(command).to be_a(Caliph::CommandLine) }
-
-        it { expect(command.redirections).to eq(["0<#{path}/#{filename}"]) }
-        it { expect(command.executable).to eq('mysql')}
-        it { expect(command.options).to eq(["-u #{username}", db_name ]) }
+        it "should raise an exception if load file is missing" do
+          expect{ command }.to raise_error(/Missing/i)
+        end
 
-        context "plus password" do
-          let :config_hash do
-            base_config_hash.tap do |hash|
-              hash["database_config"]["password"] = password
-            end
+        context 'with existent backup file' do
+          before :each do
+            sandbox.new :file => File.join(path, filename)
+            sandbox.new :file => File.join(path, filename + '.gz')
           end
 
-          it { expect(command.options).to eq(["-u #{username}","--password='#{password}'", "#{db_name}"]) }
+          it { expect(command).to be_a(Caliph::CommandLine) }
 
-          context 'and compressor' do
-            let :options do
-              { :backups => {
-                :filename => filename + '.gz',
-                :dir => path,
-                :compress => :gzip
-              } }
+          it { expect(command.redirections).to eq(["0<#{path}/#{filename}"]) }
+          it { expect(command.executable).to eq('mysql')}
+          it { expect(command.options).to eq(["-u #{username}", db_name ]) }
+
+          context "plus password" do
+            let :config_hash do
+              base_config_hash.tap do |hash|
+                hash["database_config"]["password"] = password
+              end
             end
 
-            it { expect(command).to be_a(Caliph::PipelineChain) }
-            it { expect(first_cmd.executable).to eq('gunzip') }
-            it { expect(first_cmd.options).to eq(["-c", "#{path}/#{filename}.gz"]) }
+            it { expect(command.options).to eq(["-u #{username}","--password='#{password}'", "#{db_name}"]) }
+
+            context 'and compressor' do
+              let :options do
+                { :backups => {
+                  :filename => filename + '.gz',
+                  :dir => path,
+                  :compress => :gzip
+                } }
+              end
+
+              it { expect(command).to be_a(Caliph::PipelineChain) }
+              it { expect(first_cmd.executable).to eq('gunzip') }
+              it { expect(first_cmd.options).to eq(["-c", "#{path}/#{filename}.gz"]) }
+            end
           end
         end
       end

data/spec/bibliotech/command_generator/postgres_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
+require 'file-sandbox'
 
 module BiblioTech
+  include FileSandbox
+
   describe CommandGenerator do
     let :generator do
       CommandGenerator.new(config)
@@ -11,7 +14,7 @@ module BiblioTech
     let   (:password){   "password123"   }
     let   (:host){       "127.0.0.1"     }
     let   (:filename){   "export.pg"     }
-    let   (:path){       "/some/path"    }
+    let   (:path){       "some/path"    }
 
 
     let   (:base_options){{}}
@@ -135,6 +138,8 @@ module BiblioTech
 
 
     describe :import do
+      include FileSandbox
+
       let :command do
         generator.import(options)
       end
@@ -148,32 +153,43 @@ module BiblioTech
           base_options.merge(:backups => { :filename => filename, :dir => path })
         end
 
-        it { expect(command.redirections).to eq(["0<#{path}/#{filename}"]) }
-        it { expect(command.executable).to eq('pg_restore')}
-        it { expect(command.options).to eq(["-Oc", "-U #{username}", "-d #{db_name}" ]) }
+        it "should raise an exception if load file is missing" do
+          expect{ command }.to raise_error(/Missing/i)
+        end
 
-        context "plus password" do
-          let :config_hash do
-            base_config_hash.tap do |hash|
-              hash["database_config"]["password"] = password
-            end
+        context "where file exists" do
+          before :each do
+            sandbox.new :file => File.join(path, filename)
+            sandbox.new :file => File.join(path, filename + '.gz')
           end
 
-          it { expect(command.options).to eq(["-Oc", "-U #{username}", "-d #{db_name}"]) }
-          it { expect(command.env['PGPASSWORD']).to eq(password) }
+          it { expect(command.redirections).to eq(["0<#{path}/#{filename}"]) }
+          it { expect(command.executable).to eq('pg_restore')}
+          it { expect(command.options).to eq(["-Oc", "-U #{username}", "-d #{db_name}" ]) }
 
-          context 'and compressor' do
-            let :options do
-              base_options.merge(:backups => {
-                :filename => filename + '.gz',
-                :dir => path,
-                :compressor => :gzip
-              })
+          context "plus password" do
+            let :config_hash do
+              base_config_hash.tap do |hash|
+                hash["database_config"]["password"] = password
+              end
             end
 
-            it { expect(command).to be_a(Caliph::PipelineChain) }
-            it { expect(first_cmd.executable).to eq('gunzip') }
-            it { expect(first_cmd.options).to eq(["-c", "#{path}/#{filename}.gz"]) }
+            it { expect(command.options).to eq(["-Oc", "-U #{username}", "-d #{db_name}"]) }
+            it { expect(command.env['PGPASSWORD']).to eq(password) }
+
+            context 'and compressor' do
+              let :options do
+                base_options.merge(:backups => {
+                  :filename => filename + '.gz',
+                  :dir => path,
+                  :compressor => :gzip
+                })
+              end
+
+              it { expect(command).to be_a(Caliph::PipelineChain) }
+              it { expect(first_cmd.executable).to eq('gunzip') }
+              it { expect(first_cmd.options).to eq(["-c", "#{path}/#{filename}.gz"]) }
+            end
           end
         end
       end

data/spec/bibliotech/config_spec.rb

@@ -101,7 +101,7 @@ module BiblioTech
       end
     end
 
-    describe "schedule shorthands" do
+    describe "schedule configuration" do
       let :config do
         Config.new(nil).tap do |config|
           config.hash =  config_hash
@@ -111,21 +111,108 @@ module BiblioTech
       let :config_hash do
         { "backups" => {
           "frequency" => 60,
-          "keep" => {
-            60 => 24,
-            1440 => 7
-          }}}
+          "retain" => {
+            "periodic" => {
+              60 => 24,
+              1440 => 7
+            },
+            "calendar" => {
+              [ 1,1,1 ] => 10
+            }
+          }
+        }}
+      end
+
+      let :all_schedules do
+        config.prune_schedules
       end
 
-      let :schedule_array do
-        config.prune_schedules.map do |sched|
+      let :periodic_array do
+        all_schedules.find_all{|sch| sch.class == Backups::Scheduler}.map do |sched|
           [sched.frequency, sched.limit]
         end
       end
 
+      let :calendar_array do
+        all_schedules.find_all{|sch| sch.is_a? Backups::CalendarScheduler}.map do |sched|
+          [sched.pattern, sched.limit]
+        end
+      end
+
       context "simple numerics" do
         it "should produce correct schedule" do
-          expect(schedule_array).to contain_exactly([60, 24], [1440, 7])
+          expect(periodic_array).to contain_exactly([60, 24], [1440, 7])
+          expect(calendar_array).to contain_exactly([[1,1,1],10])
+        end
+      end
+
+      context "legacy overrides" do
+        let :config_hash do
+          { "backups" => {
+            "frequency" => 60,
+            "keep" => {
+              60 => 12,
+              2400 => 6
+            },
+            "calendar" => {
+              [ 1,1,1 ] => 8,
+              [ 2,1,1 ] => 8
+            },
+            "retain" => {
+              "periodic" => {
+                60 => 24,
+                1440 => 7
+              },
+              "calendar" => {
+                [ 1,1,1 ] => 10
+              }
+            }
+          }}
+        end
+
+        # because it exists in deployment, and wants to be fixed
+        it "should prefer the legacy config" do
+          expect(periodic_array).to contain_exactly([60, 12], [1440, 7], [2400, 6])
+          expect(calendar_array).to contain_exactly([[1,1,1],10])
+        end
+      end
+
+      context "complete removal of calendar scedule" do
+        let :config_hash do
+          { "backups" => {
+            "frequency" => 60,
+            "retain" => {
+              "periodic" => {
+                60 => 24,
+                1440 => 7
+              },
+              "calendar" => "none"
+            }
+          }}
+        end
+
+        it "should prefer the modern config" do
+          expect(periodic_array).to contain_exactly([60, 24], [1440, 7])
+          expect(calendar_array).to be_empty
+        end
+      end
+
+      context "complete removal of periodic scedule" do
+        let :config_hash do
+          { "backups" => {
+            "frequency" => 60,
+            "retain" => {
+              "periodic" => "none",
+              "calendar" => {
+                [ 1,1,1 ] => 10
+              }
+            }
+          }}
+        end
+
+        it "should prefer the modern config" do
+          expect(periodic_array).to be_empty
+          expect(calendar_array).to contain_exactly([[1,1,1],10])
         end
       end
 
@@ -148,7 +235,7 @@ module BiblioTech
         end
 
         it "should prefer the local config" do
-          expect(schedule_array).to contain_exactly([60, 12])
+          expect(periodic_array).to contain_exactly([60, 12])
         end
       end
 
@@ -164,7 +251,7 @@ module BiblioTech
 
         it "should raise an error" do
           expect do
-            schedule_array
+            periodic_array
           end.to raise_error(/59/)
         end
       end
@@ -182,7 +269,7 @@ module BiblioTech
 
         it "should raise an error" do
           expect do
-            schedule_array
+            periodic_array
           end.to raise_error
         end
       end
@@ -200,7 +287,7 @@ module BiblioTech
         end
 
         it "should not raise error" do
-          expect(schedule_array).to contain_exactly([60*24, nil])
+          expect(periodic_array).to contain_exactly([60*24, nil])
         end
       end
 
@@ -217,7 +304,7 @@ module BiblioTech
 
         it "should raise an error" do
           expect do
-            schedule_array
+            periodic_array
           end.to raise_error
         end
       end
@@ -226,16 +313,26 @@ module BiblioTech
         let :config_hash do
           { "backups" => {
             "frequency" => "hourly",
-            "keep" => {
-              "hourlies" => 24,
-              "daily" => 7,
-              "weeklies" => 4,
-              "monthly" => "all"
-            }}}
+            "retain" => {
+              "periodic" => {
+                "hourlies" => 24,
+                "daily" => 7,
+                "weeklies" => 4,
+                "monthly" => "all"
+              },
+              "calendar" => {
+                "monthly" => 12,
+                "quarterly" => "all"
+              }
+            }
+          }}
         end
 
         it "should produce correct schedule" do
-          expect(schedule_array).to contain_exactly([60, 24], [60*24, 7], [60*24*7, 4], [60*24*30, nil])
+          expect(periodic_array).to contain_exactly([60, 24], [60*24, 7], [60*24*7, 4], [60*24*30, nil])
+          expect(calendar_array).to contain_exactly(
+            [[1,0,0],12], [[1,1,0,0],nil],[[4,1,0,0],nil],[[7,1,0,0],nil], [[10,1,0,0],nil]
+          )
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bibliotech
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Evan Dorn
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2015-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caliph
@@ -79,47 +79,49 @@ extra_rdoc_files:
 - doc/todo.txt
 - doc/example_config_file.yml
 files:
+- bin/bibliotech
 - default_configuration/config.yaml
+- doc/example_config_file.yml
+- doc/todo.txt
+- lib/bibliotech.rb
+- lib/bibliotech/application.rb
+- lib/bibliotech/backups/calendar_scheduler.rb
+- lib/bibliotech/backups/file_record.rb
+- lib/bibliotech/backups/prune_list.rb
+- lib/bibliotech/backups/pruner.rb
+- lib/bibliotech/backups/scheduler.rb
 - lib/bibliotech/builders.rb
 - lib/bibliotech/builders/database.rb
-- lib/bibliotech/builders/gzip.rb
 - lib/bibliotech/builders/file.rb
-- lib/bibliotech/builders/postgres.rb
+- lib/bibliotech/builders/gzip.rb
 - lib/bibliotech/builders/mysql.rb
-- lib/bibliotech/config.rb
-- lib/bibliotech/logger.rb
-- lib/bibliotech/command_runner.rb
+- lib/bibliotech/builders/postgres.rb
+- lib/bibliotech/cli.rb
 - lib/bibliotech/command_generator.rb
-- lib/bibliotech/rake_lib.rb
+- lib/bibliotech/command_runner.rb
 - lib/bibliotech/compression.rb
 - lib/bibliotech/compression/bzip2.rb
 - lib/bibliotech/compression/gzip.rb
 - lib/bibliotech/compression/sevenzip.rb
-- lib/bibliotech/backups/scheduler.rb
-- lib/bibliotech/backups/pruner.rb
-- lib/bibliotech/backups/prune_list.rb
-- lib/bibliotech/backups/file_record.rb
-- lib/bibliotech/application.rb
-- lib/bibliotech/cli.rb
+- lib/bibliotech/config.rb
+- lib/bibliotech/config/schedule.rb
+- lib/bibliotech/logger.rb
 - lib/bibliotech/railtie.rb
-- lib/bibliotech.rb
-- bin/bibliotech
-- spec/spec_helper.rb
-- spec/bibliotech/config_spec.rb
-- spec/bibliotech/command_generator/postgres_spec.rb
-- spec/bibliotech/command_generator/mysql_spec.rb
+- lib/bibliotech/rake_lib.rb
 - spec/bibliotech/backup_pruner_spec.rb
-- spec/bibliotech/compression_spec.rb
-- spec/bibliotech/compression/bzip2_spec.rb
-- spec/bibliotech/compression/sevenzip_spec.rb
-- spec/bibliotech/compression/bunzip2_spec.rb
-- spec/bibliotech/compression/gzip_spec.rb
 - spec/bibliotech/backup_scheduler_spec.rb
+- spec/bibliotech/command_generator/mysql_spec.rb
+- spec/bibliotech/command_generator/postgres_spec.rb
 - spec/bibliotech/command_generator_spec.rb
 - spec/bibliotech/command_runner_spec.rb
+- spec/bibliotech/compression/bunzip2_spec.rb
+- spec/bibliotech/compression/bzip2_spec.rb
+- spec/bibliotech/compression/gzip_spec.rb
+- spec/bibliotech/compression/sevenzip_spec.rb
+- spec/bibliotech/compression_spec.rb
+- spec/bibliotech/config_spec.rb
 - spec/gem_test_suite.rb
-- doc/todo.txt
-- doc/example_config_file.yml
+- spec/spec_helper.rb
 homepage: ''
 licenses:
 - MIT
@@ -130,7 +132,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- bibliotech-0.7.1 Documentation
+- bibliotech-0.8.0 Documentation
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -145,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: bibliotech
-rubygems_version: 2.0.14
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: ''