s3_db_assets_backup 0.2.1 → 0.2.2

data/config/initializers/load_s3_backup_config.rb

@@ -1,6 +1,8 @@
 config_file = "#{Rails.root.to_s}/config/s3_backup_config.yml"
 if FileTest.exists?(config_file)
   S3_CONFIG = YAML.load_file(config_file)[Rails.env].symbolize_keys
+  AWS.config(S3_CONFIG)
+  
   EMAIL_CONFIG = YAML.load_file(config_file)["email_config"].symbolize_keys
 else
   puts "WARNING: Can't find s3_backup_config.yml"

data/lib/s3_db_assets_backup/railties/assets_backup.rake

@@ -5,20 +5,29 @@ require 'aws/s3'
 namespace :assets do
   desc "Backup everything in the public folder." 
   task :backup => [:environment] do
-    AWS::S3::Base.establish_connection!(:access_key_id => S3_CONFIG[:access_key_id], :secret_access_key => S3_CONFIG[:secret_access_key])
-    BUCKET = S3_CONFIG[:bucket]
 
+    # establish a connection and create the s3 bucket
+    s3 = AWS::S3.new
+    bucket = s3.buckets.create(S3_CONFIG[:bucket])
+
+    # Build the backup directory and filename
     datestamp = Time.now.strftime("%Y-%m-%d-%H-%M-%S")
     base_path = ENV["RAILS_ROOT"] || "." 
-    file_name = "assets-#{datestamp}.tgz" 
+    file_name = "#{Rails.env}_assets-#{datestamp}.sql.gz" 
     backup_file = File.join(base_path, "tmp", file_name)
+    
     sh "tar -cvzpf #{backup_file} public"
     
-    AWS::S3::S3Object.store(file_name, open(backup_file), BUCKET)
-    puts "Created backup: #{file_name}" 
+    # Upload the backup file to Amazon and remove the file from the local filesystem
+    basename = File.basename(file_name)
+    object = bucket.objects[basename]
+    object.write(:file => backup_file)
+
+    puts "Uploaded #{file_name} to:"
+    puts object.public_url
+
     FileUtils.rm_rf(backup_file)
 
-    bucket = AWS::S3::Bucket.find(BUCKET)
     all_backups = bucket.objects.select { |f| f.key.match(/assets/) }.sort { |a,b| a.key <=> b.key }.reverse
     max_backups = S3_CONFIG[:assets_backups_to_keep].to_i || 28
     unwanted_backups = all_backups[max_backups..-1] || []
@@ -28,15 +37,16 @@ namespace :assets do
     end
     puts "Deleted #{unwanted_backups.length} backups, #{all_backups.length - unwanted_backups.length} backups available" 
   end
-end
 
-namespace :assets do
   desc "Restore the public folder from an available backup." 
   task :restore => [:environment] do
     base_path = ENV["RAILS_ROOT"] || "." 
-    AWS::S3::Base.establish_connection!(:access_key_id => S3_CONFIG[:access_key_id], :secret_access_key => S3_CONFIG[:secret_access_key])
-    bucket_name = S3_CONFIG[:bucket]
-    backups = AWS::S3::Bucket.objects(bucket_name).select { |f| f.key.match(/assets/) }
+    
+    # establish a connection and find the s3 bucket
+    s3 = AWS::S3.new
+    bucket = s3.buckets[S3_CONFIG[:bucket]]
+
+    backups = bucket.objects.select { |f| f.key.match(/assets/) }
     if backups.size == 0
       puts "no backups available, check your settings in config/s3_backup_config.yml"
     else
@@ -56,12 +66,12 @@ namespace :assets do
       if backups.at(selected).nil?
         puts "Backup not found, aborting"
       else
-        file_name = backups.at(selected).key
-        backup_file = File.join(base_path, file_name)
+        backup = backups.at(selected)
+        backup_file = File.join(base_path, "tmp", backup.key)
         destination = File.join(base_path, "public")
         puts "downloading backup..."
-        open(backup_file).read.force_encoding('utf-8') do |file|
-          AWS::S3::S3Object.stream(file_name, bucket_name) do |chunk|
+        open(backup_file, 'wb') do |file|
+          backup.read do |chunk|
             file.write chunk
           end
         end

data/lib/s3_db_assets_backup/railties/db_backup.rake

@@ -1,15 +1,16 @@
 require 'find'
 require 'fileutils'
-require 'aws/s3'
+require 'aws-sdk'
 require 'pony'
 require 'unit_converter'
 
 namespace :db do
   desc "Backup the database to a file. Options: RAILS_ENV=production" 
   task :backup => [:environment] do
-    # Establish connection to Amazon S3 and fetch the bucket name from the config
-    AWS::S3::Base.establish_connection!(:access_key_id => S3_CONFIG[:access_key_id], :secret_access_key => S3_CONFIG[:secret_access_key])
-    BUCKET = S3_CONFIG[:bucket]
+    
+    # establish a connection and create the s3 bucket
+    s3 = AWS::S3.new
+    bucket = s3.buckets.create(S3_CONFIG[:bucket])
 
     # Build the backup directory and filename
     datestamp = Time.now.strftime("%Y-%m-%d-%H-%M-%S")
@@ -22,13 +23,17 @@ namespace :db do
     sh "mysqldump -u #{db_config['username']} -p#{db_config['password']} --default-character-set=latin1 -N -Q --add-drop-table #{db_config['database']} | gzip -c > #{backup_file}" 
     
     # Upload the backup file to Amazon and remove the file from the local filesystem
