backup_restore 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52a3d02544e7d87169f6e59d87fb310df702b686595ad1710fdca391ef2a6f0e
-  data.tar.gz: 8e479224dd354eed4e1a0ad0c86e6b2aba9a4de1eedaec4d2c2eb168fe130415
+  metadata.gz: 3e7a464428ceef64077b7ca512c2db305cb656b875e9845eacffbb22b648f63a
+  data.tar.gz: 6b02d201beb07c60606d9e17803d88e25021b3bdc72d24c7a55911c579fc5184
 SHA512:
-  metadata.gz: 0b2e650319d9938e0c636463a4cf4df33bacd744a9ac9777d31341598f03f923837f15e9ebae74244bfeb56bb4a2f9283a20b2515b43b0538f47e580d18d62ef
-  data.tar.gz: 50d801d332ebd95cb9f24fe8db8e81871a4a559d1cda4e9be7f943055b6a2cc8095ef6b4cd3203c709c52c8544fa653dfbb3ced06fd624e306f30512dcbde422
+  metadata.gz: 3853115422a90a10a13821a082ba6a0e71044ae6533d869c01dc7fabd487e341e66cea0658b34bd2d9811e86702ed1f686d9a1889b94e4f014b41c13c1876e07
+  data.tar.gz: 52c75509732950bab87afd86e061cb1a13782505fd1cad17c6b3125943ffec229535cdee4caa135558973ee401d4198ead727cd060f665e7fedaa607d194c941

data/lib/backup_restore.rb

@@ -48,10 +48,9 @@ class BackupRestore
     output = `#{command}`
     if $?.success? || unstandard_error_free_exit_codes.include?($?.exitstatus)
       debug('all done', :low)
-    else
-      raise "<#{command}> command had problem (<#{$?}> with output <#{output}>). Working directory path was <#{Dir.getwd}>"
+      return output
     end
-    return output
+    raise "<#{command}> command had problem (<#{$?}> with output <#{output}>). Working directory path was <#{Dir.getwd}>"
   end
 
   def self.extract_tar_file(file, target_folder = nil)
@@ -133,10 +132,18 @@ class BackupRestore
   end
 
   def self.validate_folder_parameters(archive_storage_root, unpack_root)
-    raise PreconditionFailed.new("archive_storage_root (<#{archive_storage_root}>) does not exists") if !File.exist?(archive_storage_root)
-    raise PreconditionFailed.new("unpack_root (<#{unpack_root}>) does not exists") if !File.exist?(unpack_root)
-    raise PreconditionFailed.new("archive_storage_root (<#{archive_storage_root}>) is a file, not directory") if !Dir.exist?(archive_storage_root)
-    raise PreconditionFailed.new("unpack_root (<#{unpack_root}>) is a file, not directory") if !Dir.exist?(unpack_root)
+    unless File.exist?(archive_storage_root)
+      raise PreconditionFailed.new("archive_storage_root (<#{archive_storage_root}>) does not exists")
+    end
+    unless File.exist?(unpack_root)
+      raise PreconditionFailed.new("unpack_root (<#{unpack_root}>) does not exists")
+    end
+    unless Dir.exist?(archive_storage_root)
+      raise PreconditionFailed.new("archive_storage_root (<#{archive_storage_root}>) is a file, not directory")
+    end
+    unless Dir.exist?(unpack_root)
+      raise PreconditionFailed.new("unpack_root (<#{unpack_root}>) is a file, not directory")
+    end
   end
 
   def self.process_given_archive(archive_storage_root, archive_name, unpack_root, password)
@@ -159,6 +166,7 @@ class BackupRestore
     # it is deleted at this step to reduce peak memory consumption on disk
     # for unpacking large archives
     if is_unsplitting_necessary(archive_storage_root, archive_name)
+      storage = get_storage_folder(archive_storage_root, archive_name)
       FileUtils.rm_rf(storage + archive_name + ".tar.enc")
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backup_restore
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Mateusz Konieczny