lib/heirloom/archive/destroyer.rb in heirloom-0.3.1 vs lib/heirloom/archive/destroyer.rb in heirloom-0.4.0

@@ -1,52 +1,61 @@
 module Heirloom
 
   class Destroyer
 
-    attr_accessor :config, :id, :logger, :name
-
     def initialize(args)
-      self.config = args[:config]
-      self.name = args[:name]
-      self.id = args[:id]
-      self.logger = config.logger
+      @config = args[:config]
+      @name = args[:name]
+      @domain = "heirloom_#{@name}"
+      @id = args[:id]
+      @logger = @config.logger
     end
 
     def destroy(args)
       regions = args[:regions]
 
-      logger.info "Destroying #{@name} - #{@id}"
+      @logger.info "Destroying #{@name} - #{@id}"
 
       regions.each do |region|
         bucket = reader.get_bucket :region => region
 
-        key = "#{id}.tar.gz"
+        key = "#{@id}.tar.gz"
 
         if bucket
-          logger.info "Destroying 's3://#{bucket}/#{name}/#{key}'."
+          @logger.info "Destroying 's3://#{bucket}/#{@name}/#{key}'."
 
-          s3_destroyer = Destroyer::S3.new :config => config,
+          s3_destroyer = Destroyer::S3.new :config => @config,
                                            :region => region
 
-          s3_destroyer.destroy_file :key_name => key,
-                                    :key_folder => name,
-                                    :bucket => bucket
+          s3_destroyer.destroy_file :key_name   => key,
+                                    :bucket     => bucket,
+                                    :key_folder => @name
         end
       end
-      sdb.delete name, id
-      logger.info "Destroy complete."
+
+      sdb.delete @domain, @id
+
+      # Simple DB is eventually consisten
+      # Sleep for 3 sec for changes to reflect
+      Kernel.sleep 3
+
+      if sdb.domain_empty? @domain
+        @logger.info "Domain #{@domain} empty. Destroying."
+        sdb.delete_domain @domain
+      end
+      @logger.info "Destroy complete."
     end
 
     private
 
     def sdb
       @sdb ||= AWS::SimpleDB.new :config => @config
     end
 
     def reader
-      @reader ||= Reader.new :config => config,
-                             :name   => name,
-                             :id     => id
+      @reader ||= Reader.new :config => @config,
+                             :name   => @name,
+                             :id     => @id
     end
 
   end
 end