boxgrinder-build 0.9.4 → 0.9.5

data/spec/plugins/delivery/ebs/ebs-plugin-spec.rb

@@ -63,8 +63,8 @@ module BoxGrinder
       AWS.config({:access_key_id => '', :secret_access_key => ''})
       @ec2 = AWS::EC2.new
       @s3 = AWS::S3.new
-      @s3helper = S3Helper.new(@ec2, @s3)
-      @ec2helper = EC2Helper.new(@ec2)
+      @s3helper = S3Helper.new(@ec2, @s3, :log => LogHelper.new(:level => :trace, :type => :stdout))
+      @ec2helper = EC2Helper.new(@ec2, :log => LogHelper.new(:level => :trace, :type => :stdout))
 
       @plugin.instance_variable_set(:@ec2, @ec2)
       @plugin.instance_variable_set(:@s3, @s3)
@@ -89,7 +89,7 @@ module BoxGrinder
       supported_oses['fedora'].should == ['13', '14', '15']
       supported_oses['centos'].should == ['5']
     end
-    #
+
     it "should adjust fstab" do
       prepare_plugin { |plugin| plugin.stub!(:after_init) }
 
@@ -99,7 +99,6 @@ module BoxGrinder
 
       @plugin.adjust_fstab(guestfs)
     end
-    #
 
     describe '.free_device_suffix' do
       it "should get a new free device" do
@@ -110,7 +109,7 @@ module BoxGrinder
 
         @plugin.free_device_suffix.should == "f"
       end
-      #
+      
       it "should get a new free device next in order" do
         prepare_plugin { |plugin| plugin.stub!(:after_init) }
 
@@ -122,7 +121,7 @@ module BoxGrinder
         @plugin.free_device_suffix.should == "g"
       end
     end
-    #
+    
     describe ".valid_platform?" do
       it "should return true if on EC2" do
         prepare_plugin do |plugin|
@@ -133,7 +132,7 @@ module BoxGrinder
         end
         @plugin.valid_platform?.should == true
       end
-    #
+      
       it "should return false if NOT on EC2" do
         prepare_plugin do |plugin|
           plugin.stub!(:after_init)
@@ -142,53 +141,51 @@ module BoxGrinder
         end
         @plugin.valid_platform?.should == false
       end
-    #
     end
-    #
+   
     describe ".ebs_appliance_name" do
       it "should return basic appliance name" do
         prepare_plugin { |plugin| plugin.stub!(:after_init) }
         @plugin.ebs_appliance_name.should == "appliance_name/fedora/14/1.0/x86_64"
       end
-    #
+      
       it "should always return basic appliance name when overwrite is enabled, but snapshot is disabled" do
         prepare_plugin { |plugin| plugin.stub!(:after_init) }
         @plugin_config.merge!('overwrite' => true, 'snapshot' => false)
         @plugin.ebs_appliance_name.should == "appliance_name/fedora/14/1.0/x86_64"
       end
-    #
+      
       it "should still return a valid _initial_ snapshot appliance name, even if overwrite and snapshot are enabled on first ever run" do
         prepare_plugin { |plugin| plugin.stub!(:after_init) }
         @plugin_config.merge!('overwrite' => true, 'snapshot' => true)
 
-        @ec2helper.should_receive(:already_registered?).with("appliance_name/fedora/14/1.0-SNAPSHOT-1/x86_64")
+        @plugin.should_receive(:ami_by_name).with("appliance_name/fedora/14/1.0-SNAPSHOT-1/x86_64")
         @plugin.ebs_appliance_name.should == "appliance_name/fedora/14/1.0-SNAPSHOT-1/x86_64"
       end
-    #
+      
       it "should return 2nd snapshot of appliance" do
         prepare_plugin { |plugin| plugin.stub!(:after_init) }
 
         @plugin_config.merge!('snapshot' => true)
 
-        @ec2helper.should_receive(:already_registered?).with("appliance_name/fedora/14/1.0-SNAPSHOT-1/x86_64").and_return(true)
-        @ec2helper.should_receive(:already_registered?).with("appliance_name/fedora/14/1.0-SNAPSHOT-2/x86_64").and_return(false)
+        @plugin.should_receive(:ami_by_name).with("appliance_name/fedora/14/1.0-SNAPSHOT-1/x86_64").and_return("blah")
+        @plugin.should_receive(:ami_by_name).with("appliance_name/fedora/14/1.0-SNAPSHOT-2/x86_64").and_return(nil)
 
         @plugin.ebs_appliance_name.should == "appliance_name/fedora/14/1.0-SNAPSHOT-2/x86_64"
       end
-    #
+      
       it "should return the last snapshot name again when OVERWRITE is enabled" do
         prepare_plugin { |plugin| plugin.stub!(:after_init) }
 
         @plugin_config.merge!('snapshot' => true, 'overwrite' => true)
 
-        @ec2helper.should_receive(:already_registered?).with("appliance_name/fedora/14/1.0-SNAPSHOT-1/x86_64").and_return(true)
-        @ec2helper.should_receive(:already_registered?).with("appliance_name/fedora/14/1.0-SNAPSHOT-2/x86_64").and_return(false)
+        @plugin.should_receive(:ami_by_name).with("appliance_name/fedora/14/1.0-SNAPSHOT-1/x86_64").and_return("blah")
+        @plugin.should_receive(:ami_by_name).with("appliance_name/fedora/14/1.0-SNAPSHOT-2/x86_64").and_return(nil)
 
         @plugin.ebs_appliance_name.should == "appliance_name/fedora/14/1.0-SNAPSHOT-1/x86_64"
       end
-    #
-    end
-    #
+   end 
+    
     describe ".stomp_ebs" do
       before(:each) do
         prepare_plugin

data/spec/plugins/delivery/s3/s3-plugin-spec.rb

@@ -50,21 +50,23 @@ module BoxGrinder
       @appliance_config.stub!(:hardware).and_return(OpenCascade.new({:arch => 'x86_64', :base_arch => 'x86_64'}))
 
       @plugin = S3Plugin.new.init(@config, @appliance_config, {:class => BoxGrinder::S3Plugin, :type => :delivery, :name => :s3, :full_name => "Amazon Simple Storage Service (Amazon S3)", :types => [:s3, :cloudfront, :ami]}, :log => LogHelper.new(:level => :trace, :type => :stdout), :type => :s3)
-      @plugin.validate
+      @plugin.stub!(:validate)
 
       #Set convenient dummies
+      AWS.stub!
       AWS.config({:access_key_id => '', :secret_access_key => ''})
       @ec2 = AWS::EC2.new
       @s3 = AWS::S3.new
-      @s3helper = S3Helper.new(@ec2, @s3)
-      @ec2helper = EC2Helper.new(@ec2)
+      @s3helper = S3Helper.new(@ec2, @s3, :log => LogHelper.new(:level => :trace, :type => :stdout))
+      @ec2helper = EC2Helper.new(@ec2, :log => LogHelper.new(:level => :trace, :type => :stdout))
+      @bucket = mock(AWS::S3::Bucket)
 
       @plugin.instance_variable_set(:@ec2, @ec2)
       @plugin.instance_variable_set(:@s3, @s3)
       @plugin.instance_variable_set(:@ec2helper, @ec2helper)
       @plugin.instance_variable_set(:@s3helper, @s3helper)
+      @plugin.instance_variable_set(:@bucket, @bucket)
 
-      @asset_bucket = mock('Bucket')
 
       @appliance_config = @plugin.instance_variable_get(:@appliance_config)
       @exec_helper = @plugin.instance_variable_get(:@exec_helper)
@@ -80,11 +82,16 @@ module BoxGrinder
       supportes_oses['centos'].should == ['5']
       supportes_oses['rhel'].should == ['5', '6']
       supportes_oses['sl'].should == ['5', '6']
-      supportes_oses['fedora'].should == ['13', '14', '15']
+      supportes_oses['fedora'].should == ['13', '14', '15', '16']
     end
 
     describe ".ami_key" do
 
+      before(:each) do
+        @key1 = mock('AWS::S3::S3Object-1')
+        @key2 = mock('AWS::S3::S3Object-2')    
+      end
+
       it "should generate valid ami_key" do
         @plugin.ami_key("name", "this/is/a/path").should == "this/is/a/path/name/fedora/14/1.0/x86_64"
       end
@@ -100,82 +107,56 @@ module BoxGrinder
       it "should generate valid ami_key with snapshot number two" do
         @config.plugins['s3'].merge!('snapshot' => true)
 
-        @s3helper.should_receive(:object_exists?).and_return(true)
-        @s3helper.should_receive(:object_exists?).and_return(false)
+        @key1.should_receive(:exists?).and_return(true)
+        @key2.should_receive(:exists?).and_return(false)
 
-        @s3helper.should_receive(:stub_s3obj).with(@asset_bucket, 'name/fedora/14/1.0-SNAPSHOT-1/x86_64/')
-        @s3helper.should_receive(:stub_s3obj).with(@asset_bucket, 'name/fedora/14/1.0-SNAPSHOT-2/x86_64/')
+        @s3helper.should_receive(:stub_s3obj).with(@bucket, 'name/fedora/14/1.0-SNAPSHOT-1/x86_64/').and_return(@key1)
+        @s3helper.should_receive(:stub_s3obj).with(@bucket, 'name/fedora/14/1.0-SNAPSHOT-2/x86_64/').and_return(@key2)
 
-        @plugin.should_receive(:asset_bucket).twice.and_return(@asset_bucket)
         @plugin.ami_key("name", "/").should == "name/fedora/14/1.0-SNAPSHOT-2/x86_64"
       end
 
       it "should return valid ami_key with snapshot and overwrite enabled" do
         @config.plugins['s3'].merge!('snapshot' => true, 'overwrite' => true)
 
-        @s3helper.should_receive(:object_exists?).and_return(true)
-        @s3helper.should_receive(:object_exists?).and_return(false)
+        @key1.should_receive(:exists?).and_return(true)
+        @key2.should_receive(:exists?).and_return(false)
 
-        @s3helper.should_receive(:stub_s3obj).with(@asset_bucket, 'name/fedora/14/1.0-SNAPSHOT-1/x86_64/')
-        @s3helper.should_receive(:stub_s3obj).with(@asset_bucket, 'name/fedora/14/1.0-SNAPSHOT-2/x86_64/')
+        @s3helper.should_receive(:stub_s3obj).with(@bucket, 'name/fedora/14/1.0-SNAPSHOT-1/x86_64/').and_return(@key1)
+        @s3helper.should_receive(:stub_s3obj).with(@bucket, 'name/fedora/14/1.0-SNAPSHOT-2/x86_64/').and_return(@key2)
 
-        @plugin.should_receive(:asset_bucket).twice.and_return(@asset_bucket)
         @plugin.ami_key("name", "/").should == "name/fedora/14/1.0-SNAPSHOT-1/x86_64"
       end
     end
 
-    it "should fix sha1 sum" do
-      ami_manifest = mock('ami_manifest')
-      ami_manifest.should_receive(:read).and_return("!sdfrthty54623r2gertyhe(stdin)= wf34r32tewrgeg")
-
-      File.should_receive(:open).with("build/path/s3-plugin/ami/appliance.ec2.manifest.xml").and_return(ami_manifest)
-
-      f = mock('File')
-      f.should_receive(:write).with('!sdfrthty54623r2gertyhewf34r32tewrgeg')
-
-      File.should_receive(:open).with("build/path/s3-plugin/ami/appliance.ec2.manifest.xml", 'w').and_yield(f)
-
-      @plugin.fix_sha1_sum
-    end
-
-    it "should upload to an S3 bucket" do
-      package_helper = mock(PackageHelper)
-      package_helper.should_receive(:package).with(".", "build/path/s3-plugin/tmp/appliance-1.0-fedora-14-x86_64-raw.tgz").and_return("a_built_package.zip")
-
-      PackageHelper.should_receive(:new).with(@config, @appliance_config, :log => @log, :exec_helper => @exec_helper).and_return(package_helper)
-
-      s3 = mock(AWS::S3)
-      @plugin.instance_variable_set(:@s3, s3)
-
-      File.should_receive(:size).with("build/path/s3-plugin/tmp/appliance-1.0-fedora-14-x86_64-raw.tgz").and_return(23234566)
+    describe ".upload_to_bucket" do
 
-      s3obj = mock(AWS::S3::S3Object)
-      s3obj.should_receive(:write).with(:file => "build/path/s3-plugin/tmp/appliance-1.0-fedora-14-x86_64-raw.tgz", :acl => :private)
-
-      @s3helper.should_receive(:stub_s3obj).and_return(s3obj)
-      @s3helper.stub!(:object_exists?).and_return(false)
+      before(:each) do
+        @package_helper = mock(PackageHelper)
+        @s3obj = mock(AWS::S3::S3Object)
 
-      @plugin.upload_to_bucket(:disk => "adisk")
-    end
+        PackageHelper.should_receive(:new).with(@config, @appliance_config, :log => @log, :exec_helper => @exec_helper).and_return(@package_helper)
+        @package_helper.should_receive(:package).with(".", "build/path/s3-plugin/tmp/appliance-1.0-fedora-14-x86_64-raw.tgz").and_return("a_built_package.zip")
 
-    it "should NOT upload to an S3 bucket when the file already exists" do
-      package_helper = mock(PackageHelper)
-      package_helper.should_receive(:package).with(".", "build/path/s3-plugin/tmp/appliance-1.0-fedora-14-x86_64-raw.tgz").and_return("a_built_package.zip")
+        File.should_receive(:size).with("build/path/s3-plugin/tmp/appliance-1.0-fedora-14-x86_64-raw.tgz").and_return(23234566)
+        @s3helper.should_receive(:stub_s3obj).and_return(@s3obj)
+      end
 
-      PackageHelper.should_receive(:new).with(@config, @appliance_config, :log => @log, :exec_helper => @exec_helper).and_return(package_helper)
+      it "should upload to an S3 bucket" do
+        @s3obj.stub!(:exists?).and_return(false)
 
-      s3 = mock(AWS::S3)
-      @plugin.instance_variable_set(:@s3, s3)
+        @s3obj.should_receive(:write).with(:file => "build/path/s3-plugin/tmp/appliance-1.0-fedora-14-x86_64-raw.tgz", :acl => :private)
 
-      File.should_receive(:size).with("build/path/s3-plugin/tmp/appliance-1.0-fedora-14-x86_64-raw.tgz").and_return(23234566)
+        @plugin.upload_to_bucket(:disk => "adisk")
+      end
 
-      s3obj = mock(AWS::S3::S3Object)
-      s3obj.should_not_receive(:write)
+      it "should NOT upload to an S3 bucket when the file already exists" do
+        @s3obj.stub!(:exists?).and_return(true)
 
-      @s3helper.should_receive(:stub_s3obj).and_return(s3obj)
-      @s3helper.stub!(:object_exists?).and_return(true)
+        @s3obj.should_not_receive(:write)
 
-      @plugin.upload_to_bucket(:disk => "adisk")
+        @plugin.upload_to_bucket(:disk => "adisk")
+      end
     end
 
     it "should bundle the image" do
@@ -196,128 +177,206 @@ module BoxGrinder
     end
 
     describe ".execute" do
-
       before(:each) do
         @s3obj = mock(AWS::S3::S3Object)
-        @bucket = mock(AWS::S3::Bucket)
         FileUtils.stub!(:mkdir_p)
       end
-    #
-      it "should create an AMI" do
-        @plugin.instance_variable_set(:@type, :ami)
-        @plugin.instance_variable_set(:@previous_deliverables, {:disk => 'a/disk'})
 
-        @plugin.should_receive(:ami_key).with("appliance", "/").and_return('ami/key')
+      context "AMI" do
+        before(:each) do
+          @plugin.instance_variable_set(:@previous_deliverables, {:disk => 'a/disk'})
+          @s3helper.should_receive(:stub_s3obj).with(@bucket, "ami/key/appliance.ec2.manifest.xml").and_return(@s3obj)
+          @plugin.should_receive(:ami_key).with("appliance", "/").and_return('ami/key')
+          @plugin.instance_variable_set(:@type, :ami)
+        end
 
-        @plugin.stub!(:asset_bucket).and_return(@bucket)
-        @s3helper.stub!(:stub_s3obj).and_return(@s3obj)
-        @s3helper.should_receive(:object_exists?).twice.with(@s3obj).and_return(false)
-        @plugin.should_receive(:bundle_image).with(:disk => 'a/disk')
-        @plugin.should_receive(:fix_sha1_sum)
-        @plugin.should_receive(:upload_image)
-        @plugin.should_receive(:register_image)
-
-        @plugin.execute
-      end
-    #
-      it "should not upload an AMI because it's already there" do
-        @plugin.instance_variable_set(:@type, :ami)
+        it "should create an AMI" do
 
-        @plugin.stub!(:asset_bucket).and_return(@bucket)
-        @s3helper.should_receive(:stub_s3obj).with(@bucket, "ami/key/appliance.ec2.manifest.xml").and_return(@s3obj)
-        @plugin.should_receive(:ami_key).with("appliance", "/").and_return('ami/key')
-        @s3helper.should_receive(:object_exists?).twice.with(@s3obj).and_return(true)
-        @plugin.should_not_receive(:upload_image)
-        @plugin.should_receive(:register_image)
+          @s3obj.should_receive(:exists?).twice.and_return(false)
+          @plugin.should_receive(:bundle_image).with(:disk => 'a/disk')
+          @plugin.should_receive(:upload_image)
+          @plugin.should_receive(:register_image)
 
-        @plugin.execute
-      end
-    #
-      it "should upload an AMI even if one is already present in order to perform a snapshot" do
-        @config.plugins['s3'].merge!('snapshot' => true)
+          @plugin.execute
+        end
 
-        @plugin.instance_variable_set(:@type, :ami)
-        @plugin.instance_variable_set(:@previous_deliverables, {:disk => 'a/disk'})
+        it "should not upload an AMI because it's already there" do
 
-        @plugin.stub!(:asset_bucket).and_return(@bucket)
-        @s3helper.should_receive(:stub_s3obj).with(@bucket, "ami/key/appliance.ec2.manifest.xml").and_return(@s3obj)
-        @plugin.should_receive(:ami_key).with("appliance", "/").and_return('ami/key')
-        @s3helper.should_receive(:object_exists?).twice.with(@s3obj).and_return(false)
-        @plugin.should_receive(:bundle_image).with(:disk => 'a/disk')
-        @plugin.should_receive(:fix_sha1_sum)
-        @plugin.should_receive(:upload_image)
-        @plugin.should_receive(:register_image)
-
-        @plugin.execute
-      end
-    #
-      it "should upload image to s3" do
-        @plugin.instance_variable_set(:@type, :s3)
-        @plugin.instance_variable_set(:@previous_deliverables, :disk => 'a/disk')
-        @plugin.should_receive(:upload_to_bucket).with({:disk => 'a/disk'})
-        @plugin.execute
+          @s3obj.should_receive(:exists?).twice.and_return(true)
+          @plugin.should_not_receive(:upload_image)
+          @plugin.should_receive(:register_image)
+
+          @plugin.execute
+        end
+
+        it "should upload an AMI even if one is already present in order to perform a snapshot" do
+          @config.plugins['s3'].merge!('snapshot' => true)
+
+          @s3obj.should_receive(:exists?).twice.and_return(false)
+          @plugin.should_receive(:bundle_image).with(:disk => 'a/disk')
+          @plugin.should_receive(:upload_image)
+          @plugin.should_receive(:register_image)
+
+          @plugin.execute
+        end
       end
-    #
-      it "should upload image to cloudfront" do
-        @plugin.instance_variable_set(:@type, :cloudfront)
-        @plugin.instance_variable_set(:@previous_deliverables, {:disk => 'a/disk'})
-        @plugin.should_receive(:upload_to_bucket).with({:disk => 'a/disk'}, :public_read)
-        @plugin.execute
+
+      context "s3" do
+        it "should upload image to s3" do
+          @plugin.instance_variable_set(:@type, :s3)
+          @plugin.instance_variable_set(:@previous_deliverables, :disk => 'a/disk')
+          @plugin.should_receive(:upload_to_bucket).with({:disk => 'a/disk'})
+          @plugin.execute
+        end
       end
 
+      context "cloudfront" do
+        it "should upload image to cloudfront" do
+          @plugin.instance_variable_set(:@type, :cloudfront)
+          @plugin.instance_variable_set(:@previous_deliverables, {:disk => 'a/disk'})
+          @plugin.should_receive(:upload_to_bucket).with({:disk => 'a/disk'}, :public_read)
+          @plugin.execute
+        end
+      end
     end
-    #
+
     describe ".validate" do
-    #
-      it "should validate only basic params" do
-        @plugin.should_receive(:set_default_config_value).with('overwrite', false)
-        @plugin.should_receive(:set_default_config_value).with('path', '/')
-        @plugin.should_receive(:set_default_config_value).with('region', 'us-east-1')
+      before(:each) do
+        @plugin.unstub!(:validate)
+        @plugin.stub!(:asset_bucket).and_return(nil)
+        @plugin.stub!(:asset_bucket).and_return(@bucket)
+      end
 
-        @plugin.should_receive(:validate_plugin_config).with(['bucket', 'access_key', 'secret_access_key'], 'http://boxgrinder.org/tutorials/boxgrinder-build-plugins/#S3_Delivery_Plugin')
+      context "bucket is not already in existence" do
+        before(:each) do
+          @plugin.should_receive(:set_default_config_value).with('overwrite', false)
+          @plugin.should_receive(:set_default_config_value).with('path', '/')
+          @plugin.should_receive(:set_default_config_value).with('region', 'us-east-1')
+        end
 
-        @plugin.validate
-      end
-    #
-      it "should validate basic and additional ami params" do
-        @plugin.instance_variable_set(:@type, :ami)
+        it "should validate only basic params" do
 
-        @plugin.should_receive(:set_default_config_value).with('overwrite', false)
-        @plugin.should_receive(:set_default_config_value).with('path', '/')
-        @plugin.should_receive(:set_default_config_value).with('region', 'us-east-1')
-        @plugin.should_receive(:set_default_config_value).with('snapshot', false)
+          @plugin.should_receive(:validate_plugin_config).with(['bucket', 'access_key', 'secret_access_key'], 'http://boxgrinder.org/tutorials/boxgrinder-build-plugins/#S3_Delivery_Plugin')
 
-        @plugin.should_receive(:validate_plugin_config).with(['bucket', 'access_key', 'secret_access_key'], 'http://boxgrinder.org/tutorials/boxgrinder-build-plugins/#S3_Delivery_Plugin')
-        @plugin.should_receive(:validate_plugin_config).with(["cert_file", "key_file", "account_number"], "http://boxgrinder.org/tutorials/boxgrinder-build-plugins/#S3_Delivery_Plugin")
+          @plugin.validate
+        end
+
+        it "should validate basic and additional ami params" do
+          @plugin.instance_variable_set(:@type, :ami)
+
+          @plugin.should_receive(:set_default_config_value).with('snapshot', false)
+
+          @plugin.should_receive(:validate_plugin_config).with(['bucket', 'access_key', 'secret_access_key'], 'http://boxgrinder.org/tutorials/boxgrinder-build-plugins/#S3_Delivery_Plugin')
+          @plugin.should_receive(:validate_plugin_config).with(["cert_file", "key_file", "account_number"], "http://boxgrinder.org/tutorials/boxgrinder-build-plugins/#S3_Delivery_Plugin")
+
+          File.stub!(:expand_path)
+          File.stub!(:exists?)
+          File.should_receive(:expand_path).with('/path/to/cert/file').and_return('path1')
+          File.should_receive(:exists?).with('path1').and_return(true)
+          File.should_receive(:expand_path).with('/path/to/key/file').and_return('path2')
+          File.should_receive(:exists?).with('path2').and_return(true)
+
+          @plugin.should_receive(:asset_bucket).with(false).and_return(nil)
+          @plugin.should_receive(:asset_bucket).with(true).and_return(@bucket)
+
+          @plugin.validate
+        end
+
+        it "should raise because key file doesn't exists" do
+          @plugin.instance_variable_set(:@type, :ami)
+
+          @plugin.should_receive(:set_default_config_value).with('snapshot', false)
+
+          @plugin.should_receive(:validate_plugin_config).with(['bucket', 'access_key', 'secret_access_key'], 'http://boxgrinder.org/tutorials/boxgrinder-build-plugins/#S3_Delivery_Plugin')
+          @plugin.should_receive(:validate_plugin_config).with(["cert_file", "key_file", "account_number"], "http://boxgrinder.org/tutorials/boxgrinder-build-plugins/#S3_Delivery_Plugin")
+
+          File.stub!(:expand_path)
+          File.stub!(:exists?)
+          File.should_receive(:expand_path).with('/path/to/cert/file').and_return('path1')
+          File.should_receive(:exists?).with('path1').and_return(true)
+          File.should_receive(:expand_path).with('/path/to/key/file').and_return('path2')
+          File.should_receive(:exists?).with('path2').and_return(false)
+
+          lambda { @plugin.validate }.should raise_error(PluginValidationError, "AWS key file doesn't exists, please check the path: '/path/to/key/file'.")
+        end
+
+        it "should raise because key file doesn't exists" do
+          @plugin.instance_variable_set(:@type, :ami)
+
+          @plugin.should_receive(:set_default_config_value).with('snapshot', false)
+
+          @plugin.should_receive(:validate_plugin_config).with(['bucket', 'access_key', 'secret_access_key'], 'http://boxgrinder.org/tutorials/boxgrinder-build-plugins/#S3_Delivery_Plugin')
+          @plugin.should_receive(:validate_plugin_config).with(["cert_file", "key_file", "account_number"], "http://boxgrinder.org/tutorials/boxgrinder-build-plugins/#S3_Delivery_Plugin")
+
+          File.stub!(:expand_path)
+          File.stub!(:exists?)
+          File.should_receive(:expand_path).with('/path/to/cert/file').and_return('path1')
+          File.should_receive(:exists?).with('path1').and_return(false)
+
+          lambda { @plugin.validate }.should raise_error(PluginValidationError, "AWS certificate file doesn't exists, please check the path: '/path/to/cert/file'.")
+        end
+
+        it "should raise an error if an invalid region is specified" do
+          @plugin.instance_variable_set(:@type, :ami)
+
+          @config.plugins['s3']['region'] = 'near-spain-1'
+
+          @plugin.should_receive(:set_default_config_value).with('snapshot', false)
+
+          @plugin.should_receive(:validate_plugin_config).with(['bucket', 'access_key', 'secret_access_key'], 'http://boxgrinder.org/tutorials/boxgrinder-build-plugins/#S3_Delivery_Plugin')
+          @plugin.should_receive(:validate_plugin_config).with(["cert_file", "key_file", "account_number"], "http://boxgrinder.org/tutorials/boxgrinder-build-plugins/#S3_Delivery_Plugin")
 
-        @plugin.validate
+          File.stub!(:expand_path)
+          File.stub!(:exists?)
+          File.should_receive(:expand_path).with('/path/to/cert/file').and_return('path1')
+          File.should_receive(:exists?).with('path1').and_return(true)
+          File.should_receive(:expand_path).with('/path/to/key/file').and_return('path2')
+          File.should_receive(:exists?).with('path2').and_return(true)
+
+          lambda { @plugin.validate }.should raise_error(PluginValidationError, "Invalid region specified: near-spain-1. This plugin is only aware of the following regions: us-west-1, ap-southeast-1, eu-west-1, us-east-1, ap-northeast-1.")
+        end
       end
-    #
-      it "should raise an error if an invalid region is specified" do
-        @plugin.instance_variable_set(:@type, :ami)
 
-        @config.plugins['s3']['region'] = 'bolkonski'
+      context "bucket exists (AMI mode)" do
+
+        before(:each) do
+          @plugin.instance_variable_set(:@type, :ami)
+          @plugin.stub!(:set_default_config_value)
+
+          File.stub!(:expand_path)
+          File.stub!(:exists?)
+          File.should_receive(:expand_path).with('/path/to/cert/file').and_return('path1')
+          File.should_receive(:exists?).with('path1').and_return(true)
+          File.should_receive(:expand_path).with('/path/to/key/file').and_return('path2')
+          File.should_receive(:exists?).with('path2').and_return(true)
+
+          @plugin.should_receive(:validate_plugin_config).with(['bucket', 'access_key', 'secret_access_key'], 'http://boxgrinder.org/tutorials/boxgrinder-build-plugins/#S3_Delivery_Plugin')
+          @plugin.should_receive(:validate_plugin_config).with(["cert_file", "key_file", "account_number"], "http://boxgrinder.org/tutorials/boxgrinder-build-plugins/#S3_Delivery_Plugin")
+        end
+
+        it "should succeed if the bucket location constraint and region match" do
+          @plugin.should_receive(:asset_bucket).and_return(@bucket)
+          @bucket.should_receive(:location_constraint).and_return(nil)
 
-        @plugin.should_receive(:set_default_config_value).with('overwrite', false)
-        @plugin.should_receive(:set_default_config_value).with('path', '/')
-        @plugin.should_receive(:set_default_config_value).with('region', 'us-east-1')
-        @plugin.should_receive(:set_default_config_value).with('snapshot', false)
+          @plugin.validate
+        end
+
+        it "should raise an error if bucket location constraint and region do not match" do
+          @plugin.should_receive(:asset_bucket).and_return(@bucket)
+          @bucket.should_receive(:location_constraint).and_return('eu-west-1')
 
-        @plugin.should_receive(:validate_plugin_config).with(['bucket', 'access_key', 'secret_access_key'], 'http://boxgrinder.org/tutorials/boxgrinder-build-plugins/#S3_Delivery_Plugin')
-        @plugin.should_receive(:validate_plugin_config).with(["cert_file", "key_file", "account_number"], "http://boxgrinder.org/tutorials/boxgrinder-build-plugins/#S3_Delivery_Plugin")
+          lambda { @plugin.validate }.should raise_error(PluginValidationError, "Existing bucket bucket has a location constraint that does not match the region selected. AMI region and bucket location constraint must match.")
+        end
 
-        lambda { @plugin.validate }.should raise_error(PluginValidationError)
       end
-    #
     end
-    #
-    describe ".bucket" do
 
+    describe ".bucket" do
       it "should create the asset bucket by default" do
         @config.plugins['s3'].merge!('region' => 'ap-southeast-1')
 
         @s3helper.should_receive(:bucket).with(:bucket => 'bucket', :acl => :private,
-        :create_of_missing => true, :location_constraint => 'ap-southeast-1')
+        :create_if_missing => true, :location_constraint => 'ap-southeast-1')
 
         @plugin.asset_bucket
       end
@@ -326,17 +385,14 @@ module BoxGrinder
         @config.plugins['s3'].merge!('region' => 'ap-southeast-1')
 
         @s3helper.should_receive(:bucket).with(:bucket => 'bucket', :acl => :private,
-        :create_of_missing => false, :location_constraint => 'ap-southeast-1')
+        :create_if_missing => false, :location_constraint => 'ap-southeast-1')
 
         @plugin.asset_bucket(false)
       end
-
     end
-    #
-    describe ".upload_image" do
 
+    describe ".upload_image" do
       it "should upload image for default region" do
-        @plugin.should_receive(:asset_bucket)
         @exec_helper.should_receive(:execute).with("euca-upload-bundle -U http://s3.amazonaws.com -b bucket/ami/key -m build/path/s3-plugin/ami/appliance.ec2.manifest.xml -a access_key -s secret_access_key", :redacted=>["access_key", "secret_access_key"])
         @plugin.upload_image("ami/key")
       end
@@ -344,15 +400,12 @@ module BoxGrinder
       it "should upload image for us-west-1 region" do
         @config.plugins['s3'].merge!('region' => 'us-west-1')
 
-        @plugin.should_receive(:asset_bucket)
         @exec_helper.should_receive(:execute).with("euca-upload-bundle -U http://s3-us-west-1.amazonaws.com -b bucket/ami/key -m build/path/s3-plugin/ami/appliance.ec2.manifest.xml -a access_key -s secret_access_key", :redacted=>["access_key", "secret_access_key"])
         @plugin.upload_image("ami/key")
       end
-
     end
-    #
-    describe ".register_image" do
 
+    describe ".register_image" do
       before(:each) do
         @ami = mock(AWS::EC2::Image)
         @ami.stub!(:id).and_return('ami-1234')
@@ -363,7 +416,7 @@ module BoxGrinder
         @ec2.stub!(:images)
         @ec2helper.stub!(:wait_for_image_state)
       end
-    #
+
       context "when the AMI has not been registered" do
         before(:each) do
           @plugin.stub!(:ami_by_manifest_key).and_return(nil)
@@ -376,12 +429,12 @@ module BoxGrinder
           @plugin.register_image(@manifest_key)
         end
       end
-    #
+
       context "when the AMI has been registered" do
         before(:each) do
           @plugin.stub!(:ami_by_manifest_key).and_return(@ami)
         end
-    #
+
         it "should not register the AMI" do
           @plugin.should_receive(:ami_by_manifest_key).with(@manifest_key)
           @ec2.images.should_not_receive(:create)
@@ -389,11 +442,9 @@ module BoxGrinder
           @plugin.register_image(@manifest_key)
         end
       end
-
     end
 
      describe ".deregister_image" do
-
        before(:each) do
          @ami = mock(AWS::EC2::Image)
          @plugin.stub!(:ami_by_manifest_key).and_return(@ami)
@@ -411,7 +462,6 @@ module BoxGrinder
          @ec2helper.should_receive(:wait_for_image_death).with(@ami)
          @plugin.deregister_image(@manifest_key)
        end
-
     end
 
   end