backup 3.0.16 → 3.0.18

data/spec/database/redis_spec.rb

@@ -6,7 +6,6 @@ describe Backup::Database::Redis do
 
   before do
     Backup::Database::Redis.any_instance.stubs(:load_defaults!)
-    Backup::Logger.stubs(:error)
   end
 
   let(:db) do
@@ -51,7 +50,7 @@ describe Backup::Database::Redis do
   end
 
   describe '#credential_options' do
-    it 'should return the mongo syntax for the credential options' do
+    it 'should return the redis-cli syntax for the credential options' do
       db.credential_options.should == "-a 'secret'"
     end
   end
@@ -72,7 +71,7 @@ describe Backup::Database::Redis do
   end
 
   describe '#invoke_save!' do
-    it 'should return the full mongodump string' 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.invoke_save!
@@ -86,11 +85,17 @@ describe Backup::Database::Redis do
       db.expects(:run).with("cp '#{ File.join('/var/lib/redis/db/mydatabase.rdb') }' '#{ File.join(Backup::TMP_PATH, Backup::TRIGGER, 'Redis', 'mydatabase.rdb') }'")
       db.copy!
     end
+
+    it 'should find the cp utility when utility_path is set' do
+      File.expects(:exist?).returns(true)
+      db.utility_path = '/usr/local/bin/redis-cli'
+      db.expects(:run).with { |v| v =~ %r{^/bin/cp .+} }
+      db.copy!
+    end
   end
 
   describe '#perform!' do
     before do
-      Backup::Logger.stubs(:message)
       File.stubs(:exist?).returns(true)
       db.stubs(:utility).returns('redis-cli')
       db.stubs(:mkdir)

data/spec/encryptor/gpg_spec.rb

@@ -45,7 +45,7 @@ WNa3g2n0nokA7Zr5FA4GXoEaYivfbvGiyNpd6P4okH+//G2p+3FIryu5xz+89D1b
 
   describe '#write_tmp_file!' do
     it do
-      tmp_file = mock('TmpFile')
+      tmp_file = Tempfile.new("foo")
       Tempfile.expects(:new).returns(tmp_file)
       tmp_file.expects(:write).with('secret')
       tmp_file.expects(:close)

data/spec/encryptor/open_ssl_spec.rb

@@ -54,7 +54,6 @@ describe Backup::Encryptor::OpenSSL do
     let(:encryptor) { Backup::Encryptor::OpenSSL.new }
     before do
       Backup::Model.extension = 'tar'
-      Backup::Logger.stubs(:message)
       [:utility, :run, :rm].each { |method| encryptor.stubs(method) }
     end
 

data/spec/logger_spec.rb

@@ -5,49 +5,57 @@ require 'timecop'
 
 describe Backup::Logger do
   before do
-    Timecop.freeze( Time.now )
+    Timecop.freeze(Time.now)
+
+    [:message, :error, :warn, :normal, :silent].each do |message_type|
+      Backup::Logger.unstub(message_type)
+    end
   end
 
-  context 'when logging regular messages' do
-    it do
-      Backup::Logger.expects(:puts).with("[#{ Time.now.strftime("%Y/%m/%d %H:%M:%S") }][\e[32mmessage\e[0m] This has been logged.")
+  describe 'logging messages to STDOUT and a log file' do
+    before do
       File.expects(:open).with(File.join(Backup::LOG_PATH, 'backup.log'), 'a')
+    end
 
-      Backup::Logger.message "This has been logged."
+    context 'when logging regular messages' do
+      it do
+        Backup::Logger.expects(:puts).with("[#{ Time.now.strftime("%Y/%m/%d %H:%M:%S") }][\e[32mmessage\e[0m] This has been logged.")
+
+        Backup::Logger.message "This has been logged."
+      end
     end
-  end
 
-  context 'when logging error messages' do
-    it do
-      Backup::Logger.expects(:puts).with("[#{ Time.now.strftime("%Y/%m/%d %H:%M:%S") }][\e[31merror\e[0m] This has been logged.")
-      File.expects(:open).with(File.join(Backup::LOG_PATH, 'backup.log'), 'a')
+    context 'when logging error messages' do
+      it do
+        Backup::Logger.expects(:puts).with("[#{ Time.now.strftime("%Y/%m/%d %H:%M:%S") }][\e[31merror\e[0m] This has been logged.")
 
-      Backup::Logger.error "This has been logged."
+        Backup::Logger.error "This has been logged."
+      end
     end
-  end
 
-  context 'when logging warn messages' do
-    it do
-      Backup::Logger.expects(:puts).with("[#{ Time.now.strftime("%Y/%m/%d %H:%M:%S") }][\e[33mwarning\e[0m] This has been logged.")
-      File.expects(:open).with(File.join(Backup::LOG_PATH, 'backup.log'), 'a')
+    context 'when logging warn messages' do
+      it do
+        Backup::Logger.expects(:puts).with("[#{ Time.now.strftime("%Y/%m/%d %H:%M:%S") }][\e[33mwarning\e[0m] This has been logged.")
 
-      Backup::Logger.warn "This has been logged."
+        Backup::Logger.warn "This has been logged."
+      end
     end
-  end
 
-  context 'when logging silent messages' do
-    it do
-      Backup::Logger.expects(:puts).never
-      File.expects(:open).with(File.join(Backup::LOG_PATH, 'backup.log'), 'a')
+    context 'when logging silent messages' do
+      it do
+        Backup::Logger.expects(:puts).never
 
-      Backup::Logger.silent "This has been logged."
+        Backup::Logger.silent "This has been logged."
+      end
     end
   end
 
-  context 'when quieted' do
+  describe 'logging messages to log file and not STDOUT' do
     it do
       Backup::Logger.send(:const_set, :QUIET, true)
+
       Backup::Logger.expects(:puts).never
+      File.expects(:open).times(4).with(File.join(Backup::LOG_PATH, 'backup.log'), 'a')
 
       Backup::Logger.message "This has been logged."
       Backup::Logger.error   "This has been logged."

data/spec/model_spec.rb

@@ -5,30 +5,32 @@ require File.dirname(__FILE__) + '/spec_helper'
 describe Backup::Model do
 
   before do
+    # stub out the creation of an archive, for this spec's purpose
+    Backup::Archive.stubs(:new).returns(true)
+
+    # create mockup classes for testing the behavior of Backup::Model
     class Backup::Database::TestDatabase
       def initialize(&block); end
     end
     class Backup::Storage::TestStorage
       def initialize(&block); end
     end
-    class Backup::Archive
-      def initialize(name, &block); end
-    end
-    class Backup::Compressor::Gzip
+    class Backup::Compressor::TestGzip
       def initialize(&block); end
     end
-    class Backup::Compressor::SevenZip
+    class Backup::Compressor::TestSevenZip
       def initialize(&block); end
     end
-    class Backup::Encryptor::OpenSSL
+    class Backup::Encryptor::TestOpenSSL
       def initialize(&block); end
     end
-    class Backup::Encryptor::GPG
+    class Backup::Encryptor::TestGPG
       def initialize(&block); end
     end
     class Backup::Notifier::TestMail
       def initialize(&block); end
     end
+
   end
 
   let(:model) { Backup::Model.new('mysql-s3', 'MySQL S3 Backup for MyApp') {} }
@@ -143,7 +145,7 @@ describe Backup::Model do
   describe '#compress_with' do
     it 'should add a compressor to the array of compressors to use' do
       model = Backup::Model.new('mysql-s3', 'MySQL S3 Backup for MyApp') do
-        compress_with('Gzip')
+        compress_with('TestGzip')
       end
 
       model.compressors.count.should == 1
@@ -151,8 +153,8 @@ describe Backup::Model do
 
     it 'should add a compressor to the array of compressors to use' do
       model = Backup::Model.new('mysql-s3', 'MySQL S3 Backup for MyApp') do
-        compress_with('Gzip')
-        compress_with('SevenZip')
+        compress_with('TestGzip')
+        compress_with('TestSevenZip')
       end
 
       model.compressors.count.should == 2
@@ -162,7 +164,7 @@ describe Backup::Model do
   describe '#encrypt_with' do
     it 'should add a encryptor to the array of encryptors to use' do
       model = Backup::Model.new('mysql-s3', 'MySQL S3 Backup for MyApp') do
-        encrypt_with('OpenSSL')
+        encrypt_with('TestOpenSSL')
       end
 
       model.encryptors.count.should == 1
@@ -170,8 +172,8 @@ describe Backup::Model do
 
     it 'should add a encryptor to the array of encryptors to use' do
       model = Backup::Model.new('mysql-s3', 'MySQL S3 Backup for MyApp') do
-        encrypt_with('OpenSSL')
-        encrypt_with('GPG')
+        encrypt_with('TestOpenSSL')
+        encrypt_with('TestGPG')
       end
 
       model.encryptors.count.should == 2
@@ -200,7 +202,6 @@ describe Backup::Model do
   describe '#package!' do
     before do
       [:utility, :run].each { |method| model.stubs(method) }
-      Backup::Logger.stubs(:message)
     end
 
     it 'should package the folder' do
@@ -218,7 +219,6 @@ describe Backup::Model do
   describe '#clean!' do
     before do
       [:utility, :run, :rm].each { |method| model.stubs(method) }
-      Backup::Logger.stubs(:message)
     end
 
     it 'should remove the temporary files and folders that were created' do

data/spec/spec_helper.rb

@@ -8,10 +8,14 @@ require File.expand_path( '../../lib/backup', __FILE__ )
 # Use Mocha to mock with RSpec
 RSpec.configure do |config|
   config.mock_with :mocha
+  config.before(:each) do
+    FileUtils.stubs(:mkdir_p)
+    [:message, :error, :warn, :normal, :silent].each do |message_type|
+      Backup::Logger.stubs(message_type)
+    end
+  end
 end
 
-# FIXTURES_PATH = File.join( File.dirname(__FILE__), 'fixtures' )
-
 Backup.send(:remove_const, :TRIGGER) if defined? Backup::TRIGGER
 Backup.send(:remove_const, :TIME) if defined? Backup::TIME
 
@@ -20,6 +24,6 @@ module Backup
   TIME = Time.now.strftime("%Y.%m.%d.%H.%M.%S")
 end
 
-unless @put_ruby_version
-  puts @put_ruby_version = "\n\nRuby version: #{ENV['rvm_ruby_string']}\n\n"
+unless @_put_ruby_version
+  puts @_put_ruby_version = "\n\nRuby version: #{ENV['rvm_ruby_string']}\n\n"
 end

data/spec/storage/base_spec.rb

@@ -5,10 +5,6 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe Backup::Storage::Base do
   let(:base) { Backup::Storage::Base.new }
 
-  before do
-    Backup::Logger.stubs(:message)
-  end
-
   it do
     storage_object = mock
     Backup::Storage::Object.expects(:new).with('Base').returns(storage_object)

data/spec/storage/cloudfiles_spec.rb

@@ -65,7 +65,6 @@ describe Backup::Storage::CloudFiles do
     let(:connection) { mock('Fog::Storage') }
     before do
       Fog::Storage.stubs(:new).returns(connection)
-      Backup::Logger.stubs(:message)
     end
 
     it 'should transfer the provided file to the container' do

data/spec/storage/dropbox_spec.rb

@@ -6,8 +6,6 @@ describe Backup::Storage::Dropbox do
 
   let(:db) do
     Backup::Storage::Dropbox.new do |db|
-      db.email       = 'my@email.com'
-      db.password    = 'my_password'
       db.api_key     = 'my_api_key'
       db.api_secret  = 'my_secret'
       db.keep        = 20
@@ -22,11 +20,10 @@ describe Backup::Storage::Dropbox do
 
   before do
     Backup::Configuration::Storage::Dropbox.clear_defaults!
+    STDIN.stubs(:gets)
   end
 
   it 'should have defined the configuration properly' do
-    db.email.should       == 'my@email.com'
-    db.password.should    == 'my_password'
     db.api_key.should     == 'my_api_key'
     db.api_secret.should  == 'my_secret'
     db.path.should        == 'backups'
@@ -57,21 +54,54 @@ describe Backup::Storage::Dropbox do
   end
 
   describe '#connection' do
-    it do
-      session = mock("Dropbox::Session")
-      Dropbox::Session.expects(:new).with('my_api_key', 'my_secret').returns(session)
-      session.expects(:mode=).with(:dropbox)
-      session.expects(:authorizing_user=).with('my@email.com')
-      session.expects(:authorizing_password=).with('my_password')
-      session.expects(:authorize!)
-
-      db.send(:connection)
+    context "when the session cache has not yet been written" do
+      before do
+        db.stubs(:gets)
+      end
+
+      it do
+        session = mock("Dropbox::Session")
+        Dropbox::Session.expects(:new).with('my_api_key', 'my_secret').returns(session)
+        session.expects(:mode=).with(:dropbox)
+        session.expects(:authorize)
+        session.expects(:authorize_url)
+        db.expects(:cache_exists?).returns(false)
+        db.expects(:write_cache!).with(session)
+        db.send(:connection)
+      end
+    end
+
+    context "when the session cache has already been written" do
+      before do
+        db.stubs(:gets)
+      end
+
+      it "should load the session from cache, instead of creating a new one" do
+        db.expects(:cache_exists?).returns(true)
+        File.expects(:read).with("#{ENV['HOME']}/Backup/.cache/my_api_keymy_secret").returns("foo")
+        session = mock("Dropbox::Session")
+        session.expects(:authorized?).returns(true)
+        Dropbox::Session.expects(:deserialize).with("foo").returns(session)
+
+        db.expects(:create_write_and_return_new_session!).never
+        db.send(:connection)
+      end
+
+      it "should load it from cache, but if it's invalid/corrupt, the create a session anyway" do
+        db.expects(:cache_exists?).returns(true)
+        File.expects(:read).with("#{ENV['HOME']}/Backup/.cache/my_api_keymy_secret").returns("foo")
+        session = mock("Dropbox::Session")
+        session.expects(:authorized?).returns(false)
+        Dropbox::Session.expects(:deserialize).with("foo").returns(session)
+
+        db.expects(:create_write_and_return_new_session!)
+        db.send(:connection)
+      end
     end
   end
 
   describe '#transfer!' do
     before do
-      Backup::Logger.stubs(:message)
       connection.stubs(:upload)
       connection.stubs(:delete)
     end

data/spec/storage/ftp_spec.rb

@@ -6,12 +6,13 @@ describe Backup::Storage::FTP do
 
   let(:ftp) do
     Backup::Storage::FTP.new do |ftp|
-      ftp.username  = 'my_username'
-      ftp.password  = 'my_password'
-      ftp.ip        = '123.45.678.90'
-      ftp.port      = 21
-      ftp.path      = '~/backups/'
-      ftp.keep      = 20
+      ftp.username     = 'my_username'
+      ftp.password     = 'my_password'
+      ftp.ip           = '123.45.678.90'
+      ftp.port         = 21
+      ftp.path         = '~/backups/'
+      ftp.keep         = 20
+      ftp.passive_mode = false
     end
   end
 
@@ -20,12 +21,13 @@ describe Backup::Storage::FTP do
   end
 
   it 'should have defined the configuration properly' do
-    ftp.username.should == 'my_username'
-    ftp.password.should == 'my_password'
-    ftp.ip.should       == '123.45.678.90'
-    ftp.port.should     == 21
-    ftp.path.should     == 'backups/'
-    ftp.keep.should     == 20
+    ftp.username.should     == 'my_username'
+    ftp.password.should     == 'my_password'
+    ftp.ip.should           == '123.45.678.90'
+    ftp.port.should         == 21
+    ftp.path.should         == 'backups/'
+    ftp.keep.should         == 20
+    ftp.passive_mode.should == false
   end
 
   it 'should use the defaults if a particular attribute has not been defined' do
@@ -48,11 +50,14 @@ describe Backup::Storage::FTP do
 
   it 'should have its own defaults' do
     ftp = Backup::Storage::FTP.new
-    ftp.port.should == 21
-    ftp.path.should == 'backups'
+    ftp.port.should         == 21
+    ftp.path.should         == 'backups'
+    ftp.passive_mode.should == false
   end
 
   describe '#connection' do
+    let(:connection) { mock('Fog::Storage') }
+
     it 'should establish a connection to the remote server using the provided ip address and credentials' do
       Net::FTP.expects(:new).with('123.45.678.90', 'my_username', 'my_password')
       ftp.send(:connection)
@@ -64,6 +69,13 @@ describe Backup::Storage::FTP do
       ftp.send(:connection)
       Net::FTP::FTP_PORT.should == 40
     end
+
+    it 'configures net/ftp to use passive mode if passive_mode set to true' do
+      ftp.passive_mode = true
+      Net::FTP.stubs(:new).returns(connection)
+      connection.expects(:passive=).with(true)
+      ftp.send(:connection)
+    end
   end
 
   describe '#transfer!' do
@@ -72,7 +84,6 @@ describe Backup::Storage::FTP do
     before do
       Net::FTP.stubs(:new).returns(connection)
       ftp.stubs(:create_remote_directories!)
-      Backup::Logger.stubs(:message)
     end
 
     it 'should transfer the provided file to the path' do