pg_s3_dumper 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c33d69433cb0de8e56d6dcb827b37127056e47a7
-  data.tar.gz: 93a1e084a246a5e2e4cbd21b9471512e61018622
+  metadata.gz: 9a837802c2f2d926d2673ad6ff09f3e803bb141a
+  data.tar.gz: f0bccfbce6115d8834755ece91f40af1148a87d6
 SHA512:
-  metadata.gz: 2d7ca920a30ad0acbf6894daa1d5bfe9e5cdbf247130053c88da345fe2630036fa21186b4f6b7a361b74809890d0bf9621e38cf8a8be5dcb086aa2e737f12825
-  data.tar.gz: 80ce6b71c72e8bd1c4e2abe46fb557b705a88fd374c35940a6b752e49c05e78b81df75c573ac518d2462884ab0d3cad2e10d5646f8c60cd673bf9ecf18d24c95
+  metadata.gz: 2adb27f14f6861fc1f182ac28da7a1c85bc2a7964bf1bd5943da93ea7ae8bd2ca2889a1a0e5daa7369df01a5127da16ab600fcc6ca8aef701cdcf1d72d5e8963
+  data.tar.gz: d157714a3d23441a2622b825c2c0171a89bc4d69869ff3a3be91e738660a3aa48d02bfbcee30744344f8992e73a0c64f9f87e5a667b7dc3fffb97956055f8d25

data/lib/pg_s3_dumper/backup.rb

@@ -26,10 +26,26 @@ class Backup
     ts.strftime('%F') == date.strftime('%F')
   end
 
+  def on_week?(date)
+    ts.strftime('%Y-%U') == date.strftime('%Y-%U')
+  end
+
+  def on_month?(date)
+    ts.strftime('%Y-%m') == date.strftime('%Y-%m')
+  end
+
   def keep_on_day(date)
     @keep = true if on_day?(date)
   end
 
+  def keep_on_week(date)
+    @keep = true if on_week?(date)
+  end
+
+  def keep_on_month(date)
+    @keep = true if on_month?(date)
+  end
+
   def prune
     if keep
       puts "Keeping backup: #{self}"

data/lib/pg_s3_dumper/dumper.rb

@@ -77,12 +77,7 @@ module PgS3Dumper
       # Keep daily backups for one week
       # Keep weekly backups for one month
       # Keep monthly backups for one year
-      days =
-      7.times.map{|i| i.days.ago} +
-      4.times.map{|i| i.weeks.ago} +
-      12.times.map{|i| i.months.ago}
-
-      days.each do |ts|
+      7.times.map{|i| i.days.ago}.each do |ts|
         backups.each do |b|
           b.keep_on_day(ts)
           # We kept one backup on day ts, go to next day
@@ -90,6 +85,23 @@ module PgS3Dumper
         end
       end
 
+      4.times.map{|i| i.weeks.ago}.each do |ts|
+        backups.each do |b|
+          b.keep_on_week(ts)
+          # We kept one backup on day ts, go to next day
+          break if b.keep
+        end
+      end
+
+      12.times.map{|i| i.months.ago}.each do |ts|
+        backups.each do |b|
+          b.keep_on_month(ts)
+          # We kept one backup on day ts, go to next day
+          break if b.keep
+        end
+      end
+
+
       # Keep all backups for today
       backups.each do |b|
         b.keep_on_day(Date.today)

data/lib/pg_s3_dumper/version.rb

@@ -1,3 +1,3 @@
 module PgS3Dumper
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_s3_dumper
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Nicolas Goy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Simple tool to dump postgresql database to an S3 bucket.