cfncli 0.7.0 → 0.8.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDE5OTQwN2E1M2FiODUwZmQyOWZlNGM3Y2E5YWI5NmYwMTVjMGVlNQ==
+    OTFhM2IxNmEzYjFjMWZjYmY3NDUwNmNmZWZiYjZhMjljYTg5ZDA5Yw==
   data.tar.gz: !binary |-
-    MjYwOWI3MGZkNDhmYzMyNzE2YmE0ODQ3OWZmMjliMTg2YzkxODg4MQ==
+    ZWQ0ZTE4NTg5MDNjODI2ZjI0ZjJiZWJhOGY3MzY4YzNhNTBkNDJhMg==
 SHA512:
   metadata.gz: !binary |-
-    ODVmNzI1MTg4ODMyN2E5Y2EwN2YyNTcxZjcyMTMzNWY4ODFmYmYxYTMwMzg1
-    OTljYTU5ZjQ2ZGRkZWEzOTUxN2IxYTU0YjJiMTczMzM2MTMxMWVmZGZhMGMx
-    ODZlOTcwNzlhMDM0ZmI1NTYxNjU0NmYyYTdjZmU5M2E3M2M3ZGQ=
+    YzI4OWZhMjg4OGRhYjkwODE2YjI2YWFhMjllMzI0YWU3NDY0NzQ3ZDcyZDlm
+    YzEwNDZiMGVjOTM5YjUxYmVlNzllZjY1MTFiM2RhNjU5ZGU5ODhlOGY4NTc0
+    NWZkZTBmZDExZjQ2Yjg4YzBiYTM0MjFkMmJmNTUwYTg1NmFkOTA=
   data.tar.gz: !binary |-
-    OGI3OTVhZWJmNDI5NTUzY2YyNDA3Y2MwMmYzN2ZiMDI0ZTE0MzEzOTc1ZGRm
-    M2UyMzgzYmZiMjU0NjhiZDNjMzJjOWRlODU0YTBiZmUwZDM1Y2U1YTJmNTM5
-    OGVkZWZmNjE2YTcxZmM2ZmQyYWZjMDZhM2M0ZDhlMDFjY2E5NWE=
+    ZTBjZjQwZWM0NjU3M2Y2MDkzZThmYjQyNGVjNWE3YmU1OTY2ZDU5ZTA4MjBk
+    NTQ5Yzk2Y2NjNjNhODBkZmU2NTY4NWUyNDNlMjMyYzE2YTczMGFhNmJhYjJl
+    MWYyZmI4NDc1NDhjZTcxNGQ1ZGE2Y2Q2MGQyODZjNjhhMTAyZWE=

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/.travis.yml

@@ -13,6 +13,6 @@ deploy:
   on:
     tags: true
 addons:
-    code_climate:
-        repo_token: 
-          secure: "AKrgx5PtDa5/pek0hLgtk55SEE4DzCBM1li4eVCPK4CWfo7WgiODN51rnE7uhnABdaeI82t/YuJIyLE37PnsU4dqkXVBXtPmijBkbZy1SZ/bmTsSnOFoMTVWkaCb/iAcr+i5yqJ16bSGLV/t3K80ksyH80WgZTdzmh75pEDKaOBDLI42mgBf/eXkLZ68iuotatLnuLFwVa4mGW79yiJYBxHNstYHEBd0B4Ahutz3BMGFUiwCBx0wer+nVf+RxN+RKkiXRLnOeucwVEcbOOHbm1nkLDhL8U1KQ8lnWNV+RSUPNoOJNoMcgMRKMavDj6TC29e2pO44PWNgICCkUqbvc9Otrac5HG566ZsYZ0gp9BhQxEIpeYkzEUh7a/znLGiQYylrohIf9gsWz3KLGOPD68y4DZfmKgQDZG8ag1ErKmIv1Cna1PmsFA/lXUrZ60hIzgc0Vdw2jb7Ww2GHK35h8kSOCuDOOgmDpLhESvPVb7PPL2ftTLwSH6FT/P7wyfoeSqgotZTKZCw6JZAnV+HjwWB1uzR7dlt/H0qjduCVekWcK7Pq4lnlNI8S4tcAYiJSaL6EcCvrQ2qUAlw2xXYar0ouRgOQgM4H3HCleqkNIZwHxc3GYgdyhhPYqBr8Uq1ziT7NnQ4X94cCu9tuAcvKoqvQiJOKc4HUGCzgPnJiqL8="
+#    code_climate:
+#        repo_token: 
+#          secure: "AKrgx5PtDa5/pek0hLgtk55SEE4DzCBM1li4eVCPK4CWfo7WgiODN51rnE7uhnABdaeI82t/YuJIyLE37PnsU4dqkXVBXtPmijBkbZy1SZ/bmTsSnOFoMTVWkaCb/iAcr+i5yqJ16bSGLV/t3K80ksyH80WgZTdzmh75pEDKaOBDLI42mgBf/eXkLZ68iuotatLnuLFwVa4mGW79yiJYBxHNstYHEBd0B4Ahutz3BMGFUiwCBx0wer+nVf+RxN+RKkiXRLnOeucwVEcbOOHbm1nkLDhL8U1KQ8lnWNV+RSUPNoOJNoMcgMRKMavDj6TC29e2pO44PWNgICCkUqbvc9Otrac5HG566ZsYZ0gp9BhQxEIpeYkzEUh7a/znLGiQYylrohIf9gsWz3KLGOPD68y4DZfmKgQDZG8ag1ErKmIv1Cna1PmsFA/lXUrZ60hIzgc0Vdw2jb7Ww2GHK35h8kSOCuDOOgmDpLhESvPVb7PPL2ftTLwSH6FT/P7wyfoeSqgotZTKZCw6JZAnV+HjwWB1uzR7dlt/H0qjduCVekWcK7Pq4lnlNI8S4tcAYiJSaL6EcCvrQ2qUAlw2xXYar0ouRgOQgM4H3HCleqkNIZwHxc3GYgdyhhPYqBr8Uq1ziT7NnQ4X94cCu9tuAcvKoqvQiJOKc4HUGCzgPnJiqL8="

