db2s3 0.2.5 → 0.2.6

data/.gitignore

@@ -1 +1,3 @@
 spec/s3_config.rb
+db2s3.gemspec
+pkg

data/HISTORY

@@ -1,3 +1,9 @@
+0.2.6
+  - Remove metrics task, since it was far too inaccurate
+  - Add statistics task to show you the size of your tables
+  - Only add username to mysql command line if provided in database.yml
+0.2.5
+  - Use host provided in database.yml
 0.2.4 (2 Sep 2009)
   - Fix credentials bug
 0.2.3

data/README

@@ -5,7 +5,7 @@ So pony up you cheap bastard, and store your backups on S3
 
 Usage:
   # In config/environment.rb
-  config.gem "xaviershay-db2s3", :lib => "db2s3", :source => "http://gems.github.com"
+  config.gem "db2s3", :source => "http://gemcutter.org"
 
   # In Rakefile
   require 'db2s3/tasks'

data/VERSION

@@ -0,0 +1 @@
+0.2.6

data/lib/db2s3.rb

@@ -20,32 +20,11 @@ class DB2S3
     run "gunzip -c #{file.path} | mysql #{mysql_options}"
   end
 
-  def metrics
-    dump_file = dump_db
-
-    storage_dollars_per_byte_per_month  = 0.15 / 1024.0 / 1024.0 / 1024.0
-    transfer_dollars_per_byte_per_month = 0.10 / 1024.0 / 1024.0 / 1024.0
-    full_dumps_per_month = 30
-
-    storage_cost = (dump_file.size * storage_dollars_per_byte_per_month * 100).ceil / 100.0
-    transfer_cost = (dump_file.size * full_dumps_per_month * transfer_dollars_per_byte_per_month * 100).ceil / 100.0
-    requests_cost = 0.02 # TODO: Actually calculate this, with incremental backups could be more
-
-    {
-      :db_size       => dump_file.size,
-      :storage_cost  => storage_cost,
-      :transfer_cost => transfer_cost,
-      :total_cost    => storage_cost + transfer_cost + requests_cost,
-      :requests_cost => requests_cost,
-      :full_backups_per_month => full_dumps_per_month
-    }
-  end
-
   private
 
   def dump_db
     dump_file = Tempfile.new("dump")
-    
+
     #cmd = "mysqldump --quick --single-transaction --create-options -u#{db_credentials[:user]} --flush-logs --master-data=2 --delete-master-logs"
     cmd = "mysqldump --quick --single-transaction --create-options #{mysql_options}"
     cmd += " | gzip > #{dump_file.path}"
@@ -55,7 +34,8 @@ class DB2S3
   end
 
   def mysql_options
-    cmd = " -u #{db_credentials[:username]} "
+    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]}"
@@ -74,7 +54,7 @@ class DB2S3
     raise("error, process exited with status #{$?.exitstatus}") unless result
   end
 
-  def db_credentials 
+  def db_credentials
     ActiveRecord::Base.connection.instance_eval { @config } # Dodgy!
   end
 
@@ -98,7 +78,7 @@ class DB2S3
     def fetch(file_name)
       ensure_connected
       AWS::S3::S3Object.find(file_name, bucket)
-      
+
       file = Tempfile.new("dump")
       open(file.path, 'w') do |f|
         AWS::S3::S3Object.stream(file_name, bucket) do |chunk|

data/spec/db2s3_spec.rb

@@ -23,28 +23,4 @@ describe 'db2s3' do
       Person.find_by_name("Baxter").should_not be_nil
     end
   end
-
-  it 'provides estimated metrics' do
-    db2s3 = DB2S3.new
-    # 1 GB DB
-    db2s3.stub!(:dump_db).and_return(stub("dump file", :size => 1024 * 1024 * 1024))
-    metrics = db2s3.metrics
-    metrics.should == {
-      :storage_cost => 0.15, # 15c/GB-Month rounded up to nearest cent, we're only storing one backup
-      :transfer_cost => 3.0, # 10c/GB-Month * 30 backups
-      :db_size       => 1024 * 1024 * 1024, # 1 GB
-      :total_cost    => 3.17,
-      :requests_cost => 0.02,
-      :full_backups_per_month => 30 # Default 1 backup/day
-    }
-  end
-
-  it 'rounds transfer cost metric up to nearest cent' do
-    db2s3 = DB2S3.new
-    # 1 KB DB
-    db2s3.stub!(:dump_db).and_return(stub("dump file", :size => 1024))
-    metrics = db2s3.metrics
-    metrics[:storage_cost].should == 0.01
-    metrics[:transfer_cost].should == 0.01
-  end
 end

data/tasks/tasks.rake

@@ -9,32 +9,27 @@ namespace :db2s3 do
     task :restore => :environment do
       DB2S3.new.restore
     end
-  end
 
-  desc "Provide estimated costs for backing up your DB to S3"
-  task :metrics => :environment do
-    def format_size(size)
-      units = %w{B KB MB GB TB}
-      e = (Math.log(size)/Math.log(1024)).floor
-      s = "%.3f" % (size.to_f / 1024**e)
-      s.sub(/\.?0*$/, units[e])
-    end
+    desc "Show table sizes for your database"
+    task :statistics => :environment do
+      # From http://mysqlpreacher.com/wordpress/tag/table-size/
+      results = ActiveRecord::Base.connection.execute(<<-EOS)
+      SELECT
+        engine,
+        ROUND(data_length/1024/1024,2) total_size_mb,
+        ROUND(index_length/1024/1024,2) total_index_size_mb,
+        table_rows,
+        table_name article_attachment
+        FROM information_schema.tables
+        WHERE table_schema = 'rhnh_production'
+        ORDER BY 3 desc;
+      EOS
 
-    def format_cost(cost)
-      "%.2f" % [cost]
+      rows = []
+      header = [["Type", "Data MB", "Index", "Rows", "Name"], []]
+      results.each {|x| rows << x.to_a }
+      rows.sort_by {|x| -x[3].to_i }
+      puts (header + rows).collect {|x| x.join("\t") }
     end
-
-    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]}
-Storage Cost $US:   #{format_cost(metrics[:storage_cost])}
-Transfer Cost $US:  #{format_cost(metrics[:transfer_cost])}
-Requests Cost $US:  #{format_cost(metrics[:requests_cost])}
-Total Cost $US:     #{format_cost(metrics[:total_cost])}
-    EOS
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: db2s3
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Xavier Shay
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-07 00:00:00 +11:00
+date: 2009-12-06 00:00:00 +11:00
 default_executable: 
 dependencies: []
 
@@ -26,7 +26,7 @@ files:
 - HISTORY
 - README
 - Rakefile
-- db2s3.gemspec
+- VERSION
 - init.rb
 - lib/db2s3.rb
 - lib/db2s3/tasks.rb

data/db2s3.gemspec

@@ -1,55 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{db2s3}
-  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-11-07}
-  s.description = %q{db2s3 provides rake tasks for backing up and restoring your DB to S3}
-  s.email = %q{contact@rhnh.net}
-  s.extra_rdoc_files = [
-    "README"
-  ]
-  s.files = [
-    ".gitignore",
-     "HISTORY",
-     "README",
-     "Rakefile",
-     "db2s3.gemspec",
-     "init.rb",
-     "lib/db2s3.rb",
-     "lib/db2s3/tasks.rb",
-     "rails/init.rb",
-     "spec/db2s3_spec.rb",
-     "spec/mysql_drop_schema.sql",
-     "spec/mysql_schema.sql",
-     "spec/s3_config.example.rb",
-     "spec/spec_helper.rb",
-     "tasks/tasks.rake"
-  ]
-  s.homepage = %q{http://github.com/xaviershay/db2s3}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.4}
-  s.summary = %q{Summarize your gem}
-  s.test_files = [
-    "spec/db2s3_spec.rb",
-     "spec/s3_config.example.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  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
-    else
-    end
-  else
-  end
-end