backup 3.0.20 → 3.0.21

data/spec/configuration/base_spec.rb

@@ -20,16 +20,16 @@ describe Backup::Configuration::Helpers do
   end
 
   it 'should return the setters' do
-    Backup::Configuration::Base.setter_methods.count.should == 3
+    Backup::Configuration::Base.send(:setter_methods).count.should == 3
     %w[rspec_method= rspec_test= rspec_mocha=].each do |method|
-      Backup::Configuration::Base.setter_methods.should include(method)
+      Backup::Configuration::Base.send(:setter_methods).should include(method)
     end
   end
 
   it 'should return the getters' do
-    Backup::Configuration::Base.getter_methods.count.should == 3
+    Backup::Configuration::Base.send(:getter_methods).count.should == 3
     %w[rspec_method rspec_test rspec_mocha].each do |method|
-      Backup::Configuration::Base.getter_methods.should include(method)
+      Backup::Configuration::Base.send(:getter_methods).should include(method)
     end
   end
 end

data/spec/configuration/compressor/bzip2_spec.rb

@@ -9,6 +9,7 @@ describe Backup::Configuration::Compressor::Bzip2 do
       compressor.fast = true
     end
   end
+  after { Backup::Configuration::Compressor::Bzip2.clear_defaults! }
 
   it 'should set the default compressor configuration' do
     compressor = Backup::Configuration::Compressor::Bzip2

data/spec/configuration/compressor/gzip_spec.rb

@@ -9,6 +9,7 @@ describe Backup::Configuration::Compressor::Gzip do
       compressor.fast = true
     end
   end
+  after { Backup::Configuration::Compressor::Gzip.clear_defaults! }
 
   it 'should set the default compressor configuration' do
     compressor = Backup::Configuration::Compressor::Gzip

data/spec/configuration/compressor/lzma_spec.rb

@@ -9,6 +9,7 @@ describe Backup::Configuration::Compressor::Lzma do
       compressor.fast = true
     end
   end
+  after { Backup::Configuration::Compressor::Lzma.clear_defaults! }
 
   it 'should set the default compressor configuration' do
     compressor = Backup::Configuration::Compressor::Lzma

data/spec/configuration/compressor/pbzip2_spec.rb

@@ -0,0 +1,32 @@
+# encoding: utf-8
+
+require File.expand_path('../../../spec_helper.rb', __FILE__)
+
+describe Backup::Configuration::Compressor::Pbzip2 do
+  before do
+    Backup::Configuration::Compressor::Pbzip2.defaults do |compressor|
+      compressor.best = true
+      compressor.fast = true
+      compressor.processors = 2
+    end
+  end
+  after { Backup::Configuration::Compressor::Pbzip2.clear_defaults! }
+
+  it 'should set the default compressor configuration' do
+    compressor = Backup::Configuration::Compressor::Pbzip2
+    compressor.best.should == true
+    compressor.fast.should == true
+    compressor.processors.should == 2
+  end
+
+  describe '#clear_defaults!' do
+    it 'should clear all the defaults, resetting them to nil' do
+      Backup::Configuration::Compressor::Pbzip2.clear_defaults!
+
+      compressor = Backup::Configuration::Compressor::Pbzip2
+      compressor.best.should == nil
+      compressor.fast.should == nil
+      compressor.processors.should == nil
+    end
+  end
+end

data/spec/configuration/database/base_spec.rb

@@ -5,9 +5,10 @@ require File.expand_path('../../../spec_helper.rb', __FILE__)
 describe Backup::Configuration::Database::Base do
   before do
     Backup::Configuration::Database::Base.defaults do |db|
-      db.utility_path = '/usr/bin/my_util'
+      db.utility_path = '/usr/bin/my_util' # deprecated
     end
   end
+  after { Backup::Configuration::Database::Base.clear_defaults! }
 
   it 'should set the default Base configuration' do
     db = Backup::Configuration::Database::Base

data/spec/configuration/database/mongodb_spec.rb

@@ -13,19 +13,26 @@ describe Backup::Configuration::Database::MongoDB do
       db.only_collections   = %w[my other tables]
       db.additional_options = %w[my options]
       db.ipv6               = true
+      db.mongodump_utility  = '/path/to/mongodump'
+      db.mongo_utility      = '/path/to/mongo'
+      db.lock               = true
     end
   end
+  after { Backup::Configuration::Database::MongoDB.clear_defaults! }
 
   it 'should set the default MongoDB configuration' do
     db = Backup::Configuration::Database::MongoDB
-    db.name.should               == 'mydb'
-    db.username.should           == 'myuser'
-    db.password.should           == 'mypassword'
-    db.host.should               == 'myhost'
-    db.port.should               == 'myport'
-    db.only_collections.should   == %w[my other tables]
-    db.additional_options.should == %w[my options]
-    db.ipv6.should               == true
+    db.name.should                == 'mydb'
+    db.username.should            == 'myuser'
+    db.password.should            == 'mypassword'
+    db.host.should                == 'myhost'
+    db.port.should                == 'myport'
+    db.only_collections.should    == %w[my other tables]
+    db.additional_options.should  == %w[my options]
+    db.ipv6.should                == true
+    db.mongodump_utility.should   == '/path/to/mongodump'
+    db.mongo_utility.should       == '/path/to/mongo'
+    db.lock.should                == true
   end
 
   describe '#clear_defaults!' do
@@ -33,14 +40,17 @@ describe Backup::Configuration::Database::MongoDB do
       Backup::Configuration::Database::MongoDB.clear_defaults!
 
       db = Backup::Configuration::Database::MongoDB
-      db.name.should               == nil
-      db.username.should           == nil
-      db.password.should           == nil
-      db.host.should               == nil
-      db.port.should               == nil
-      db.only_collections.should   == nil
-      db.additional_options.should == nil
-      db.ipv6.should               == nil
+      db.name.should                == nil
+      db.username.should            == nil
+      db.password.should            == nil
+      db.host.should                == nil
+      db.port.should                == nil
+      db.only_collections.should    == nil
+      db.additional_options.should  == nil
+      db.ipv6.should                == nil
+      db.mongodump_utility.should   == nil
+      db.mongo_utility.should       == nil
+      db.lock.should                == nil
     end
   end
 end

data/spec/configuration/database/mysql_spec.rb

@@ -14,8 +14,10 @@ describe Backup::Configuration::Database::MySQL do
       db.skip_tables        = %w[my tables]
       db.only_tables        = %w[my other tables]
       db.additional_options = %w[my options]
+      db.mysqldump_utility  = '/path/to/mysqldump'
     end
   end
+  after { Backup::Configuration::Database::MySQL.clear_defaults! }
 
   it 'should set the default MySQL configuration' do
     db = Backup::Configuration::Database::MySQL
@@ -28,6 +30,7 @@ describe Backup::Configuration::Database::MySQL do
     db.skip_tables.should        == %w[my tables]
     db.only_tables.should        == %w[my other tables]
     db.additional_options.should == %w[my options]
+    db.mysqldump_utility.should  == '/path/to/mysqldump'
   end
 
   describe '#clear_defaults!' do
@@ -44,6 +47,7 @@ describe Backup::Configuration::Database::MySQL do
       db.skip_tables.should        == nil
       db.only_tables.should        == nil
       db.additional_options.should == nil
+      db.mysqldump_utility.should  == nil
     end
   end
 end

data/spec/configuration/database/postgresql_spec.rb

@@ -14,8 +14,10 @@ describe Backup::Configuration::Database::PostgreSQL do
       db.skip_tables        = %w[my tables]
       db.only_tables        = %w[my other tables]
       db.additional_options = %w[my options]
+      db.pg_dump_utility    = '/path/to/pg_dump'
     end
   end
+  after { Backup::Configuration::Database::PostgreSQL.clear_defaults! }
 
   it 'should set the default PostgreSQL configuration' do
     db = Backup::Configuration::Database::PostgreSQL
@@ -28,6 +30,7 @@ describe Backup::Configuration::Database::PostgreSQL do
     db.skip_tables.should        == %w[my tables]
     db.only_tables.should        == %w[my other tables]
     db.additional_options.should == %w[my options]
+    db.pg_dump_utility.should    == '/path/to/pg_dump'
   end
 
   describe '#clear_defaults!' do
@@ -44,6 +47,7 @@ describe Backup::Configuration::Database::PostgreSQL do
       db.skip_tables.should        == nil
       db.only_tables.should        == nil
       db.additional_options.should == nil
+      db.pg_dump_utility.should    == nil
     end
   end
 end

data/spec/configuration/database/redis_spec.rb

@@ -13,8 +13,10 @@ describe Backup::Configuration::Database::Redis do
       db.port                = 123
       db.socket              = '/redis.sock'
       db.additional_options  = %w[my options]
+      db.redis_cli_utility   = '/path/to/redis-cli'
     end
   end
+  after { Backup::Configuration::Database::Redis.clear_defaults! }
 
   it 'should set the default Redis configuration' do
     db = Backup::Configuration::Database::Redis
@@ -26,6 +28,7 @@ describe Backup::Configuration::Database::Redis do
     db.port.should                == 123
     db.socket.should              == '/redis.sock'
     db.additional_options.should  == %w[my options]
+    db.redis_cli_utility.should   == '/path/to/redis-cli'
   end
 
   describe '#clear_defaults!' do
@@ -41,6 +44,7 @@ describe Backup::Configuration::Database::Redis do
       db.port.should                == nil
       db.socket.should              == nil
       db.additional_options.should  == nil
+      db.redis_cli_utility.should   == nil
     end
   end
 end

data/spec/configuration/database/riak_spec.rb

@@ -8,14 +8,17 @@ describe Backup::Configuration::Database::Riak do
       db.name   = 'mydb'
       db.node   = '/var/lib/redis/db'
       db.cookie = 'mypassword'
+      db.riak_admin_utility = '/path/to/riak-admin'
     end
   end
+  after { Backup::Configuration::Database::Riak.clear_defaults! }
 
   it 'should set the default Riak configuration' do
     db = Backup::Configuration::Database::Riak
     db.name.should   == 'mydb'
     db.node.should   == '/var/lib/redis/db'
     db.cookie.should == 'mypassword'
+    db.riak_admin_utility.should == '/path/to/riak-admin'
   end
 
   describe '#clear_defaults!' do
@@ -26,6 +29,7 @@ describe Backup::Configuration::Database::Riak do
       db.name.should   == nil
       db.node.should   == nil
       db.cookie.should == nil
+      db.riak_admin_utility.should == nil
     end
   end
 end

data/spec/configuration/encryptor/gpg_spec.rb

@@ -8,6 +8,7 @@ describe Backup::Configuration::Encryptor::GPG do
       encryptor.key = 'my_key'
     end
   end
+  after { Backup::Configuration::Encryptor::GPG.clear_defaults! }
 
   it 'should set the default encryptor configuration' do
     encryptor = Backup::Configuration::Encryptor::GPG

data/spec/configuration/encryptor/open_ssl_spec.rb

@@ -11,6 +11,7 @@ describe Backup::Configuration::Encryptor::OpenSSL do
       encryptor.salt     = true
     end
   end
+  after { Backup::Configuration::Encryptor::OpenSSL.clear_defaults! }
 
   it 'should set the default encryptor configuration' do
     encryptor = Backup::Configuration::Encryptor::OpenSSL

data/spec/configuration/notifier/base_spec.rb

@@ -0,0 +1,32 @@
+# encoding: utf-8
+
+require File.expand_path('../../../spec_helper.rb', __FILE__)
+
+describe Backup::Configuration::Notifier::Base do
+  before do
+    Backup::Configuration::Notifier::Base.defaults do |base|
+      base.on_success = 'on_success'
+      base.on_warning = 'on_warning'
+      base.on_failure = 'on_failure'
+    end
+  end
+  after { Backup::Configuration::Notifier::Base.clear_defaults! }
+
+  it 'should set the default campfire configuration' do
+    base = Backup::Configuration::Notifier::Base
+    base.on_success.should == 'on_success'
+    base.on_warning.should == 'on_warning'
+    base.on_failure.should == 'on_failure'
+  end
+
+  describe '#clear_defaults!' do
+    it 'should clear all the defaults, resetting them to nil' do
+      Backup::Configuration::Notifier::Base.clear_defaults!
+
+      base = Backup::Configuration::Notifier::Base
+      base.on_success.should be_nil
+      base.on_warning.should be_nil
+      base.on_failure.should be_nil
+    end
+  end
+end

data/spec/configuration/notifier/campfire_spec.rb

@@ -10,6 +10,7 @@ describe Backup::Configuration::Notifier::Campfire do
       campfire.room_id   = 'my_room_id'
     end
   end
+  after { Backup::Configuration::Notifier::Campfire.clear_defaults! }
 
   it 'should set the default campfire configuration' do
     campfire = Backup::Configuration::Notifier::Campfire

data/spec/configuration/notifier/hipchat_spec.rb

@@ -14,6 +14,7 @@ describe Backup::Configuration::Notifier::Hipchat do
       hipchat.notify_users   = true
     end
   end
+  after { Backup::Configuration::Notifier::Hipchat.clear_defaults! }
 
   it 'should set the default tweet configuration' do
     hipchat = Backup::Configuration::Notifier::Hipchat

data/spec/configuration/notifier/mail_spec.rb

@@ -21,6 +21,7 @@ describe Backup::Configuration::Notifier::Mail do
       mail.mail_folder          = '/path/to/backup/mails'
     end
   end
+  after { Backup::Configuration::Notifier::Mail.clear_defaults! }
 
   it 'should set the default Mail configuration' do
     mail = Backup::Configuration::Notifier::Mail

data/spec/configuration/notifier/presently_spec.rb

@@ -11,6 +11,7 @@ describe Backup::Configuration::Notifier::Presently do
       presently.group_id  = 'my_group_id'
     end
   end
+  after { Backup::Configuration::Notifier::Presently.clear_defaults! }
 
   it 'should set the default tweet configuration' do
     presently = Backup::Configuration::Notifier::Presently

data/spec/configuration/notifier/prowl_spec.rb

@@ -9,6 +9,7 @@ describe Backup::Configuration::Notifier::Prowl do
       prowl.api_key     = 'my_api_key'
     end
   end
+  after { Backup::Configuration::Notifier::Prowl.clear_defaults! }
 
   it 'should set the default tweet configuration' do
     prowl = Backup::Configuration::Notifier::Prowl

data/spec/configuration/notifier/twitter_spec.rb

@@ -11,6 +11,7 @@ describe Backup::Configuration::Notifier::Twitter do
       tweet.oauth_token_secret = 'my_oauth_token_secret'
     end
   end
+  after { Backup::Configuration::Notifier::Twitter.clear_defaults! }
 
   it 'should set the default tweet configuration' do
     tweet = Backup::Configuration::Notifier::Twitter

data/spec/configuration/storage/cloudfiles_spec.rb

@@ -13,6 +13,7 @@ describe Backup::Configuration::Storage::CloudFiles do
       cf.servicenet = true
     end
   end
+  after { Backup::Configuration::Storage::CloudFiles.clear_defaults! }
 
   it 'should set the default Cloud Files configuration' do
     cf = Backup::Configuration::Storage::CloudFiles

data/spec/configuration/storage/dropbox_spec.rb

@@ -7,19 +7,20 @@ describe Backup::Configuration::Storage::Dropbox do
     Backup::Configuration::Storage::Dropbox.defaults do |db|
       db.api_key     = 'my_api_key'
       db.api_secret  = 'my_secret'
+      db.access_type = 'my_access_type'
       db.path        = 'my_backups'
       db.keep        = 20
-      db.timeout     = 500
     end
   end
+  after { Backup::Configuration::Storage::Dropbox.clear_defaults! }
 
   it 'should set the default Dropbox configuration' do
     db = Backup::Configuration::Storage::Dropbox
     db.api_key.should     == 'my_api_key'
     db.api_secret.should  == 'my_secret'
+    db.access_type.should == 'my_access_type'
     db.path.should        == 'my_backups'
     db.keep.should        == 20
-    db.timeout.should     == 500
   end
 
   describe '#clear_defaults!' do
@@ -29,9 +30,9 @@ describe Backup::Configuration::Storage::Dropbox do
       db = Backup::Configuration::Storage::Dropbox
       db.api_key.should     == nil
       db.api_secret.should  == nil
+      db.access_type.should == nil
       db.path.should        == nil
       db.keep.should        == nil
-      db.timeout.should     == nil
     end
   end
 end

data/spec/configuration/storage/ftp_spec.rb

@@ -14,6 +14,7 @@ describe Backup::Configuration::Storage::FTP do
       ftp.passive_mode = false
     end
   end
+  after { Backup::Configuration::Storage::FTP.clear_defaults! }
 
   it 'should set the default ftp configuration' do
     ftp = Backup::Configuration::Storage::FTP

data/spec/configuration/storage/local_spec.rb

@@ -9,6 +9,7 @@ describe Backup::Configuration::Storage::Local do
       local.keep = 20
     end
   end
+  after { Backup::Configuration::Storage::Local.clear_defaults! }
 
   it 'should set the default local configuration' do
     local = Backup::Configuration::Storage::Local

data/spec/configuration/storage/ninefold_spec.rb

@@ -10,6 +10,7 @@ describe Backup::Configuration::Storage::Ninefold do
       nf.path           = 'my_backups'
     end
   end
+  after { Backup::Configuration::Storage::Ninefold.clear_defaults! }
 
   it 'should set the default Ninefold configuration' do
     ninefold = Backup::Configuration::Storage::Ninefold

data/spec/configuration/storage/rsync_spec.rb

@@ -10,8 +10,10 @@ describe Backup::Configuration::Storage::RSync do
       rsync.ip        = '123.45.678.90'
       rsync.port      = 21
       rsync.path      = 'my_backups'
+      rsync.local     = true
     end
   end
+  after { Backup::Configuration::Storage::RSync.clear_defaults! }
 
   it 'should set the default rsync configuration' do
     rsync = Backup::Configuration::Storage::RSync
@@ -20,7 +22,7 @@ describe Backup::Configuration::Storage::RSync do
     rsync.ip.should       == '123.45.678.90'
     rsync.port.should     == 21
     rsync.path.should     == 'my_backups'
-    rsync.local.should    == nil
+    rsync.local.should    == true
   end
 
   describe '#clear_defaults!' do