heirloom 0.12.1 → 0.12.2

data/spec/catalog/add_spec.rb

@@ -5,24 +5,24 @@ describe Heirloom::Catalog::Add do
   before do
     @regions       = ['us-west-1', 'us-west-2']
     @bucket_prefix = 'bucket_prefix'
-    @logger_stub   = stub 'logger', :info => true
-    @config_stub   = stub 'config', :logger => @logger_stub
-    @verify_stub   = stub 'verify'
+    @logger_double = double 'logger', :info => true
+    @config_double = double 'config', :logger => @logger_double
+    @verify_double = double 'verify'
 
-    @add = Heirloom::Catalog::Add.new :config => @config_stub,
+    @add = Heirloom::Catalog::Add.new :config => @config_double,
                                       :name   => 'new_archive'
     Heirloom::Catalog::Verify.should_receive(:new).
-                              with(:config => @config_stub).
-                              and_return @verify_stub
+                              with(:config => @config_double).
+                              and_return @verify_double
   end
 
   it "should call sdb to add the entry to the catalog" do
-    @sdb_mock = mock 'sdb'
-    @verify_stub.stub :entry_exists_in_catalog? => false
+    @sdb_double = double 'sdb'
+    @verify_double.stub :entry_exists_in_catalog? => false
     Heirloom::AWS::SimpleDB.should_receive(:new).
-                            with(:config => @config_stub).
-                            and_return @sdb_mock
-    @sdb_mock.should_receive(:put_attributes).
+                            with(:config => @config_double).
+                            and_return @sdb_double
+    @sdb_double.should_receive(:put_attributes).
               with 'heirloom',
                    'heirloom_new_archive',
                    "regions" => @regions, "bucket_prefix" => @bucket_prefix
@@ -31,7 +31,7 @@ describe Heirloom::Catalog::Add do
   end
 
   it "should not add the entry to the catalog if it's already there" do
-    @verify_stub.stub :entry_exists_in_catalog? => true
+    @verify_double.stub :entry_exists_in_catalog? => true
     Heirloom::AWS::SimpleDB.should_receive(:new).never
     @add.add_to_catalog :regions       => @regions,
                         :bucket_prefix => @bucket_prefix

data/spec/catalog/delete_spec.rb

@@ -3,30 +3,30 @@ require 'spec_helper'
 describe Heirloom::Catalog::Delete do
 
   before do
-    @logger_stub = stub 'logger', :info => true
-    @config_stub = stub 'config', :logger => @logger_stub
-    @verify_stub = stub 'verify'
+    @logger_double = double 'logger', :info => true
+    @config_double = double 'config', :logger => @logger_double
+    @verify_double = double 'verify'
     Heirloom::Catalog::Verify.should_receive(:new).
-                              with(:config => @config_stub).
-                              and_return @verify_stub
-    @delete = Heirloom::Catalog::Delete.new :config => @config_stub,
+                              with(:config => @config_double).
+                              and_return @verify_double
+    @delete = Heirloom::Catalog::Delete.new :config => @config_double,
                                             :name   => 'old_archive'
   end
 
   it "should delete the entry from the catalog" do
-    @verify_stub.stub :catalog_domain_exists? => true
-    @sdb_mock = mock 'sdb'
+    @verify_double.stub :catalog_domain_exists? => true
+    @sdb_double = double 'sdb'
     Heirloom::AWS::SimpleDB.should_receive(:new).
-                            with(:config => @config_stub).
-                            and_return @sdb_mock
-    @sdb_mock.should_receive(:delete).
-              with('heirloom', 'heirloom_old_archive').
-              and_return true
+                            with(:config => @config_double).
+                            and_return @sdb_double
+    @sdb_double.should_receive(:delete).
+                with('heirloom', 'heirloom_old_archive').
+                and_return true
     @delete.delete_from_catalog.should be_true
   end
 
   it "should return false if an entry does not exist in catalog" do
-    @verify_stub.stub :catalog_domain_exists? => false
+    @verify_double.stub :catalog_domain_exists? => false
     @delete.delete_from_catalog.should be_false
   end
 

data/spec/catalog/list_spec.rb

@@ -3,18 +3,18 @@ require 'spec_helper'
 describe Heirloom::Catalog::List do
 
   before do
-    @config_stub = stub 'config'
-    @sdb_mock = mock 'sdb'
+    @config_double = double 'config'
+    @sdb_double = double 'sdb'
     Heirloom::AWS::SimpleDB.should_receive(:new).
-                            with(:config => @config_stub).
-                            and_return @sdb_mock
-    @list = Heirloom::Catalog::List.new :config => @config_stub
+                            with(:config => @config_double).
+                            and_return @sdb_double
+    @list = Heirloom::Catalog::List.new :config => @config_double
   end
 
   it "should list all heirlooms in the catalog" do
-    @sdb_mock.should_receive(:select).
-              with("SELECT * FROM heirloom").
-              and_return 'result'
+    @sdb_double.should_receive(:select).
+                with("SELECT * FROM heirloom").
+                and_return 'result'
     @list.all.should == 'result'
   end
 

data/spec/catalog/setup_spec.rb

@@ -3,24 +3,24 @@ require 'spec_helper'
 describe Heirloom::Catalog::Setup do
 
   before do
-    @logger_stub = stub 'logger', :info => true
-    @config_stub = stub 'config', :logger          => @logger_stub,
+    @logger_double = double 'logger', :info => true
+    @config_double = double 'config', :logger          => @logger_double,
                                   :metadata_region => 'us-west-1'
-    @verify_stub = stub 'verify', :catalog_domain_exists? => false
+    @verify_double = double 'verify', :catalog_domain_exists? => false
     Heirloom::Catalog::Verify.should_receive(:new).
-                              with(:config => @config_stub).
-                              and_return @verify_stub
-    @setup = Heirloom::Catalog::Setup.new :config => @config_stub,
+                              with(:config => @config_double).
+                              and_return @verify_double
+    @setup = Heirloom::Catalog::Setup.new :config => @config_double,
                                           :name   => 'new_archive'
   end
 
   it "should call sdb to create the catalog domain" do
-    @sdb_mock = mock 'sdb'
+    @sdb_double = double 'sdb'
     Heirloom::AWS::SimpleDB.should_receive(:new).
-                            with(:config => @config_stub).
-                            and_return @sdb_mock
-    @sdb_mock.should_receive(:create_domain).
-              with 'heirloom'
+                            with(:config => @config_double).
+                            and_return @sdb_double
+    @sdb_double.should_receive(:create_domain).
+                with 'heirloom'
     @setup.create_catalog_domain
   end
 

data/spec/catalog/show_spec.rb

@@ -3,31 +3,31 @@ require 'spec_helper'
 describe Heirloom::Catalog::Show do
 
   before do
-    @config_stub = stub 'config'
-    @sdb_mock = mock 'sdb'
+    @config_double = double 'config'
+    @sdb_double = double 'sdb'
     Heirloom::AWS::SimpleDB.should_receive(:new).
-                            with(:config => @config_stub).
-                            and_return @sdb_mock
-    @show = Heirloom::Catalog::Show.new :config => @config_stub,
+                            with(:config => @config_double).
+                            and_return @sdb_double
+    @show = Heirloom::Catalog::Show.new :config => @config_double,
                                         :name   => 'a_archive'
   end
 
   it "should return the bucket_prefix" do
-    result = { 'heirloom_a_archive' => 
-               { 'bucket_prefix' => [ 'bp' ] } 
+    result = { 'heirloom_a_archive' =>
+               { 'bucket_prefix' => [ 'bp' ] }
              }
-    @sdb_mock.should_receive(:select).
-              with("select bucket_prefix from heirloom where itemName() = 'heirloom_a_archive'").
-              and_return result
+    @sdb_double.should_receive(:select).
+                with("select bucket_prefix from heirloom where itemName() = 'heirloom_a_archive'").
+                and_return result
     @show.bucket_prefix.should == 'bp'
   end
 
   it "should return the regions" do
     regions = ['us-west-1', 'us-west-2']
     result = { 'heirloom_a_archive' => { 'regions' => @regions } }
-    @sdb_mock.should_receive(:select).
-              with("select regions from heirloom where itemName() = 'heirloom_a_archive'").
-              and_return result
+    @sdb_double.should_receive(:select).
+                with("select regions from heirloom where itemName() = 'heirloom_a_archive'").
+                and_return result
     @show.regions.should == @regions
   end
 

data/spec/catalog/verify_spec.rb

@@ -3,43 +3,43 @@ require 'spec_helper'
 describe Heirloom::Catalog::Verify do
 
   before do
-    @sdb_mock    = mock 'sdb'
-    @logger_stub = stub 'logger', :info => true,
-                                  :debug => true
-    @config_stub = stub 'config', :logger          => @logger_stub,
-                                  :metadata_region => 'us-west-1'
+    @sdb_double    = double 'sdb'
+    @logger_double = double 'logger', :info => true,
+                                      :debug => true
+    @config_double = double 'config', :logger          => @logger_double,
+                                      :metadata_region => 'us-west-1'
     Heirloom::AWS::SimpleDB.should_receive(:new).
-                            with(:config => @config_stub).
-                            and_return @sdb_mock
-    @verify = Heirloom::Catalog::Verify.new :config => @config_stub,
+                            with(:config => @config_double).
+                            and_return @sdb_double
+    @verify = Heirloom::Catalog::Verify.new :config => @config_double,
                                             :name   => 'a_archive'
 
   end
 
   context "testing catalog_domain_exists" do
     it "should return true if heirloom domain exists" do
-      @sdb_mock.should_receive(:domain_exists?).
-                with('heirloom').and_return true
+      @sdb_double.should_receive(:domain_exists?).
+                  with('heirloom').and_return true
       @verify.catalog_domain_exists?.should be_true
     end
 
     it "should return false if heirloom domain does not exists" do
-      @sdb_mock.should_receive(:domain_exists?).
-                with('heirloom').and_return false
+      @sdb_double.should_receive(:domain_exists?).
+                  with('heirloom').and_return false
       @verify.catalog_domain_exists?.should be_false
     end
   end
 
   context "testing entry_exists_in_catalog?" do
     it "should return true if an entry exists in catalog" do
-      @sdb_mock.should_receive(:item_count).
-                with('heirloom', 'heirloom_a_archive').and_return 1
+      @sdb_double.should_receive(:item_count).
+                  with('heirloom', 'heirloom_a_archive').and_return 1
       @verify.entry_exists_in_catalog?('a_archive').should be_true
     end
 
     it "should return false if an entry does not exist in catalog" do
-      @sdb_mock.should_receive(:item_count).
-                with('heirloom', 'heirloom_a_archive').and_return 0
+      @sdb_double.should_receive(:item_count).
+                  with('heirloom', 'heirloom_a_archive').and_return 0
       @verify.entry_exists_in_catalog?('a_archive').should be_false
     end
   end

data/spec/catalog_spec.rb

@@ -2,18 +2,18 @@ require 'spec_helper'
 
 describe Heirloom::Catalog do
 
-  before do 
-    @config_mock   = mock 'catalog'
+  before do
+    @config_double = double 'catalog'
     @regions       = ['us-west-1', 'us-west-2']
     @bucket_prefix = 'bp'
-    @catalog       = Heirloom::Catalog.new :config => @config_mock, :name => 'new_archive'
+    @catalog       = Heirloom::Catalog.new :config => @config_double, :name => 'new_archive'
 
-    Heirloom.stub :log => mock_log
+    Heirloom.stub :log => double_log
   end
 
   context "cleanup" do
     before do
-      @sdb = mock 'sdb'
+      @sdb = double 'sdb'
       @sdb.stub(:select)
         .and_yield('123', { 'preserve' => ['true'] })
         .and_yield('abc', { 'preserve' => ['true'] })
@@ -22,7 +22,7 @@ describe Heirloom::Catalog do
 
     it "should not destroy archives marked with 'preserve'" do
 
-      archive = mock 'archive', :destroy => true
+      archive = double 'archive', :destroy => true
       @catalog.stub :sdb => @sdb
 
       Heirloom::Archive.should_receive(:new)
@@ -33,7 +33,7 @@ describe Heirloom::Catalog do
     end
 
     it "should destroy archives when removed_preserved is true" do
-      archive = mock 'archive', :destroy => true
+      archive = double 'archive', :destroy => true
       @catalog.stub :sdb => @sdb
 
       Heirloom::Archive.should_receive(:new)
@@ -50,31 +50,31 @@ describe Heirloom::Catalog do
 
       @catalog.cleanup :num_to_keep => 10, :remove_preserved => true
     end
-        
+
   end
 
   context "testing add" do
     it "should call setup to create catalog_domain" do
-      @catalog_setup_stub = stub 'setup'
-      @catalog_setup_stub.stub :create_catalog_domain => true
+      @catalog_setup_double = double 'setup'
+      @catalog_setup_double.stub :create_catalog_domain => true
       Heirloom::Catalog::Setup.should_receive(:new).
-                               with(:config => @config_mock).
-                               and_return @catalog_setup_stub
+                               with(:config => @config_double).
+                               and_return @catalog_setup_double
       @catalog.create_catalog_domain.should be_true
     end
   end
 
   context "testing setup" do
     it "should call setup to add_to_catalog" do
-      @catalog_add_mock = mock 'add'
+      @catalog_add_double = double 'add'
       Heirloom::Catalog::Add.should_receive(:new).
-                             with(:config => @config_mock,
+                             with(:config => @config_double,
                                   :name   => 'new_archive').
-                             and_return @catalog_add_mock
-      @catalog_add_mock.should_receive(:add_to_catalog).
-                        with(:bucket_prefix => @bucket_prefix,
-                             :regions       => @regions).
-                        and_return true
+                             and_return @catalog_add_double
+      @catalog_add_double.should_receive(:add_to_catalog).
+                          with(:bucket_prefix => @bucket_prefix,
+                               :regions       => @regions).
+                          and_return true
       @catalog.add_to_catalog(:bucket_prefix => @bucket_prefix,
                               :regions       => @regions).
                should be_true
@@ -83,12 +83,12 @@ describe Heirloom::Catalog do
 
   context "testing show" do
     before do
-      @catalog_show_stub = stub 'show', :regions       => @regions,
+      @catalog_show_double = double 'show', :regions       => @regions,
                                         :bucket_prefix => @bucket_prefix
       Heirloom::Catalog::Show.should_receive(:new).
-                              with(:config => @config_mock,
+                              with(:config => @config_double,
                                    :name   => 'new_archive').
-                              and_return @catalog_show_stub
+                              and_return @catalog_show_double
     end
 
     it "should call regions from show object" do
@@ -102,40 +102,40 @@ describe Heirloom::Catalog do
 
   context "testing catalog_domain_exists?" do
     before do
-      @catalog_verify_stub = stub 'show'
+      @catalog_verify_double = double 'show'
       Heirloom::Catalog::Verify.should_receive(:new).
-                                with(:config => @config_mock).
-                                and_return @catalog_verify_stub
+                                with(:config => @config_double).
+                                and_return @catalog_verify_double
     end
     it "should return true if the catalog domain exists" do
-      @catalog_verify_stub.stub :catalog_domain_exists? => true
+      @catalog_verify_double.stub :catalog_domain_exists? => true
       @catalog.catalog_domain_exists?.should be_true
     end
 
     it "should return false if the catalog domain does not exist" do
-      @catalog_verify_stub.stub :catalog_domain_exists? => false
+      @catalog_verify_double.stub :catalog_domain_exists? => false
       @catalog.catalog_domain_exists?.should be_false
     end
   end
 
   context "testing entry_exists_in_catalog?" do
     before do
-      @catalog_verify_mock = mock 'show'
+      @catalog_verify_double = double 'show'
       Heirloom::Catalog::Verify.should_receive(:new).
-                                with(:config => @config_mock).
-                                and_return @catalog_verify_mock
+                                with(:config => @config_double).
+                                and_return @catalog_verify_double
     end
     it "should return true if the entry exists in the catalog" do
-      @catalog_verify_mock.should_receive(:entry_exists_in_catalog?).
-                           with('entry').
-                           and_return true
+      @catalog_verify_double.should_receive(:entry_exists_in_catalog?).
+                             with('entry').
+                             and_return true
       @catalog.entry_exists_in_catalog?('entry').should be_true
     end
 
     it "should return false if the entry does not exists in the catalog" do
-      @catalog_verify_mock.should_receive(:entry_exists_in_catalog?).
-                           with('entry').
-                           and_return false
+      @catalog_verify_double.should_receive(:entry_exists_in_catalog?).
+                             with('entry').
+                             and_return false
       @catalog.entry_exists_in_catalog?('entry').should be_false
     end
   end

data/spec/cipher/data_spec.rb

@@ -2,17 +2,17 @@ require 'spec_helper'
 
 describe Heirloom do
   before do
-    @encrypted_file_mock = mock 'encrypted mock'
-    @decrypted_file_mock = mock 'decrypted mock'
-    @encrypted_file_mock.stub :path => '/tmp/enc'
-    @decrypted_file_mock.stub :path => '/tmp/dec',
-                              :read => 'plaintext'
-    @logger_mock = mock 'logger', :info => true
-    @logger_mock.stub :info  => true,
-                      :debug => true
-    @config_mock = mock 'config'
-    @config_mock.stub :logger => @logger_mock
-    @data = Heirloom::Cipher::Data.new :config => @config_mock
+    @encrypted_file_double = double 'encrypted mock'
+    @decrypted_file_double = double 'decrypted mock'
+    @encrypted_file_double.stub :path => '/tmp/enc'
+    @decrypted_file_double.stub :path => '/tmp/dec',
+                                :read => 'plaintext'
+    @logger_double = double 'logger', :info => true
+    @logger_double.stub :info  => true,
+                        :debug => true
+    @config_double = double 'config'
+    @config_double.stub :logger => @logger_double
+    @data = Heirloom::Cipher::Data.new :config => @config_double
   end
 
   context "when succesful" do
@@ -20,11 +20,11 @@ describe Heirloom do
       it "should decrypt the given data" do
         @data.should_receive(:which).with('gpg').and_return true
         Tempfile.should_receive(:new).with('archive.tar.gz.gpg').
-                 and_return @encrypted_file_mock
+                 and_return @encrypted_file_double
         Tempfile.should_receive(:new).with('archive.tar.gz').
-                 and_return @decrypted_file_mock
+                 and_return @decrypted_file_double
         ::File.should_receive(:open).
-               with(@encrypted_file_mock,'w')
+               with(@encrypted_file_double,'w')
         $?.stub :success? => true
 
         command = 'gpg --batch --yes --cipher-algo AES256 --passphrase password --output /tmp/dec /tmp/enc 2>&1'
@@ -45,21 +45,21 @@ describe Heirloom do
   context "when unsuccesful" do
     context "with secret given" do
       it "should return false if gpg not in path" do
-        @logger_mock.should_receive(:error)
+        @logger_double.should_receive(:error)
         @data.should_receive(:which).with('gpg').and_return false
         @data.decrypt_data(:data   => 'crypted',
                            :secret => 'password').should be_false
       end
 
       it "should return false if decrypted fails" do
-        @logger_mock.should_receive(:error)
+        @logger_double.should_receive(:error)
         @data.should_receive(:which).with('gpg').and_return true
         Tempfile.should_receive(:new).with('archive.tar.gz.gpg').
-                 and_return @encrypted_file_mock
+                 and_return @encrypted_file_double
         Tempfile.should_receive(:new).with('archive.tar.gz').
-                 and_return @decrypted_file_mock
+                 and_return @decrypted_file_double
         ::File.should_receive(:open).
-               with(@encrypted_file_mock,'w')
+               with(@encrypted_file_double,'w')
         $?.stub :success? => false
 
         command = 'gpg --batch --yes --cipher-algo AES256 --passphrase password --output /tmp/dec /tmp/enc 2>&1'