opendelivery 0.0.24 → 0.1.25

data/lib/opendelivery/domain.rb

@@ -30,17 +30,55 @@ module OpenDelivery
     end
 
     def load_stack_properties(domain, stack)
-      stack.resources.each do |resource|
-        set_property(domain, stack.name, resource.resource_type, resource.physical_resource_id)
+      AWS::SimpleDB.consistent_reads do
+        stack.resources.each do |resource|
+          set_property(domain, stack.name, resource.resource_type, resource.physical_resource_id)
+        end
       end
     end
 
-    def get_property(domain, item_name, key, index=0)
+    # Look for AWS::Some:Type|MyItemName or just AWS::Some::Type.
+
+    def get_property(domain, item_name, key, index=0, name=nil)
       property_value = nil
+      attribute = nil
+
       AWS::SimpleDB.consistent_reads do
         item = @sdb.domains[domain].items[item_name]
         if !item.nil?
-          attribute = item.attributes[key]
+          item.attributes.each do |att|
+            col_name = nil
+
+            att_array = att.name.split('|')
+            col_title = att_array.first
+
+            if att_array.length > 1
+              col_name = att_array[1]
+            end
+
+            if col_title == key
+              # Found a column with first portion that matches our search 'key'
+              # Now, determine if we need to match the "|name" name criteria.
+
+              if name.nil?
+                # Not given a name to search for, just return the first one
+                # we have found.
+                attribute = att
+                break
+              else
+
+                # Give a 'name' search criteria, so match it against this column
+                if name == col_name
+                  # 'name' criteria matches "|name" value, found a match
+                  attribute = att
+                  break
+                else
+                  # 'name' criteria did not match, keep searching
+                end
+
+              end
+            end
+          end
           if !attribute.nil?
             value = attribute.values[index]
             if !value.nil?
@@ -52,7 +90,8 @@ module OpenDelivery
       return property_value
     end
 
-    def set_property(domain, item_name, key, value)
+    def set_property(domain, item_name, key, value, name=nil)
+      if name then key = key + "|" + name end
       AWS::SimpleDB.consistent_reads do
         item = @sdb.domains[domain].items[item_name]
         item.attributes.set(key => [value])

data/lib/opendelivery/stack.rb

@@ -144,7 +144,9 @@ module OpenDelivery
           print_status(status, silent)
           sleep (sleep_time * 0.1)
         end
-        sleep(sleep_time)
+        if keep_watching
+          sleep(sleep_time)
+        end
       end
       return success
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opendelivery
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.1.25
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec