backup 3.0.23 → 3.0.24

data/spec/storage/base_spec.rb

@@ -5,33 +5,53 @@ require File.expand_path('../../spec_helper.rb', __FILE__)
 describe Backup::Storage::Base do
   let(:model)   { Backup::Model.new(:test_trigger, 'test label') }
   let(:package) { mock }
-  let(:base)    { Backup::Storage::Base.new(model) }
+  let(:storage) { Backup::Storage::Base.new(model) }
+
+  it 'should include Configuration::Helpers' do
+    Backup::Storage::Base.
+      include?(Backup::Configuration::Helpers).should be_true
+  end
 
   describe '#initialize' do
-    it 'should set instance variables' do
-      base.instance_variable_get(:@model).should be(model)
-      base.instance_variable_defined?(:@storage_id).should be_true
-      base.instance_variable_get(:@storage_id).should be_nil
-      base.keep.should be_nil
+    after { Backup::Storage::Base.clear_defaults! }
+
+    it 'should load pre-configured defaults' do
+      Backup::Storage::Base.any_instance.expects(:load_defaults!)
+      storage
     end
 
-    context 'when given a storage_id' do
-      it 'should set @storage_id' do
-        base = Backup::Storage::Base.new(model, 'my storage id')
-        base.instance_variable_get(:@storage_id).should == 'my storage id'
-      end
+    it 'should set a reference to the model' do
+      storage.instance_variable_get(:@model).should == model
+    end
+
+    it 'should set a reference to the storage_id' do
+      storage = Backup::Storage::Base.new(model, 'test_id')
+      storage.storage_id.should == 'test_id'
     end
 
-    context 'when configuration defaults are set' do
-      after { Backup::Configuration::Storage::Base.clear_defaults! }
-      it 'should use the defaults' do
-        Backup::Configuration::Storage::Base.defaults do |base|
-          base.keep = 5
+    it 'should not require the storage_id' do
+      storage.instance_variable_defined?(:@storage_id).should be_true
+      storage.storage_id.should be_nil
+    end
+
+    context 'when no pre-configured defaults have been set' do
+      it 'should set default values' do
+        storage.keep.should be_nil
+        storage.storage_id.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::Base.defaults do |s|
+          s.keep = 5
         end
-        base = Backup::Storage::Base.new(model)
-        base.keep.should be(5)
       end
-    end
+
+      it 'should use pre-configured defaults' do
+        storage.keep.should be(5)
+      end
+    end # context 'when pre-configured defaults have been set'
   end # describe '#initialize'
 
   describe '#perform!' do
@@ -41,31 +61,31 @@ describe Backup::Storage::Base do
 
     it 'should call #transfer!, then #cycle!' do
       s = sequence ''
-      base.expects(:transfer!).in_sequence(s)
-      base.expects(:cycle!).in_sequence(s)
-      base.perform!
-      base.instance_variable_get(:@package).should be(package)
+      storage.expects(:transfer!).in_sequence(s)
+      storage.expects(:cycle!).in_sequence(s)
+      storage.perform!
+      storage.instance_variable_get(:@package).should be(package)
     end
   end
 
   describe '#storage_name' do
     context 'when given a storage_id' do
-      before { base.storage_id = 'storage id' }
+      before { storage.storage_id = 'storage id' }
       it 'should return a log-friendly name with the storage_id' do
-        base.send(:storage_name).should == 'Storage::Base (storage id)'
+        storage.send(:storage_name).should == 'Storage::Base (storage id)'
       end
     end
 
     context 'when not given a storage_id' do
       it 'should return a log-friendly name without a storage_id' do
-        base.send(:storage_name).should == 'Storage::Base'
+        storage.send(:storage_name).should == 'Storage::Base'
       end
     end
   end
 
   describe '#local_path' do
     it 'should return the configured tmp_path' do
-      base.send(:local_path).should == Backup::Config.tmp_path
+      storage.send(:local_path).should == Backup::Config.tmp_path
     end
   end
 
@@ -73,11 +93,11 @@ describe Backup::Storage::Base do
     before do
       package.expects(:trigger).returns('test_trigger')
       package.expects(:time).returns('backup_time')
-      base.expects(:path).returns('base/remote/path')
+      storage.expects(:path).returns('base/remote/path')
     end
 
     it 'should return the remote_path for the given package' do
-      base.send(:remote_path_for, package).should ==
+      storage.send(:remote_path_for, package).should ==
           File.join('base/remote/path', 'test_trigger', 'backup_time')
     end
   end
@@ -98,47 +118,47 @@ describe Backup::Storage::Base do
       given_block.expects(:got).with(
         '2011.12.31.11.00.02.backup.tar.enc-ab', 'backup.tar.enc-ab'
       )
-      base.send(:files_to_transfer_for, package) do |local_file, remote_file|
+      storage.send(:files_to_transfer_for, package) do |local_file, remote_file|
         given_block.got(local_file, remote_file)
       end
     end
 
     it 'should have an alias method called #transferred_files_for' do
-      base.method(:transferred_files_for).should ==
-          base.method(:files_to_transfer_for)
+      storage.method(:transferred_files_for).should ==
+          storage.method(:files_to_transfer_for)
     end
   end
 
   describe '#cycle!' do
     before do
-      base.stubs(:storage_name).returns('Storage Name')
-      base.instance_variable_set(:@package, package)
+      storage.stubs(:storage_name).returns('Storage Name')
+      storage.instance_variable_set(:@package, package)
     end
 
     context 'when keep is set and > 0' do
-      before { base.keep = 1 }
+      before { storage.keep = 1 }
       it 'should cycle' do
         s = sequence ''
         Backup::Logger.expects(:message).in_sequence(s).
             with('Storage Name: Cycling Started...')
         Backup::Storage::Cycler.expects(:cycle!).in_sequence(s).
-            with(base, package)
+            with(storage, package)
         Backup::Logger.expects(:message).in_sequence(s).
             with('Storage Name: Cycling Complete!')
 
-        base.send(:cycle!)
+        storage.send(:cycle!)
       end
     end
 
     context 'when keep is not set or == 0' do
       it 'should return nil when not set' do
-        base.keep = nil
-        base.send(:cycle!).should be_nil
+        storage.keep = nil
+        storage.send(:cycle!).should be_nil
       end
 
       it 'should return nil when == 0' do
-        base.keep = 0
-        base.send(:cycle!).should be_nil
+        storage.keep = 0
+        storage.send(:cycle!).should be_nil
       end
     end
   end

data/spec/storage/cloudfiles_spec.rb

@@ -14,38 +14,72 @@ describe Backup::Storage::CloudFiles do
     end
   end
 
+  it 'should be a subclass of Storage::Base' do
+    Backup::Storage::CloudFiles.
+      superclass.should == Backup::Storage::Base
+  end
+
   describe '#initialize' do
-    it 'should set the correct values' do
-      storage.username.should   == 'my_username'
-      storage.api_key.should    == 'my_api_key'
-      storage.auth_url.should   == 'lon.auth.api.rackspacecloud.com'
-      storage.container.should  == 'my_container'
-      storage.servicenet.should == false
-      storage.path.should       == 'backups'
-
-      storage.storage_id.should be_nil
-      storage.keep.should       == 5
+    after { Backup::Storage::CloudFiles.clear_defaults! }
+
+    it 'should load pre-configured defaults through Base' do
+      Backup::Storage::CloudFiles.any_instance.expects(:load_defaults!)
+      storage
     end
 
-    it 'should set a storage_id if given' do
-      cf = Backup::Storage::CloudFiles.new(model, 'my storage_id')
-      cf.storage_id.should == 'my storage_id'
+    it 'should pass the model reference to Base' do
+      storage.instance_variable_get(:@model).should == model
     end
 
-    context 'when setting configuration defaults' do
-      after { Backup::Configuration::Storage::CloudFiles.clear_defaults! }
-
-      it 'should use the configured defaults' do
-        Backup::Configuration::Storage::CloudFiles.defaults do |cf|
-          cf.username   = 'some_username'
-          cf.api_key    = 'some_api_key'
-          cf.auth_url   = 'some_auth_url'
-          cf.container  = 'some_container'
-          cf.servicenet = true
-          cf.path       = 'some_path'
-          cf.keep       = 15
+    it 'should pass the storage_id to Base' do
+      storage = Backup::Storage::CloudFiles.new(model, 'my_storage_id')
+      storage.storage_id.should == 'my_storage_id'
+    end
+
+    context 'when no pre-configured defaults have been set' do
+      it 'should use the values given' do
+        storage.username.should   == 'my_username'
+        storage.api_key.should    == 'my_api_key'
+        storage.auth_url.should   == 'lon.auth.api.rackspacecloud.com'
+        storage.container.should  == 'my_container'
+        storage.servicenet.should == false
+        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::CloudFiles.new(model)
+
+        storage.username.should   be_nil
+        storage.api_key.should    be_nil
+        storage.auth_url.should   be_nil
+        storage.container.should  be_nil
+        storage.servicenet.should == false
+        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::CloudFiles.defaults do |s|
+          s.username   = 'some_username'
+          s.api_key    = 'some_api_key'
+          s.auth_url   = 'some_auth_url'
+          s.container  = 'some_container'
+          s.servicenet = true
+          s.path       = 'some_path'
+          s.keep       = 15
         end
+      end
+
+      it 'should use pre-configured defaults' do
         storage = Backup::Storage::CloudFiles.new(model)
+
         storage.username.should   == 'some_username'
         storage.api_key.should    == 'some_api_key'
         storage.auth_url.should   == 'some_auth_url'
@@ -57,24 +91,15 @@ describe Backup::Storage::CloudFiles do
         storage.keep.should       == 15
       end
 
-      it 'should override the configured defaults' do
-        Backup::Configuration::Storage::CloudFiles.defaults do |cf|
-          cf.username   = 'old_username'
-          cf.api_key    = 'old_api_key'
-          cf.auth_url   = 'old_auth_url'
-          cf.container  = 'old_container'
-          cf.servicenet = true
-          cf.path       = 'old_path'
-          cf.keep       = 15
-        end
-        storage = Backup::Storage::CloudFiles.new(model) do |cf|
-          cf.username   = 'new_username'
-          cf.api_key    = 'new_api_key'
-          cf.auth_url   = 'new_auth_url'
-          cf.container  = 'new_container'
-          cf.servicenet = false
-          cf.path       = 'new_path'
-          cf.keep       = 10
+      it 'should override pre-configured defaults' do
+        storage = Backup::Storage::CloudFiles.new(model) do |s|
+          s.username   = 'new_username'
+          s.api_key    = 'new_api_key'
+          s.auth_url   = 'new_auth_url'
+          s.container  = 'new_container'
+          s.servicenet = false
+          s.path       = 'new_path'
+          s.keep       = 10
         end
 
         storage.username.should   == 'new_username'
@@ -87,8 +112,7 @@ describe Backup::Storage::CloudFiles 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/dropbox_spec.rb

@@ -12,34 +12,65 @@ describe Backup::Storage::Dropbox do
     end
   end
 
+  it 'should be a subclass of Storage::Base' do
+    Backup::Storage::Dropbox.
+      superclass.should == Backup::Storage::Base
+  end
+
   describe '#initialize' do
-    it 'should set the correct values' do
-      storage.api_key.should      == 'my_api_key'
-      storage.api_secret.should   == 'my_api_secret'
-      storage.access_type.should  == :app_folder
-      storage.path.should         == 'backups'
-
-      storage.storage_id.should be_nil
-      storage.keep.should       == 5
+    after { Backup::Storage::Dropbox.clear_defaults! }
+
+    it 'should load pre-configured defaults through Base' do
+      Backup::Storage::Dropbox.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
-      db = Backup::Storage::Dropbox.new(model, 'my storage_id')
-      db.storage_id.should == 'my storage_id'
+    it 'should pass the storage_id to Base' do
+      storage = Backup::Storage::Dropbox.new(model, 'my_storage_id')
+      storage.storage_id.should == 'my_storage_id'
     end
 
-    context 'when setting configuration defaults' do
-      after { Backup::Configuration::Storage::Dropbox.clear_defaults! }
+    context 'when no pre-configured defaults have been set' do
+      it 'should use the values given' do
+        storage.api_key.should      == 'my_api_key'
+        storage.api_secret.should   == 'my_api_secret'
+        storage.access_type.should  == :app_folder
+        storage.path.should         == 'backups'
 
-      it 'should use the configured defaults' do
-        Backup::Configuration::Storage::Dropbox.defaults do |db|
-          db.api_key      = 'some_api_key'
-          db.api_secret   = 'some_api_secret'
-          db.access_type  = 'some_access_type'
-          db.path         = 'some_path'
-          db.keep         = 15
+        storage.storage_id.should be_nil
+        storage.keep.should       == 5
+      end
+
+      it 'should use default values if none are given' do
+        storage = Backup::Storage::Dropbox.new(model)
+        storage.api_key.should      be_nil
+        storage.api_secret.should   be_nil
+        storage.access_type.should  == :app_folder
+        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::Dropbox.defaults do |s|
+          s.api_key      = 'some_api_key'
+          s.api_secret   = 'some_api_secret'
+          s.access_type  = 'some_access_type'
+          s.path         = 'some_path'
+          s.keep         = 15
         end
+      end
+
+      it 'should use pre-configured defaults' do
         storage = Backup::Storage::Dropbox.new(model)
+
         storage.api_key.should      == 'some_api_key'
         storage.api_secret.should   == 'some_api_secret'
         storage.access_type.should  == 'some_access_type'
@@ -49,20 +80,13 @@ describe Backup::Storage::Dropbox do
         storage.keep.should       == 15
       end
 
-      it 'should override the configured defaults' do
-        Backup::Configuration::Storage::Dropbox.defaults do |db|
-          db.api_key      = 'old_api_key'
-          db.api_secret   = 'old_api_secret'
-          db.access_type  = 'old_access_type'
-          db.path         = 'old_path'
-          db.keep         = 15
-        end
-        storage = Backup::Storage::Dropbox.new(model) do |db|
-          db.api_key      = 'new_api_key'
-          db.api_secret   = 'new_api_secret'
-          db.access_type  = 'new_access_type'
-          db.path         = 'new_path'
-          db.keep         = 10
+      it 'should override pre-configured defaults' do
+        storage = Backup::Storage::Dropbox.new(model) do |s|
+          s.api_key      = 'new_api_key'
+          s.api_secret   = 'new_api_secret'
+          s.access_type  = 'new_access_type'
+          s.path         = 'new_path'
+          s.keep         = 10
         end
 
         storage.api_key.should      == 'new_api_key'
@@ -73,8 +97,7 @@ describe Backup::Storage::Dropbox 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 '#connection' do
@@ -367,4 +390,103 @@ describe Backup::Storage::Dropbox do
     end
   end
 
+  describe 'deprecations' do
+    after do
+      Backup::Storage::Dropbox.clear_defaults!
+    end
+
+    describe '#email' do
+      context 'when set directly' do
+        it 'should issue a deprecation warning' do
+          Backup::Logger.expects(:warn).with do |err|
+            err.message.should == "ConfigurationError: [DEPRECATION WARNING]\n" +
+                "  Backup::Storage::Dropbox.email has been deprecated " +
+                  "as of backup v.3.0.17"
+          end
+
+          Backup::Storage::Dropbox.new(model) do |storage|
+            storage.email = 'foo'
+          end
+        end
+      end
+
+      context 'when set as a default' do
+        it 'should issue a deprecation warning' do
+          Backup::Logger.expects(:warn).with do |err|
+            err.message.should == "ConfigurationError: [DEPRECATION WARNING]\n" +
+                "  Backup::Storage::Dropbox.email has been deprecated " +
+                  "as of backup v.3.0.17"
+          end
+
+          Backup::Storage::Dropbox.defaults do |storage|
+            storage.email = 'foo'
+          end
+          Backup::Storage::Dropbox.new(model)
+        end
+      end
+    end
+
+    describe '#password' do
+      context 'when set directly' do
+        it 'should issue a deprecation warning' do
+          Backup::Logger.expects(:warn).with do |err|
+            err.message.should == "ConfigurationError: [DEPRECATION WARNING]\n" +
+                "  Backup::Storage::Dropbox.password has been deprecated " +
+                  "as of backup v.3.0.17"
+          end
+
+          Backup::Storage::Dropbox.new(model) do |storage|
+            storage.password = 'foo'
+          end
+        end
+      end
+
+      context 'when set as a default' do
+        it 'should issue a deprecation warning' do
+          Backup::Logger.expects(:warn).with do |err|
+            err.message.should == "ConfigurationError: [DEPRECATION WARNING]\n" +
+                "  Backup::Storage::Dropbox.password has been deprecated " +
+                  "as of backup v.3.0.17"
+          end
+
+          Backup::Storage::Dropbox.defaults do |storage|
+            storage.password = 'foo'
+          end
+          Backup::Storage::Dropbox.new(model)
+        end
+      end
+    end
+
+    describe '#timeout' do
+      context 'when set directly' do
+        it 'should issue a deprecation warning' do
+          Backup::Logger.expects(:warn).with do |err|
+            err.message.should == "ConfigurationError: [DEPRECATION WARNING]\n" +
+                "  Backup::Storage::Dropbox.timeout has been deprecated " +
+                  "as of backup v.3.0.21"
+          end
+
+          Backup::Storage::Dropbox.new(model) do |storage|
+            storage.timeout = 'foo'
+          end
+        end
+      end
+
+      context 'when set as a default' do
+        it 'should issue a deprecation warning' do
+          Backup::Logger.expects(:warn).with do |err|
+            err.message.should == "ConfigurationError: [DEPRECATION WARNING]\n" +
+                "  Backup::Storage::Dropbox.timeout has been deprecated " +
+                  "as of backup v.3.0.21"
+          end
+
+          Backup::Storage::Dropbox.defaults do |storage|
+            storage.timeout = 'foo'
+          end
+          Backup::Storage::Dropbox.new(model)
+        end
+      end
+    end
+  end
+
 end