db2fog 0.4.2 → 0.5.0

data/HISTORY

@@ -1,3 +1,7 @@
+v0.5.0 (6th August 2011)
+  - initial postgresql support
+  - removed the statistics rake task
+  - fix an encoding issue under 1.9
 v0.4.2 (24th July 2011)
   - fixed recording of most recent backup
   - remove runtime dependency on mysql2

data/README.rdoc

@@ -59,7 +59,6 @@ providers they should work with just a config change to Db2Fog.
   rake db2fog:backup:full
 
   # Handy tasks
-  rake db2fog:statistics      # Shows you the size of your DB
   rake db2fog:backup:restore  # You should be testing this regularly
   rake db2fog:backup:clean    # Clean up old backups - cron this
 

data/lib/db2fog/tasks.rb

@@ -17,12 +17,4 @@ namespace :db2fog do
       DB2Fog.new.clean
     end
   end
-
-  desc "Show table sizes for your database"
-  task :statistics => :environment do
-    rows = DB2Fog.new.statistics
-    rows.sort_by {|x| -x[3].to_i }
-    header = [["Type", "Data MB", "Index", "Rows", "Name"], []]
-    puts (header + rows).collect {|x| x.join("\t") }
-  end
 end

data/lib/db2fog.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'active_support'
 require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/core_ext/hash/except'
@@ -10,17 +12,16 @@ class DB2Fog
 
   def full_backup
     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(file_name, open(database.dump))
     store.store(most_recent_dump_file_name, file_name)
   end
 
   def restore
     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}"
+    database.restore(file.path)
   end
 
-  # TODO: This method really needs specs
   def clean
     to_keep = []
     filelist = store.list
@@ -52,44 +53,8 @@ class DB2Fog
     end
   end
 
-  def statistics
-      # 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 = '#{db_credentials[:database]}'
-      ORDER BY total_size_mb + total_index_size_mb desc;
-    EOS
-    rows = []
-    results.each {|x| rows << x.to_a }
-    rows
-  end
-
   private
 
-  def dump_db
-    dump_file = Tempfile.new("dump")
-
-    cmd = "mysqldump --quick --single-transaction --create-options #{mysql_options}"
-    cmd += " | gzip > #{dump_file.path}"
-    run(cmd)
-
-    dump_file
-  end
-
-  def 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
-
   def store
     @store ||= FogStore.new
   end
@@ -107,6 +72,97 @@ class DB2Fog
     ActiveRecord::Base.connection.instance_eval { @config } # Dodgy!
   end
 
+  def database
+    @database ||= case db_credentials[:adapter]
+                  when /mysql/    then MysqlAdaptor.new(db_credentials)
+                  when /postgres/ then PsqlAdaptor.new(db_credentials)
+                  else
+                    raise "database adaptor '#{db_credentials[:adapter]}' not supported"
+                  end
+  end
+
+  class MysqlAdaptor
+
+    def initialize(credentials)
+      @credentials = credentials
+    end
+
+    def dump
+      dump_file = Tempfile.new("dump")
+
+      cmd = "mysqldump --quick --single-transaction --create-options #{mysql_options}"
+      cmd += " | gzip -9 > #{dump_file.path}"
+      run(cmd)
+
+      dump_file.path
+    end
+
+    def restore(path)
+      run "gunzip -c #{path} | mysql #{mysql_options}"
+    end
+
+    private
+
+    def mysql_options
+      cmd = ''
+      cmd += " -u #{@credentials[:username]} " unless @credentials[:username].nil?
+      cmd += " -p'#{@credentials[:password]}'" unless @credentials[:password].nil?
+      cmd += " -h '#{@credentials[:host]}'"    unless @credentials[:host].nil?
+      cmd += " #{@credentials[:database]}"
+    end
+
+    def run(command)
+      result = system(command)
+      raise("error, process exited with status #{$?.exitstatus}") unless result
+    end
+
+  end
+
+  class PsqlAdaptor
+
+    def initialize(credentials)
+      @credentials = credentials
+    end
+
+    def dump
+      dump_file = Tempfile.new("dump")
+
+      cmd = "pg_dump --clean --format=p #{pg_dump_options}"
+      cmd += " | gzip -9 > #{dump_file.path}"
+      run(cmd)
+
+      dump_file.path
+    end
+
+    def restore
+      run "gunzip -c #{path} | psql #{psql_options}"
+    end
+
+    private
+
+    def pg_dump_options
+      cmd = ''
+      cmd += " -U #{@credentials[:username]} " unless @credentials[:username].nil?
+      cmd += " -w"
+      cmd += " -h '#{@credentials[:host]}'"    unless @credentials[:host].nil?
+      cmd += " #{@credentials[:database]}"
+    end
+
+    def psql_options
+      cmd = ''
+      cmd += " -U #{@credentials[:username]} " unless @credentials[:username].nil?
+      cmd += " -w"
+      cmd += " -h '#{@credentials[:host]}'"    unless @credentials[:host].nil?
+      cmd += " -d #{@credentials[:database]}"
+    end
+
+    def run(command)
+      result = system(command)
+      raise("error, process exited with status #{$?.exitstatus}") unless result
+    end
+
+  end
+
   class FogStore
 
     def store(remote_filename, io)
@@ -117,7 +173,7 @@ class DB2Fog
       remote_file = directory.files.get(remote_filename)
 
       file = Tempfile.new("dump")
-      open(file.path, 'w') { |f| f.write(remote_file.body) }
+      open(file.path, 'wb') { |f| f.write(remote_file.body) }
       file
     end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 2
-  version: 0.4.2
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - James Healy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-24 00:00:00 +10:00
+date: 2011-08-07 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency