backup 3.0.23 → 3.0.24

data/spec/database/riak_spec.rb

@@ -13,48 +13,81 @@ describe Backup::Database::Riak do
     end
   end
 
+  it 'should be a subclass of Database::Base' do
+    Backup::Database::Riak.superclass.
+      should == Backup::Database::Base
+  end
+
   describe '#initialize' do
-    it 'should read the adapter details correctly' do
-      db.name.should      == 'mydatabase'
-      db.node.should      == 'riak@localhost'
-      db.cookie.should    == 'riak'
-      db.riak_admin_utility.should == '/path/to/riak-admin'
+
+    it 'should load pre-configured defaults through Base' do
+      Backup::Database::Riak.any_instance.expects(:load_defaults!)
+      db
     end
 
-    context 'when options are not set' do
-      before do
-        Backup::Database::Riak.any_instance.expects(:utility).
-            with('riak-admin').returns('/real/riak-admin')
+    it 'should pass the model reference to Base' do
+      db.instance_variable_get(:@model).should == model
+    end
+
+    context 'when no pre-configured defaults have been set' do
+      context 'when options are specified' do
+        it 'should use the given values' do
+          db.name.should      == 'mydatabase'
+          db.node.should      == 'riak@localhost'
+          db.cookie.should    == 'riak'
+          db.riak_admin_utility.should == '/path/to/riak-admin'
+        end
       end
 
-      it 'should use default values' do
-        db = Backup::Database::Riak.new(model)
+      context 'when options are not specified' do
+        before do
+          Backup::Database::Riak.any_instance.expects(:utility).
+              with('riak-admin').returns('/real/riak-admin')
+        end
 
-        db.name.should        be_nil
-        db.node.should        be_nil
-        db.cookie.should      be_nil
-        db.riak_admin_utility.should == '/real/riak-admin'
-      end
-    end
+        it 'should provide default values' do
+          db = Backup::Database::Riak.new(model)
 
-    context 'when configuration defaults have been set' do
-      after { Backup::Configuration::Database::Riak.clear_defaults! }
+          db.name.should        be_nil
+          db.node.should        be_nil
+          db.cookie.should      be_nil
+          db.riak_admin_utility.should == '/real/riak-admin'
+        end
+      end
+    end # context 'when no pre-configured defaults have been set'
 
-      it 'should use configuration defaults' do
-        Backup::Configuration::Database::Riak.defaults do |db|
+    context 'when pre-configured defaults have been set' do
+      before do
+        Backup::Database::Riak.defaults do |db|
           db.name         = 'db_name'
           db.node         = 'db_node'
           db.cookie       = 'db_cookie'
           db.riak_admin_utility = '/default/path/to/riak-admin'
         end
+      end
+
+      after { Backup::Database::Riak.clear_defaults! }
 
-        db = Backup::Database::Riak.new(model)
-        db.name.should        == 'db_name'
-        db.node.should        == 'db_node'
-        db.cookie.should      == 'db_cookie'
-        db.riak_admin_utility.should == '/default/path/to/riak-admin'
+      context 'when options are specified' do
+        it 'should override the pre-configured defaults' do
+          db.name.should      == 'mydatabase'
+          db.node.should      == 'riak@localhost'
+          db.cookie.should    == 'riak'
+          db.riak_admin_utility.should == '/path/to/riak-admin'
+        end
       end
-    end
+
+      context 'when options are not specified' do
+        it 'should use the pre-configured defaults' do
+          db = Backup::Database::Riak.new(model)
+
+          db.name.should        == 'db_name'
+          db.node.should        == 'db_node'
+          db.cookie.should      == 'db_cookie'
+          db.riak_admin_utility.should == '/default/path/to/riak-admin'
+        end
+      end
+    end # context 'when no pre-configured defaults have been set'
   end # describe '#initialize'
 
   describe '#perform!' do
@@ -105,4 +138,40 @@ describe Backup::Database::Riak do
     end
   end
 
+  describe 'deprecations' do
+    after do
+      Backup::Database::Riak.clear_defaults!
+    end
+
+    describe '#utility_path' do
+      before do
+        Backup::Database::Riak.any_instance.stubs(:utility)
+        Backup::Logger.expects(:warn).with(
+          instance_of(Backup::Errors::ConfigurationError)
+        )
+        Backup::Logger.expects(:warn).with(
+          "Backup::Database::Riak.riak_admin_utility is being set to 'foo'"
+        )
+      end
+
+      context 'when set directly' do
+        it 'should issue a deprecation warning and set the replacement value' do
+          riak = Backup::Database::Riak.new(model) do |db|
+            db.utility_path = 'foo'
+          end
+          riak.riak_admin_utility.should == 'foo'
+        end
+      end
+
+      context 'when set as a default' do
+        it 'should issue a deprecation warning and set the replacement value' do
+          riak = Backup::Database::Riak.defaults do |db|
+            db.utility_path = 'foo'
+          end
+          riak = Backup::Database::Riak.new(model)
+          riak.riak_admin_utility.should == 'foo'
+        end
+      end
+    end # describe '#utility_path'
+  end
 end

data/spec/dependency_spec.rb

@@ -40,6 +40,8 @@ describe Backup::Dependency do
       end
 
       it "should exit with status code 1" do
+        Backup::Logger.expects(:error)
+
         expect do
           Backup::Dependency.load("net-sftp")
         end.to raise_error { |exit| exit.status.should be(1) }

data/spec/encryptor/base_spec.rb

@@ -5,6 +5,16 @@ require File.expand_path('../../spec_helper.rb', __FILE__)
 describe Backup::Encryptor::Base do
   let(:base) { Backup::Encryptor::Base.new }
 
+  it 'should include CLI::Helpers' do
+    Backup::Encryptor::Base.
+      include?(Backup::CLI::Helpers).should be_true
+  end
+
+  it 'should include Configuration::Helpers' do
+    Backup::Encryptor::Base.
+      include?(Backup::Configuration::Helpers).should be_true
+  end
+
   describe '#initialize' do
     it 'should load defaults' do
       Backup::Encryptor::Base.any_instance.expects(:load_defaults!)

data/spec/encryptor/gpg_spec.rb

@@ -9,30 +9,46 @@ describe Backup::Encryptor::GPG do
     end
   end
 
+  it 'should be a subclass of Encryptor::Base' do
+    Backup::Encryptor::GPG.
+      superclass.should == Backup::Encryptor::Base
+  end
+
   describe '#initialize' do
-    it 'should read the adapter details correctly' do
-      encryptor.key.should == 'gpg_key'
+    after { Backup::Encryptor::GPG.clear_defaults! }
+
+    it 'should load pre-configured defaults' do
+      Backup::Encryptor::GPG.any_instance.expects(:load_defaults!)
+      encryptor
     end
 
-    context 'when options are not set' do
-      it 'should use default values' do
+    context 'when no pre-configured defaults have been set' do
+      it 'should use the values given' do
+        encryptor.key.should == 'gpg_key'
+      end
+
+      it 'should use default values if none are given' do
         encryptor = Backup::Encryptor::GPG.new
         encryptor.key.should be_nil
       end
-    end
+    end # context 'when no pre-configured defaults have been set'
 
-    context 'when configuration defaults have been set' do
-      after { Backup::Configuration::Encryptor::GPG.clear_defaults! }
-
-      it 'should use configuration defaults' do
-        Backup::Configuration::Encryptor::GPG.defaults do |encryptor|
-          encryptor.key = 'my_key'
+    context 'when pre-configured defaults have been set' do
+      before do
+        Backup::Encryptor::GPG.defaults do |e|
+          e.key = 'default_key'
         end
+      end
 
+      it 'should use pre-configured defaults' do
         encryptor = Backup::Encryptor::GPG.new
-        encryptor.key.should == 'my_key'
+        encryptor.key.should == 'default_key'
       end
-    end
+
+      it 'should override pre-configured defaults' do
+        encryptor.key.should == 'gpg_key'
+      end
+    end # context 'when pre-configured defaults have been set'
   end # describe '#initialize'
 
   describe '#encrypt_with' do

data/spec/encryptor/open_ssl_spec.rb

@@ -12,42 +12,61 @@ describe Backup::Encryptor::OpenSSL do
     end
   end
 
+  it 'should be a subclass of Encryptor::Base' do
+    Backup::Encryptor::OpenSSL.
+      superclass.should == Backup::Encryptor::Base
+  end
+
   describe '#initialize' do
-    it 'should read the adapter details correctly' do
-      encryptor.password.should       == 'mypassword'
-      encryptor.password_file.should  == '/my/password/file'
-      encryptor.base64.should         == true
-      encryptor.salt.should           == true
+    after { Backup::Encryptor::OpenSSL.clear_defaults! }
+
+    it 'should load pre-configured defaults' do
+      Backup::Encryptor::OpenSSL.any_instance.expects(:load_defaults!)
+      encryptor
     end
 
-    context 'when options are not set' do
-      it 'should use default values' do
+    context 'when no pre-configured defaults have been set' do
+      it 'should use the values given' do
+        encryptor.password.should       == 'mypassword'
+        encryptor.password_file.should  == '/my/password/file'
+        encryptor.base64.should         == true
+        encryptor.salt.should           == true
+      end
+
+      it 'should use default values if none are given' do
         encryptor = Backup::Encryptor::OpenSSL.new
         encryptor.password.should       be_nil
         encryptor.password_file.should  be_nil
         encryptor.base64.should         be_false
         encryptor.salt.should           be_true
       end
-    end
-
-    context 'when configuration defaults have been set' do
-      after { Backup::Configuration::Encryptor::OpenSSL.clear_defaults! }
-
-      it 'should use configuration defaults' do
-        Backup::Configuration::Encryptor::OpenSSL.defaults do |encryptor|
-          encryptor.password      = 'my_password'
-          encryptor.password_file = '/my_password/file'
-          encryptor.base64        = true
-          encryptor.salt          = true
+    end # context 'when no pre-configured defaults have been set'
+
+    context 'when pre-configured defaults have been set' do
+      before do
+        Backup::Encryptor::OpenSSL.defaults do |e|
+          e.password      = 'default_password'
+          e.password_file = '/default/password/file'
+          e.base64        = 'default_base64'
+          e.salt          = 'default_salt'
         end
+      end
 
+      it 'should use pre-configured defaults' do
         encryptor = Backup::Encryptor::OpenSSL.new
-        encryptor.password.should       == 'my_password'
-        encryptor.password_file.should  == '/my_password/file'
+        encryptor.password      = 'default_password'
+        encryptor.password_file = '/default/password/file'
+        encryptor.base64        = 'default_base64'
+        encryptor.salt          = 'default_salt'
+      end
+
+      it 'should override pre-configured defaults' do
+        encryptor.password.should       == 'mypassword'
+        encryptor.password_file.should  == '/my/password/file'
         encryptor.base64.should         == true
         encryptor.salt.should           == true
       end
-    end
+    end # context 'when pre-configured defaults have been set'
   end # describe '#initialize'
 
   describe '#encrypt_with' do

data/spec/logger_spec.rb

@@ -181,6 +181,10 @@ describe Backup::Logger do
         FileUtils.unstub(:rm_f)
       end
 
+      after do
+        Backup::Config.send(:reset!)
+      end
+
       it 'should truncate the file, removing older lines' do
         max_bytes = 5_000
         line_len  = 120

data/spec/model_spec.rb

@@ -209,10 +209,25 @@ describe 'Backup::Model' do
         end
       end
 
-      it 'should warn user of change from RSync to RSync::Local' do
+      it 'should warn user of change from RSync to RSync::Push' do
         Backup::Logger.expects(:warn)
         model.sync_with('Backup::Config::RSync')
-        model.syncers.first.should be_an_instance_of Backup::Syncer::RSync::Local
+        model.syncers.first.should
+            be_an_instance_of Backup::Syncer::RSync::Push
+      end
+
+      it 'should warn user of change from S3 to Cloud::S3' do
+        Backup::Logger.expects(:warn)
+        model.sync_with('Backup::Config::S3')
+        model.syncers.first.should
+            be_an_instance_of Backup::Syncer::Cloud::S3
+      end
+
+      it 'should warn user of change from CloudFiles to Cloud::CloudFiles' do
+        Backup::Logger.expects(:warn)
+        model.sync_with('Backup::Config::CloudFiles')
+        model.syncers.first.should
+            be_an_instance_of Backup::Syncer::Cloud::CloudFiles
       end
     end
 
@@ -327,6 +342,8 @@ describe 'Backup::Model' do
       Timecop.freeze(Time.now)
       started_at = Time.now
       time = started_at.strftime("%Y.%m.%d.%H.%M.%S")
+      model.expects(:log!).with(:started)
+      model.expects(:log!).with(:finished)
 
       model.perform!
       model.time.should == time

data/spec/notifier/base_spec.rb

@@ -6,31 +6,46 @@ describe 'Backup::Notifier::Base' do
   let(:model) { Backup::Model.new(:test_trigger, 'test label') }
   let(:notifier) { Backup::Notifier::Base.new(model) }
 
+  it 'should include Configuration::Helpers' do
+    Backup::Notifier::Base.
+      include?(Backup::Configuration::Helpers).should be_true
+  end
+
   describe '#initialize' do
+    after { Backup::Notifier::Base.clear_defaults! }
 
-    it "sets the correct defaults" do
-      notifier.on_success.should == true
-      notifier.on_warning.should == true
-      notifier.on_failure.should == true
+    it 'should load pre-configured defaults' do
+      Backup::Notifier::Base.any_instance.expects(:load_defaults!)
+      notifier
     end
 
-    context 'when using configuration defaults' do
-      after { Backup::Configuration::Notifier::Base.clear_defaults! }
+    it 'should set a reference to the model' do
+      notifier.instance_variable_get(:@model).should == model
+    end
 
-      it 'uses configuration defaults' do
-        Backup::Configuration::Notifier::Base.defaults do |notifier|
-          notifier.on_success = false
-          notifier.on_warning = false
-          notifier.on_failure = false
+    context 'when no pre-configured defaults have been set' do
+      it 'should set default values' do
+        notifier.on_success.should == true
+        notifier.on_warning.should == true
+        notifier.on_failure.should == true
+      end
+    end # context 'when no pre-configured defaults have been set'
+
+    context 'when pre-configured defaults have been set' do
+      before do
+        Backup::Notifier::Base.defaults do |n|
+          n.on_success = false
+          n.on_warning = false
+          n.on_failure = false
         end
-
-        base = Backup::Notifier::Base.new(model)
-        base.on_success.should == false
-        base.on_warning.should == false
-        base.on_failure.should == false
       end
-    end
 
+      it 'should use pre-configured defaults' do
+        notifier.on_success.should be_false
+        notifier.on_warning.should be_false
+        notifier.on_failure.should be_false
+      end
+    end # context 'when pre-configured defaults have been set'
   end # describe '#initialize'
 
   describe '#perform!' do

data/spec/notifier/campfire_spec.rb

@@ -12,30 +12,60 @@ describe Backup::Notifier::Campfire do
     end
   end
 
+  it 'should be a subclass of Notifier::Base' do
+    Backup::Notifier::Campfire.
+      superclass.should == Backup::Notifier::Base
+  end
+
   describe '#initialize' do
-    it 'should sets the correct values' do
-      notifier.api_token.should == 'token'
-      notifier.subdomain.should == 'subdomain'
-      notifier.room_id.should   == 'room_id'
-
-      notifier.on_success.should == true
-      notifier.on_warning.should == true
-      notifier.on_failure.should == true
+    after { Backup::Notifier::Campfire.clear_defaults! }
+
+    it 'should load pre-configured defaults through Base' do
+      Backup::Notifier::Campfire.any_instance.expects(:load_defaults!)
+      notifier
     end
 
-    context 'when using configuration defaults' do
-      after { Backup::Configuration::Notifier::Campfire.clear_defaults! }
+    it 'should pass the model reference to Base' do
+      notifier.instance_variable_get(:@model).should == model
+    end
 
-      it 'should use the configuration defaults' do
-        Backup::Configuration::Notifier::Campfire.defaults do |campfire|
-          campfire.api_token  = 'some_token'
-          campfire.subdomain  = 'some_subdomain'
-          campfire.room_id    = 'some_room_id'
+    context 'when no pre-configured defaults have been set' do
+      it 'should use the values given' do
+        notifier.api_token.should == 'token'
+        notifier.subdomain.should == 'subdomain'
+        notifier.room_id.should   == 'room_id'
 
-          campfire.on_success = false
-          campfire.on_warning = false
-          campfire.on_failure = false
+        notifier.on_success.should == true
+        notifier.on_warning.should == true
+        notifier.on_failure.should == true
+      end
+
+      it 'should use default values if none are given' do
+        notifier = Backup::Notifier::Campfire.new(model)
+        notifier.api_token.should be_nil
+        notifier.subdomain.should be_nil
+        notifier.room_id.should   be_nil
+
+        notifier.on_success.should == true
+        notifier.on_warning.should == true
+        notifier.on_failure.should == true
+      end
+    end # context 'when no pre-configured defaults have been set'
+
+    context 'when pre-configured defaults have been set' do
+      before do
+        Backup::Notifier::Campfire.defaults do |n|
+          n.api_token  = 'some_token'
+          n.subdomain  = 'some_subdomain'
+          n.room_id    = 'some_room_id'
+
+          n.on_success = false
+          n.on_warning = false
+          n.on_failure = false
         end
+      end
+
+      it 'should use pre-configured defaults' do
         notifier = Backup::Notifier::Campfire.new(model)
         notifier.api_token.should == 'some_token'
         notifier.subdomain.should == 'some_subdomain'
@@ -46,24 +76,15 @@ describe Backup::Notifier::Campfire do
         notifier.on_failure.should == false
       end
 
-      it 'should override the configuration defaults' do
-        Backup::Configuration::Notifier::Campfire.defaults do |campfire|
-          campfire.api_token  = 'old_token'
-          campfire.subdomain  = 'old_subdomain'
-          campfire.room_id    = 'old_room_id'
+      it 'should override pre-configured defaults' do
+        notifier = Backup::Notifier::Campfire.new(model) do |n|
+          n.api_token  = 'new_token'
+          n.subdomain  = 'new_subdomain'
+          n.room_id    = 'new_room_id'
 
-          campfire.on_success = true
-          campfire.on_warning = false
-          campfire.on_failure = false
-        end
-        notifier = Backup::Notifier::Campfire.new(model) do |campfire|
-          campfire.api_token  = 'new_token'
-          campfire.subdomain  = 'new_subdomain'
-          campfire.room_id    = 'new_room_id'
-
-          campfire.on_success = false
-          campfire.on_warning = true
-          campfire.on_failure = true
+          n.on_success = false
+          n.on_warning = true
+          n.on_failure = true
         end
 
         notifier.api_token.should == 'new_token'
@@ -74,8 +95,8 @@ describe Backup::Notifier::Campfire do
         notifier.on_warning.should == true
         notifier.on_failure.should == true
       end
-    end # context 'when using configuration defaults'
-  end
+    end # context 'when pre-configured defaults have been set'
+  end # describe '#initialize'
 
   describe '#notify!' do
     context 'when status is :success' do
@@ -163,14 +184,11 @@ describe 'Backup::Notifier::Campfire::Room' do
 
   describe '#send_message' do
     it 'should pass a JSON formatted HTTParty.post to #post' do
-      room.expects(:post).with('speak',
-        {
-          :body => {
-            :message => {
-              :body => 'a message',
-              :type => 'Textmessage'
-            }
-          }.to_json
+      room.expects(:post).with(
+        'speak', {
+          :body => MultiJson.encode(
+            { :message => { :body => 'a message', :type => 'Textmessage' } }
+          )
         }
       )
       room.send(:send_message, 'a message')