data/Gemfile.lock

@@ -0,0 +1,130 @@
+PATH
+  remote: .
+  specs:
+    cfncli (0.8.1)
+      activesupport (~> 4)
+      aws-sdk (~> 2)
+      colorize (~> 0)
+      concurrent-ruby (~> 1.0)
+      thor
+      waiting (~> 0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.2.7.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    aws-sdk (2.5.6)
+      aws-sdk-resources (= 2.5.6)
+    aws-sdk-core (2.5.6)
+      jmespath (~> 1.0)
+    aws-sdk-resources (2.5.6)
+      aws-sdk-core (= 2.5.6)
+    builder (3.2.2)
+    codeclimate-test-reporter (0.5.0)
+      simplecov (>= 0.7.1, < 1.0.0)
+    coderay (1.1.1)
+    colorize (0.8.1)
+    concurrent-ruby (1.0.2)
+    cucumber (2.3.3)
+      builder (>= 2.1.2)
+      cucumber-core (~> 1.4.0)
+      cucumber-wire (~> 0.0.1)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 3.2.0)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.2)
+    cucumber-core (1.4.0)
+      gherkin (~> 3.2.0)
+    cucumber-wire (0.0.1)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    ffi (1.9.10)
+    formatador (0.2.5)
+    gherkin (3.2.0)
+    guard (2.13.0)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, <= 4.0)
+      lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.6.5)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    i18n (0.7.0)
+    jmespath (1.3.1)
+    json (1.8.3)
+    listen (3.0.6)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9.7)
+    lumberjack (1.0.10)
+    method_source (0.8.2)
+    minitest (5.9.0)
+    multi_json (1.11.2)
+    multi_test (0.1.2)
+    nenv (0.3.0)
+    notiffany (0.0.8)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rake (10.5.0)
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.7)
+      ffi (>= 0.5.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.4)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    shellany (0.0.1)
+    simplecov (0.11.2)
+      docile (~> 1.1.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    slop (3.6.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    waiting (0.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.10)
+  cfncli!
+  codeclimate-test-reporter
+  cucumber (~> 2)
+  guard (~> 2)
+  guard-rspec
+  rake (~> 10.0)
+  rspec
+  rspec-its (~> 1.2)
+
+BUNDLED WITH
+   1.12.5

data/README.md

@@ -1,5 +1,6 @@
 # cfncli
 [![Gem Version](https://badge.fury.io/rb/cfncli.svg)](https://badge.fury.io/rb/cfncli)
+[![Build Status](https://travis-ci.org/lethalpaga/cfncli.svg?branch=master)](https://travis-ci.org/lethalpaga/cfncli)
 [![Code Climate](https://codeclimate.com/github/lethalpaga/cfncli/badges/gpa.svg)](https://codeclimate.com/github/lethalpaga/cfncli)
 [![Test Coverage](https://codeclimate.com/github/lethalpaga/cfncli/badges/coverage.svg)](https://codeclimate.com/github/lethalpaga/cfncli/coverage)
 

data/lib/cfncli/cli.rb

@@ -110,6 +110,11 @@ module CfnCli
                   default: true,
                   desc: 'List the stack events during the operation'
 
+    method_option 'list_nested_events',
+                  type: :boolean,
+                  default: true,
+                  desc: 'List events from nested stacks'
+
     method_option 'interval',
                   type: :numeric,
                   default: 10,
@@ -172,6 +177,11 @@ module CfnCli
                   desc: 'Name or ID of the Cloudformation stack'
 
     # Application options.
+    method_option 'list_nested_events',
+                  type: :boolean,
+                  default: true,
+                  desc: 'List events from nested stacks'
+
     method_option 'interval',
                   type: :numeric,
                   default: 10,
@@ -194,7 +204,7 @@ module CfnCli
       fail ArgumentError, 'stack_name is required' unless stack_name
 
       config = Config::CfnClient.new(options['interval'], options['retries'], options['retry_limit'])
-      cfn.events(stack_name, config)
+      cfn.events(stack_name, config, options['list_nested_events'])
     end
 
     method_option 'stack_name',

data/lib/cfncli/cloudformation.rb

@@ -11,6 +11,9 @@ module CfnCli
     include CfnClient
     include Loggable
 
+    # A list of options that only apply for stack creation
+    CREATE_ONLY_OPTIONS = %w(on_failure).freeze
+
     def initialize
     end
 
@@ -29,6 +32,7 @@ module CfnCli
       stack = create_stack_obj(stack_name, config)
 
       if stack.exists?
+        CREATE_ONLY_OPTIONS.each { |key| opts.delete key }
         stack.update(opts)
       else
         stack.create(opts)
@@ -41,16 +45,18 @@ module CfnCli
     def apply_and_list_events(options, config = nil)
       # Create/update the stack
       logger.debug "Creating stack #{options['stack_name']}"
+      list_nested_events = options['list_nested_events']
+      options.delete 'list_nested_events'
       stack = create_or_update_stack(options, config)
 
-      events(stack, config)
+      events(stack, config, list_nested_events)
       Waiting.wait(interval: config.interval || default_config.interval, max_attempts: config.retries || default_config.retries) do |waiter|
         waiter.done if stack.finished? && !stack.listing_events?
-      end  
+      end
     end
 
     # List stack events
-    def events(stack_or_name, config = nil, reset_events = true, poller = nil, streamer = nil)
+    def events(stack_or_name, config = nil, list_nested_events = true, reset_events = true, poller = nil, streamer = nil)
       stack = stack_or_name
       stack = create_stack_obj(stack_or_name, config) unless stack_or_name.is_a? CfnCli::Stack
 
@@ -60,7 +66,7 @@ module CfnCli
       streamer.reset_events if reset_events
 
       logger.debug "Listing events for stack #{stack.stack_name}"
-      stack.list_events(poller, streamer, config)
+      stack.list_events(poller, streamer, config, nil, list_nested_events)
     end
 
     # Delete a stack

data/lib/cfncli/event_streamer.rb

@@ -31,7 +31,9 @@ module CfnCli
       events.sort { |a, b| a.timestamp <=> b.timestamp }.each do |event|
         yield event unless seen?(event) if block_given?
       end
-   end
+    rescue Aws::CloudFormation::Errors::ServiceError => e
+      raise unless e.class.name == 'Aws::CloudFormation::Errors::Throttling'
+    end
 
     # Mark all the existing events as 'seen'
     def reset_events

data/lib/cfncli/stack.rb

@@ -95,11 +95,11 @@ module CfnCli
 
     # List all events in real time
     # @param poller [CfnCli::Poller] Poller class to display events
-    def list_events(poller, streamer = nil, config = nil, event_prefix = nil)
+    def list_events(poller, streamer = nil, config = nil, event_prefix = nil, list_nested_events = true)
       @event_listing_thread = Thread.new do
         streamer ||= EventStreamer.new(self, config)
         streamer.each_event do |event|
-          if Event.new(event).child_stack_create_event?
+          if list_nested_events && Event.new(event).child_stack_create_event?
             track_child_stack(event.physical_resource_id, event.logical_resource_id, poller)
           end
           poller.event(event, event_prefix)

data/lib/cfncli/version.rb

@@ -1,3 +1,3 @@
 module CfnCli
-  VERSION = "0.7.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfncli
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.1
 platform: ruby
 authors:
 - lethalpaga
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -204,6 +204,7 @@ files:
 - .rspec
 - .travis.yml
 - Gemfile
+- Gemfile.lock
 - Guardfile
 - README.md
 - Rakefile