bibliotech 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 761c445f78f11c818de079f0dbb5510d29bed7d9
-  data.tar.gz: d2b39db8989b61e69b8c5bb90b752975b53dbb91
+  metadata.gz: b5cd8c3faadcd6085476fbc3dac6f1d4454ce634
+  data.tar.gz: e4cd40ae88b8e3e24f85ab1bcf5d22ee838735b3
 SHA512:
-  metadata.gz: 647303450d28ec294209a89222b21bb8996dff93b2230ff33f52d9a283a9a42d615585bf97623198f4ec058e25f0985352c8d270ee9f8466f51ad913374c76bd
-  data.tar.gz: 66153dd8bbbc16444e0d21b4190646a0ddb7383de587b91005db5011778779e966b8eb4861000ae865019ee05eb5ac51ed2cf809312b46150e3e7ce91e75835b
+  metadata.gz: bbe5696146f64efdb9c3c0cc54b9c14f64da721f428fb8f5ae12537cc2a747759584866105a713920e2239867337c55fc2b2a2aee06e87e3d4dbadf864d43467
+  data.tar.gz: 6bced695414d447ec449eaa40fc3c3a20742b70f6640e8e4b1767fcb38e648a9d9a7322b0e1a5bb061a9edddbe7ede0734e3899e0163338354fa3ebb952a0fbe

data/lib/bibliotech/config.rb

@@ -233,7 +233,9 @@ module BiblioTech
     end
 
     def prune_schedules
-      local_get(:prune_schedule).map do |frequency, limit|
+      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)}"
@@ -246,8 +248,13 @@ module BiblioTech
             Integer(limit)
           end
         [frequency, real_frequency, limit]
-      end.sort_by do |freq_name, frequency, limit|
+      end.compact.sort_by do |freq_name, frequency, limit|
         frequency
+      end.tap do |list|
+        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

data/spec/bibliotech/config_spec.rb

@@ -163,6 +163,41 @@ module BiblioTech
         end
       end
 
+
+      context "with 'none'" do
+        let :config_hash do
+          { "backups" => {
+            "frequency" => "daily",
+            "keep" => {
+              "hourly" => "none",
+              "daily" => "all"
+            }
+          }}
+        end
+
+        it "should not raise error" do
+          expect(schedule_array).to contain_exactly([60*24, nil])
+        end
+      end
+
+      context "accidentally empty" do
+        let :config_hash do
+          { "backups" => {
+            "frequency" => "daily",
+            "keep" => {
+              "hourly" => "none",
+              "daily" => "none"
+            }
+          }}
+        end
+
+        it "should raise an error" do
+          expect do
+            schedule_array
+          end.to raise_error
+        end
+      end
+
       context "with shorthand words" do
         let :config_hash do
           { "backups" => {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bibliotech
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Evan Dorn
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caliph
@@ -130,7 +130,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- bibliotech-0.5.1 Documentation
+- bibliotech-0.6.0 Documentation
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement