heirloom 0.8.2 → 0.8.3

data/CHANGELOG

@@ -1,3 +1,7 @@
+## 0.8.3:
+
+* Teardown does not try to delete buckets if they are not empty.
+
 ## 0.8.2:
 
 * Updated docs based on feedback from mint.

data/lib/heirloom/aws/s3.rb

@@ -29,6 +29,10 @@ module Heirloom
         false
       end
 
+      def bucket_empty?(bucket)
+        get_bucket_object_versions(bucket)["Versions"].count == 0
+      end
+
       def bucket_exists_in_another_region?(bucket)
         if bucket_exists? bucket
           get_bucket(bucket).location != @region
@@ -59,7 +63,12 @@ module Heirloom
       end
 
       def delete_bucket(bucket)
-        @s3.delete_bucket bucket
+        if bucket_empty? bucket
+          @s3.delete_bucket bucket
+        else
+          @logger.warn "#{bucket} not empty, not destroying."
+          false
+        end
       rescue Excon::Errors::NotFound
         @logger.info "#{bucket} already destroyed."
         true
@@ -73,6 +82,10 @@ module Heirloom
         @s3.get_bucket_acl(bucket).body
       end
 
+      def get_bucket_object_versions(bucket)
+        @s3.get_bucket_object_versions(bucket).body
+      end
+
       def put_object_acl(bucket, key, grants)
         @s3.put_object_acl(bucket, key, grants)
       end

data/lib/heirloom/version.rb

@@ -1,3 +1,3 @@
 module Heirloom
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

data/spec/aws/s3_spec.rb

@@ -132,16 +132,62 @@ describe Heirloom do
 
   end
 
-  it "should delete a bucket from s3" do
-    @fog_mock.should_receive(:delete_bucket).with 'bucket'
-    @s3.delete_bucket 'bucket'
+  it "should return object versions for a given bucket" do
+    body_mock = mock 'body'
+    @fog_mock.should_receive(:get_bucket_object_versions).
+              with('bucket').
+              and_return body_mock
+    body_mock.stub :body => 'body_hash'
+    @s3.get_bucket_object_versions('bucket').should == 'body_hash'
   end
 
-  it "should return true if Excon::Errors::NotFound raised when deleting bucket" do
-    @fog_mock.should_receive(:delete_bucket).
-              with('bucket').
-              and_raise Excon::Errors::NotFound.new 'Bucket does not exist.'
-    @s3.delete_bucket 'bucket'
+  context "testing bucket deletion" do
+    it "should return true if the bucket has 0 objects" do
+      body_mock = mock 'body'
+      @fog_mock.should_receive(:get_bucket_object_versions).
+                with('bucket').
+                and_return body_mock
+      body_mock.stub :body => { "Versions" => [ ] }
+      @s3.bucket_empty?('bucket').should be_true
+    end
+
+    it "should return false if the bucket has any objects" do
+      body_mock = mock 'body'
+      @fog_mock.should_receive(:get_bucket_object_versions).
+                with('bucket').
+                and_return body_mock
+      body_mock.stub :body => { "Versions" => [ 'obj1', 'obj2' ] }
+      @s3.bucket_empty?('bucket').should be_false
+    end
+
+    it "should delete a bucket from s3 if empty" do
+      body_mock = mock 'body'
+      @fog_mock.should_receive(:get_bucket_object_versions).
+                with('bucket').
+                and_return body_mock
+      body_mock.stub :body => { "Versions" => [ ] }
+      @fog_mock.should_receive(:delete_bucket).
+                with('bucket').and_return true
+      @s3.delete_bucket('bucket').should be_true
+    end
+
+    it "should return false and not attempt to delete a non empty s3 bucket" do
+      body_mock = mock 'body'
+      @fog_mock.should_receive(:get_bucket_object_versions).
+                with('bucket').
+                and_return body_mock
+      body_mock.stub :body => { "Versions" => [ 'obj1', 'obj2' ] }
+      @fog_mock.should_receive(:delete_bucket).never
+      @s3.delete_bucket('bucket').should be_false
+    end
+
+    it "should return true if Excon::Errors::NotFound raised when deleting bucket" do
+      @fog_mock.should_receive(:get_bucket_object_versions).
+                with('bucket').
+                and_raise Excon::Errors::NotFound.new 'Bucket does not exist.'
+      @fog_mock.should_receive(:delete_bucket).never
+      @s3.delete_bucket('bucket').should be_true
+    end
   end
 
   it "should get an object from s3" do
@@ -149,8 +195,8 @@ describe Heirloom do
     @fog_mock.should_receive(:get_object).
               with('bucket', 'object').
               and_return body_mock
-    body_mock.should_receive(:body)
-    @s3.get_object('bucket', 'object')
+    body_mock.stub :body => 'body_hash'
+    @s3.get_object('bucket', 'object').should == 'body_hash'
   end
 
   it "should get a buckets acl from s3" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heirloom
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-16 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70116641456840 !ruby/object:Gem::Requirement
+  requirement: &70288889244580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *70116641456840
+  version_requirements: *70288889244580
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70116641456000 !ruby/object:Gem::Requirement
+  requirement: &70288889253380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70116641456000
+  version_requirements: *70288889253380
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70116641455120 !ruby/object:Gem::Requirement
+  requirement: &70288889249440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70116641455120
+  version_requirements: *70288889249440
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70116641469900 !ruby/object:Gem::Requirement
+  requirement: &70288889247600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70116641469900
+  version_requirements: *70288889247600
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70116641467720 !ruby/object:Gem::Requirement
+  requirement: &70288889097340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,7 +65,7 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70116641467720
+  version_requirements: *70288889097340
 description: I help build and manage building tar.gz files and deploying them into
   the cloud
 email:
@@ -202,7 +202,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3388616083800809289
+      hash: 3211129644745839536
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -211,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3388616083800809289
+      hash: 3211129644745839536
 requirements: []
 rubyforge_project: heirloom
 rubygems_version: 1.8.16