cfn-status 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b8d3f2b5eaaab5d41d434b53fdb4ed16337bac065772db5efd0da6869f03d7c
-  data.tar.gz: 7412b786f0ab988f2c20100222026a13fa8cd1385742efc2cc074d6bfb319925
+  metadata.gz: 8995a22b702f88f6b8474940ff4cedcad0ed03f5959662f858b20597b3b7bd75
+  data.tar.gz: 9d0a502a23754203bfdc2a7043c587b168379fc0419b2849cb76374525c9516b
 SHA512:
-  metadata.gz: 1b32d13db397770b601204ec8c9dcc33d28c0f7671863d84a8e3e225adfd2feb5674eba8ff06e808cb8399f5452e3fb9b3d9f267cc4b90288da0e02c16ea5604
-  data.tar.gz: 97dfb7f30531b3269c255af4d892e4c67084cc6c21670adc43efa48c5927088317983fdfe00888ee29a5a3395fbfb3c162c632aba34470aa67b7b1056875b6aa
+  metadata.gz: 39b82b43b28f88fc08b784a6c595d27f553f641add1f27f0ae207de62182b05269fbba62f0c094d84da918b8cf450d4ffa8d050fb73a73a63bbdbda957cd7d2e
+  data.tar.gz: f6c0b78894e28f66285c9bafb6c48775c4e13dc72d2c5908c3168368c6cf4d571ab66e464b5f9bdebc7b48ab9166f88fbd8090164fe85a3ace2624af2557e589

data/CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 This project *loosely* adheres to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [0.5.0] - 2023-12-17
+- [#6](https://github.com/tongueroo/cfn-status/pull/6) Use events.dig instead of brackets
+- [#7](https://github.com/tongueroo/cfn-status/pull/7) Add start_index_before_delete option
+- add add_development_dependency nokogiri
+- improve dev dependency version pins
+
+## [0.4.6] - 2022-02-21
+- show took time for deletion also
+
 ## [0.4.5] - 2022-02-20
 - [#5](https://github.com/tongueroo/cfn-status/pull/5) cfn-status retry options
 

data/cfn-status.gemspec

@@ -24,7 +24,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "aws-sdk-cloudformation"
 
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "nokogiri"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake", ">= 12.3.3"
+  spec.add_development_dependency "rspec", ">= 3.0"
 end

data/lib/cfn_status/version.rb

@@ -1,3 +1,3 @@
 class CfnStatus
-  VERSION = "0.4.5"
+  VERSION = "0.5.0"
 end

data/lib/cfn_status.rb

@@ -23,7 +23,7 @@ class CfnStatus
       return true
     end
 
-    puts "The current status for the stack #{@stack_name.color(:green)} is #{stack.stack_status.color(:green)}"
+    puts "Stack #{@stack_name.color(:green)} Status: #{stack.stack_status.color(:green)}"
     if in_progress?
       puts "Stack events (tailing):"
       # tail all events until done
@@ -66,6 +66,7 @@ class CfnStatus
 
     if @stack_deletion_completed
       puts "Stack #{@stack_name} deleted."
+      show_took(start_time)
       return
     end
 
@@ -74,7 +75,7 @@ class CfnStatus
 
     if last_event_status =~ /_FAILED/
       puts "Stack failed: #{last_event_status}".color(:red)
-      puts "Stack reason #{@events[0]["resource_status_reason"]}".color(:red)
+      puts "Stack reason #{@events.dig(0,"resource_status_reason")}".color(:red)
     elsif last_event_status =~ /_ROLLBACK_/
       puts "Stack rolled back: #{last_event_status}".color(:red)
     else # success
@@ -82,15 +83,19 @@ class CfnStatus
     end
 
     return if @hide_time_took # set in run
-    took = Time.now - start_time
-    puts "Time took: #{pretty_time(took).color(:green)}."
+    show_took(start_time)
     success?
   end
 
+  def show_took(start_time)
+    took = Time.now - start_time
+    puts "Time took: #{pretty_time(took).color(:green)}"
+  end
+
   def completed
     last_event_status =~ /(_COMPLETE|_FAILED)$/ &&
-    @events[0]["logical_resource_id"] == @stack_name &&
-    @events[0]["resource_type"] == "AWS::CloudFormation::Stack"
+    @events.dig(0,"logical_resource_id") == @stack_name &&
+    @events.dig(0,"resource_type") == "AWS::CloudFormation::Stack"
   end
 
   def last_event_status
@@ -118,7 +123,7 @@ class CfnStatus
       print_event(e)
     end
 
-    @last_shown_event_id = @events[0]["event_id"]
+    @last_shown_event_id = @events.dig(0, "event_id")
     # puts "@last_shown_event_id #{@last_shown_event_id.inspect}"
   end
 
@@ -186,9 +191,14 @@ class CfnStatus
 
   # Should always find a "User Initiated" stack event when @last_shown_index is not set
   def start_index
+    start_index_before_delete = @options[:start_index_before_delete]
+
     @events.find_index do |event|
+      skip = start_index_before_delete && event["resource_status"] == "DELETE_IN_PROGRESS"
+
       event["resource_type"] == "AWS::CloudFormation::Stack" &&
-      event["resource_status_reason"] == "User Initiated"
+      event["resource_status_reason"] == "User Initiated" &&
+      !skip
     end
   end
 
@@ -199,12 +209,12 @@ class CfnStatus
   end
 
   def success?
-    resource_status = @events[0]["resource_status"]
+    resource_status = @events.dig(0,"resource_status")
     %w[CREATE_COMPLETE UPDATE_COMPLETE].include?(resource_status)
   end
 
   def update_rollback?
-    @events[0]["resource_status"] == "UPDATE_ROLLBACK_COMPLETE"
+    @events.dig(0,"resource_status") == "UPDATE_ROLLBACK_COMPLETE"
   end
 
   def find_update_failed_event

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfn-status
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-20 00:00:00.000000000 Z
+date: 2023-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudformation
@@ -24,46 +24,60 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 description: 
@@ -108,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.4.20
 signing_key: 
 specification_version: 4
 summary: CloudFormation status library