s3_db_assets_backup 0.1.4 → 0.1.5

data/config/initializers/load_s3_backup_config.rb

@@ -1,6 +1,6 @@
-config_file = "#{RAILS_ROOT}/config/s3_backup_config.yml"
+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
+  S3_CONFIG = YAML.load_file(config_file)[Rails.env].symbolize_keys
 else
-  raise "Can't find s3_backup_config.yml"
+  puts "WARNING: Can't find s3_backup_config.yml"
 end

data/lib/s3_db_assets_backup/railties/assets_backup.rake

@@ -13,6 +13,7 @@ namespace :assets do
     file_name = "assets-#{datestamp}.tgz" 
     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}" 
     FileUtils.rm_rf(backup_file)
@@ -59,7 +60,7 @@ namespace :assets do
         backup_file = File.join(base_path, file_name)
         destination = File.join(base_path, "public")
         puts "downloading backup..."
-        open(backup_file, 'w') do |file|
+        open(backup_file).read.force_encoding('utf-8') do |file|
           AWS::S3::S3Object.stream(file_name, bucket_name) do |chunk|
             file.write chunk
           end

data/lib/s3_db_assets_backup/railties/db_backup.rake

@@ -10,9 +10,9 @@ namespace :db do
 
     datestamp = Time.now.strftime("%Y-%m-%d-%H-%M-%S")
     base_path = ENV["RAILS_ROOT"] || "." 
-    file_name = "#{RAILS_ENV}_dump-#{datestamp}.sql.gz" 
+    file_name = "#{Rails.env}_dump-#{datestamp}.sql.gz" 
     backup_file = File.join(base_path, "tmp", file_name)
-    db_config = ActiveRecord::Base.configurations[RAILS_ENV]
+    db_config = ActiveRecord::Base.configurations[Rails.env]
     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}" 
     AWS::S3::S3Object.store(file_name, open(backup_file), BUCKET)
     puts "Created backup: #{file_name}" 
@@ -34,7 +34,7 @@ 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]
+    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/) }
@@ -65,7 +65,7 @@ namespace :db do
             file.write chunk
           end
         end
-        puts "download complete, restoring to #{RAILS_ENV} database"
+        puts "download complete, restoring to #{Rails.env} database"
         sh "gzip -dc #{backup_file} | mysql -u #{db_config['username']} -p#{db_config['password']} #{db_config['database']} --default-character-set=latin1 -N"
         puts "cleaning up..."
         FileUtils.rm_rf(backup_file)

metadata

@@ -2,7 +2,7 @@
 name: s3_db_assets_backup
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Chris Barnes
@@ -10,10 +10,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-11 00:00:00 Z
+date: 2012-10-09 00:00:00 Z
 dependencies: []
 
-description: Generates rake tasks for backing up and restoring your database and public folder (which should also contain any 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.  This gem is based on (http://www.magnionlabs.com/2009/7/7/db-backups).
+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.  This gem is based on (http://www.magnionlabs.com/2009/7/7/db-backups).
 email: chris@randomutterings.com
 executables: []