db2fog 0.5.2 → 0.5.4

data/HISTORY

@@ -1,3 +1,7 @@
+v0.5.4 (17th October 2011)
+  - only clean files that were created by db2fog
+v0.5.3 (12th October 2011)
+  - improve robustness of clean task
 v0.5.2 (15th September 2011)
   - fix restoring of postgresql databases (thanks Dan Neighman)
 v0.5.1 (29th August 2011)

data/lib/db2fog.rb

@@ -24,13 +24,16 @@ class DB2Fog
 
   def clean
     to_keep = []
-    filelist = store.list
-    files = filelist.reject {|file| file.ends_with?(most_recent_dump_file_name) }.collect do |file|
+    # only consider files that belong to db2fog. Other files are ignored
+    filelist = store.list.select {|file|
+      file.include?(db_credentials[:database]) && file.match(/\d{12}.sql.gz\Z/)
+    }
+    files = filelist.map { |file|
       {
         :path => file,
         :date => Time.parse(file.split('-').last.split('.').first)
       }
-    end
+    }
     # Keep all backups from the past day
     files.select {|x| x[:date] >= 1.day.ago }.each do |backup_for_day|
       to_keep << backup_for_day
@@ -47,7 +50,6 @@ class DB2Fog
     end
 
     to_destroy = filelist - to_keep.uniq.collect {|x| x[:path] }
-    to_destroy.delete_if {|x| x.ends_with?(most_recent_dump_file_name) }
     to_destroy.each do |file|
       store.delete(file.split('/').last)
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - James Healy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-15 00:00:00 +10:00
+date: 2011-10-17 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,9 +54,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
         - 0
-        - 9
-        version: "0.9"
+        version: "1.0"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency