kumo_keisei 0.0.54 → 1.0.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aafae086e285b92c93f77d21ab4938c4dc4458dd
-  data.tar.gz: de6b75f61452599be6dcbd375e0bef150ed7a07f
+  metadata.gz: 177b3f9fa23f963bfa4d4448f362a242449ad975
+  data.tar.gz: 9c48934d039457ff2f5ba4c3843d5e620cee9070
 SHA512:
-  metadata.gz: 930367bd74af5b2ab2e423f41d123dd904fe33bf21c1035846ae9f0bd327b8eecaf517a2029ef0c9d81e07d5c5a887061f0c07cbe9fb7d365018744f1689fe7c
-  data.tar.gz: 665b7bab8e79ac469c3cfcf3da8c9697fd2866bbe9034a11409d538a4901f335684e3df8db684ad25a4a91c88c70396db41a2b1fcfc379df4843eaa46306f4d0
+  metadata.gz: f0fc8ee74a5ce6406fd5f40f153bd3531bcca54a30661e97dcc6912a61ea64b52f154e111932c3627764ade49573a2175a39598d4c782e1d9a60a3d3ccab676a
+  data.tar.gz: 43c8ac7e1290695186629b08ecc0a657578bf2c3b5a22889355be85ee27b0bb591894cc73e91724832453d49573b9d951ddb15876384ca2dbb9f10289a87e349

data/VERSION

@@ -1 +1 @@
-0.0.54
+1.0.0.pre

data/lib/kumo_keisei/cloud_formation_stack.rb

@@ -11,11 +11,11 @@ module KumoKeisei
     UPDATEABLE_STATUSES = [
       'UPDATE_ROLLBACK_COMPLETE',
       'CREATE_COMPLETE',
-      'UPDATE_COMPLETE',
-      'DELETE_COMPLETE'
+      'UPDATE_COMPLETE'
     ]
 
     RECOVERABLE_STATUSES = [
+      'DELETE_COMPLETE',
       'ROLLBACK_COMPLETE',
       'ROLLBACK_FAILED'
     ]
@@ -42,7 +42,6 @@ module KumoKeisei
       if updatable?
         update!(dynamic_params)
       else
-        ConsoleJockey.write_line "There's a previous stack called #{@stack_name} that didn't create properly, I'll clean it up for you..."
         ensure_deleted!
         ConsoleJockey.write_line "Creating your new stack #{@stack_name}"
         create!(dynamic_params)
@@ -50,6 +49,8 @@ module KumoKeisei
     end
 
     def destroy!
+      return if get_stack.nil?
+
       wait_until_ready(false)
       ensure_deleted!
     end
@@ -80,6 +81,8 @@ module KumoKeisei
       @stack = nil if options[:dump_cache]
 
       @stack ||= cloudformation.describe_stacks(stack_name: @stack_name).stacks.find { |stack| stack.stack_name == @stack_name }
+    rescue Aws::CloudFormation::Errors::ValidationError
+      nil
     end
 
     def cloudformation
@@ -87,19 +90,23 @@ module KumoKeisei
     end
 
     def ensure_deleted!
+      stack = get_stack
+      return if stack.nil?
+      return if stack.stack_status == 'DELETE_COMPLETE'
+
+      ConsoleJockey.write_line "There's a previous stack called #{@stack_name} that didn't create properly, I'll clean it up for you..."
       cloudformation.delete_stack(stack_name: @stack_name)
       cloudformation.wait_until(:stack_delete_complete, stack_name: @stack_name) { |waiter| waiter.delay = 20; waiter.max_attempts = 45 }
     end
 
     def updatable?
       stack = get_stack
+      return false if stack.nil?
 
       return true if UPDATEABLE_STATUSES.include? stack.stack_status
       return false if RECOVERABLE_STATUSES.include? stack.stack_status
       raise UpdateError.new("Stack is in an unrecoverable state") if UNRECOVERABLE_STATUSES.include? stack.stack_status
       raise UpdateError.new("Stack is busy, try again soon")
-    rescue Aws::CloudFormation::Errors::ValidationError
-      false
     end
 
     def create!(dynamic_params)

data/spec/lib/kumo_keisei/cloud_formation_stack_spec.rb

@@ -52,7 +52,7 @@ describe KumoKeisei::CloudFormationStack do
 
   describe "#apply!" do
     context "when the stack is updatable" do
-      UPDATEABLE_STATUSES = ['UPDATE_ROLLBACK_COMPLETE', 'CREATE_COMPLETE', 'UPDATE_COMPLETE', 'DELETE_COMPLETE']
+      UPDATEABLE_STATUSES = ['UPDATE_ROLLBACK_COMPLETE', 'CREATE_COMPLETE', 'UPDATE_COMPLETE']
 
       context "when the stack has changed" do
         before do
@@ -107,6 +107,16 @@ describe KumoKeisei::CloudFormationStack do
         allow(cloudformation).to receive(:delete_stack).with(stack_name: stack_name)
       end
 
+      context "and the stack has status DELETE_COMPLETE" do
+
+        it "creates the stack and does not attempt to delete the stack" do
+          expect(cloudformation).not_to receive(:delete_stack)
+          allow(cloudformation).to receive(:describe_stacks).with(stack_name: stack_name).and_return(stack_result_list_with_status('DELETE_COMPLETE', stack_name))
+          expect(cloudformation).to receive(:create_stack).with(cf_stack_create_params)
+          subject.apply!
+        end
+      end
+
       context "and the stack does not exist" do
         let(:stack_name) { "my-stack" }
 
@@ -118,8 +128,16 @@ describe KumoKeisei::CloudFormationStack do
         end
 
         it "shows a friendly error message if the stack had issues during creation" do
+          @call_count = 0
+
           allow(cloudformation).to receive(:delete_stack)
-          allow(cloudformation).to receive(:describe_stacks).with(stack_name: stack_name).and_raise(Aws::CloudFormation::Errors::ValidationError.new('',''))
+          allow(cloudformation).to receive(:describe_stacks).with(stack_name: stack_name) do
+            @call_count += 1
+
+            raise Aws::CloudFormation::Errors::ValidationError.new('','') if @call_count > 1
+
+            OpenStruct.new(stacks: [])
+          end
           allow(cloudformation).to receive(:create_stack).with(cf_stack_create_params)
 
           error = Aws::Waiters::Errors::UnexpectedError.new(RuntimeError.new("Stack with id #{stack_name} does not exist"))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumo_keisei
 version: !ruby/object:Gem::Version
-  version: 0.0.54
+  version: 1.0.0.pre
 platform: ruby
 authors:
 - Redbubble
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -124,9 +124,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2