stack_master 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf6c29e375676d2bbd7d93ac50eb49a2f9d34088
-  data.tar.gz: ddf038345eb4034700624804f7ca01621f7c1bb9
+  metadata.gz: d2df973e8c51854049665bee6f11cff19b8a7aba
+  data.tar.gz: 2ce1a8f1de5d06e02a47aef292648d79c2c52d21
 SHA512:
-  metadata.gz: dca5b26f38caa092166b30f2fb0210388f417feff5d2fec3236440fc7d8600d0513038dc26c2f36601b4e65e762ca2e3c4d3b6168e0fd017009e1d144f5517db
-  data.tar.gz: '098d941af23edcf79dc0baa78bf64b4eb58c0355c651c33f163cfb4e0bf5589e6e1215516cdee6f36dc922c71dc6415e04078b7ae611a321e26dafe6c7fa1466'
+  metadata.gz: 869faae3d938ae4cee9e9e666c25077a308220eaa7544fb8a9e78aeeb6df9870df541871102651a3c45efef0f1258490b50be49f48f6bf68d733e5a57001e85e
+  data.tar.gz: b2958b04187ad83dea0e22909f07a66219214080ce097715d02a06775987dc0f86e86bd55482305e9cb8de59a86e4e02c371cab6834a6ff809cafcaec9280a16

data/lib/stack_master/commands/apply.rb

@@ -76,13 +76,23 @@ module StackMaster
       end
 
       def create_stack_by_change_set
-        @change_set = ChangeSet.create(stack_options.merge(change_set_type: 'CREATE'))
-        halt!(@change_set.status_reason) if @change_set.failed?
-        @change_set.display(StackMaster.stdout)
-        unless ask?('Create stack (y/n)? ')
+        begin
+          @change_set = ChangeSet.create(stack_options.merge(change_set_type: 'CREATE'))
+          if @change_set.failed?
+            ChangeSet.delete(@change_set.id)
+            halt!(@change_set.status_reason)
+          end
+
+          @change_set.display(StackMaster.stdout)
+          unless ask?('Create stack (y/n)? ')
+            cf.delete_stack(stack_name: stack_name)
+            halt!('Stack creation aborted')
+          end
+        rescue StackMaster::CtrlC
           cf.delete_stack(stack_name: stack_name)
-          halt!('Stack creation aborted')
+          raise
         end
+
         execute_change_set
       end
 
@@ -102,7 +112,11 @@ module StackMaster
       def update_stack
         upload_files
         @change_set = ChangeSet.create(stack_options)
-        halt!(@change_set.status_reason) if @change_set.failed?
+        if @change_set.failed?
+          ChangeSet.delete(@change_set.id)
+          halt!(@change_set.status_reason)
+        end
+
         @change_set.display(StackMaster.stdout)
         unless ask?("Apply change set (y/n)? ")
           ChangeSet.delete(@change_set.id)

data/lib/stack_master/version.rb

@@ -1,3 +1,3 @@
 module StackMaster
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/stack_master/commands/apply_spec.rb

@@ -109,6 +109,7 @@ RSpec.describe StackMaster::Commands::Apply do
 
     context 'the changeset failed to create' do
       before do
+        allow(StackMaster::ChangeSet).to receive(:delete)
         allow(change_set).to receive(:failed?).and_return(true)
         allow(change_set).to receive(:status_reason).and_return('reason')
       end
@@ -222,6 +223,19 @@ RSpec.describe StackMaster::Commands::Apply do
         expect(StackMaster::ChangeSet).to_not have_received(:execute).with(change_set.id)
       end
     end
+
+    context 'user uses ctrl+c' do
+      before do
+        allow(StackMaster).to receive(:non_interactive_answer).and_return('n')
+        allow(cf).to receive(:delete_stack)
+        allow(StackMaster::ChangeSet).to receive(:create).and_raise(StackMaster::CtrlC)
+      end
+
+      it "deletes the stack" do
+        expect(cf).to receive(:delete_stack).with(stack_name: stack_name)
+        expect { apply }.to raise_error
+      end
+    end
   end
 
   context 'one or more parameters are empty' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stack_master
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Steve Hodgkiss
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-11 00:00:00.000000000 Z
+date: 2017-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler