backup2s3 0.2.2 → 0.2.4

data/README

@@ -5,7 +5,7 @@ SETUP:
 
   
   2. Add the below code to config/environment.rb
-  config.gem "backup2s3", :version => ">= 0.2.1"
+  config.gem "backup2s3", :version => ">= 0.2.3"
 
 
   3. Run the generator in your application root directory

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('backup2s3', '0.2.2') do |p|
+Echoe.new('backup2s3', '0.2.4') 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"

data/backup2s3.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{backup2s3}
-  s.version = "0.2.2"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aric Walker"]
-  s.date = %q{2010-09-13}
+  s.date = %q{2011-03-18}
   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/adapters/s3cmd_adapter.rb", "lib/backup2s3.rb", "lib/backup_management/backup.rb", "lib/backup_management/backup_manager.rb", "lib/system.rb"]

data/generators/backup2s3/templates/backup2s3.rake

@@ -1,29 +1,26 @@
+require 'backup2s3'
+
 namespace :backup2s3 do
   namespace :backup do
-    desc "Save a full back to S3"
-    task :create => :environment do
+    desc "Save a full backup to S3"
+    task :create do
       Backup2s3.new.create
     end
 
-    desc "Save a full back to S3"
-    task :delete => :environment do
+    desc "Delete a backup from S3"
+    task :delete do
       Backup2s3.new.delete
     end
 
-    desc "Save a full back to S3"
-    task :list => :environment do
+    desc "List all the backups saved on S3"
+    task :list do
       Backup2s3.new.list
     end
 
     desc "Restore your DB from S3"
-    task :restore => :environment do
+    task :restore do
       Backup2s3.new.restore
     end
-
-#    desc "Keep all backups for the last day, one per day for the last week, and one per week before that. Delete the rest."
-#    task :clean => :environment do
-#      Backup2s3.new.clean
-#    end
   end
 
   desc "Show table sizes for your database"

data/lib/adapters/s3_adapter.rb

@@ -1,7 +1,7 @@
 require 'aws/s3'
 
 
-class Adapters::S3Adapter
+class S3Adapter
   include System
 
   def initialize(config)
@@ -57,7 +57,7 @@ class Adapters::S3Adapter
   private
 
   def bucket    
-    @bucket ||= clean("#{ActiveRecord::Base.connection.current_database.to_str.downcase}-ON-#{System.hostname.downcase}")
+    @bucket ||= clean("#{System.db_credentials['database'].downcase}-ON-#{System.hostname.downcase}")
   end
 
   def clean(str)

data/lib/adapters/s3cmd_adapter.rb

@@ -1,5 +1,5 @@
 
-class Adapters::S3cmdAdapter
+class S3cmdAdapter
   include System
 
   def initialize(config)
@@ -47,7 +47,7 @@ class Adapters::S3cmdAdapter
   private
 
   def bucket
-    @bucket ||= clean("#{ActiveRecord::Base.connection.current_database.to_str.downcase}-ON-#{System.hostname.downcase}")
+    @bucket ||= clean("#{System.db_credentials['database'].downcase}-ON-#{System.hostname.downcase}")
   end
 
   def clean(str)

data/lib/backup2s3.rb

@@ -3,6 +3,12 @@ require 'active_support'
 require 'tempfile'
 require 'yaml'
 
+require 'system.rb'
+require 'adapters/s3_adapter.rb'
+require 'adapters/s3cmd_adapter.rb'
+require 'backup_management/backup.rb'
+require 'backup_management/backup_manager.rb'
+
 class Backup2s3
   include System
 
@@ -73,7 +79,7 @@ class Backup2s3
       backup_to_delete = @backup_manager.get_oldest_backup
       delete_backup(backup_to_delete.time)
     end
-    backup = BackupManagement::Backup.new(@time, @application_file, @database_file, comment)
+    backup = Backup.new(@time, @application_file, @database_file, comment)
     @backup_manager.add_backup(backup)
     puts ""
   end
@@ -128,32 +134,32 @@ class Backup2s3
   # Creates instance of class used to interface with S3
   def load_adapter
     begin
-      adapter = "Adapters::#{@conf[:adapter][:type]}".constantize
+      adapter = "#{@conf[:adapter][:type]}".constantize
     rescue
-      adapter = Adapters::S3Adapter
+      adapter = S3Adapter
     end
     @adapter = adapter.new(@conf[:adapter])
   end
 
   def load_backup_manager
-    BackupManagement::BackupManager.new()
-    BackupManagement::Backup.new(nil, nil, nil)
-    begin           
-      @backup_manager = YAML.load_file(@adapter.fetch(BackupManagement::BackupManager.filename).path)
-      @backup_manager ||= YAML.load_file(BackupManagement::BackupManager.local_filename)
+    BackupManager.new()
+    Backup.new(nil, nil, nil)
+    begin
+      @backup_manager = YAML.load_file(@adapter.fetch(BackupManager.filename).path)
+      @backup_manager ||= YAML.load_file(BackupManager.local_filename)
     rescue
-      @backup_manager ||= BackupManagement::BackupManager.new
+      @backup_manager ||= BackupManager.new
     end
   end
 
   def save_backup_manager
     begin
-      File.open(BackupManagement::BackupManager.local_filename, "w") { |f| YAML.dump(@backup_manager, f) }
+      File.open(BackupManager.local_filename, "w") { |f| YAML.dump(@backup_manager, f) }
     rescue
-      puts "Unable to save local file: " << BackupManagement::BackupManager.local_filename
+      puts "Unable to save local file: " << BackupManager.local_filename
     end
     begin
-      @adapter.store(BackupManagement::BackupManager.filename, open(BackupManagement::BackupManager.local_filename))
+      @adapter.store(BackupManager.filename, open(BackupManager.local_filename))
     rescue
       puts "Unable to save BackupManager to S3"
     end

data/lib/backup_management/backup.rb

@@ -2,7 +2,7 @@
 # and open the template in the editor.
 require 'yaml'
 
-class BackupManagement::Backup
+class Backup
 
   attr_accessor :time, :application_file, :database_file, :comment
   

data/lib/backup_management/backup_manager.rb

@@ -1,6 +1,6 @@
 require 'yaml'
 
-class BackupManagement::BackupManager
+class BackupManager
   include System
   
   attr_accessor :backup_list_filename, :backups

data/lib/system.rb

@@ -1,4 +1,5 @@
 require 'tempfile'
+require 'yaml'
 
 module System
 
@@ -6,8 +7,9 @@ module System
     `hostname`.to_str.gsub!("\n", "")
   end
 
-  def self.db_credentials    
-    ActiveRecord::Base.configurations[RAILS_ENV]
+  def self.db_credentials
+    db_config = YAML.load_file("#{RAILS_ROOT}/config/database.yml")
+    db_config[RAILS_ENV]
   end
 
   # Run system commands

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: backup2s3
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Aric Walker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-13 00:00:00 -06:00
+date: 2011-03-18 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency