opendelivery 0.0.8 → 0.0.9

data/lib/opendelivery/domain.rb

@@ -18,30 +18,22 @@ module OpenDelivery
     end
 
     def destroy(domain)
-      @sdb.domains[domain].delete
-    end
-
-    def destroy_item(domain, item_name)
-      @sdb.domains[domain].items[item_name].delete
+      AWS::SimpleDB.consistent_reads do
+        @sdb.domains[domain].delete
+      end
     end
 
     def get_property(domain, item_name, key)
       AWS::SimpleDB.consistent_reads do
         item = @sdb.domains[domain].items[item_name]
-        item.attributes.each_value do |name, value|
-          if name == key
-            @property_value = value.chomp
-          end
-        end
+        property_value = item.attributes[key].values[0].chomp
       end
-
-      return @property_value
     end
 
-    def set_property(domain, item_name, property, value)
+    def set_property(domain, item_name, key, value)
       AWS::SimpleDB.consistent_reads do
         item = @sdb.domains[domain].items[item_name]
-        item.attributes.set(property => [value])
+        item.attributes.set(key => [value])
       end
     end
   end

data/lib/opendelivery/{image.rb → machine_image.rb}

@@ -1,23 +1,37 @@
 require 'aws-sdk'
 
 module OpenDelivery
-  class Image
+  class MachineImage
 
     def initialize(region=nil)
       if region.nil?
         @ec2 = AWS::EC2.new
         @sdb = AWS::SimpleDB.new
         @auto_scale = AWS::AutoScaling.new
+        @domain = OpenDelivery::Domain.new
       else
         @ec2 = AWS::EC2.new(:region => region)
         @sdb = AWS::SimpleDB.new(:region => region)
         @auto_scale = AWS::AutoScaling.new(:region => region)
+        @domain = OpenDelivery::Domain.new(:region => region)
       end
     end
 
-    protected
+    def create(domain, stack_name, type, key)
+      instance_id = prep_instance(domain, stack_name)
+      image = @ec2.images.create(
+        instance_id: instance_id,
+        name: image_name)
+
+      wait_for_image(image)
+
+      @domain.set_property(domain, key, type, image.id)
+    end
+
+    private
 
     def wait_for_image(image)
+      # Waiting for AWS to realize the image is ready to start
       sleep 10
 
       while image.state != :available

data/lib/opendelivery/stack.rb

@@ -32,8 +32,6 @@ module OpenDelivery
       "UPDATE_ROLLBACK_IN_PROGRESS",
       "UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS" ]
 
-    attr_accessor :sleep_time, :silent, :cfm
-
     def watch(stack_name, sleep_time, silent=false)
       success = false
       begin
@@ -47,7 +45,7 @@ module OpenDelivery
     end
 
 
-    def create(template, stack_name, parameters = {}, wait=false)
+    def create(stack_name, template, parameters = {}, wait=false, domain=nil)
       stack = @cfn.stacks.create(stack_name,
         File.open(template, "r").read,
         :parameters => parameters,
@@ -58,13 +56,16 @@ module OpenDelivery
         wait_for_stack(stack)
       end
 
-      stack.resources.each do |resource|
-        @domain.set_property(domain, stack_name, resource.resource_type, resource.physical_resource_id)
+      if domain.nil
+        stack.resources.each do |resource|
+          @domain.set_property(domain, stack_name, resource.resource_type, resource.physical_resource_id)
+        end
       end
     end
 
-    def destroy(domain, stack_name, wait=false)
+    def destroy(stack_name, domain=nil, wait=false)
       stack = @cfn.stacks[stack_name]
+      unless stack.exists? raise "Stack: #{stack_name} doesn't exist, therefore it cannot be destroyed"
       stack.delete
       while wait and stack.exists?
         sleep 20
@@ -78,22 +79,21 @@ module OpenDelivery
       end
     end
 
-    protected
+    private
 
     def wait_for_stack(stack)
       while stack.status != "CREATE_COMPLETE"
         sleep 20
 
-        case stack.status
-        when "ROLLBACK_IN_PROGESS" || "ROLLBACK_COMPLETE"
+        if FAILURE_STATUSES.include? stack.status
           stack.delete
         end
       end
     end
 
-    def print_status status
+    def print_status(status, silent)
       timestamp = Time.now.strftime("%Y.%m.%d %H:%M:%S:%L")
-      if (!@silent)
+      unless silent
         puts "#{timestamp}: #{status}"
       end
     end

data/lib/opendelivery.rb

@@ -1,6 +1,6 @@
 require 'opendelivery/source_control.rb'
 require 'opendelivery/domain.rb'
-require 'opendelivery/image.rb'
+require 'opendelivery/machine_image.rb'
 require 'opendelivery/stack.rb'
 require 'opendelivery/storage.rb'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opendelivery
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -13,6 +13,54 @@ bindir: bin
 cert_chain: []
 date: 2013-08-30 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -69,7 +117,7 @@ extra_rdoc_files: []
 files:
 - lib/opendelivery.rb
 - lib/opendelivery/domain.rb
-- lib/opendelivery/image.rb
+- lib/opendelivery/machine_image.rb
 - lib/opendelivery/source_control.rb
 - lib/opendelivery/stack.rb
 - lib/opendelivery/storage.rb