backup2s3 0.4.2.pre → 0.4.3.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbe9babacb955bdce764bb078bfbd06e41dab9a3
-  data.tar.gz: b51bca66befe63ed2533e1e5695a81053fbc1e67
+  metadata.gz: 36041043eb3ba624bd28f457b85e96fb61b4ef3d
+  data.tar.gz: 8a7ff25bdb6ba1d8239af24e36088d4859a021b0
 SHA512:
-  metadata.gz: ab0dae65db967e3b99a5b5c4ad1266bbcd1c5d6bf70134da3e88c91708be4a87b454442dee3e2a5b2a79f8e1cb216ea89bcc169385128cde16bf3c47c982151f
-  data.tar.gz: 334327c31b23a580a48e72a02c57e18833c543a7c3d6c3ad37c2c29b26659324d0f5f28933d07eac8a7c5fdc48ebc2b4c78732870606b5bd98f4e5998fe54879
+  metadata.gz: 5a06f860c82ace6add1ae131b8a49d3c1bbb55f1466d28904663c2c15e560ca7558d9d638fb3389f54013240f6246d5dcdc1a7be258e4fe5b2c26ed574a0f110
+  data.tar.gz: 499d3121ab0fb1094b9062fc081ee040ec8694ab9610151db003131541d98a0fd87acc0425f33cdb03d68646bebfe23de3a28e46b9e5df507e78b3419a63b464

data/lib/backup2s3.rb

@@ -63,7 +63,7 @@ class Backup2s3
   # information.
   def create_backup(comment)
     if @conf[:backups][:backup_database]
-      @database_file = System.clean("#{@time}-#{System.db_credentials['database']}-database") << ".sql"
+      @database_file = System.clean("#{@time}-#{System.db_credentials['database']}-database") << @db_adapter.backup_extension
       print "\nDumping database..."
       database_temp = @db_adapter.db_dump
       puts "\ndone\n- Database dump file size: " << database_temp.size.to_s << " B"; print "Backing up database dump file..."

data/lib/db_adapters/mysql_adapter.rb

@@ -23,6 +23,10 @@ class MysqlAdapter
     true
   end
 
+  def backup_extension
+    return ".sql"
+  end
+
   private
 
   def db_options

data/lib/db_adapters/postgresql_adapter.rb

@@ -22,12 +22,15 @@ class PostgresqlAdapter
     host = @db_credentials['host'] || 'localhost'
     superuser = System.prompt "Postgres superuser: "
     su_password = System.prompt "#{superuser} password: "
-    cmd = "PGPASSWORD=\"#{su_password}\" && PGUSER=\"#{superuser}\"; " +
-      "dropdb --host #{host} #{database}; " +
-      "createdb --host #{host} -T template0 #{database}; " +
-      "pg_restore --host #{host} -Ft --dbname=#{database} #{dump_file.path}"
+    cmd = "PGPASSWORD=\"#{su_password}\" PGUSER=\"#{superuser}\" dropdb --host #{host} #{database} && " +
+      "PGPASSWORD=\"#{su_password}\" PGUSER=\"#{superuser}\" createdb --host #{host} -T template0 #{database} && " +
+      "PGPASSWORD=\"#{su_password}\" PGUSER=\"#{superuser}\" pg_restore --host #{host} -Ft --dbname=#{database} #{dump_file.path}"
     System.run(cmd)
   end
 
+  def backup_extension
+    return ".tar"
+  end
+
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backup2s3
 version: !ruby/object:Gem::Version
-  version: 0.4.2.pre
+  version: 0.4.3.pre
 platform: ruby
 authors:
 - Aric Walker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-31 00:00:00.000000000 Z
+date: 2015-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk