rubypond-s3backup-manager 0.0.9 → 0.0.10

data/bin/s3backup

@@ -1,6 +1,10 @@
 #!/usr/bin/env ruby
 require 'optparse'
-require "s3backup-manager"
+begin
+  require 's3backup-manager'
+rescue LoadError
+  require "#{File.dirname(__FILE__)}/../lib/s3backup-manager"
+end  
 
 options = {}
 optparse = OptionParser.new do|opts|

data/bin/s3restore

@@ -1,6 +1,10 @@
 #!/usr/bin/env ruby
 require 'optparse'
-require "s3backup-manager"
+begin
+  require 's3backup-manager'
+rescue LoadError
+  require "#{File.dirname(__FILE__)}/../lib/s3backup-manager"
+end  
 
 options = {}
 optparse = OptionParser.new do|opts|
@@ -32,6 +36,10 @@ optparse = OptionParser.new do|opts|
     options[:type] = t.downcase
     options[:type_provided] = true
   end
+  
+  opts.on('--username USER', 'User to connect to the database as' ) do |u|
+    options[:username] = u
+  end
 
   opts.on('-h', '--help', 'Display this screen') do
     puts opts

data/lib/adapters/postgres_adapter.rb

@@ -1,17 +1,25 @@
 module S3BackupManager
   module PostgresAdapter
   
-    def dump_database_to_file(filename, options = {})
-      database = options[:database]
-      username = options[:username]
-      system "sudo -u #{username} vacuumdb -z #{database} >/dev/null 2>&1"
+    def dump_database_to_file(username, database, directory)
+      directory = "#{directory}/s3postgresbackup/#{database}"
+      FileUtils.mkdir_p(directory)
+      system "cd #{directory} && sudo -u #{username} vacuumdb -z #{database} >/dev/null 2>&1"
       exit(1) unless $?.success?
-      system "sudo -u #{username} pg_dump --blobs --format=t #{database} > #{filename}"
+      dump_file = "#{directory}/#{database}.pgsql"
+      system "cd #{directory} && sudo -u #{username} pg_dump --blobs --format=t #{database} > #{dump_file}"
       exit(1) unless $?.success?
+      user_file = "#{directory}/globals.pgsql"
+      system "cd #{directory} && sudo -u #{username} pg_dumpall -v -f #{user_file} --globals-only >/dev/null 2>&1"
+      exit(1) unless $?.success?
+      [directory]
     end
   
-    def restore_database_from_file(database, filename)
-      `sudo -u postgres pg_restore --format=t -d #{database} #{filename}`
+    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}`
+      exit(1) unless $?.success?
     end
 
     private

data/lib/models/database_backup.rb

@@ -19,16 +19,19 @@ module S3BackupManager
     end
   
     def backup(database)
-      filename = "/tmp/#{database}"
-      dump_database_to_file(filename, @options.merge(:database => database))
-      super(filename, "databases/#{@options[:adapter]}")
+      directory = "/tmp/#{database}"
+      files = dump_database_to_file(@options[:username], database, directory)
+      super(files, "databases/#{@options[:adapter]}")
+      files.each do |file|
+        FileUtils.rm_r(file)
+      end
     end
 
     def restore(database, timestamp)
       filename = "#{@options[:adapter]}/#{timestamp}/#{database}"
       @dumped_filename = "/tmp/#{random_string}"
       super(filename, timestamp, @dumped_filename, "databases")
-      restore_database_from_file(@dumped_filename, @options)
+      restore_database_from_file(@options[:username], database, "#{@dumped_filename}/tmp/#{database}")
       db_cleanup!
     end
     

data/lib/models/file_backup.rb

@@ -15,9 +15,9 @@ module S3BackupManager
       bucket.files.select{|f| f.key.match(%r{^filesystem/})}
     end
   
-    def backup(file, directory = "filesystem")
-      stored_file_name = "#{Time.now.strftime("%Y%m%d%H%M%S")}/#{File.basename(file)}"
-      encrypted_file = encrypt(pack(file))
+    def backup(files, directory = "filesystem")
+      stored_file_name = "#{Time.now.strftime("%Y%m%d%H%M%S")}/#{File.basename(files.first)}"
+      encrypted_file = encrypt(pack(files))
       bucket.store("#{directory}/#{stored_file_name}", open(encrypted_file))    
       cleanup!
     end
@@ -83,10 +83,10 @@ module S3BackupManager
         @decrypted_filename
       end
     
-      def pack(file)
-        @packed_filename = "#{random_string}_#{File.basename(file)}.tgz"
+      def pack(files)
+        @packed_filename = "#{random_string}_#{File.basename(files.first)}.tgz"
         tgz = Zlib::GzipWriter.new(File.open(@packed_filename, 'wb'))
-        Archive::Tar::Minitar.pack("#{file}", tgz, recurse_directories = true)
+        Archive::Tar::Minitar.pack(files, tgz, recurse_directories = true)
         @packed_filename
       end
       

data/lib/s3backup-manager.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'aws/s3'
 require 'zlib'
 require 'archive/tar/minitar'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubypond-s3backup-manager
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Glenn Gillen