backup2s3 0.2.0 → 0.2.1

data/Rakefile

@@ -2,11 +2,12 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('backup2s3', '0.2.0') do |p|
-  p.description = "Backup application and database to S3"
+Echoe.new('backup2s3', '0.2.1') do |p|
+  p.description = "Backup2s3 is a gem that performs database and application backups and stores this data on Amazon S3."
+  p.summary     = "Backup2s3 is a gem that creates, deletes and restores db and application backups."
   p.url         = "http://github.com/aricwalker/backup2s3"
   p.author      = "Aric Walker"
   p.email       = "aric@truespire.com"
   p.ignore_pattern = ["nbproject/*/*", "nbproject/*"]
-  p.development_dependencies = []
+  p.development_dependencies = ["aws-s3 >=0.6.2"]
 end

data/backup2s3.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{backup2s3}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aric Walker"]
   s.date = %q{2010-04-18}
-  s.description = %q{Backup application and database to S3}
+  s.description = %q{Backup2s3 is a gem that performs database and application backups and stores this data on Amazon S3.}
   s.email = %q{aric@truespire.com}
   s.extra_rdoc_files = ["CHANGELOG", "README", "lib/adapters/s3_adapter.rb", "lib/backup2s3.rb", "lib/backup_management/backup.rb", "lib/backup_management/backup_manager.rb", "lib/system.rb"]
   s.files = ["CHANGELOG", "Manifest", "README", "Rakefile", "generators/backup2s3/USAGE", "generators/backup2s3/backup2s3_generator.rb", "generators/backup2s3/templates/backup2s3.rake", "generators/backup2s3/templates/backup2s3.yml", "init.rb", "lib/adapters/s3_adapter.rb", "lib/backup2s3.rb", "lib/backup_management/backup.rb", "lib/backup_management/backup_manager.rb", "lib/system.rb", "backup2s3.gemspec"]
@@ -16,15 +16,18 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{backup2s3}
   s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Backup application and database to S3}
+  s.summary = %q{Backup2s3 is a gem that creates, deletes and restores db and application backups.}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<aws-s3>, [">= 0.6.2"])
     else
+      s.add_dependency(%q<aws-s3>, [">= 0.6.2"])
     end
   else
+    s.add_dependency(%q<aws-s3>, [">= 0.6.2"])
   end
 end

data/lib/adapters/s3_adapter.rb

@@ -1,7 +1,7 @@
 require 'aws/s3'
-require 'tidy'
 
 class Adapters::S3Adapter
+  include System
 
   def initialize(config)
     @config = config
@@ -33,10 +33,8 @@ class Adapters::S3Adapter
     file
   end
 
-  def read(file_name)
-    puts "trying..."
+  def read(file_name)    
     ensure_connected
-    puts "trying..."
     return AWS::S3::S3Object.find(file_name, bucket)
   end
 
@@ -53,17 +51,15 @@ class Adapters::S3Adapter
 
   private
 
-  def access_key_id
-
-  end
-
   def bucket    
-    @bucket ||= clean("#{ActiveRecord::Base.connection.current_database.to_str.downcase}-ON-#{`hostname`.to_str.downcase}")
+    @bucket ||= clean("#{ActiveRecord::Base.connection.current_database.to_str.downcase}-ON-#{System.hostname.downcase}")
   end
 
   def clean(str)
     str.gsub!(".", "-dot-")
-    str.gsub!("_", "-")    
-    return str.tidy
+    str.gsub!("_", "-")
+    str.gsub!("\n", "")
+    return str
   end
+  
 end

data/lib/backup2s3.rb

@@ -26,14 +26,14 @@ class Backup2s3
 
   #DELETE deletes a backup
   def delete(backup_id = ENV['id'])
-    raise "ID to delete is blank!" and return if backup_id == nil
+    raise "id is blank! There was no backup specified for deletion." and return if backup_id == nil
     delete_backup(backup_id)
     save_backup_manager
   end
 
   #RESTORE restores a backup
   def restore(backup_id = ENV['id'])
-    raise "ID to restore is blank!" and return if backup_id == nil
+    raise "id is blank! There was no backup specified for restoration." and return if backup_id == nil
     restore_backup(backup_id)
     save_backup_manager
   end
@@ -52,16 +52,18 @@ class Backup2s3
   def create_backup(comment)
     if @conf[:backups][:backup_database]
       @database_file = "#{@time}-#{System.db_credentials['database']}-database.sql"
+      print "\nDumping database..."
       database_temp = System.db_dump      
-      puts "\n- System dump size: " << database_temp.size.to_s << " B"; print "--- Backing up database..."
+      puts "done\n- Database dump file size: " << database_temp.size.to_s << " B"; print "Backing up database dump file..."
       @adapter.store(@database_file, open(database_temp.path))
       puts "done"
     end
     
     if @conf[:backups][:backup_application_folders].is_a?(Array)
       @application_file = "#{@time}-#{System.db_credentials['database']}-application.tar.gz"
+      print "\nZipping application folders..."
       application_temp = System.tarzip_folders(@conf[:backups][:backup_application_folders])
-      puts "\n- Application tarball size: " << application_temp.size.to_s << " B"; print "--- Backing up application folders..."
+      puts "done\n- Application tarball size: " << application_temp.size.to_s << " B"; print "Backing up application tarball..."
       @adapter.store(@application_file, open(application_temp.path))
       puts "done"
     end
@@ -91,14 +93,28 @@ class Backup2s3
         "Warning: Backup with ID #{backup.time} was not found and therefore not deleted.")
   end
 
-#  def restore_backup(backup_id)
-#    backup = backup_manager.get_backup(backup_id)
-#    if backup.nil? then
-#      puts "Backup with ID #{backup_id} does not exist."
-#      return
-#    end
-#
-#  end
+  def restore_backup(backup_id)
+    backup = @backup_manager.get_backup(backup_id)
+    if backup.nil? then
+      puts "Backup with ID #{backup_id} does not exist."
+      return
+    end
+    print "\nRetrieving application tarball..."
+    application_file = @adapter.fetch(backup.application_file)
+    puts "done"
+
+    print "Restoring application from application tarball..."
+    System.unzip_file(application_file)
+    puts "done\n"
+
+    print "\nRetrieving datbase dump_file..."
+    dump_file = @adapter.fetch(backup.database_file)
+    puts "done";
+
+    print "Restoring database from database dump file..."
+    System.load_db_dump(dump_file)
+    puts "done\n\n"
+  end
 
   # Loads the config/backup2s3.yml configuration file
   def load_configuration

data/lib/backup_management/backup_manager.rb

@@ -11,7 +11,7 @@ class BackupManagement::BackupManager
   end
 
   def self.filename
-    "#{System.db_credentials['database']}_ON_#{`hostname`.tidy}_backups.yaml".tidy
+    "#{System.db_credentials['database']}_ON_#{System.hostname}_backups.yaml"
   end
 
   def self.local_filename

data/lib/system.rb

@@ -2,6 +2,10 @@ require 'tempfile'
 
 module System
 
+  def self.hostname
+    `hostname`.to_str.gsub!("\n", "")
+  end
+
   def self.db_credentials    
     ActiveRecord::Base.configurations[RAILS_ENV]
   end
@@ -24,6 +28,11 @@ module System
     return application_tar
   end
 
+  def self.unzip_file(tarball)
+    cmd = "tar xpf #{tarball.path}"
+    run(cmd)
+  end
+
   # Creates and runs mysqldump and throws into .tar.gz file.
   # Returns .tar.gz file
   def self.db_dump
@@ -34,13 +43,20 @@ module System
     return dump_file
   end
 
+  def self.load_db_dump(dump_file)
+    cmd = "mysql #{mysql_options}"
+    cmd += " < #{dump_file.path}"
+    run(cmd)
+    true
+  end
+
   def self.mysql_options
     cmd = ''
     cmd += " -u #{db_credentials['username']} " unless db_credentials['username'].nil?
     cmd += " -p'#{db_credentials['password']}'" unless db_credentials['password'].nil?
     cmd += " -h '#{db_credentials['host']}'"    unless db_credentials['host'].nil?
     cmd += " #{db_credentials['database']}"
-  end
+  end  
     
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Aric Walker
@@ -16,9 +16,22 @@ cert_chain: []
 
 date: 2010-04-18 00:00:00 -06:00
 default_executable: 
-dependencies: []
-
-description: Backup application and database to S3
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: aws-s3
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        - 2
+        version: 0.6.2
+  type: :development
+  version_requirements: *id001
+description: Backup2s3 is a gem that performs database and application backups and stores this data on Amazon S3.
 email: aric@truespire.com
 executables: []
 
@@ -83,6 +96,6 @@ rubyforge_project: backup2s3
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Backup application and database to S3
+summary: Backup2s3 is a gem that creates, deletes and restores db and application backups.
 test_files: []