cloudformer 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58d2ce781939b779dd804bf2ec33c8168cf62b1a
-  data.tar.gz: 24689509a537bc7f1bd3c9e92fadb19135e9e834
+  metadata.gz: 97c0ebd927bd0827047330b59ece651cca71605f
+  data.tar.gz: d28f7fddddf0bb0fc9a325ed13c963f3afb73f52
 SHA512:
-  metadata.gz: 885f731ad0b348038916ac5fb4c24b2c948aedb89e8d3d9a62b6b3d951508563c735b4e1e2d85f04b732875e445ac45c6be96fe0fc2abf3f6165eefd72a0ae1f
-  data.tar.gz: 6c3a897daeab52367d18b7f80c42c600f710d4677c6bdca725a1292dabf95886e7adb169676db14250cc25697c3ab79a0523a7b0cfc86c7fc89d7f61aa9f53af
+  metadata.gz: e99bd60c7d6f380cd3fbe0cb9234df3548575e4d59100e7005b7933c3aad0599dcbb2957f6d92805b98d50468dd9fc972aa0edc2c87a8d56e81f1039bb295eb8
+  data.tar.gz: 8b6fb6d5283446de6cbc4442f86f0953eabdf448b77663903a35f901c8a4ee1ad7d6b2fcf45ce153a22c865071a902239590a24f9e975a81a8315d5f3eecdcd2

data/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require "bundler/gem_tasks"

data/lib/cloudformer/stack.rb

@@ -2,6 +2,12 @@ require 'aws-sdk'
 
 class Stack
   attr_accessor :stack, :name, :deployed
+
+  SUCESS_STATES  = ["CREATE_COMPLETE", "UPDATE_COMPLETE"]
+  FAILURE_STATES = ["CREATE_FAILED", "DELETE_FAILED", "UPDATE_ROLLBACK_FAILED", "ROLLBACK_FAILED", "ROLLBACK_COMPLETE","ROLLBACK_FAILED","UPDATE_ROLLBACK_COMPLETE","UPDATE_ROLLBACK_FAILED"]
+  END_STATES     = SUCESS_STATES + FAILURE_STATES
+
+  # WAITING_STATES = ["CREATE_IN_PROGRESS","DELETE_IN_PROGRESS","ROLLBACK_IN_PROGRESS","UPDATE_COMPLETE_CLEANUP_IN_PROGRESS","UPDATE_IN_PROGRESS","UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS","UPDATE_ROLLBACK_IN_PROGRESS"]
   def initialize(stack_name)
     @name = stack_name
     @cf = AWS::CloudFormation.new
@@ -18,7 +24,7 @@ class Stack
     validation = validate(template)
     unless validation["valid"]
       puts "Unable to update - #{validation["response"][:code]} - #{validation["response"][:message]}"
-      return 1
+      return false
     end
     pending_operations = false
     if deployed
@@ -27,12 +33,13 @@ class Stack
       pending_operations = create(template, parameters, disable_rollback, capabilities)
     end
     wait_until_end if pending_operations
-    if stack.status == "ROLLBACK_COMPLETE" || stack.status == "CREATE_FAILED"
-      puts "Unable to update template. Check log for more information."
-      return 1
-    else
-      return 0
-    end
+    return deploy_succeded?
+  end
+
+  def deploy_succeded?
+    return true unless FAILURE_STATES.include?(stack.status)
+    puts "Unable to deploy template. Check log for more information."
+    false
   end
 
   def stop_instances
@@ -48,6 +55,7 @@ class Stack
       puts "Attempting to delete stack - #{name}"
       stack.delete
       wait_until_end
+      return deploy_succeded?
     end
   end
 
@@ -93,7 +101,7 @@ class Stack
       "response" => response
     }
   end
-  
+
   private
   def wait_until_end
     printed = []
@@ -103,16 +111,10 @@ class Stack
         return
       end
       loop do
-        exit_loop = false
         printable_events = stack.events.sort_by {|a| a.timestamp}.reject {|a| a if printed.include?(a.event_id)}
-        printable_events.each do |event|
-          puts "#{event.timestamp} - #{event.resource_type} - #{event.resource_status} - #{event.resource_status_reason.to_s}"
-          if event.resource_type == "AWS::CloudFormation::Stack" && !event.resource_status.match(/_COMPLETE$/).nil?
-            exit_loop = true
-          end
-        end
+        printable_events.each { |event| puts "#{event.timestamp} - #{event.resource_type} - #{event.resource_status} - #{event.resource_status_reason.to_s}" }
         printed.concat(printable_events.map(&:event_id))
-        break if !stack.status.match(/_COMPLETE$/).nil? || !stack.status.match(/DELETE_FAILED$/).nil? || !stack.status.match(/CREATE_FAILED$/).nil?
+        break if END_STATES.include?(stack.status)
         sleep(30)
       end
     end

data/lib/cloudformer/tasks.rb

@@ -35,14 +35,15 @@ module Cloudformer
         if retry_delete
           @stack.delete
         end
-       exit @stack.apply(template, parameters, disable_rollback, capabilities)
+       exit 1 unless @stack.apply(template, parameters, disable_rollback, capabilities)
      end
    end
+
    def define_delete_task
      desc "Delete stack from CloudFormation"
      task :delete do
       begin
-        @stack.delete
+        exit 1 unless @stack.delete
       rescue
         puts "Stack deleted successfully."
       end
@@ -54,25 +55,27 @@ module Cloudformer
     task :force_delete do
       begin
         @stack.stop_instances
-        @stack.delete
+        exit 1 unless @stack.delete
       rescue => e
         puts "Stack delete message - #{e.message}"
       end
     end
    end
-   
+
    def define_status_task
      desc "Get the deployed app status."
      task :status do
-       @stack.status
+      @stack.status
      end
    end
+
    def define_events_task
      desc "Get the recent events from the stack."
      task :events do
        @stack.events
      end
    end
+
    def define_outputs_task
      desc "Get the outputs of stack."
      task :outputs do

data/lib/cloudformer/version.rb

@@ -1,3 +1,3 @@
 module Cloudformer
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudformer
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Arvind Kunday
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler