backup 3.0.19 → 3.0.20

data/spec/configuration/notifier/presently_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper.rb', __FILE__)
 
 describe Backup::Configuration::Notifier::Presently do
   before do

data/spec/configuration/notifier/prowl_spec.rb

@@ -0,0 +1,28 @@
+# encoding: utf-8
+
+require File.expand_path('../../../spec_helper.rb', __FILE__)
+
+describe Backup::Configuration::Notifier::Prowl do
+  before do
+    Backup::Configuration::Notifier::Prowl.defaults do |prowl|
+      prowl.application = 'my_application'
+      prowl.api_key     = 'my_api_key'
+    end
+  end
+
+  it 'should set the default tweet configuration' do
+    prowl = Backup::Configuration::Notifier::Prowl
+    prowl.application.should == 'my_application'
+    prowl.api_key.should     == 'my_api_key'
+  end
+
+  describe '#clear_defaults!' do
+    it 'should clear all the defaults, resetting them to nil' do
+      Backup::Configuration::Notifier::Prowl.clear_defaults!
+
+      prowl = Backup::Configuration::Notifier::Prowl
+      prowl.application.should == nil
+      prowl.api_key.should     == nil
+    end
+  end
+end

data/spec/configuration/notifier/twitter_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper.rb', __FILE__)
 
 describe Backup::Configuration::Notifier::Twitter do
   before do

data/spec/configuration/storage/cloudfiles_spec.rb

@@ -1,25 +1,27 @@
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper.rb', __FILE__)
 
 describe Backup::Configuration::Storage::CloudFiles do
   before do
     Backup::Configuration::Storage::CloudFiles.defaults do |cf|
-      cf.username  = 'my_username'
-      cf.api_key   = 'my_api_key'
-      cf.container = 'my_container'
-      cf.path      = 'my_backups'
-      cf.auth_url  = 'lon.auth.api.rackspacecloud.com'
+      cf.username   = 'my_username'
+      cf.api_key    = 'my_api_key'
+      cf.container  = 'my_container'
+      cf.path       = 'my_backups'
+      cf.auth_url   = 'lon.auth.api.rackspacecloud.com'
+      cf.servicenet = true
     end
   end
 
   it 'should set the default Cloud Files configuration' do
     cf = Backup::Configuration::Storage::CloudFiles
-    cf.username.should  == 'my_username'
-    cf.api_key.should   == 'my_api_key'
-    cf.container.should == 'my_container'
-    cf.path.should      == 'my_backups'
-    cf.auth_url.should  == 'lon.auth.api.rackspacecloud.com'
+    cf.username.should   == 'my_username'
+    cf.api_key.should    == 'my_api_key'
+    cf.container.should  == 'my_container'
+    cf.path.should       == 'my_backups'
+    cf.auth_url.should   == 'lon.auth.api.rackspacecloud.com'
+    cf.servicenet.should == true
   end
 
   describe '#clear_defaults!' do
@@ -27,11 +29,12 @@ describe Backup::Configuration::Storage::CloudFiles do
       Backup::Configuration::Storage::CloudFiles.clear_defaults!
 
       cf = Backup::Configuration::Storage::CloudFiles
-      cf.username.should  == nil
-      cf.api_key.should   == nil
-      cf.container.should == nil
-      cf.path.should      == nil
-      cf.auth_url.should  == nil
+      cf.username.should   == nil
+      cf.api_key.should    == nil
+      cf.container.should  == nil
+      cf.path.should       == nil
+      cf.auth_url.should   == nil
+      cf.servicenet.should == nil
     end
   end
 end

data/spec/configuration/storage/dropbox_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper.rb', __FILE__)
 
 describe Backup::Configuration::Storage::Dropbox do
   before do

data/spec/configuration/storage/ftp_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper.rb', __FILE__)
 
 describe Backup::Configuration::Storage::FTP do
   before do

data/spec/configuration/storage/local_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper.rb', __FILE__)
 
 describe Backup::Configuration::Storage::Local do
   before do

data/spec/configuration/storage/ninefold_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper.rb', __FILE__)
 
 describe Backup::Configuration::Storage::Ninefold do
   before do

data/spec/configuration/storage/rsync_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper.rb', __FILE__)
 
 describe Backup::Configuration::Storage::RSync do
   before do

data/spec/configuration/storage/s3_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper.rb', __FILE__)
 
 describe Backup::Configuration::Storage::S3 do
   before do

data/spec/configuration/storage/scp_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper.rb', __FILE__)
 
 describe Backup::Configuration::Storage::SCP do
   before do

data/spec/configuration/storage/sftp_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper.rb', __FILE__)
 
 describe Backup::Configuration::Storage::SFTP do
   before do

data/spec/configuration/syncer/rsync_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper.rb', __FILE__)
 
 describe Backup::Configuration::Syncer::RSync do
   before do

data/spec/configuration/syncer/s3_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path('../../../spec_helper.rb', __FILE__)
 
 describe Backup::Configuration::Syncer::S3 do
   before do

data/spec/database/base_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path('../../spec_helper.rb', __FILE__)
 
 describe Backup::Database::Base do
 
@@ -27,4 +27,13 @@ describe Backup::Database::Base do
     db.utility(:my_database_util).should == :my_database_util
   end
 
+  describe '#perform!' do
+    it 'should invoke prepare! and log!' do
+      db.expects(:prepare!)
+      db.expects(:log!)
+
+      db.perform!
+    end
+  end
+
 end

data/spec/database/mongodb_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path('../../spec_helper.rb', __FILE__)
 
 describe Backup::Database::MongoDB do
 
@@ -44,11 +44,6 @@ describe Backup::Database::MongoDB do
       db.only_collections.should   == []
       db.additional_options.should == ""
     end
-
-    it 'should ensure the directory is available' do
-      Backup::Database::MongoDB.any_instance.expects(:mkdir).with("#{Backup::TMP_PATH}/myapp/MongoDB")
-      Backup::Database::MongoDB.new {}
-    end
   end
 
   describe '#only_collections' do
@@ -101,6 +96,7 @@ describe Backup::Database::MongoDB do
   describe '#mongodump_string' do
     it 'should return the full mongodump string' do
       db.expects(:utility).with(:mongodump).returns('mongodump')
+      db.prepare!
       db.mongodump.should ==
       "mongodump --db='mydatabase' --username='someuser' --password='secret' " +
       "--host='localhost' --port='123' --ipv6 --query --out='#{ File.join(Backup::TMP_PATH, Backup::TRIGGER, 'MongoDB') }'"
@@ -114,6 +110,11 @@ describe Backup::Database::MongoDB do
       db.stubs(:run)
     end
 
+    it 'should ensure the directory is available' do
+      db.expects(:mkdir).with(File.join(Backup::TMP_PATH, "myapp", "MongoDB"))
+      db.perform!
+    end
+
     it 'should run the mongodump command and dump all collections' do
       db.only_collections = []
       db.expects(:dump!)
@@ -173,8 +174,34 @@ describe Backup::Database::MongoDB do
     end
 
     it do
-      Backup::Logger.expects(:message).with("Backup::Database::MongoDB started dumping and archiving \"mydatabase\".")
+      Backup::Logger.expects(:message).
+          with("Backup::Database::MongoDB started dumping and archiving 'mydatabase'.")
       db.perform!
     end
   end
+
+  describe "#mongo_uri" do
+    before do
+      db.host     = "flame.mongohq.com"
+      db.port     = 12345
+      db.username = "sample_username"
+      db.password = "sample_password"
+      db.ipv6     = nil
+    end
+
+    it "should return URI without database" do
+      db.name = nil
+      db.mongo_uri.should == "flame.mongohq.com:12345 --username='sample_username' --password='sample_password'"
+    end
+
+    it "should return URI without database" do
+      db.name = ""
+      db.mongo_uri.should == "flame.mongohq.com:12345 --username='sample_username' --password='sample_password'"
+    end
+
+    it "should return URI without database" do
+      db.name = "sample_db"
+      db.mongo_uri.should == "flame.mongohq.com:12345/sample_db --username='sample_username' --password='sample_password'"
+    end
+  end
 end

data/spec/database/mysql_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path('../../spec_helper.rb', __FILE__)
 
 describe Backup::Database::MySQL do
 
@@ -48,11 +48,6 @@ describe Backup::Database::MySQL do
       db.only_tables.should == []
       db.additional_options.should == []
     end
-
-    it 'should ensure the directory is available' do
-      Backup::Database::MySQL.any_instance.expects(:mkdir).with("#{Backup::TMP_PATH}/myapp/MySQL")
-      Backup::Database::MySQL.new {}
-    end
   end
 
   describe '#skip_tables' do
@@ -136,13 +131,19 @@ describe Backup::Database::MySQL do
       db.stubs(:run)
     end
 
+    it 'should ensure the directory is available' do
+      db.expects(:mkdir).with(File.join(Backup::TMP_PATH, "myapp", "MySQL"))
+      db.perform!
+    end
+
     it 'should run the mysqldump command and dump it to the specified path' do
       db.expects(:run).with("#{db.mysqldump} > '#{Backup::TMP_PATH}/myapp/MySQL/mydatabase.sql'")
       db.perform!
     end
 
     it do
-      Backup::Logger.expects(:message).with("Backup::Database::MySQL started dumping and archiving \"mydatabase\".")
+      Backup::Logger.expects(:message).
+          with("Backup::Database::MySQL started dumping and archiving 'mydatabase'.")
       db.perform!
     end
   end

data/spec/database/postgresql_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path('../../spec_helper.rb', __FILE__)
 
 describe Backup::Database::PostgreSQL do
 
@@ -64,11 +64,6 @@ describe Backup::Database::PostgreSQL do
       db.username_options.should == ''
       db.password_options.should == ''
     end
-
-    it 'should ensure the directory is available' do
-      Backup::Database::PostgreSQL.any_instance.expects(:mkdir).with("#{Backup::TMP_PATH}/myapp/PostgreSQL")
-      Backup::Database::PostgreSQL.new {}
-    end
   end
 
   describe '#skip_tables' do
@@ -171,13 +166,19 @@ describe Backup::Database::PostgreSQL do
       db.stubs(:run)
     end
 
+    it 'should ensure the directory is available' do
+      db.expects(:mkdir).with(File.join(Backup::TMP_PATH, "myapp", "PostgreSQL"))
+      db.perform!
+    end
+
     it 'should run the pg_dump command and dump it to the specified path' do
       db.expects(:run).with("#{db.pgdump} > '#{Backup::TMP_PATH}/myapp/PostgreSQL/mydatabase.sql'")
       db.perform!
     end
 
     it do
-      Backup::Logger.expects(:message).with("Backup::Database::PostgreSQL started dumping and archiving \"mydatabase\".")
+      Backup::Logger.expects(:message).
+          with("Backup::Database::PostgreSQL started dumping and archiving 'mydatabase'.")
       db.perform!
     end
   end

data/spec/database/redis_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path('../../spec_helper.rb', __FILE__)
 
 describe Backup::Database::Redis do
 
@@ -42,11 +42,6 @@ describe Backup::Database::Redis do
 
       db.additional_options.should == ""
     end
-
-    it 'should ensure the directory is available' do
-      Backup::Database::Redis.any_instance.expects(:mkdir).with("#{Backup::TMP_PATH}/myapp/Redis")
-      Backup::Database::Redis.new {}
-    end
   end
 
   describe '#credential_options' do
@@ -71,18 +66,35 @@ describe Backup::Database::Redis do
   end
 
   describe '#invoke_save!' do
+
     it 'should return the full redis-cli string' do
       db.expects(:utility).with('redis-cli').returns('redis-cli')
-      db.expects(:run).with("redis-cli -a 'secret' -h 'localhost' -p '123' -s '/redis.sock' --query SAVE")
+      db.expects(:run).with("redis-cli -a 'secret' -h 'localhost' " +
+                            "-p '123' -s '/redis.sock' --query SAVE")
+      db.stubs(:raise)
       db.invoke_save!
     end
-  end
+
+    it 'should raise and error if response is not OK' do
+      db.stubs(:utility)
+      db.stubs(:run).returns('BAD')
+      expect { db.invoke_save! }.to raise_error do |err|
+        err.should be_an_instance_of Backup::Errors::Database::Redis::CommandError
+        err.message.should match(/Could not invoke the Redis SAVE command/)
+        err.message.should match(/The #{db.database} file/)
+        err.message.should match(/Redis CLI response: BAD/)
+      end
+    end
+
+  end # describe '#invoke_save!'
 
   describe '#copy!' do
     it do
       File.expects(:exist?).returns(true)
       db.stubs(:utility).returns('cp')
       db.expects(:run).with("cp '#{ File.join('/var/lib/redis/db/mydatabase.rdb') }' '#{ File.join(Backup::TMP_PATH, Backup::TRIGGER, 'Redis', 'mydatabase.rdb') }'")
+      db.expects(:mkdir).with(File.join(Backup::TMP_PATH, "myapp", "Redis"))
+      db.prepare!
       db.copy!
     end
 
@@ -90,8 +102,19 @@ describe Backup::Database::Redis do
       File.expects(:exist?).returns(true)
       db.utility_path = '/usr/local/bin/redis-cli'
       db.expects(:run).with { |v| v =~ %r{^/bin/cp .+} }
+      db.expects(:mkdir).with(File.join(Backup::TMP_PATH, "myapp", "Redis"))
+      db.prepare!
       db.copy!
     end
+
+    it 'should raise an error if the database dump file is not found' do
+      File.expects(:exist?).returns(false)
+      expect { db.copy! }.to raise_error do |err|
+        err.should be_an_instance_of Backup::Errors::Database::Redis::NotFoundError
+        err.message.should match(/Redis database dump not found/)
+        err.message.should match(/File path was #{File.join(db.path, db.database)}/)
+      end
+    end
   end
 
   describe '#perform!' do
@@ -100,6 +123,12 @@ describe Backup::Database::Redis do
       db.stubs(:utility).returns('redis-cli')
       db.stubs(:mkdir)
       db.stubs(:run)
+      db.stubs(:raise)
+    end
+
+    it 'should ensure the directory is available' do
+      db.expects(:mkdir).with(File.join(Backup::TMP_PATH, "myapp", "Redis"))
+      db.perform!
     end
 
     it 'should copy over without persisting (saving) first' do
@@ -119,7 +148,8 @@ describe Backup::Database::Redis do
     end
 
     it do
-      Backup::Logger.expects(:message).with("Backup::Database::Redis started dumping and archiving \"mydatabase\".")
+      Backup::Logger.expects(:message).
+          with("Backup::Database::Redis started dumping and archiving 'mydatabase'.")
 
       db.perform!
     end