heroku_cloud_backup 0.0.3 → 0.0.4

data/README.md

@@ -14,7 +14,7 @@ If you want this to run daily, you'll need to enable the Heroku cron addon:
 
     heroku addons:add cron:daily
 
-For Rails 3.0 and later, add this to your Gemfile:
+For Rails 3 and later, add this to your Gemfile:
 
     gem 'heroku_backup_task'
     gem 'heroku_cloud_backup'
@@ -27,42 +27,53 @@ For Rails 2.1 and later, add this to your in your environment.rb:
 In your Rakefile:
 
     require "heroku_backup_task"
+    require "heroku_cloud_backup"
     task :cron do
       HerokuBackupTask.execute
-      HerokuCloudBackupTask.execute
+      HerokuCloudBackup.execute
     end
 
 ## Usage
 
 The first thing you'll want to do is configure the addon.
 
-HCB_PROVIDERS (aws, rackspace, google) - Add which providers you're using. Accepts a comma delimited value with each provider so you can store backups in more than 1 provider. **Required**
+HCB_PROVIDER (aws, rackspace, google) - Add which provider you're using. **Required**
 
-    heroku config:add HCB_PROVIDERS='aws' # or 'aws, google, rackspace'
+    heroku config:add HCB_PROVIDER='aws' # or 'google' or 'rackspace'
 
-HCB_BUCKET (Defaults to "[APP NAME]-heroku-backups") - Select a bucket name to upload to. This the bucket or root directory that your files will be stored in. **Optional**
+HCB_BUCKET (alphanumberic characters, dashes, period, underscore are allowed, between 3 and 255 characters long) - Select a bucket name to upload to. This the bucket or root directory that your files will be stored in. If the bucket doesn't exist, it will be created. **Required**
 
     heroku config:add HCB_BUCKET='mywebsite'
 
-HCB_PREFIX (Defaults to "db") - The direction prefix for where the backups are stored. This is so you can store your backups within a specific sub directory within the bucket. **Optional**
+HCB_PREFIX (Defaults to "db") - The direction prefix for where the backups are stored. This is so you can store your backups within a specific sub directory within the bucket. heroku_cloud_backup will also append the ENV var of the database to the path, so you can backup multiple databases, by their ENV names. **Optional**
 
     heroku config:add HCB_PREFIX='backups/pg'
 
-HCB_MAX_BACKUPS (Defaults to no limit) - The number of backups to store before the script will prune out older backups. A value of 10 will allow you to store 10 of the most recent backups. Newer backups will replace older ones. **Optional**
+HCB_MAX (Defaults to no limit) - The number of backups to store before the script will prune out older backups. A value of 10 will allow you to store 10 of the most recent backups. Newer backups will replace older ones. **Optional**
 
-    heroku config:add HCB_MAX_BACKUPS=10
+    heroku config:add HCB_MAX=10
 
-Depending on which providers you specify, you'll need to provide login credentials.
+Depending on which provider you specify, you'll need to provide different login credentials.
 
-Currently, only Amazon Web Services is supported.
+For Amazon:
 
-    heroku config:add HCB_AWS_ACCESS_KEY_ID="your_access_key"
-    heroku config:add HCB_AWS_SECRET_ACCESS_KEY="your_secret"
+    heroku config:add HCB_KEY1="aws_access_key_id"
+    heroku config:add HCB_KEY2="aws_secret_access_key"
+
+For Rackspace:
+
+    heroku config:add HCB_KEY1="rackspace_username"
+    heroku config:add HCB_KEY2="rackspace_api_key"
+
+For Google Storage:
+
+    heroku config:add HCB_KEY1="google_storage_secret_access_key"
+    heroku config:add HCB_KEY2="google_storage_access_key_id"
 
 You can run this manually like this:
 
-    rake heroku_backup
-    rake heroku:cloud_backup
+    heroku rake heroku_backup
+    heroku rake heroku:cloud_backup
 
 ## Note on Patches/Pull Requests
 
@@ -76,4 +87,4 @@ You can run this manually like this:
 
 ### Copyright
 
-Copyright (c) 2011 Jack Chu. See LICENSE for details.
+Copyright (c) 2011 Jack Chu. See LICENSE for details.

data/lib/heroku_cloud_backup/tasks.rb

@@ -1,7 +1,7 @@
 require 'heroku_cloud_backup'
 
 namespace :heroku do
-  desc "Example showing PostgreSQL database backups from Heroku to Amazon S3"
+  desc "Transfer PostgreSQL database backups from Heroku to the cloud"
   task :cloud_backup => :environment do
     HerokuCloudBackup.execute
   end

data/lib/heroku_cloud_backup/version.rb

@@ -1,3 +1,3 @@
 module HerokuCloudBackup
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/heroku_cloud_backup.rb

@@ -12,15 +12,15 @@ module HerokuCloudBackup
     def log(message)
       puts "[#{Time.now}] #{message}"
     end
-    
+
     def backups_url
       ENV["PGBACKUPS_URL"]
     end
-    
+
     def client
       @client ||= PGBackups::Client.new(ENV["PGBACKUPS_URL"])
     end
-    
+
     def databases
       if db = ENV["HEROKU_BACKUP_DATABASES"]
         db.split(",").map(&:strip)
@@ -28,7 +28,7 @@ module HerokuCloudBackup
         ["DATABASE_URL"]
       end
     end
-    
+
     def backup_name(to_url)
       # translate s3://bucket/email/foo/bar.dump => foo/bar
       parts = to_url.split('/')
@@ -38,45 +38,56 @@ module HerokuCloudBackup
     def execute
       log "heroku:backup started"
 
-      @bucket_name = ENV['HCB_BUCKET'] || "#{ENV['APP_NAME']}-heroku-backups"
+      @bucket_name = ENV['HCB_BUCKET'] || raise(HerokuCloudBackup::Errors::NotFound.new("Please provide a 'HCB_BUCKET' config variable."))
       @backup_path = ENV['HCB_PREFIX'] || "db"
-      @providers = ENV['HCB_PROVIDERS'] || raise(HerokuCloudBackup::Errors::NotFound.new("Please provide a 'HCB_PROVIDERS' config variable."))
+      @provider = ENV['HCB_PROVIDER'] || raise(HerokuCloudBackup::Errors::NotFound.new("Please provide a 'HCB_PROVIDER' config variable."))
+      @key1 = ENV['HCB_KEY1'] || raise(HerokuCloudBackup::Errors::NotFound.new("Please provide a 'HCB_KEY1' config variable."))
+      @key2 = ENV['HCB_KEY2'] || raise(HerokuCloudBackup::Errors::NotFound.new("Please provide a 'HCB_KEY2' config variable."))
+
       b = client.get_latest_backup
       raise HerokuCloudBackup::Errors::NoBackups.new("You don't have any pgbackups. Please run heroku pgbackups:capture first.") if b.empty?
 
-      @providers.split(',').each do |provider|
-        case provider
+      begin
+        case @provider
           when 'aws'
-            @hcb_aws_access_key_id = ENV['HCB_AWS_ACCESS_KEY_ID'] || raise(HerokuCloudBackup::Errors::NotFound.new("Please provide a 'HCB_AWS_ACCESS_KEY_ID' config variable."))
-            @hcb_aws_secret_access_key = ENV['HCB_AWS_SECRET_ACCESS_KEY'] || raise(HerokuCloudBackup::Errors::NotFound.new("Please provide a 'HCB_AWS_SECRET_ACCESS_KEY' config variable."))
-            begin
-              @connection = Fog::Storage.new(
-                :provider => 'AWS',
-                :aws_access_key_id => @hcb_aws_access_key_id,
-                :aws_secret_access_key => @hcb_aws_secret_access_key
-              )
-            rescue
-              raise HerokuCloudBackup::Errors::ConnectionError.new("There was an error connecting to your provider.")
-            end
+            @connection = Fog::Storage.new(
+              :provider => 'AWS',
+              :aws_access_key_id     => @key1,
+              :aws_secret_access_key => @key2
+            )
+          when 'rackspace'
+            connection = Fog::Storage.new(
+              :provider => 'Rackspace',
+              :rackspace_username => @key1,
+              :rackspace_api_key  => @key2
+            )
+          when 'google'
+            connection = Fog::Storage.new(
+              :provider => 'Google',
+              :google_storage_secret_access_key => @key1,
+              :google_storage_access_key_id     => @key2
+            )
         else
-          raise HerokuCloudBackup::Errors::InvalidProvider.new("One or more of your providers were invalid. Valid values are 'aws', 'rackspace', or 'google'")
+          raise HerokuCloudBackup::Errors::InvalidProvider.new("Your provider was invalid. Valid values are 'aws', 'rackspace', or 'google'")
         end
+      rescue
+        raise HerokuCloudBackup::Errors::ConnectionError.new("There was an error connecting to your provider.")
+      end
 
-        directory = @connection.directories.get(@bucket_name)
+      directory = @connection.directories.get(@bucket_name) rescue Excon::Errors::Forbidden nil
 
-        if !directory
-          directory = @connection.directories.create(:key => @bucket_name)
-        end
+      if !directory
+        directory = @connection.directories.create(:key => @bucket_name)
+      end
 
-        public_url = b["public_url"]
-        created_at = DateTime.parse b["created_at"]
-        db_name = b["from_name"]
-        name = "#{ENV['APP_NAME']}-#{created_at.strftime('%Y-%m-%d-%H%M%S')}.dump"
-        begin
-          directory.files.create(:key => "#{@backup_path}/#{b["from_name"]}/#{name}", :body => open(public_url))
-        rescue Exception => e
-          raise HerokuCloudBackup::Errors::UploadError.new(e.message)
-        end
+      public_url = b["public_url"]
+      created_at = DateTime.parse b["created_at"]
+      db_name = b["from_name"]
+      name = "#{created_at.strftime('%Y-%m-%d-%H%M%S')}.dump"
+      begin
+        directory.files.create(:key => "#{@backup_path}/#{b["from_name"]}/#{name}", :body => open(public_url))
+      rescue Exception => e
+        raise HerokuCloudBackup::Errors::UploadError.new(e.message)
       end
 
       prune
@@ -87,13 +98,13 @@ module HerokuCloudBackup
     private
 
     def prune
-      number_of_files = ENV['HCB_MAX_BACKUPS']
+      number_of_files = ENV['HCB_MAX']
       if number_of_files && number_of_files.to_i > 0
         directory = @connection.directories.get(@bucket_name)
         files = directory.files.all(:prefix => @backup_path)
         file_count = 0
         files.reverse.each do |file|
-          if file.key =~ Regexp.new("/#{@backup_path}\/#{ENV['APP_NAME']}-\d{4}-\d{2}-\d{2}-\d{6}\.sql\.gz$/i")
+          if file.key =~ Regexp.new("/#{@backup_path}\/\d{4}-\d{2}-\d{2}-\d{6}\.sql\.gz$/i")
             file_count += 1
           else
             next

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: heroku_cloud_backup
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
-  version: 0.0.3
+  segments: 
+  - 0
+  - 0
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jack Chu
@@ -10,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 Z
+date: 2011-06-08 00:00:00 -04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fog
@@ -20,6 +26,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 7
+        - 2
         version: 0.7.2
   type: :runtime
   version_requirements: *id001
@@ -31,6 +42,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 1
+        - 4
         version: 2.1.4
   type: :runtime
   version_requirements: *id002
@@ -55,6 +71,7 @@ files:
 - lib/heroku_cloud_backup/railtie.rb
 - lib/heroku_cloud_backup/tasks.rb
 - lib/heroku_cloud_backup/version.rb
+has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -68,17 +85,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: heroku_cloud_backup
-rubygems_version: 1.8.3
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Backup pg dumps to the cloud