heroku-mongo-backup 0.4.2 → 0.4.3

data/README.md

@@ -64,3 +64,4 @@ For Rails 2 add this to your Rakefile to import rake tasks:
 3. [stefl - stef.io](http://stef.io "Stef Lewandowski") - Rails is not required for production
 4. [moonhouse - moonhouse.se](http://www.moonhouse.se/ "David Hall") - default config improvement
 5. [wolfpakz](https://github.com/wolfpakz "Dan Porter") - Rails2 support
+6. [solacreative](http://sola-la.com/creative "Taro Murao") - Max backups feature for aws/s3 and s3 gems

data/heroku-mongo-backup.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = 'heroku-mongo-backup'
-  s.version = '0.4.2'
+  s.version = '0.4.3'
   s.summary = 'Rake task backups mongo database on Heroku and push gzipped file to Amazon S3 or FTP.'
   s.description = 'Rake task for backing up mongo database on heroku and push it to S3 or FTP. Library can be used as rake task or be easily integrated into daily cron job.'
 

data/lib/s3_helpers.rb

@@ -39,7 +39,9 @@ if defined?(S3)
       return content
     end
 
-    def HerokuMongoBackup::remove_old_backup_files(files_number_to_leave)
+    def HerokuMongoBackup::remove_old_backup_files(bucket, files_number_to_leave)
+      excess = ( object_keys = bucket.objects.find_all(:prefix => "backups/").map { |o| o.key }.sort ).count - files_number_to_leave
+      (0..excess-1).each { |i| bucket.objects.find(object_keys[i]).destroy } if excess > 0
     end
 
 end
@@ -75,19 +77,9 @@ if defined?(AWS)
     return content
   end
 
-  def HerokuMongoBackup::remove_old_backup_files(bucket_name, files_number_to_leave)
-    bucket = Bucket.find(bucket_name)
-
-    object_keys = []
-    bucket.objects.each { |o| object_keys << o.key }
-
-    object_keys = object_keys.sort
-
-    excess = object_keys.count - files_number_to_leave
-
-    if excess > 0
-      (0..excess-1).each { |i| S3Object.find(object_keys[i], bucket_name).delete }
-    end
+  def HerokuMongoBackup::remove_old_backup_files(bucket, files_number_to_leave)
+    excess = ( object_keys = AWS::S3::Bucket.find(bucket).objects(:prefix => 'backups/').map { |o| o.key }.sort ).count - files_number_to_leave
+    (0..excess-1).each { |i| AWS::S3::S3Object.find(object_keys[i], bucket).delete } if excess > 0
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-mongo-backup
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-03 00:00:00.000000000 Z
+date: 2012-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo