opendelivery 0.0.14 → 0.0.15

data/lib/opendelivery/domain.rb

@@ -29,6 +29,12 @@ module OpenDelivery
       end
     end
 
+    def load_stack_properties(domain, stack)
+      stack.resources.each do |resource|
+        set_property(domain, stack.name, resource.resource_type, resource.physical_resource_id)
+      end
+    end
+
     def get_property(domain, item_name, key)
       AWS::SimpleDB.consistent_reads do
         item = @sdb.domains[domain].items[item_name]

data/lib/opendelivery/stack.rb

@@ -47,22 +47,16 @@ module OpenDelivery
     end
 
 
-    def create(stack_name, template, parameters = {}, wait=false, domain=nil)
+    def create(stack_name, template, parameters = {}, wait?=false, domain=nil)
       stack = @cfn.stacks.create(stack_name,
         File.open(template, "r").read,
         :parameters => parameters,
         :capabilities => ["CAPABILITY_IAM"],
         :disable_rollback => true)
 
-      if wait
-        wait_for_stack(stack)
-      end
+      wait_for_stack(stack, wait?)
 
-      unless domain.nil?
-        stack.resources.each do |resource|
-          @domain.set_property(domain, stack_name, resource.resource_type, resource.physical_resource_id)
-        end
-      end
+      @domain.load_stack_properties(domain, stack)
     end
 
     def destroy(stack_name, domain=nil, wait=false)
@@ -98,12 +92,14 @@ module OpenDelivery
 
     protected
 
-    def wait_for_stack(stack)
-      while stack.status != "CREATE_COMPLETE"
-        sleep 20
+    def wait_for_stack(stack, wait?)
+      if wait?
+        while stack.status != "CREATE_COMPLETE"
+          sleep 20
 
-        if FAILURE_STATUSES.include? stack.status
-          stack.delete
+          if FAILURE_STATUSES.include? stack.status
+            stack.delete
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opendelivery
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-31 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec