backup 3.0.9 → 3.0.10

data/lib/backup/configuration/syncer/s3.rb

@@ -22,6 +22,10 @@ module Backup
           # Flag to enable mirroring
           attr_accessor :mirror
 
+          ##
+          # Additional options for the s3sync cli
+          attr_accessor :additional_options
+
         end
       end
     end

data/lib/backup/syncer/s3.rb

@@ -20,6 +20,10 @@ module Backup
       # Flag to enable mirroring
       attr_accessor :mirror
 
+      ##
+      # Additional options for the s3sync cli
+      attr_accessor :additional_options
+
       ##
       # Instantiates a new S3 Syncer object and sets the default configuration
       # specified in the Backup::Configuration::Syncer::S3. Then it sets the object
@@ -28,9 +32,10 @@ module Backup
       def initialize(&block)
         load_defaults!
 
-        @path        ||= 'backups'
-        @directories ||= Array.new
-        @mirror      ||= false
+        @path               ||= 'backups'
+        @directories        ||= Array.new
+        @mirror             ||= false
+        @additional_options ||= []
 
         instance_eval(&block) if block_given?
 
@@ -56,7 +61,7 @@ module Backup
       ##
       # Returns all the specified S3Sync options, concatenated, ready for the CLI
       def options
-        [verbose, recursive, mirror].compact.join("\s")
+        ([verbose, recursive, mirror] + additional_options).compact.join("\s")
       end
 
       ##

data/lib/backup/version.rb

@@ -13,7 +13,7 @@ module Backup
     #  Defines the minor version
     # PATCH:
     #  Defines the patch version
-    MAJOR, MINOR, PATCH = 3, 0, 9
+    MAJOR, MINOR, PATCH = 3, 0, 10
 
     ##
     # Returns the major version ( big release based off of multiple minor releases )

data/spec/configuration/syncer/s3_spec.rb

@@ -0,0 +1,43 @@
+# encoding: utf-8
+
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Backup::Configuration::Syncer::S3 do
+  before do
+    Backup::Configuration::Syncer::S3.defaults do |s3|
+      s3.access_key_id       = 'my_access_key_id'
+      s3.secret_access_key   = 'my_secret_access_key'
+      s3.bucket              = 'my-bucket'
+      s3.path                = '/backups/'
+      s3.directories         = '/directories/to/backup/'
+      s3.mirror              = true
+      s3.additional_options  = ['--exclude="*.rb"']
+    end
+  end
+
+  it 'should set the default s3 configuration' do
+    s3 = Backup::Configuration::Syncer::S3
+    s3.access_key_id.should       == 'my_access_key_id'
+    s3.secret_access_key.should   == 'my_secret_access_key'
+    s3.bucket.should              == 'my-bucket'
+    s3.path.should                == '/backups/'
+    s3.directories.should         == '/directories/to/backup/'
+    s3.mirror.should              == true
+    s3.additional_options.should  == ['--exclude="*.rb"']
+  end
+
+  describe '#clear_defaults!' do
+    it 'should clear all the defaults, resetting them to nil' do
+      Backup::Configuration::Syncer::S3.clear_defaults!
+
+      s3 = Backup::Configuration::Syncer::S3
+      s3.access_key_id.should       == nil
+      s3.secret_access_key.should   == nil
+      s3.bucket.should              == nil
+      s3.path.should                == nil
+      s3.directories.should         == nil
+      s3.mirror.should              == nil
+      s3.additional_options.should  == nil
+    end
+  end
+end

data/spec/syncer/s3_spec.rb

@@ -57,6 +57,7 @@ describe Backup::Syncer::S3 do
     s3.path.should        == 'backups'
     s3.directories.should == Array.new
     s3.mirror.should      == nil
+    s3.additional_options.should == []
   end
 
   describe '#mirror' do
@@ -86,6 +87,13 @@ describe Backup::Syncer::S3 do
     end
   end
 
+  describe '#additional_options' do
+    it do
+      s3.additional_options = ['--exclude="*.rb"']
+      s3.options.should == '--verbose --recursive --delete --exclude="*.rb"'
+    end
+  end
+
   describe '#verbose' do
     it do
       s3.verbose.should == '--verbose'

metadata

@@ -2,7 +2,7 @@
 name: backup
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.0.9
+  version: 3.0.10
 platform: ruby
 authors: 
 - Michael van Rooijen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-18 00:00:00 +01:00
+date: 2011-03-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -144,6 +144,7 @@ files:
 - spec/configuration/storage/scp_spec.rb
 - spec/configuration/storage/sftp_spec.rb
 - spec/configuration/syncer/rsync_spec.rb
+- spec/configuration/syncer/s3_spec.rb
 - spec/database/base_spec.rb
 - spec/database/mongodb_spec.rb
 - spec/database/mysql_spec.rb