-    AWS::S3::S3Object.store(file_name, open(backup_file), BUCKET)
-    puts "Created backup: #{file_name}" 
+    basename = File.basename(file_name)
+    object = bucket.objects[basename]
+    object.write(:file => backup_file)
+
+    puts "Uploaded #{file_name} to:"
+    puts object.public_url
+
     FileUtils.rm_rf(backup_file)
 
     # Check the bucket for the number of backups and remove the oldest backups if
     # it is over the number of backups sets configured
-    bucket = AWS::S3::Bucket.find(BUCKET)
     all_backups = bucket.objects.select { |f| f.key.match(/dump/) }.sort { |a,b| a.key <=> b.key }.reverse
     max_backups = S3_CONFIG[:database_backups_to_keep].to_i || 28
     unwanted_backups = all_backups[max_backups..-1] || []
@@ -38,16 +43,17 @@ namespace :db do
     end
     puts "Deleted #{unwanted_backups.length} backups, #{all_backups.length - unwanted_backups.length} backups available" 
   end
-end
 
-namespace :db do
   desc "Restore the database from an available backup. Options: RAILS_ENV=production" 
   task :restore => [:environment] do
     base_path = ENV["RAILS_ROOT"] || "." 
     db_config = ActiveRecord::Base.configurations[Rails.env]
-    AWS::S3::Base.establish_connection!(:access_key_id => S3_CONFIG[:access_key_id], :secret_access_key => S3_CONFIG[:secret_access_key])
-    bucket_name = S3_CONFIG[:bucket]
-    backups = AWS::S3::Bucket.objects(bucket_name).select { |f| f.key.match(/dump/) }
+    
+    # establish a connection and find the s3 bucket
+    s3 = AWS::S3.new
+    bucket = s3.buckets[S3_CONFIG[:bucket]]
+
+    backups = bucket.objects.select { |f| f.key.match(/dump/) }
     if backups.size == 0
       puts "no backups available, check your settings in config/s3_backup_config.yml"
     else
@@ -67,11 +73,11 @@ namespace :db do
       if backups.at(selected).nil?
         puts "Backup not found, aborting"
       else
-        file_name = backups.at(selected).key
-        backup_file = File.join(base_path, "tmp", file_name)
+        backup = backups.at(selected)
+        backup_file = File.join(base_path, "tmp", backup.key)
         puts "downloading backup..."
         open(backup_file, 'wb') do |file|
-          AWS::S3::S3Object.stream(file_name, bucket_name) do |chunk|
+          backup.read do |chunk|
             file.write chunk
           end
         end
@@ -83,15 +89,15 @@ namespace :db do
       end
     end
   end
-end
 
-namespace :db do
   namespace :backup do
     desc "Email a report of current backups."
     task :status => [:environment] do
-      AWS::S3::Base.establish_connection!(:access_key_id => S3_CONFIG[:access_key_id], :secret_access_key => S3_CONFIG[:secret_access_key])
-      BUCKET = S3_CONFIG[:bucket]
-      bucket = AWS::S3::Bucket.find(BUCKET)
+      
+      # establish a connection and find the s3 bucket
+      s3 = AWS::S3.new
+      bucket = s3.buckets[S3_CONFIG[:bucket]]
+
       backups = bucket.objects.select { |f| f.key.match(/dump/) }.sort { |a,b| a.key <=> b.key }.reverse
       email = EMAIL_CONFIG
       message = "Archive contains the following backups:\n\n"

metadata

@@ -1,95 +1,86 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: s3_db_assets_backup
-version: !ruby/object:Gem::Version
-  version: 0.2.1
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.2.2
 platform: ruby
-authors:
+authors: 
 - Chris Barnes
 - Michael Burk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-13 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-12-09 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: pony
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: aws-s3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.6.3
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.4"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: aws-sdk
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.6.3
-description: Generates rake tasks for backing up and restoring your database and public
-  folder (which should also contain any user uploaded assets) to and from an existing
-  bucket in your Amazon S3 account.  The rake tasks compresses and uploads each backup
-  with a time stamp and the config file allows you to set how many of each backup
-  to keep.  Additionally, the plugin can be configured to generate and send a backup
-  status report via email.
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.7"
+  type: :runtime
+  version_requirements: *id002
+description: Generates rake tasks for backing up and restoring your database and public folder (which should also contain any user uploaded assets) to and from an existing bucket in your Amazon S3 account.  The rake tasks compresses and uploads each backup with a time stamp and the config file allows you to set how many of each backup to keep.  Additionally, the plugin can be configured to generate and send a backup status report via email.
 email: chris@randomutterings.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.rdoc
-files:
-- lib/generators/s3_backup/USAGE
+files: 
 - lib/generators/s3_backup/s3_backup_generator.rb
 - lib/generators/s3_backup/templates/s3_backup_config.yml
-- lib/s3_db_assets_backup.rb
+- lib/generators/s3_backup/USAGE
 - lib/s3_db_assets_backup/engine.rb
 - lib/s3_db_assets_backup/railties/assets_backup.rake
 - lib/s3_db_assets_backup/railties/db_backup.rake
+- lib/s3_db_assets_backup.rb
 - lib/unit_converter.rb
 - config/initializers/load_s3_backup_config.rb
 - README.rdoc
 homepage: http://www.randomutterings.com/projects/s3_db_assets_backup
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Rake tasks for backing up and restoring db and public folder to and from
-  an existing S3 bucket with email notifications.
+summary: Rake tasks for backing up and restoring db and public folder to and from an existing S3 bucket with email notifications.
 test_files: []
+
 has_rdoc: