rubypond-s3backup-manager 0.1.00 → 0.1.1

data/lib/adapters/postgres_adapter.rb

@@ -4,6 +4,8 @@ module S3BackupManager
     def dump_database_to_file(username, database, directory)
       directory = "#{directory}/s3postgresbackup/#{database}"
       FileUtils.mkdir_p(directory)
+      FileUtils.chmod_R 0770, directory
+      FileUtils.chown_R nil, username, directory
       system "cd #{directory} && sudo -u #{username} vacuumdb -z #{database} >/dev/null 2>&1"
       exit(1) unless $?.success?
       dump_file = "#{directory}/#{database}.pgsql"
@@ -15,17 +17,21 @@ module S3BackupManager
       [directory]
     end
   
-    def restore_database_from_file(username, database, filename)
-      # `psql -h localhost -d postgres -U postgres -f "/path/to/useraccts.sql" `
-      # exit(1) unless $?.success?
-      `sudo -u #{username} pg_restore --format=t -d #{database} #{filename}`
+    def restore_database_from_file(username, database, directory)
+      system "chown -R #{username} #{directory}"
+      user_file = "#{directory}/globals.pgsql"
+      system "cd /tmp && sudo -u #{username} psql -f #{user_file} >/dev/null 2>&1"
+      exit(1) unless $?.success?
+      dump_file = "#{directory}/#{database}.pgsql"
+      recreate_database!(username, database)
+      system "cd /tmp && sudo -u #{username} pg_restore --format=t -d #{database} #{dump_file} >/dev/null 2>&1"
       exit(1) unless $?.success?
     end
 
     private
-      def recreate_database(database)
-        `sudo -u postgres dropdb #{database}`
-        `sudo -u postgres createdb --encoding=UNICODE #{database}`
+      def recreate_database!(username, database)
+        # system "cd /tmp && sudo -u #{username} dropdb #{database}"
+        system "cd /tmp && sudo -u #{username} createdb --encoding=UNICODE #{database} > /dev/null 2>&1"
       end
     
   end

data/lib/models/database_backup.rb

@@ -29,16 +29,16 @@ module S3BackupManager
 
     def restore(database, timestamp)
       filename = "#{@options[:adapter]}/#{timestamp}/#{database}"
-      @dumped_filename = "/tmp/#{random_string}"
-      super(filename, timestamp, @dumped_filename, "databases")
-      restore_database_from_file(@options[:username], database, "#{@dumped_filename}/tmp/#{database}")
+      @dumped_filename = "/tmp/#{database}/s3postgresbackup/#{database}"
+      super(filename, timestamp, "/", "databases")
+      restore_database_from_file(@options[:username], database, @dumped_filename)
       db_cleanup!
     end
     
     private
       def db_cleanup!
         if @dumped_filename
-          File.delete(@dumped_filename) 
+          FileUtils.rm_r(@dumped_filename) 
           @dumped_filename = nil
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubypond-s3backup-manager
 version: !ruby/object:Gem::Version 
-  version: 0.1.00
+  version: 0.1.1
 platform: ruby
 authors: 
 - Glenn Gillen
@@ -74,6 +74,7 @@ files:
 - spec/spec_helper.rb
 has_rdoc: "false"
 homepage: http://github.com/rubypond/s3backup-manager
+licenses: 
 post_install_message: 
 rdoc_options: []
 
@@ -95,7 +96,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: Scripts and daemon to manage encrypted backups on AmazonS3