backup 3.0.23 → 3.0.24

data/spec/storage/s3_spec.rb

@@ -17,36 +17,69 @@ describe Backup::Storage::S3 do
     end
   end
 
+  it 'should be a subclass of Storage::Base' do
+    Backup::Storage::S3.
+      superclass.should == Backup::Storage::Base
+  end
+
   describe '#initialize' do
-    it 'should set the correct values' do
-      storage.access_key_id.should      == 'my_access_key_id'
-      storage.secret_access_key.should  == 'my_secret_access_key'
-      storage.bucket.should             == 'my-bucket'
-      storage.path.should               == 'backups'
-      storage.region.should             == 'us-east-1'
-
-      storage.storage_id.should be_nil
-      storage.keep.should       == 5
+    after { Backup::Storage::S3.clear_defaults! }
+
+    it 'should load pre-configured defaults through Base' do
+      Backup::Storage::S3.any_instance.expects(:load_defaults!)
+      storage
+    end
+
+    it 'should pass the model reference to Base' do
+      storage.instance_variable_get(:@model).should == model
     end
 
-    it 'should set a storage_id if given' do
-      s3 = Backup::Storage::S3.new(model, 'my storage_id')
-      s3.storage_id.should == 'my storage_id'
+    it 'should pass the storage_id to Base' do
+      storage = Backup::Storage::S3.new(model, 'my_storage_id')
+      storage.storage_id.should == 'my_storage_id'
     end
 
-    context 'when setting configuration defaults' do
-      after { Backup::Configuration::Storage::S3.clear_defaults! }
-
-      it 'should use the configured defaults' do
-        Backup::Configuration::Storage::S3.defaults do |s3|
-          s3.access_key_id      = 'some_access_key_id'
-          s3.secret_access_key  = 'some_secret_access_key'
-          s3.bucket             = 'some-bucket'
-          s3.path               = 'some_path'
-          s3.region             = 'some_region'
-          s3.keep               = 15
+    context 'when no pre-configured defaults have been set' do
+      it 'should use the values given' do
+        storage.access_key_id.should      == 'my_access_key_id'
+        storage.secret_access_key.should  == 'my_secret_access_key'
+        storage.bucket.should             == 'my-bucket'
+        storage.path.should               == 'backups'
+        storage.region.should             == 'us-east-1'
+
+        storage.storage_id.should be_nil
+        storage.keep.should       == 5
+      end
+
+      it 'should use default values if none are given' do
+        storage = Backup::Storage::S3.new(model)
+
+        storage.access_key_id.should      be_nil
+        storage.secret_access_key.should  be_nil
+        storage.bucket.should             be_nil
+        storage.path.should               == 'backups'
+        storage.region.should             be_nil
+
+        storage.storage_id.should be_nil
+        storage.keep.should       be_nil
+      end
+    end # context 'when no pre-configured defaults have been set'
+
+    context 'when pre-configured defaults have been set' do
+      before do
+        Backup::Storage::S3.defaults do |s|
+          s.access_key_id      = 'some_access_key_id'
+          s.secret_access_key  = 'some_secret_access_key'
+          s.bucket             = 'some-bucket'
+          s.path               = 'some_path'
+          s.region             = 'some_region'
+          s.keep               = 15
         end
+      end
+
+      it 'should use pre-configured defaults' do
         storage = Backup::Storage::S3.new(model)
+
         storage.access_key_id.should      == 'some_access_key_id'
         storage.secret_access_key.should  == 'some_secret_access_key'
         storage.bucket.should             == 'some-bucket'
@@ -57,22 +90,14 @@ describe Backup::Storage::S3 do
         storage.keep.should       == 15
       end
 
-      it 'should override the configured defaults' do
-        Backup::Configuration::Storage::S3.defaults do |s3|
-          s3.access_key_id      = 'old_access_key_id'
-          s3.secret_access_key  = 'old_secret_access_key'
-          s3.bucket             = 'old-bucket'
-          s3.path               = 'old_path'
-          s3.region             = 'old_region'
-          s3.keep               = 15
-        end
-        storage = Backup::Storage::S3.new(model) do |s3|
-          s3.access_key_id      = 'new_access_key_id'
-          s3.secret_access_key  = 'new_secret_access_key'
-          s3.bucket             = 'new-bucket'
-          s3.path               = 'new_path'
-          s3.region             = 'new_region'
-          s3.keep               = 10
+      it 'should override pre-configured defaults' do
+        storage = Backup::Storage::S3.new(model) do |s|
+          s.access_key_id      = 'new_access_key_id'
+          s.secret_access_key  = 'new_secret_access_key'
+          s.bucket             = 'new-bucket'
+          s.path               = 'new_path'
+          s.region             = 'new_region'
+          s.keep               = 10
         end
 
         storage.access_key_id.should      == 'new_access_key_id'
@@ -84,8 +109,7 @@ describe Backup::Storage::S3 do
         storage.storage_id.should be_nil
         storage.keep.should       == 10
       end
-    end # context 'when setting configuration defaults'
-
+    end # context 'when pre-configured defaults have been set'
   end # describe '#initialize'
 
   describe '#provider' do

data/spec/storage/scp_spec.rb

@@ -13,21 +13,26 @@ describe Backup::Storage::SCP do
     end
   end
 
+  it 'should be a subclass of Storage::Base' do
+    Backup::Storage::SCP.
+      superclass.should == Backup::Storage::Base
+  end
+
   describe '#initialize' do
-    it 'should set the correct values' do
-      storage.username.should     == 'my_username'
-      storage.password.should     == 'my_password'
-      storage.ip.should           == '123.45.678.90'
-      storage.port.should         == 22
-      storage.path.should         == 'backups'
-
-      storage.storage_id.should be_nil
-      storage.keep.should       == 5
+    after { Backup::Storage::SCP.clear_defaults! }
+
+    it 'should load pre-configured defaults through Base' do
+      Backup::Storage::SCP.any_instance.expects(:load_defaults!)
+      storage
+    end
+
+    it 'should pass the model reference to Base' do
+      storage.instance_variable_get(:@model).should == model
     end
 
-    it 'should set a storage_id if given' do
-      scp = Backup::Storage::SCP.new(model, 'my storage_id')
-      scp.storage_id.should == 'my storage_id'
+    it 'should pass the storage_id to Base' do
+      storage = Backup::Storage::SCP.new(model, 'my_storage_id')
+      storage.storage_id.should == 'my_storage_id'
     end
 
     it 'should remove any preceeding tilde and slash from the path' do
@@ -37,19 +42,47 @@ describe Backup::Storage::SCP do
       storage.path.should == 'my_backups/path'
     end
 
-    context 'when setting configuration defaults' do
-      after { Backup::Configuration::Storage::SCP.clear_defaults! }
-
-      it 'should use the configured defaults' do
-        Backup::Configuration::Storage::SCP.defaults do |scp|
-          scp.username     = 'some_username'
-          scp.password     = 'some_password'
-          scp.ip           = 'some_ip'
-          scp.port         = 'some_port'
-          scp.path         = 'some_path'
-          scp.keep         = 'some_keep'
+    context 'when no pre-configured defaults have been set' do
+      it 'should use the values given' do
+        storage.username.should     == 'my_username'
+        storage.password.should     == 'my_password'
+        storage.ip.should           == '123.45.678.90'
+        storage.port.should         == 22
+        storage.path.should         == 'backups'
+
+        storage.storage_id.should be_nil
+        storage.keep.should       == 5
+      end
+
+      it 'should use default values if none are given' do
+        storage = Backup::Storage::SCP.new(model)
+
+        storage.username.should     be_nil
+        storage.password.should     be_nil
+        storage.ip.should           be_nil
+        storage.port.should         == 22
+        storage.path.should         == 'backups'
+
+        storage.storage_id.should be_nil
+        storage.keep.should       be_nil
+      end
+    end # context 'when no pre-configured defaults have been set'
+
+    context 'when pre-configured defaults have been set' do
+      before do
+        Backup::Storage::SCP.defaults do |s|
+          s.username     = 'some_username'
+          s.password     = 'some_password'
+          s.ip           = 'some_ip'
+          s.port         = 'some_port'
+          s.path         = 'some_path'
+          s.keep         = 'some_keep'
         end
+      end
+
+      it 'should use pre-configured defaults' do
         storage = Backup::Storage::SCP.new(model)
+
         storage.username.should     == 'some_username'
         storage.password.should     == 'some_password'
         storage.ip.should           == 'some_ip'
@@ -60,22 +93,14 @@ describe Backup::Storage::SCP do
         storage.keep.should       == 'some_keep'
       end
 
-      it 'should override the configured defaults' do
-        Backup::Configuration::Storage::SCP.defaults do |scp|
-          scp.username     = 'old_username'
-          scp.password     = 'old_password'
-          scp.ip           = 'old_ip'
-          scp.port         = 'old_port'
-          scp.path         = 'old_path'
-          scp.keep         = 'old_keep'
-        end
-        storage = Backup::Storage::SCP.new(model) do |scp|
-          scp.username     = 'new_username'
-          scp.password     = 'new_password'
-          scp.ip           = 'new_ip'
-          scp.port         = 'new_port'
-          scp.path         = 'new_path'
-          scp.keep         = 'new_keep'
+      it 'should override pre-configured defaults' do
+        storage = Backup::Storage::SCP.new(model) do |s|
+          s.username     = 'new_username'
+          s.password     = 'new_password'
+          s.ip           = 'new_ip'
+          s.port         = 'new_port'
+          s.path         = 'new_path'
+          s.keep         = 'new_keep'
         end
 
         storage.username.should     == 'new_username'
@@ -87,8 +112,7 @@ describe Backup::Storage::SCP do
         storage.storage_id.should be_nil
         storage.keep.should       == 'new_keep'
       end
-    end # context 'when setting configuration defaults'
-
+    end # context 'when pre-configured defaults have been set'
   end # describe '#initialize'
 
   describe '#connection' do

data/spec/storage/sftp_spec.rb

@@ -13,21 +13,26 @@ describe Backup::Storage::SFTP do
     end
   end
 
+  it 'should be a subclass of Storage::Base' do
+    Backup::Storage::SFTP.
+      superclass.should == Backup::Storage::Base
+  end
+
   describe '#initialize' do
-    it 'should set the correct values' do
-      storage.username.should == 'my_username'
-      storage.password.should == 'my_password'
-      storage.ip.should       == '123.45.678.90'
-      storage.port.should     == 22
-      storage.path.should     == 'backups'
-
-      storage.storage_id.should be_nil
-      storage.keep.should       == 5
+    after { Backup::Storage::SFTP.clear_defaults! }
+
+    it 'should load pre-configured defaults through Base' do
+      Backup::Storage::SFTP.any_instance.expects(:load_defaults!)
+      storage
+    end
+
+    it 'should pass the model reference to Base' do
+      storage.instance_variable_get(:@model).should == model
     end
 
-    it 'should set a storage_id if given' do
-      sftp = Backup::Storage::SFTP.new(model, 'my storage_id')
-      sftp.storage_id.should == 'my storage_id'
+    it 'should pass the storage_id to Base' do
+      storage = Backup::Storage::SFTP.new(model, 'my_storage_id')
+      storage.storage_id.should == 'my_storage_id'
     end
 
     it 'should remove any preceeding tilde and slash from the path' do
@@ -37,19 +42,47 @@ describe Backup::Storage::SFTP do
       storage.path.should == 'my_backups/path'
     end
 
-    context 'when setting configuration defaults' do
-      after { Backup::Configuration::Storage::SFTP.clear_defaults! }
-
-      it 'should use the configured defaults' do
-        Backup::Configuration::Storage::SFTP.defaults do |sftp|
-          sftp.username  = 'some_username'
-          sftp.password  = 'some_password'
-          sftp.ip        = 'some_ip'
-          sftp.port      = 'some_port'
-          sftp.path      = 'some_path'
-          sftp.keep      = 'some_keep'
+    context 'when no pre-configured defaults have been set' do
+      it 'should use the values given' do
+        storage.username.should == 'my_username'
+        storage.password.should == 'my_password'
+        storage.ip.should       == '123.45.678.90'
+        storage.port.should     == 22
+        storage.path.should     == 'backups'
+
+        storage.storage_id.should be_nil
+        storage.keep.should       == 5
+      end
+
+      it 'should use default values if none are given' do
+        storage = Backup::Storage::SFTP.new(model)
+
+        storage.username.should be_nil
+        storage.password.should be_nil
+        storage.ip.should       be_nil
+        storage.port.should     == 22
+        storage.path.should     == 'backups'
+
+        storage.storage_id.should be_nil
+        storage.keep.should       be_nil
+      end
+    end # context 'when no pre-configured defaults have been set'
+
+    context 'when pre-configured defaults have been set' do
+      before do
+        Backup::Storage::SFTP.defaults do |s|
+          s.username  = 'some_username'
+          s.password  = 'some_password'
+          s.ip        = 'some_ip'
+          s.port      = 'some_port'
+          s.path      = 'some_path'
+          s.keep      = 'some_keep'
         end
+      end
+
+      it 'should use pre-configured defaults' do
         storage = Backup::Storage::SFTP.new(model)
+
         storage.username.should == 'some_username'
         storage.password.should == 'some_password'
         storage.ip.should       == 'some_ip'
@@ -60,22 +93,14 @@ describe Backup::Storage::SFTP do
         storage.keep.should       == 'some_keep'
       end
 
-      it 'should override the configured defaults' do
-        Backup::Configuration::Storage::SFTP.defaults do |sftp|
-          sftp.username  = 'old_username'
-          sftp.password  = 'old_password'
-          sftp.ip        = 'old_ip'
-          sftp.port      = 'old_port'
-          sftp.path      = 'old_path'
-          sftp.keep      = 'old_keep'
-        end
-        storage = Backup::Storage::SFTP.new(model) do |sftp|
-          sftp.username  = 'new_username'
-          sftp.password  = 'new_password'
-          sftp.ip        = 'new_ip'
-          sftp.port      = 'new_port'
-          sftp.path      = 'new_path'
-          sftp.keep      = 'new_keep'
+      it 'should override pre-configured defaults' do
+        storage = Backup::Storage::SFTP.new(model) do |s|
+          s.username  = 'new_username'
+          s.password  = 'new_password'
+          s.ip        = 'new_ip'
+          s.port      = 'new_port'
+          s.path      = 'new_path'
+          s.keep      = 'new_keep'
         end
 
         storage.username.should == 'new_username'
@@ -87,8 +112,7 @@ describe Backup::Storage::SFTP do
         storage.storage_id.should be_nil
         storage.keep.should       == 'new_keep'
       end
-    end # context 'when setting configuration defaults'
-
+    end # context 'when pre-configured defaults have been set'
   end # describe '#initialize'
 
   describe '#connection' do

data/spec/syncer/base_spec.rb

@@ -3,15 +3,102 @@
 require File.expand_path('../../spec_helper.rb', __FILE__)
 
 describe Backup::Syncer::Base do
-  let(:base)    { Backup::Syncer::Base }
-  let(:syncer)  { base.new }
+  let(:syncer)    { Backup::Syncer::Base.new }
 
   it 'should include CLI::Helpers' do
-    base.included_modules.should include(Backup::CLI::Helpers)
+    Backup::Syncer::Base.
+      include?(Backup::CLI::Helpers).should be_true
   end
 
   it 'should include Configuration::Helpers' do
-    base.included_modules.should include(Backup::Configuration::Helpers)
+    Backup::Syncer::Base.
+      include?(Backup::Configuration::Helpers).should be_true
+  end
+
+  describe '#initialize' do
+    after { Backup::Syncer::Base.clear_defaults! }
+
+    it 'should load pre-configured defaults through Base' do
+      Backup::Syncer::Base.any_instance.expects(:load_defaults!)
+      syncer
+    end
+
+    it 'should establish a new array for @directories' do
+      syncer.directories.should == []
+    end
+
+    context 'when no pre-configured defaults have been set' do
+      it 'should set default values' do
+        syncer.path.should    == 'backups'
+        syncer.mirror.should  == false
+      end
+    end # context 'when no pre-configured defaults have been set'
+
+    context 'when pre-configured defaults have been set' do
+      before do
+        Backup::Syncer::Base.defaults do |s|
+          s.path   = 'some_path'
+          s.mirror = 'some_mirror'
+        end
+      end
+
+      it 'should use pre-configured defaults' do
+        syncer.path.should    == 'some_path'
+        syncer.mirror.should  == 'some_mirror'
+      end
+    end # context 'when pre-configured defaults have been set'
+  end # describe '#initialize'
+
+  describe '#directories' do
+    before do
+      syncer.instance_variable_set(
+        :@directories,  ['/some/directory', '/another/directory']
+      )
+    end
+
+    context 'when no block is given' do
+      it 'should return @directories' do
+        syncer.directories.should ==
+            ['/some/directory', '/another/directory']
+      end
+    end
+
+    context 'when a block is given' do
+      it 'should evalute the block, allowing #add to add directories' do
+        syncer.directories do
+          add '/new/path'
+          add '/another/new/path'
+        end
+        syncer.directories.should == [
+          '/some/directory',
+          '/another/directory',
+          '/new/path',
+          '/another/new/path'
+        ]
+      end
+    end
+  end # describe '#directories'
+
+  describe '#add' do
+    before do
+      syncer.instance_variable_set(
+        :@directories,  ['/some/directory', '/another/directory']
+      )
+    end
+
+    it 'should add the given path to @directories' do
+      syncer.add '/my/path'
+      syncer.directories.should ==
+          ['/some/directory', '/another/directory', '/my/path']
+    end
+
+    # Note: Each Syncer should handle this as needed.
+    # For example, expanding these here would break RSync::Pull
+    it 'should not expand the given paths' do
+      syncer.add 'relative/path'
+      syncer.directories.should ==
+          ['/some/directory', '/another/directory', 'relative/path']
+    end
   end
 
   describe '#syncer_name' do