simple_backup 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0469f56e22f8ab0f509e8a51eb8ffdfd820ac023
-  data.tar.gz: 17b0d6e3a9c824e2e49567dda5d9eeacc2f76044
+  metadata.gz: 6c6501e16071df57faa608b6f7a1d9b39de67286
+  data.tar.gz: 7b34e18d1444980aa6e45573e11f4323231dea09
 SHA512:
-  metadata.gz: 89f78bb4979170c15b9c2467e7cadb1d70889b67ec46786e1aff3732a417e59aac3af0b5c03cd311be76ae346d5a69a5e3f41064a61ee805040ce2f097daeb5f
-  data.tar.gz: 6c28e913f0964292ec9013ca023391da1880213026f5bc0bce1583b1443b742aafdd60ee757aa4f99ea24f1b672d7e45033697f70cbce6ffa1d2457f5805332d
+  metadata.gz: a44d236089f3f903b5e8463f0b7a588bb596d94d9d460376a69581aa3140170bef4377aa0010f4d13d012c4e80ea80524c7d35f8b95ff8d7526f44416cdf07e9
+  data.tar.gz: a41711c5c5d4cf7a3da7191a3e5767d01bdb18efe18435b394f45678380be6c05fcde25b327d4ae65cfc933d4fddac5a8cd7ae35ab8778be1f7e5330d1c7100e

data/backup_example.rb

@@ -15,7 +15,18 @@ SimpleBackup.define do
 
   default_keep_last 9
 
+  mailer do
+    subject_prefix '[BACKUP]'
+
+    from 'backup@localhost'
+    to   'root@localhost'
+    cc   'rb@localhost'
+    bcc  'root@localhost'
+  end
+
   sources do
+#    tmp_dir '/tmp/tmp'
+
     dir 'app-1', path: '/home/app/app-1', type: :capistrano, backends: 'backup'
     dir 'app-2', path: '/home/app/app-2', backends: :none
     dir 'none',  path: '/none'
@@ -28,7 +39,7 @@ SimpleBackup.define do
   end
 
   backends do
-    local 'backup', path: '/srv/backup'
+    local 'backup', path: '/tmp/backup'
   end
 
   mysql do
@@ -37,13 +48,4 @@ SimpleBackup.define do
     user 'root'
     pass 'root'
   end
-
-  mailer do
-    subject_prefix '[BACKUP]'
-
-    from 'backup@localhost'
-    to   'root@localhost'
-    cc   'rb@localhost'
-    bcc  'root@localhost'
-  end
 end

data/lib/simple_backup/source/abstract.rb

@@ -1,4 +1,6 @@
+require 'fileutils'
 require 'rubygems/package'
+require 'securerandom'
 require 'tmpdir'
 require 'zlib'
 
@@ -6,6 +8,7 @@ module SimpleBackup
   module Source
     class Abstract
       @@logger = Utils::Logger.instance
+      @tmp_base_path = nil
 
       def configure(options = {})
         raise NotImplementedError
@@ -27,6 +30,10 @@ module SimpleBackup
         @name
       end
 
+      def tmp_base_path=(value)
+        @tmp_base_path = value
+      end
+
       def type
         self.class.name.split('::').last.gsub(/[^a-zA-Z0-9\-\_\. ]*/, '').gsub(/\s+/, '_').downcase
       end
@@ -40,9 +47,7 @@ module SimpleBackup
 
         @@logger.scope_start :info, "Getting archive for: #{desc}"
 
-        @tmp_dir = ::Dir.mktmpdir('simple_backup-')
-        @@logger.debug "Created tmp directory #{@tmp_dir}"
-
+        prepare_tmp_dir
         data_exists = prepare_data
 
         @@logger.warning "No data for: #{desc}" unless data_exists
@@ -87,7 +92,7 @@ module SimpleBackup
 
       def archive_data
         filename = "#{type}-#{name}.#{SimpleBackup::TIMESTAMP}.tar.gz"
-        @backup_file = ::File.join(::Dir.tmpdir, filename)
+        @backup_file = ::File.join(get_tmp, filename)
 
         ::File.open(backup_file, 'w') do |f|
           f.write targz.string
@@ -96,6 +101,20 @@ module SimpleBackup
         @@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
 

data/lib/simple_backup/sources.rb

@@ -6,6 +6,7 @@ module SimpleBackup
     include Singleton
 
     @@logger = Utils::Logger.instance
+    @tmp_dir = nil
 
     def initialize
       @sources = {}
@@ -16,6 +17,14 @@ module SimpleBackup
       @default_keep_last = value
     end
 
+    def tmp_dir(path)
+      raise "Temporary path '#{path}' does not exists" unless ::File.exist?(path)
+      raise "Temporary path '#{path}' is not a directory" unless ::File.directory?(path)
+      raise "Temporary path '#{path}' is not writable" unless ::File.writable?(path)
+      @tmp_dir = path
+      @@logger.info "Replaced temporary path to '#{@tmp_dir}'"
+    end
+
     def each(&block)
       @sources.each do |type, sources|
         sources.each(&block)
@@ -52,6 +61,7 @@ module SimpleBackup
       source.keep_last = @default_keep_last
       source.keep_last = options[:keep_last] if options[:keep_last]
       source.backends = options[:backends] if options[:backends]
+      source.tmp_base_path = @tmp_dir if @tmp_dir
       source.name = name
 
       source.configure(options)

data/lib/simple_backup/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_backup
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Tomasz Maczukin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake