cfncli 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWQ3YjUwZTM2YzUyNzBlOGJjMzhjZmJjZTkxMDI1N2JhNTA3N2NmYw==
+    OTFjZTBhZDk1Y2JjZWM5YWE0MWFlOTlhNTEwZDEyYjRjZWFkNDk2Zg==
   data.tar.gz: !binary |-
-    Yjc2NTBmY2Y5ZWY3YWZiMzNjZDdlMDdkYjI3NWY3ZjJkNmU2YWE4Mg==
+    OTFiMzU2MzM0YjVkNjNiNWY0Yzg3YjdhYjBhOTg0Y2FlZGRjMWFlNQ==
 SHA512:
   metadata.gz: !binary |-
-    NjFlMTEzZWQ4ZDgxN2YzN2RlZDdmZDY1NzRhY2E4YWUyOGI4M2IwYTc0Yzg2
-    YWFkYjA3MTRjZGVlZmI4N2MxZDFlNjM2YjZkYTE3YjYwMTc4MWMzZjg0ZTFj
-    YTBkZmI0NDE0MWM4NTAyNjY1ZjU5Njk1ZmM2Zjk0YmE3OWU3M2Q=
+    ZDM5NmE0MzczOTMzN2E1ODljYjgwYjE4ZjNhZjllYWVjM2Y4ZWI0NjEwMzFj
+    MzFmM2EyNWM4ZDA2NTE3YjU3ZjM3NzljMDdiMzczNDkwM2VlYWRhZWFlNTYy
+    MmEwZjg0ZWFhZmI5ZjVhYTE2ZGU1MTFmMGRhMTRiNDdjZmZiNGE=
   data.tar.gz: !binary |-
-    YjgzNmY4N2QzNjQ5MDliOTRjYWIzNjM0ZjE2MjIyODFhN2EzYmFmYmVkYTBi
-    YTQzZmFhMTkyMGNkOTRlODk0ZDM3NDljMTY0NDBhYmFmYjBhNjQ0YjE3YzA5
-    MDc0YzU5ZjNjYzQ4MmFkZDRiNTE4NmQ0OWU3Njk0OWMyYzZkY2E=
+    OGViNTIwM2FjOGE4NjViM2M4MzA5ZTdkY2U3OWJmZTM2YThlMjVjOWMwNzdm
+    YWVhMjM1YjJmZGI2ZTU4OWVhM2FhODExNzU2MzcwNTVmNmJkYTFjNzZmMTgz
+    M2IzMmVlM2U3MjU3ZWJjNGMyMDE4ZDFkMWU2MWE5Njk3MzNlMmE=

data/README.md

@@ -1,4 +1,5 @@
 # cfncli
+[![Gem Version](https://badge.fury.io/rb/cfncli.svg)](https://badge.fury.io/rb/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/exe/cfncli

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
 require 'cfncli/cli'
 
-args = CfnCli::Config.load_from_file('cfncli.yml').to_thor(ARGV)
-CfnCli::Cli.start(args)
+CfnCli::Cli.start

data/lib/cfncli/cli.rb

@@ -3,9 +3,14 @@ require 'aws-sdk'
 
 require 'cfncli/cloudformation'
 require 'cfncli/config'
+require 'cfncli/thor_yaml'
+require 'cfncli/logger'
+require 'cfncli/version'
 
 module CfnCli
   class Cli < Thor
+    include ThorYamlLoader
+    include Loggable
 
     module ExitCode
       OK = 0
@@ -18,12 +23,16 @@ module CfnCli
                   type: :numeric,
                   default: 1,
                   desc: 'Log level to display (0=DEBUG, 1=INFO, 2=ERROR, 3=CRITICAL)'
+  
+    class_option 'config_file',
+                  type: :string,
+                  default: 'cfncli.yml',
+                  desc: 'Configuration file'
 
     # Stack options
     method_option 'stack_name',
                   alias: '-n',
                   type: :string,
-                  required: true,
                   desc: 'Cloudformation stack name'
 
     method_option 'template_body',
@@ -114,22 +123,27 @@ module CfnCli
       opts = process_params(options)
 
       stack_name = opts['stack_name']
-     
-      interval = consume_option(opts, 'interval')
+      fail ArgumentError, 'stack_name is required' unless stack_name
+    
       timeout = consume_option(opts, 'timeout')
-      retries = timeout / interval 
+      interval = consume_option(opts, 'interval')
+      retries = timeout / interval
       fail_on_noop = consume_option(opts, 'fail_on_noop')
       list_events = consume_option(opts, 'list_events')
+      config_file = consume_option(opts, 'config_file')
 
       ENV['CFNCLI_LOG_LEVEL'] = consume_option(opts, 'log_level').to_s
 
+      logger.debug "Apply parameters: #{options.inspect}"
+
       client_config = Config::CfnClient.new(interval, retries, fail_on_noop)
 
       res = ExitCode::OK 
-      cfn.create_stack(opts, client_config)
       if list_events
-        cfn.events(stack_name, client_config) 
+        cfn.apply_and_list_events(opts, client_config) 
         res = ExitCode::STACK_ERROR unless cfn.stack_successful? stack_name
+      else
+        cfn.create_stack(opts, client_config)
       end
 
       puts "Stack creation #{res == 0 ? 'successful' : 'failed'}"
@@ -142,10 +156,9 @@ module CfnCli
     method_option 'stack_name',
                   alias: '-n',
                   type: :string,
-                  required: true,
                   desc: 'Name or ID of the Cloudformation stack'
-    
-    # Application options
+
+    # Application options.
     method_option 'interval',
                   type: :numeric,
                   default: 10,
@@ -159,9 +172,57 @@ module CfnCli
     desc 'events', 'Displays the events for a stack in realtime'
     def events
       stack_name = options['stack_name']
+      
+      fail ArgumentError, 'stack_name is required' unless stack_name
+      
       config = Config::CfnClient.new(options['interval'], options['retries'])
       cfn.events(stack_name, config)
     end
+    
+    method_option 'stack_name',
+                  aliases: ['-n'],
+                  type: :string,
+                  desc: 'Name or ID of the Cloudformation stack'
+
+    # Application options.
+    method_option 'interval',
+                  type: :numeric,
+                  default: 10,
+                  desc: 'Polling interval (in seconds) for the cloudformation events'
+
+    method_option 'timeout',
+                  type: :numeric,
+                  default: 1800,
+                  desc: 'Timeout (in seconds) for the stack event listing'
+
+    desc 'delete', 'Deletes a stack'
+    def delete
+      opts = options.dup
+      stack_name = opts['stack_name']
+      
+      fail ArgumentError, 'stack_name is required' unless stack_name
+      
+      interval = consume_option(opts, 'interval')
+      timeout = consume_option(opts, 'timeout')
+      consume_option(opts, 'log_level')
+      consume_option(opts, 'config_file')
+      retries = timeout / interval
+
+      config = Config::CfnClient.new(interval, retries)
+      cfn.delete_stack(opts, config)
+    end
+
+    method_option 'verbose',
+                  aliases: ['-v'],
+                  type: :boolean,
+                  default: false,
+                  desc: 'Displays the full path to the command'
+    desc 'version', 'Display the version'
+    def version
+      program_name = $PROGRAM_NAME
+      program_name = File.basename program_name unless options['verbose']
+      puts "#{program_name} v#{CfnCli::VERSION}"
+    end
 
     no_tasks do
       # Reads an option from a hash and deletes it

data/lib/cfncli/cloudformation.rb

@@ -15,7 +15,7 @@ module CfnCli
     end
 
     # Creates a stack and wait for the creation to be finished
-    # @param options [Hash] Options for the stack creation 
+    # @param options [Hash] Options for the stack creation
     #                       (@see http://docs.aws.amazon.com/sdkforruby/api/Aws/CloudFormation/Client.html)
     def create_stack(options, config = nil)
       create_or_update_stack(options, config)
@@ -24,27 +24,51 @@ module CfnCli
     # Creates a stack if it doesn't exist otherwise update it
     def create_or_update_stack(options, config = nil)
       opts = process_params(options.dup)
-      
+
       stack_name = opts['stack_name']
-      
       stack = create_stack_obj(stack_name, config)
-      
+
       if stack.exists?
         stack.update(opts)
       else
         stack.create(opts)
       end
-      
+
       stack
     end
 
+    # Creates or update the stack and list events
+    def apply_and_list_events(options, config = nil)
+      # Create/update the stack
+      logger.debug "Creating stack #{options['stack_name']}"
+      stack = create_or_update_stack(options, config)
+
+      events(stack.stack_id)
+    end
+
     # List stack events
-    def events(stack_name, config)
-      stack = create_stack_obj(stack_name, config)
-      stack.list_events(EventPoller.new, config)
+    def events(stack_or_name, reset_events = true, poller = nil, streamer = nil, config = nil)
+      stack = stack_or_name
+      stack = create_stack_obj(stack_or_name, config) unless stack_or_name.is_a? CfnCli::Stack
+
+      poller ||= EventPoller.new
+      streamer ||= EventStreamer.new(stack, config)
+
+      streamer.reset_events if reset_events
+
+      logger.debug "Listing events for stack #{stack.stack_name}"
+      stack.list_events(poller, streamer, config)
     end
 
-    # Returns the stack stack
+    # Delete a stack
+    def delete_stack(options, config)
+      stack = create_stack_obj(options['stack_name'], config)
+      options['stack_name'] = stack.stack_id
+      stack.delete(options, config)
+      events(stack.stack_id, config)
+    end
+
+    # Returns the stack status
     def stack_successful?(stack_name)
       Stack.new(stack_name).succeeded?
     end
@@ -66,7 +90,9 @@ module CfnCli
     # Creates a new stack object
     # Mainly useful to mock it in unit tests
     def create_stack_obj(stack_name, config)
-      CfnCli::Stack.new(stack_name, config)
+      stack = CfnCli::Stack.new(stack_name, config)
+      stack.fetch_stack_id if stack.exists?
+      stack
     end
 
     # Process the parameters

data/lib/cfncli/config.rb

@@ -20,68 +20,5 @@ module CfnCli
         @fail_on_noop = fail_on_noop
       end
     end
-    
-    class Parameters
-      def initialize(content)
-        @content = content
-      end
-      
-      # Converts parameters to command-line arguments
-      def to_args(content = nil)
-        content ||= to_a
-        content.join(' ')
-      end
-      
-      # Get an array of parameters
-      def to_a
-        from_hash(@content) if @content.is_a? Hash       
-      end
-      
-      # Format parameters for thor
-      # @param given_args [Array] Optional array of existing arguments
-      def to_thor(given_args = nil)
-        args = []
-
-        if given_args
-          given_args = given_args.dup
-          args << given_args.shift
-        end
-        args += to_a
-        args += given_args if given_args
-        
-        args
-      end
-      
-      protected
-      
-      def from_hash(content)
-        args = []
-        content.each_pair do |key, value|
-          case value
-          when Hash
-            value = parse_hash(value)
-          when Array
-            value = parse_array(value)
-          end
-          
-          args += ["--#{key}", value]
-        end
-        
-        args
-      end
-      
-      def parse_hash(content)
-        args = []
-        content.each_pair do |key, value|
-          args += ["#{key}:#{value}"]
-        end
-        
-        args
-      end
-      
-      def parse_array(value)
-        "[#{value.join(',')}]"
-      end
-    end
   end
 end

data/lib/cfncli/event_streamer.rb

@@ -16,16 +16,25 @@ module CfnCli
     # Wait for events. This will exit when the
     # stack reaches a finished state
     # @yields [CfnEvent] Events for the stack
-    def each_event
+    def each_event(&block)
       Waiting.wait(interval: config.interval, max_attempts: config.retries) do |waiter|
-        @next_token = stack.events(@next_token).each do |event|
-          yield event unless seen?(event)
-        end
+        list_events(&block)
 
         waiter.done if stack.finished?
       end
     end
 
+    def list_events(&block)
+      @next_token = stack.events(@next_token).each do |event|
+        yield event unless seen?(event) if block_given?
+      end
+   end
+
+    # Mark all the existing events as 'seen'
+    def reset_events
+      list_events do; end
+    end
+
     private
 
     attr_accessor :seen_events

data/lib/cfncli/stack.rb

@@ -15,7 +15,7 @@ module CfnCli
     attr_reader :stack_name
 
     class StackNotFoundError < StandardError; end
-    
+
     def initialize(stack_name, config = nil)
       @stack = nil
       @stack_id = nil
@@ -65,7 +65,15 @@ module CfnCli
         raise e
       end
     end
-  
+
+    # Deletes an existing stack
+    def delete(opts, config)
+      logger.debug "Deleting stack #{opts.inspect}"
+      # Always use the real stack ID as the stack won't be available once deleted
+      id = fetch_stack_id
+      cfn.client.delete_stack(stack_name: id)
+    end
+
     # Waits for a stack to be in a finished state
     # @return A boolean indicating if the operation was succesful
     def wait_for_completion
@@ -80,13 +88,13 @@ module CfnCli
 
     # List all events in real time
     # @param poller [CfnCli::Poller] Poller class to display events
-    def list_events(poller, config = nil)
-      streamer = EventStreamer.new(self, config)
+    def list_events(poller, streamer = nil, config = nil)
+      streamer ||= EventStreamer.new(self, config)
       streamer.each_event do |event|
         poller.event(event)
       end
     end
-     
+
     # Get the events from the cfn stack
     def events(next_token)
       stack.events(next_token)
@@ -111,6 +119,13 @@ module CfnCli
       transitive_states.include? stack.stack_status
     end
 
+    # Gets stack id from the cfn API
+    def fetch_stack_id
+      @stack = cfn.stack(stack_id)
+      @stack_id = @stack.stack_id
+      @stack_id
+    end
+
     private
 
     # Gets stack info from the cfn API

data/lib/cfncli/thor_yaml.rb

@@ -0,0 +1,9 @@
+module ThorYamlLoader
+  def options
+    original_options = super
+    config_file = original_options['config_file']
+    return original_options unless File.exists?(config_file)
+    defaults = ::YAML::load_file(config_file) || {}
+    Thor::CoreExt::HashWithIndifferentAccess.new(defaults.merge(original_options))
+  end
+end

data/lib/cfncli/version.rb

@@ -1,3 +1,3 @@
 module CfnCli
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfncli
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - lethalpaga
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -208,6 +208,7 @@ files:
 - lib/cfncli/logger.rb
 - lib/cfncli/stack.rb
 - lib/cfncli/states.rb
+- lib/cfncli/thor_yaml.rb
 - lib/cfncli/version.rb
 homepage: https://github.com/lethalpaga/cfncli
 licenses: []