backup 3.9.0 → 3.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11a5142174a679705cd2443ac0248928a6c5f8b8
-  data.tar.gz: 7e6b4a5a23ab07ecd0e0cdaf96e537b721b6d3bc
+  metadata.gz: d08ea59b9238db092857f8ee08a10f1c695d1705
+  data.tar.gz: 8030b371b0b43a7ba075927af576265d5ddf8969
 SHA512:
-  metadata.gz: 18b022a990ce3a8c6010a3d7ea25bce8eca33d1552b03f852e3c02a077ac73b6788ff0d841f5f097b56536282fe1f997dcfeebd4fa1954aa18fc8553ba8f513e
-  data.tar.gz: 710399d76701426778abf1a6713a59b9f01dd532ec00a1fb2d8d2035d421441ffd0a2288fab472a68af649817086461c05e34770db6c8e7bf6698e5a2851eeb9
+  metadata.gz: 8f76e9862b4784775aecd53127ebe9c478f378a7162348d88bd2fd5e0b515b144deb89dd89c68d7b4592f0f8d94eda4ac228bee29f204a240ab635038089ed27
+  data.tar.gz: 13c73bfd31689f46c9f0c809849e59180a1e4eebeb0af05650dae7a8948895f2dc5e80e08c6a67c16a5028fb6b58269be05f49f56d8fc3a7b6782730890a1e3c

data/lib/backup/cloud_io/s3.rb

@@ -106,7 +106,7 @@ module Backup
         until keys.empty?
           _keys = keys.slice!(0, 1000)
           with_retries('DELETE Multiple Objects') do
-            resp = connection.delete_multiple_objects(bucket, _keys, opts)
+            resp = connection.delete_multiple_objects(bucket, _keys, opts.dup)
             unless resp.body['DeleteResult'].empty?
               errors = resp.body['DeleteResult'].map do |result|
                 error = result['Error']

data/lib/backup/database/redis.rb

@@ -72,6 +72,15 @@ module Backup
             Response was: #{ resp }
           EOS
         end
+
+      rescue Error
+        if resp =~ /save already in progress/
+          unless (attempts ||= '0').next! == '5'
+            sleep 5
+            retry
+          end
+        end
+        raise
       end
 
       def copy!

data/lib/backup/model.rb

@@ -202,15 +202,19 @@ module Backup
     end
 
     ##
-    # Adds a Splitter with the given +chunk_size+ in MB.
-    # This will split the final backup package into multiple files.
-    def split_into_chunks_of(chunk_size)
-      if chunk_size.is_a?(Integer)
-        @splitter = Splitter.new(self, chunk_size)
+    # Adds a Splitter to split the final backup package into multiple files.
+    #
+    # +chunk_size+ is specified in MiB and must be given as an Integer.
+    # +suffix_length+ controls the number of characters used in the suffix
+    # (and the maximum number of chunks possible).
+    # ie. 1 (-a, -b), 2 (-aa, -ab), 3 (-aaa, -aab)
+    def split_into_chunks_of(chunk_size, suffix_length = 2)
+      if chunk_size.is_a?(Integer) && suffix_length.is_a?(Integer)
+        @splitter = Splitter.new(self, chunk_size, suffix_length)
       else
         raise Error, <<-EOS
-          Invalid Chunk Size for Splitter
-          Argument to #split_into_chunks_of() must be an Integer
+          Invalid arguments for #split_into_chunks_of()
+          +chunk_size+ (and optional +suffix_length+) must be Integers.
         EOS
       end
     end

data/lib/backup/splitter.rb

@@ -4,22 +4,25 @@ module Backup
   class Splitter
     include Backup::Utilities::Helpers
 
-    attr_reader :package, :chunk_size
+    attr_reader :package, :chunk_size, :suffix_length
 
-    def initialize(model, chunk_size)
+    def initialize(model, chunk_size, suffix_length)
       @package = model.package
       @chunk_size = chunk_size
+      @suffix_length = suffix_length
     end
 
     ##
     # This is called as part of the procedure used to build the final
     # backup package file(s). It yields it's portion of the command line
     # for this procedure, which will split the data being piped into it
-    # into multiple files, based on the @chunk_size.
+    # into multiple files, based on the @chunk_size, using a suffix length as
+    # specified by @suffix_length.
     # Once the packaging procedure is complete, it will return and
     # @package.chunk_suffixes will be set based on the resulting files.
     def split_with
-      Logger.info "Splitter configured with a chunk size of #{ chunk_size }MB."
+      Logger.info "Splitter configured with a chunk size of #{ chunk_size }MB " +
+                  "and suffix length of #{ suffix_length }."
       yield split_command
       after_packaging
     end
@@ -28,12 +31,10 @@ module Backup
 
     ##
     # The `split` command reads from $stdin and will store it's output in
-    # multiple files, based on the @chunk_size. The files will be
-    # written using the given `prefix`, which is the full path to the
-    # final @package.basename, plus a '-' separator. This `prefix` will then
-    # be suffixed using 'aa', 'ab', and so on... for each file.
+    # multiple files, based on @chunk_size and @suffix_length, using the full
+    # path to the final @package.basename, plus a '-' separator as the `prefix`.
     def split_command
-      "#{ utility(:split) } -b #{ chunk_size }m - " +
+      "#{ utility(:split) } -a #{ suffix_length } -b #{ chunk_size }m - " +
           "'#{ File.join(Config.tmp_path, package.basename + '-') }'"
     end
 
@@ -41,13 +42,15 @@ module Backup
     # Finds the resulting files from the packaging procedure
     # and stores an Array of suffixes used in @package.chunk_suffixes.
     # If the @chunk_size was never reached and only one file
-    # was written, that file will be suffixed with '-aa'.
-    # In which case, it will simply remove the suffix from the filename.
+    # was written, that file will be suffixed with '-aa' (or -a; -aaa; etc
+    # depending upon suffix_length). In which case, it will simply
+    # remove the suffix from the filename.
     def after_packaging
       suffixes = chunk_suffixes
-      if suffixes == ['aa']
+      first_suffix = 'a' * suffix_length
+      if suffixes == [first_suffix]
         FileUtils.mv(
-          File.join(Config.tmp_path, package.basename + '-aa'),
+          File.join(Config.tmp_path, "#{ package.basename }-#{ first_suffix }"),
           File.join(Config.tmp_path, package.basename)
         )
       else
@@ -57,7 +60,7 @@ module Backup
 
     ##
     # Returns an array of suffixes for each chunk, in alphabetical order.
-    # For example: [aa, ab, ac, ad, ae]
+    # For example: [aa, ab, ac, ad, ae] or [aaa, aab, aac aad]
     def chunk_suffixes
       chunks.map {|chunk| File.extname(chunk).split('-').last }.sort
     end

data/lib/backup/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Backup
-  VERSION = '3.9.0'
+  VERSION = '3.10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backup
 version: !ruby/object:Gem::Version
-  version: 3.9.0
+  version: 3.10.0
 platform: ruby
 authors:
 - Michael van Rooijen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2013-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -511,7 +511,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.1
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Provides an elegant DSL in Ruby for performing backups on UNIX-like systems.