heroku-s3-backup-zinergia 0.0.1 → 0.0.2

data/README.rdoc

@@ -1,31 +1,34 @@
-= heroku_s3_backup
+= Heroku S3 Backup (Zinergia's version)
 
-Gem to backup your database on Heroku.com to S3.
+Gem to backup postgress your database on Heroku.com to S3.
+
+This was copied from https://github.com/edavis10/heroku_s3_backup  but we added support for Ruby 1.9.2 and also used Bundler for the gem management (it's much cleaner).
+
+Other than that, it's the same...
 
 == Usage
 
-1. Add the heroku_s3_backup gem to your .gems file for Heroku
+1. Add the 'heroku-s3-backup-zinergia' gem to your Gemfile for Heroku
+
 2. Add your S3 config to Heroku
+
      heroku config:add s3_access_key_id=YOUR_ID s3_secret_access_key=YOUR_KEY
+     
 3. Run the HerokuS3Backup.backup method from your console or a cronjob
+
      task :cron => :environment do
-       HerokuS3Backup.backup
+       require 'heroku-s3-backup-zinergia'
+       HerokuDatabaseBackupToS3.backup
      end
 
 The blog post at http://almosteffortless.com/2010/04/14/automated-heroku-backups/ has some more detailed instructions.
 
-== Note on Patches/Pull Requests
+== Patches/Pull Requests
  
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
+Everything it's welcome. But please, if you'll edit the version file, make that a separate commit. That way I can edit that if needed.
 
 == Copyright
 
 Code stolen from Trevor Turk (http://almosteffortless.com/2010/04/14/automated-heroku-backups/) and packaged by Eric Davis.
 
-Copyright (c) 2010 Eric Davis. See LICENSE for details.
+Copyright (c) 2011 Zinergia. Released under the MIT License

data/heroku-s3-backup-zinergia.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "heroku-s3-backup-zinergia"
 
-  s.add_dependency('right_aws', '>= 2.1.0')
+  s.add_dependency('aws-s3', '~> 0.6.2')
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/heroku-s3-backup-zinergia.rb

@@ -1,20 +1,31 @@
 class HerokuDatabaseBackupToS3
+  
+  def self.create_bucket_if_it_does_not_exist(bucket_name)
+    AWS::S3::Bucket.find(bucket_name)
+  rescue AWS::S3::NoSuchBucket => e
+    puts "Bucket '#{bucket_name}' does not exist. Creating it..."
+    AWS::S3::Bucket.create(bucket_name)
+  end
+  
   def self.backup
     begin
-      require 'digest/md5'
-      require 'right_aws'
+      require 'aws/s3'
       puts "[#{Time.now}] heroku:backup started"
       name = "#{ENV['APP_NAME']}-#{Time.now.strftime('%Y-%m-%d-%H%M%S')}.dump"
       db = ENV['DATABASE_URL'].match(/postgres:\/\/([^:]+):([^@]+)@([^\/]+)\/(.+)/)
       system "PGPASSWORD=#{db[2]} pg_dump -Fc --username=#{db[1]} --host=#{db[3]} #{db[4]} > tmp/#{name}"
-      s3 = RightAws::S3.new(ENV['s3_access_key_id'], ENV['s3_secret_access_key'])
-      bucket = s3.bucket("#{ENV['APP_NAME']}-heroku-backups", true, 'private')
-      bucket.put(name, open("tmp/#{name}"))
+      bucket_name = "#{ENV['APP_NAME']}-heroku-backups"
+      create_bucket_if_it_does_not_exist(bucket_name)
+      
+      AWS::S3::S3Object.store(name, open("tmp/#{name}"),
+                              bucket_name,
+                              :access => :private)
+      
+      # s3 = RightAws::S3.new(ENV['s3_access_key_id'], ENV['s3_secret_access_key'])
+      # bucket = s3.bucket("#{ENV['APP_NAME']}-heroku-backups", true, 'private')
+      # bucket.put(name, open("tmp/#{name}"))
       system "rm tmp/#{name}"
       puts "[#{Time.now}] heroku:backup complete"
-      # rescue Exception => e
-      #   require 'toadhopper'
-      #   Toadhopper(ENV['hoptoad_key']).post!(e)
     end
   end
 end

data/lib/heroku-s3-backup-zinergia/version.rb

@@ -2,7 +2,7 @@ module Heroku
   module S3
     module Backup
       module Zinergia
-        VERSION = "0.0.1"
+        VERSION = "0.0.2"
       end
     end
   end

data/lib/tasks/heroku.rake

@@ -1,6 +1,7 @@
 namespace :heroku do
   desc "Example showing PostgreSQL database backups from Heroku to Amazon S3"
   task :backup => :environment do
+    require 'heroku-s3-backup-zinergia'
     HerokuDatabaseBackupToS3.backup
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: heroku-s3-backup-zinergia
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Eric Davis
@@ -12,17 +12,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-24 00:00:00 Z
+date: 2011-05-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: right_aws
+  name: aws-s3
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.1.0
+        version: 0.6.2
   type: :runtime
   version_requirements: *id001
 description: Backup your heroku database to S3 without suffering. Based on http://almosteffortless.com/2010/04/14/automated-heroku-backups/