dumper 0.3.0 → 0.4.0

data/lib/dumper.rb

@@ -10,9 +10,10 @@ module Dumper
   autoload :VERSION,    'dumper/version'
 
   module Database
-    autoload :Base,     'dumper/database/base'
-    autoload :MySQL,    'dumper/database/mysql'
-    autoload :MongoDB,  'dumper/database/mongodb'
-    autoload :Redis,    'dumper/database/redis'
+    autoload :Base,       'dumper/database/base'
+    autoload :MySQL,      'dumper/database/mysql'
+    autoload :PostgreSQL, 'dumper/database/postgresql'
+    autoload :MongoDB,    'dumper/database/mongodb'
+    autoload :Redis,      'dumper/database/redis'
   end
 end

data/lib/dumper/agent.rb

@@ -22,7 +22,7 @@ module Dumper
     def initialize(options = {})
       log 'app_key is missing' if options[:app_key].blank?
 
-      @stack = Dumper::Stack.new
+      @stack = Dumper::Stack.new(options)
       @api_base = options[:api_base] || 'http://dumper.io'
       @app_key = options[:app_key]
       @app_env = @stack.rails_env

data/lib/dumper/database/base.rb

@@ -3,7 +3,7 @@ module Dumper
     class Base
       include Dumper::Utility::ObjectFinder
 
-      attr_accessor :tmpdir, :filename
+      attr_accessor :tmpdir, :filename, :config
 
       def initialize(stack = nil)
         @stack = stack

data/lib/dumper/database/mongodb.rb

@@ -10,8 +10,8 @@ module Dumper
 
       def connection_options
         [ :database, :host, :port, :username, :password ].map do |option|
-          next if @stack.configs[:mongodb][option].blank?
-          "--#{option}='#{@stack.configs[:mongodb][option]}'".gsub('--database', '--db')
+          next if @config.send(option).blank?
+          "--#{option}='#{@config.send(option)}'".gsub('--database', '--db')
         end.compact.join(' ')
       end
 

data/lib/dumper/database/mysql.rb

@@ -5,13 +5,13 @@ module Dumper
       FILE_EXT = 'sql.gz'
 
       def command
-        "cd #{tmpdir} && #{dump_tool_path} #{connection_options} #{additional_options} #{@stack.configs[:mysql][:database]} | gzip > #{filename}"
+        "cd #{tmpdir} && #{dump_tool_path} #{connection_options} #{additional_options} #{@config.database} | gzip > #{filename}"
       end
 
       def connection_options
         [ :host, :port, :username, :password ].map do |option|
-          next if @stack.configs[:mysql][option].blank?
-          "--#{option}='#{@stack.configs[:mysql][option]}'".gsub('--username', '--user')
+          next if @config.send(option).blank?
+          "--#{option}='#{@config.send(option)}'".gsub('--username', '--user')
         end.compact.join(' ')
       end
 

data/lib/dumper/database/postgresql.rb

@@ -0,0 +1,39 @@
+module Dumper
+  module Database
+    class PostgreSQL < Base
+      DUMP_TOOL = 'pg_dump'
+      FILE_EXT = 'sql.gz'
+
+      def command
+        "cd #{tmpdir} && #{password_variable} #{dump_tool_path} #{connection_options} #{@config.database} | gzip > #{filename}"
+      end
+
+      def connection_options
+        [ :host, :port, :socket ].map do |option|
+          next if @config.send(option).blank?
+          "--#{option}='#{@config.send(option)}'".gsub('--socket', '--host')
+        end.compact.join(' ')
+      end
+
+      def password_variable
+        @config.password.blank? ? '' : "PGPASSWORD='#{@config.password}'"
+      end
+
+      def config_for(rails_env=nil)
+        return unless defined?(ActiveRecord::Base) &&
+          ActiveRecord::Base.configurations &&
+          (config = ActiveRecord::Base.configurations[rails_env]) &&
+          (config['adapter'] == 'postgresql')
+
+        {
+          :host => config['host'],
+          :port => config['port'],
+          :username => config['username'],
+          :password => config['password'],
+          :database => config['database'],
+          :dump_tool => dump_tool_path
+        }
+      end
+    end
+  end
+end

data/lib/dumper/database/redis.rb

@@ -6,7 +6,7 @@ module Dumper
 
       def command
         uncompressed = filename.sub('.gz','')
-        "cd #{tmpdir} && cp #{@stack.configs[:redis][:dbpath]} #{uncompressed} && gzip #{uncompressed}"
+        "cd #{tmpdir} && cp #{@config.dbpath} #{uncompressed} && gzip #{uncompressed}"
       end
 
       def config_for(rails_env=nil)

data/lib/dumper/job.rb

@@ -1,3 +1,4 @@
+require 'ostruct'
 require 'posix/spawn'
 
 module Dumper
@@ -25,15 +26,12 @@ module Dumper
 
     def perform(server)
       # Initialize database
-      case server[:type]
-      when 'mysql'
-        @database = Dumper::Database::MySQL.new(@stack)
-      when 'mongodb'
-        @database = Dumper::Database::MongoDB.new(@stack)
-      when 'redis'
-        @database = Dumper::Database::Redis.new(@stack)
+      server_type = server[:type].to_sym
+      if Dumper::Stack::DATABASES.keys.include?(server_type)
+        @database = Dumper::Stack::DATABASES[server_type].new(@stack)
+        @database.config = OpenStruct.new(@stack.configs[Dumper::Stack::DATABASES.key(@database.class)])
       else
-        abort_with "invalid server type: #{server[:type]}"
+        abort_with "invalid server type: #{server_type}"
       end
 
       # Prepare

data/lib/dumper/stack.rb

@@ -3,14 +3,15 @@ module Dumper
     include Dumper::Utility::ObjectFinder
 
     DATABASES = {
-      :mysql => Dumper::Database::MySQL,
-      :mongodb => Dumper::Database::MongoDB,
-      :redis => Dumper::Database::Redis,
+      :mysql      =>  Dumper::Database::MySQL,
+      :postgresql =>  Dumper::Database::PostgreSQL,
+      :mongodb    =>  Dumper::Database::MongoDB,
+      :redis      =>  Dumper::Database::Redis,
     }
 
     attr_accessor :rails_env, :dispatcher, :framework, :rackup, :configs
 
-    def initialize
+    def initialize(options = {})
       @configs = {}
 
       # Rackup?
@@ -23,7 +24,8 @@ module Dumper
         @rails_version = Rails::VERSION::STRING
         @is_supported_rails_version = (::Rails::VERSION::MAJOR >= 3)
         DATABASES.each do |key, klass|
-          next unless config = klass.new.config_for(@rails_env)
+          database = klass.new
+          next unless config = database.config_for(@rails_env) || database.config_for(options[:additional_env])
           @configs[key] = config
         end
 

data/lib/dumper/version.rb

@@ -1,3 +1,3 @@
 module Dumper
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dumper
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-03 00:00:00.000000000 Z
+date: 2012-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -114,6 +114,7 @@ files:
 - lib/dumper/database/base.rb
 - lib/dumper/database/mongodb.rb
 - lib/dumper/database/mysql.rb
+- lib/dumper/database/postgresql.rb
 - lib/dumper/database/redis.rb
 - lib/dumper/dependency.rb
 - lib/dumper/job.rb