bibliotech 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 362f3dae672cae010fb9c54ce32f9efe63ed11ae
-  data.tar.gz: b0ef186c4471df52e2823fdeca2e064a8830c6e7
+  metadata.gz: 78931ee4f81a0aad3515900a1ae81c8701e7d9a4
+  data.tar.gz: 1b041221fb2870192453e8b91593cd495e383303
 SHA512:
-  metadata.gz: 4ae066bc0ad6d6ca7e68c78d123ee98405bcf9e94ebb837118db657deaf2bb5458800842fe14a505fe747c75e9fe51ef5cea695aeacd0ab3bf3c2a0e8675d09a
-  data.tar.gz: 9b487de7b0a95505ac761879862c934ce6dd6ac69b3a730cdc58c2c9bfc7eb0cf7360e0a0be747a0ce0f22f2ac70dd25419dbebd17e78f00715c97b9064da40b
+  metadata.gz: a8f215b830a6bbcc1b38138e870cef3108d3b211f77f411be2a477a2cb6e60353efec6ab3feb25ec7faa59befb5be50339265f6a840b4d7fa1bca87b5174725c
+  data.tar.gz: 4367fbb3f7795f4c36cd72843df9fb505bcf45e1889dd3bc160346cabbd867f58ffac9a409172947af3cfc7eeff24713c5088e49274a1f4f63f2eb67a56de7d0

data/lib/bibliotech/backups/pruner.rb

@@ -30,18 +30,17 @@ module BiblioTech
       def backup_needed?(time)
         most_recent = most_recent()
         return true if most_recent.nil?
-        time - most_recent.timestamp < config.backup_frequency * 60
+        (time - most_recent.timestamp) > (config.backup_frequency * 60)
       end
 
       def list
-        @list ||=
-          begin
-            list = PruneList.new(path, name).list
-            schedules.each do |schedule|
-              schedule.mark(list)
-            end
-            list
-          end
+        @list ||= PruneList.new(path, name).list
+      end
+
+      def mark_list
+        schedules.each do |schedule|
+          schedule.mark(list)
+        end
       end
 
       def most_recent
@@ -55,6 +54,7 @@ module BiblioTech
       end
 
       def pruneable
+        mark_list
         list.select do |record|
           !record.keep?
         end

data/lib/bibliotech/config.rb

@@ -203,12 +203,16 @@ module BiblioTech
     end
 
     def each_prune_schedule
-      local_get(:prune_schedule).each do |frequency, limit|
+      local_get(:prune_schedule).map do |frequency, limit|
         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
-        yield(real_frequency, limit)
+        [real_frequency, limit]
+      end.sort_by do |frequency, limit|
+        frequency
+      end.each do |frequency, limit|
+        yield(frequency, limit)
       end
     end
 

data/spec/bibliotech/backup_pruner_spec.rb

@@ -42,6 +42,25 @@ module BiblioTech
       end
     end
 
+    context "with a recent file" do
+      before :each do
+        sandbox.new :file => "db_backups/#{pruner.filename_for(Time.now.utc - 120)}"
+      end
+
+      it "should return false from #backup_needed?" do
+        expect(pruner.backup_needed?(Time.now.utc)).to be_falsey
+      end
+    end
+
+    context "with an old file" do
+      before :each do
+        sandbox.new :file => "db_backups/#{pruner.filename_for(Time.now.utc - (24 * 60 * 60 + 120))}"
+      end
+
+      it "should return true from #backup_needed?" do
+        expect(pruner.backup_needed?(Time.now.utc)).to be_truthy
+      end
+    end
   end
 
   describe Backups::PruneList do

data/spec/bibliotech/backup_scheduler_spec.rb

@@ -89,7 +89,7 @@ module BiblioTech::Backups
         let(:frequency){ 60*8 }
         let(:test_jitter){ 60 }
 
-        it "should mark 8 files kept" do
+        it "should mark 5 files kept" do
           expect(kept_files.count).to eql 5
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bibliotech
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors:
 - Evan Dorn
@@ -128,7 +128,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- bibliotech-0.2.10 Documentation
+- bibliotech-0.2.11 Documentation
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement