simple_backup 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c6501e16071df57faa608b6f7a1d9b39de67286
-  data.tar.gz: 7b34e18d1444980aa6e45573e11f4323231dea09
+  metadata.gz: 6bf4a9cc5d50117feeda791694e81ebcc8d6f7ed
+  data.tar.gz: fcfebcc9a956f6eac79aa694f63c0c06df522286
 SHA512:
-  metadata.gz: a44d236089f3f903b5e8463f0b7a588bb596d94d9d460376a69581aa3140170bef4377aa0010f4d13d012c4e80ea80524c7d35f8b95ff8d7526f44416cdf07e9
-  data.tar.gz: a41711c5c5d4cf7a3da7191a3e5767d01bdb18efe18435b394f45678380be6c05fcde25b327d4ae65cfc933d4fddac5a8cd7ae35ab8778be1f7e5330d1c7100e
+  metadata.gz: 1c2a8673f38826bc67799a4a1a8056c2769a78040b540a84b56895ba53346a88c0f32690b4916fc5120e44459a4c9aa61d2927538569536dabc62ec2476d55ec
+  data.tar.gz: f889560ab87b72d0ee0935ca27e6b56e5d6584b7e97692470cdec6fb8dc7f13bbcd762c8003ac2fa830a1838c5bef2b780de809c7fb6a6edd1b66f967bd2d0ff

data/lib/simple_backup/source/abstract.rb

@@ -2,6 +2,7 @@ require 'fileutils'
 require 'rubygems/package'
 require 'securerandom'
 require 'tmpdir'
+require 'tempfile'
 require 'zlib'
 
 module SimpleBackup
@@ -47,11 +48,15 @@ module SimpleBackup
 
         @@logger.scope_start :info, "Getting archive for: #{desc}"
 
-        prepare_tmp_dir
+        @tmp_dir = ::File.join(get_tmp, "simple_backup-#{SimpleBackup::TIMESTAMP}-#{SecureRandom.uuid}")
+        FileUtils.mkdir_p @tmp_dir, mode: 0700
+
+        @@logger.debug "Created tmp directory #{@tmp_dir}"
+
         data_exists = prepare_data
+        archive_data if data_exists
 
         @@logger.warning "No data for: #{desc}" unless data_exists
-        archive_data if data_exists
 
         FileUtils.rm_rf(@tmp_dir)
         @@logger.debug "Removed tmp directory #{@tmp_dir}"
@@ -94,33 +99,27 @@ module SimpleBackup
         filename = "#{type}-#{name}.#{SimpleBackup::TIMESTAMP}.tar.gz"
         @backup_file = ::File.join(get_tmp, filename)
 
-        ::File.open(backup_file, 'w') do |f|
-          f.write targz.string
-        end
+        targz
 
         @@logger.debug "Backup saved to temporary file #{backup_file}"
       end
 
-      def prepare_tmp_dir
-        @tmp_dir = ::File.join(get_tmp, "simple_backup-#{SimpleBackup::TIMESTAMP}-#{SecureRandom.uuid}")
-        FileUtils.mkdir_p @tmp_dir, mode: 0700
-
-        @@logger.debug "Created tmp directory #{@tmp_dir}"
-      end
-
       def get_tmp
         tmp = @tmp_base_path
         tmp = ::Dir.tmpdir unless tmp
-
         tmp
       end
 
       def targz
         path = @tmp_dir
 
-        content = StringIO.new('');
-        Gem::Package::TarWriter.new(content) do |tar|
+        tempfile = Tempfile.new("#{type}-#{name}", get_tmp)
+        @@logger.debug tempfile.path
+
+        Gem::Package::TarWriter.new(tempfile) do |tar|
+          @@logger.debug "Openet tar archive #{tar}"
           ::Dir[::File.join(path, '**/*')].each do |file|
+            @@logger.debug "Adding file #{file}"
             mode = ::File.stat(file).mode
             relative_file = file.sub(/^#{Regexp::escape path}\/?/, '')
 
@@ -129,20 +128,25 @@ module SimpleBackup
             else
               tar.add_file relative_file, mode do |tf|
                 ::File.open(file, 'rb') do |f|
-                  tf.write f.read
+                  while f_content = f.read(512)
+                    tf.write f_content
+                  end
                 end
               end
             end
           end
         end
-        content.rewind
 
-        gz = StringIO.new('')
-        zip = Zlib::GzipWriter.new(gz)
-        zip.write content.string
-        zip.close
+        gz = ::File.open(@backup_file, 'w')
+        Zlib::GzipWriter.open(gz) do |zip|
+          tempfile.seek(0)
+          while f_content = tempfile.read(512)
+            zip.write f_content
+          end
+        end
 
-        gz
+        tempfile.close
+        tempfile.unlink
       end
     end
   end

data/lib/simple_backup/version.rb

@@ -2,7 +2,7 @@ module SimpleBackup
   class Version
     MAJOR = 0
     MINOR = 4
-    PATCH = 1
+    PATCH = 2
     PRE_RELEASE = nil
 
     def self.get

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_backup
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Tomasz Maczukin