rubypond-s3backup-manager 0.1.4 → 0.1.5

data/config/config.yml

@@ -1,4 +1,5 @@
 aws_access_key_id: 
 aws_secret_access_key: 
 encryption_secret: 
-collection_prefix: 
+collection_prefix: 
+temp_dir:

data/lib/adapters/postgres_adapter.rb

@@ -18,16 +18,16 @@ module S3BackupManager
     end
   
     def restore_database_from_file(username, database, directory)
-      system "chown -R #{username} /tmp/#{database}"
+      system "chown -R #{username} #{config[:temp_dir]}/#{database}"
       user_file = "#{directory}/globals.pgsql"
-      system "cd /tmp && sudo -u #{username} psql -f #{user_file} >/dev/null 2>&1"
+      system "cd #{config[:temp_dir]} && sudo -u #{username} psql -f #{user_file} >/dev/null 2>&1"
       unless $?.success?
         puts "Unable to load in the users"
         exit(1) 
       end
       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"
+      system "cd #{config[:temp_dir]} && sudo -u #{username} pg_restore --format=t -d #{database} #{dump_file} >/dev/null 2>&1"
       unless $?.success?
         puts "Unable to restore database. Did you provide a username that has permission?"
         exit(1) 
@@ -36,8 +36,7 @@ module S3BackupManager
 
     private
       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"
+        system "cd #{config[:temp_dir]} && sudo -u #{username} createdb --encoding=UNICODE #{database} > /dev/null 2>&1"
       end
     
   end

data/lib/models/database_backup.rb

@@ -19,7 +19,7 @@ module S3BackupManager
     end
   
     def backup(database)
-      directory = "/tmp/#{database}"
+      directory = "#{config[:temp_dir]}/#{database}"
       files = dump_database_to_file(@options[:username], database, directory)
       super(files, "databases/#{@options[:adapter]}")
       files.each do |file|
@@ -29,7 +29,7 @@ module S3BackupManager
 
     def restore(database, timestamp)
       filename = "#{@options[:adapter]}/#{timestamp}/#{database}"
-      @dumped_filename = "/tmp/#{database}/s3postgresbackup/#{database}"
+      @dumped_filename = "#{config[:temp_dir]}/#{database}/s3postgresbackup/#{database}"
       super(filename, timestamp, "/", "databases")
       restore_database_from_file(@options[:username], database, @dumped_filename)
       db_cleanup!

data/lib/models/file_backup.rb

@@ -15,9 +15,9 @@ module S3BackupManager
       bucket.files.select{|f| f.key.match(%r{^filesystem/})}
     end
   
-    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))
+    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))
       bucket.store("#{directory}/#{stored_file_name}", open(encrypted_file))    
       cleanup!
     end
@@ -83,10 +83,10 @@ module S3BackupManager
         @decrypted_filename
       end
     
-      def pack(files)
-        @packed_filename = "#{random_string}_#{File.basename(files.first)}.tgz"
+      def pack(file)
+        @packed_filename = "#{random_string}_#{File.basename(file)}.tgz"
         tgz = Zlib::GzipWriter.new(File.open(@packed_filename, 'wb'))
-        Archive::Tar::Minitar.pack(files, tgz, recurse_directories = true)
+        Archive::Tar::Minitar.pack(file, tgz, recurse_directories = true)
         @packed_filename
       end
       

metadata

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