xaviershay-db2s3 0.2.2 → 0.2.5

data/README

@@ -31,7 +31,7 @@ Usage:
   rake db2s3:backup:restore  # You should be testing this regularly
 
 Caveats:
-  Currently only stores the latest backup
+  Currently does not clean up old back ups
 
 Kudos:
   http://github.com/pauldowman/blog_code_examples/tree/master/mysql_s3_backup

data/db2s3.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{db2s3}
-  s.version = "0.2.2"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Xavier Shay"]
-  s.date = %q{2009-03-08}
+  s.date = %q{2009-09-22}
   s.description = %q{db2s3 provides rake tasks for backing up and restoring your DB to S3}
   s.email = %q{contact@rhnh.net}
   s.files = %w(
@@ -24,7 +24,6 @@ Gem::Specification.new do |s|
     spec/mysql_drop_schema.sql
     spec/mysql_schema.sql
     spec/s3_config.example.rb
-    spec/s3_config.rb
     spec/spec_helper.rb
     tasks
     tasks/tasks.rake

data/lib/db2s3.rb

@@ -1,4 +1,5 @@
 require 'aws/s3'
+require 'tempfile'
 
 class DB2S3
   class Config
@@ -8,11 +9,14 @@ class DB2S3
   end
 
   def full_backup
-    store.store("dump-#{db_credentials[:database]}.sql.gz", open(dump_db.path))
+    file_name = "dump-#{db_credentials[:database]}-#{Time.now.utc.strftime("%Y%m%d%H%M")}.sql.gz"
+    store.store(file_name, open(dump_db.path))
+    store.store(most_recent_dump_file_name, file_name)
   end
 
   def restore
-    file = store.fetch("dump-#{db_credentials[:database]}.sql.gz")
+    dump_file_name = store.fetch(most_recent_dump_file_name).read
+    file = store.fetch(dump_file_name)
     run "gunzip -c #{file.path} | mysql #{mysql_options}"
   end
 
@@ -51,8 +55,9 @@ class DB2S3
   end
 
   def mysql_options
-    cmd = " -u#{db_credentials[:user]} "
+    cmd = " -u #{db_credentials[:username]} "
     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
 
@@ -60,6 +65,10 @@ class DB2S3
     @store ||= S3Store.new
   end
 
+  def most_recent_dump_file_name
+    "most-recent-dump-#{db_credentials[:database]}.txt"
+  end
+
   def run(command)
     result = system(command)
     raise("error, process exited with status #{$?.exitstatus}") unless result

data/spec/db2s3_spec.rb

@@ -12,14 +12,16 @@ describe 'db2s3' do
   class Person < ActiveRecord::Base
   end
 
-  it 'can save and restore a backup to S3' do
-    db2s3 = DB2S3.new
-    load_schema
-    Person.create!(:name => "Baxter")
-    db2s3.full_backup
-    drop_schema
-    db2s3.restore
-    Person.find_by_name("Baxter").should_not be_nil
+  if DB2S3::Config.const_defined?('S3')
+    it 'can save and restore a backup to S3' do
+      db2s3 = DB2S3.new
+      load_schema
+      Person.create!(:name => "Baxter")
+      db2s3.full_backup
+      drop_schema
+      db2s3.restore
+      Person.find_by_name("Baxter").should_not be_nil
+    end
   end
 
   it 'provides estimated metrics' do

data/spec/s3_config.example.rb

@@ -1,7 +1,5 @@
-DB2S3::Config.instance_eval do
-  S3 = {
-    :access_key_id     => 'yourkey',
-    :secret_access_key => 'yoursecretkey',
-    :bucket            => 'db2s3_test'
-  }
-end
+DB2S3::Config:: S3 = {
+  :access_key_id     => 'yourkey',
+  :secret_access_key => 'yoursecretkey',
+  :bucket            => 'db2s3_test'
+}

data/spec/spec_helper.rb

@@ -1,7 +1,11 @@
 require 'spec'
 require 'activerecord'
 require File.dirname(__FILE__) + '/../lib/db2s3'
-require File.dirname(__FILE__) + '/s3_config.rb'
+if File.exists?(File.dirname(__FILE__) + '/s3_config.rb')
+  require File.dirname(__FILE__) + '/s3_config.rb'
+else
+  puts "s3_config.rb does not exist - not running live tests"
+end
 
 DBConfig = {
   :adapter  => "mysql",

data/tasks/tasks.rake

@@ -27,6 +27,7 @@ namespace :db2s3 do
     metrics = DB2S3.new.metrics
     puts <<-EOS
 Estimates only, does not take into account metadata overhead 
+Code has recently been added that keeps old backups around - this is not taken into account in these estimates
 
 DB Size:            #{format_size(metrics[:db_size])}
 Full backups/month: #{metrics[:full_backups_per_month]}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: xaviershay-db2s3
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.5
 platform: ruby
 authors: 
 - Xavier Shay
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-08 00:00:00 -08:00
+date: 2009-09-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,12 +45,12 @@ files:
 - spec/mysql_drop_schema.sql
 - spec/mysql_schema.sql
 - spec/s3_config.example.rb
-- spec/s3_config.rb
 - spec/spec_helper.rb
 - tasks
 - tasks/tasks.rake
 has_rdoc: false
 homepage: http://github.com/xaviershay/db2s3
+licenses: 
 post_install_message: 
 rdoc_options: []
 
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: db2s3 provides rake tasks for backing up and restoring your DB to S3