server_backups 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55cf8d25682ff8ed9109cbba146d0bc6c401e793
-  data.tar.gz: 6d813fc1f41d21306be76c81b3d2ca2abb9e7099
+  metadata.gz: 6bbe471e2cac24b388fe6d97450da0c42e7c93be
+  data.tar.gz: 87e672ccfa51e7a03f07e18431661db750df9c26
 SHA512:
-  metadata.gz: 91ba5f8c8abe776d465dd2295c8d35168bb3c557274e10d1ef53a60946456a1fa72410d0e6b35b7427c7d7d038800de35cf8f751dd849a7416668fe619a89417
-  data.tar.gz: 5a6c5870270b33264082455d92874cf76519a1297a37d6678b4a4d417e1ae3d5cdd3c1d76113fdb8319acf698c8de168c341faa22e8b4b685a9088e149750ab7
+  metadata.gz: 3c247e3be593ae9538a1ad28c8ebfa46c5140e07e76c3d345bea9006a65f2b817f70c091eb1e6f97616d42c77f88ec800813028393490849c636c258b14e4d4c
+  data.tar.gz: 53c9860952db72da8c98d0be71e58b72d9b6e1138cc9aee2625f8b1fd81de34b381c7494d8fb93dcf2516ff71cbc7fd9d92ce7a589f490c8588ac93488bdf1bd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    server_backups (0.1.20)
+    server_backups (0.1.21)
       activesupport (~> 5.1)
       aws-sdk-s3 (~> 1.8)
       main (~> 6.2)

data/bin/server_backup

@@ -46,21 +46,25 @@ def handle_errors(config_path)
 end
 
 def run_backups(backup_type, config_file, database, db_only, files_only)
-    website_backup = unless db_only
-                         backup_thread do |tmp_dir|
-                             ServerBackups::WebsiteBackup.new(config_file,
-                                                              tmp_dir, backup_type).do_backup
-                         end
-                     end
-    database_backup = unless files_only
-                          backup_thread do |tmp_dir|
-                              ServerBackups::MysqlBackup.send(backup_type,
-                                                              config_file,
-                                                              tmp_dir, database).do_backup
-                          end
-                      end
-    [website_backup, database_backup].compact.each(&:join)
-    handle_errors(config_file)
+    begin
+        tmp_dir = File.join(Dir.getwd, rand.to_s)
+        FileUtils.mkdir_p tmp_dir
+        unless db_only
+            ServerBackups::WebsiteBackup.new(config_file,
+                                            tmp_dir, backup_type).do_backup
+        end
+        unless files_only
+            ServerBackups::MysqlBackup.send(backup_type,
+                                            config_file,
+                                            tmp_dir, database).do_backup
+        end
+    rescue StandardError => error
+        puts error.message
+        puts "\n\n    " + error.backtrace.join("\n    ")
+        exit(2)
+    ensure
+        FileUtils.rm_rf tmp_dir
+    end
     exit_success!
 end
 

data/lib/server_backups/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ServerBackups
-    VERSION = '0.1.20'
+    VERSION = '0.1.21'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: server_backups
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors:
 - Tyler Gannon