knife-cfn 0.1.8 → 0.1.9

data/lib/chef/knife/cfn_base.rb

@@ -1,93 +1,93 @@
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'chef/knife'
-
-class Chef
-  class Knife
-    class CfnBase < Knife
-
-      # :nodoc:
-      # Would prefer to do this in a rational way, but can't be done b/c of
-      # Mixlib::CLI's design :(
-      def self.included(includer)
-        includer.class_eval do
-
-          deps do
-            require 'fog'
-            require 'readline'
-            require 'chef/json_compat'
-          end
-
-          option :aws_access_key_id,
-            :short => "-A ID",
-            :long => "--aws-access-key-id KEY",
-            :description => "Your AWS Access Key ID",
-            :proc => Proc.new { |key| Chef::Config[:knife][:aws_access_key_id] = key }
-
-          option :aws_secret_access_key,
-            :short => "-K SECRET",
-            :long => "--aws-secret-access-key SECRET",
-            :description => "Your AWS API Secret Access Key",
-            :proc => Proc.new { |key| Chef::Config[:knife][:aws_secret_access_key] = key }
-
-          option :region,
-            :long => "--region REGION",
-            :description => "Your AWS region",
-            :default => "us-east-1",
-            :proc => Proc.new { |key| Chef::Config[:knife][:region] = key }
-        end
-      end
-
-      def connection
-        @connection ||= begin
-          connection =  Fog::AWS::CloudFormation.new(
-            :aws_access_key_id => Chef::Config[:knife][:aws_access_key_id],
-            :aws_secret_access_key => Chef::Config[:knife][:aws_secret_access_key],
-            :region => locate_config_value(:region)
-          )
-        end
-      end
-
-      def locate_config_value(key)
-        key = key.to_sym
-        Chef::Config[:knife][key] || config[key]
-      end
-
-      def msg_pair(label, value, color=:cyan)
-        if value && !value.to_s.empty?
-          puts "#{ui.color(label, color)}: #{value}"
-        end
-      end
-
-      def validate!(keys=[:aws_access_key_id, :aws_secret_access_key])
-        errors = []
-
-        keys.each do |k|
-          pretty_key = k.to_s.gsub(/_/, ' ').gsub(/\w+/){ |w| (w =~ /(ssh)|(aws)/i) ? w.upcase  : w.capitalize }
-          if Chef::Config[:knife][k].nil?
-            errors << "You did not provide a valid '#{pretty_key}' value."
-          end
-        end
-
-        if errors.each{|e| ui.error(e)}.any?
-          exit 1
-        end
-      end
-
-    end
-  end
-end
-
-
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife'
+
+class Chef
+  class Knife
+    class CfnBase < Knife
+
+      # :nodoc:
+      # Would prefer to do this in a rational way, but can't be done b/c of
+      # Mixlib::CLI's design :(
+      def self.included(includer)
+        includer.class_eval do
+
+          deps do
+            require 'fog'
+            require 'readline'
+            require 'chef/json_compat'
+          end
+
+          option :aws_access_key_id,
+            :short => "-A ID",
+            :long => "--aws-access-key-id KEY",
+            :description => "Your AWS Access Key ID",
+            :proc => Proc.new { |key| Chef::Config[:knife][:aws_access_key_id] = key }
+
+          option :aws_secret_access_key,
+            :short => "-K SECRET",
+            :long => "--aws-secret-access-key SECRET",
+            :description => "Your AWS API Secret Access Key",
+            :proc => Proc.new { |key| Chef::Config[:knife][:aws_secret_access_key] = key }
+
+          option :region,
+            :long => "--region REGION",
+            :description => "Your AWS region",
+            :default => "us-east-1",
+            :proc => Proc.new { |key| Chef::Config[:knife][:region] = key }
+        end
+      end
+
+      def connection
+        @connection ||= begin
+          connection =  Fog::AWS::CloudFormation.new(
+            :aws_access_key_id => Chef::Config[:knife][:aws_access_key_id],
+            :aws_secret_access_key => Chef::Config[:knife][:aws_secret_access_key],
+            :region => locate_config_value(:region)
+          )
+        end
+      end
+
+      def locate_config_value(key)
+        key = key.to_sym
+        Chef::Config[:knife][key] || config[key]
+      end
+
+      def msg_pair(label, value, color=:cyan)
+        if value && !value.to_s.empty?
+          puts "#{ui.color(label, color)}: #{value}"
+        end
+      end
+
+      def validate!(keys=[:aws_access_key_id, :aws_secret_access_key])
+        errors = []
+
+        keys.each do |k|
+          pretty_key = k.to_s.gsub(/_/, ' ').gsub(/\w+/){ |w| (w =~ /(ssh)|(aws)/i) ? w.upcase  : w.capitalize }
+          if Chef::Config[:knife][k].nil?
+            errors << "You did not provide a valid '#{pretty_key}' value."
+          end
+        end
+
+        if errors.each{|e| ui.error(e)}.any?
+          exit 1
+        end
+      end
+
+    end
+  end
+end
+
+

data/lib/chef/knife/cfn_create.rb

@@ -1,125 +1,125 @@
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'chef/knife'
-require 'chef/knife/cfn_base'
-
-class Chef
-  class Knife
-    class CfnCreate < Chef::Knife::CfnBase
-
-      deps do
-        require 'fog'
-        require 'readline'
-        require 'chef/json_compat'
-        require 'chef/knife/bootstrap'
-        Chef::Knife::Bootstrap.load_deps
-      end
-      
-      banner "knife cfn create <stack name> (options)"
- 
-      option :capabilities,
-        :short => "-c CAPABILITY..",
-        :long => "--capabilities CAPABILITY1,CAPABILITY2,CAPABILITY3..",
-        :description => "The explicitly approved capabilities that may be used during this stack creation",
-        :proc => Proc.new { |capabilities| capabilities.split(',') }  
-        
-      option :disable_rollback,
-        :short => "-d",
-        :long => "--disable-rollback",
-        :description => "Flag to disable rollback of created resources when failures are encountered during stack creation. The default value is 'false'",
-        :proc => Proc.new { |d| Chef::Config[:knife][:disable_rollback] = "true" }
-
-      option :template_file,
-        :short => "-f TEMPLATE_FILE",
-        :long => "--template-file TEMPLATE_FILE",
-        :description => "Path to the file that contains the template",
-        :proc => Proc.new { |f| Chef::Config[:knife][:template_file] = f }
-        
-      option :notification_arns,
-        :short => "-n NOTIFICATION_ARN1,NOTIFICATION_ARN2,NOTIFICATION_ARN3..",
-        :long => "--notification-arns VALUE1,VALUE2,VALUE3..",
-        :description => "SNS ARNs to receive notification about the stack",
-        :proc => Proc.new { |notification_arns| notification_arns.split(',') }
-           
-      option :parameters,
-        :short => "-p 'key1=value1;key2=value2...'",
-        :long => "--parameters 'key1=value1;key2=value2...'",
-        :description => "Parameter values used to create the stack",
-        :proc => Proc.new { |parameters| parameters.split(';') }
-        
-      option :timeout,
-        :short => "-t TIMEOUT_VALUE",
-        :long => "--timeout TIMEOUT_VALUE",
-        :description => " Stack creation timeout in minutes",
-        :proc => Proc.new { |t| Chef::Config[:knife][:timeout] = t }  
-        
-      option :template_url,
-        :short => "-u TEMPLATE_URL",
-        :long => "--template-file TEMPLATE_URL",
-        :description => "Path of the URL that contains the template. This must be a reference to a template in an S3 bucket in the same region that the stack will be created in",
-        :proc => Proc.new { |u| Chef::Config[:knife][:template_url] = u }
-        
-      def run
-        $stdout.sync = true
-
-        validate!
-        
-        stack_name = @name_args[0]
-	
-	if stack_name.nil?
-	  show_usage
-	  ui.error("You must specify a stack name")
-          exit 1
-	end
-        
-        begin
-          response = connection.create_stack(stack_name, create_create_def)
-          rescue Excon::Errors::BadRequest => e
-            i= e.response.body.index("<Message>")
-            j = e.response.body.index("</Message>")
-            if !i.nil? and !j.nil?
-              ui.error(e.response.body[i+9,j-i-9])
-            else
-              print "\n#{e.response.body}"
-            end
-            exit 1
-          else
-            message = "Stack #{stack_name} creation started"
-            print "\n#{ui.color(message, :green)}\n"
-          end
-        end  
-      end   
-      
-      def create_create_def
-        create_def = {} 
-        template_file = locate_config_value(:template_file)
-        if template_file != nil and template_file != ""
-          doc = File.open(template_file, 'rb') { |file| file.read }
-	  create_def['TemplateBody'] = doc
-	end
-	create_def['TemplateURL'] = locate_config_value(:template_url)
-	create_def['Capabilities'] = locate_config_value(:capabilities)
-        create_def['DisableRollback'] = locate_config_value(:disable_rollback)
-        create_def['NotificationARNs'] = locate_config_value(:notification_arns)
-        hashed_parameters={}
-        parameters = locate_config_value(:parameters)
-        parameters.map{ |t| key,val=t.split('='); hashed_parameters[key]=val} unless parameters.nil?
-        create_def['Parameters'] = hashed_parameters
-        create_def['TimeoutInMinutes'] = locate_config_value(:timeout)
-        create_def
-      end
-      
-  end
-end
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife'
+require 'chef/knife/cfn_base'
+
+class Chef
+  class Knife
+    class CfnCreate < Chef::Knife::CfnBase
+
+      deps do
+        require 'fog'
+        require 'readline'
+        require 'chef/json_compat'
+        require 'chef/knife/bootstrap'
+        Chef::Knife::Bootstrap.load_deps
+      end
+      
+      banner "knife cfn create <stack name> (options)"
+ 
+      option :capabilities,
+        :short => "-c CAPABILITY..",
+        :long => "--capabilities CAPABILITY1,CAPABILITY2,CAPABILITY3..",
+        :description => "The explicitly approved capabilities that may be used during this stack creation",
+        :proc => Proc.new { |capabilities| capabilities.split(',') }  
+        
+      option :disable_rollback,
+        :short => "-d",
+        :long => "--disable-rollback",
+        :description => "Flag to disable rollback of created resources when failures are encountered during stack creation. The default value is 'false'",
+        :proc => Proc.new { |d| Chef::Config[:knife][:disable_rollback] = "true" }
+
+      option :template_file,
+        :short => "-f TEMPLATE_FILE",
+        :long => "--template-file TEMPLATE_FILE",
+        :description => "Path to the file that contains the template",
+        :proc => Proc.new { |f| Chef::Config[:knife][:template_file] = f }
+        
+      option :notification_arns,
+        :short => "-n NOTIFICATION_ARN1,NOTIFICATION_ARN2,NOTIFICATION_ARN3..",
+        :long => "--notification-arns VALUE1,VALUE2,VALUE3..",
+        :description => "SNS ARNs to receive notification about the stack",
+        :proc => Proc.new { |notification_arns| notification_arns.split(',') }
+           
+      option :parameters,
+        :short => "-p 'key1=value1;key2=value2...'",
+        :long => "--parameters 'key1=value1;key2=value2...'",
+        :description => "Parameter values used to create the stack",
+        :proc => Proc.new { |parameters| parameters.split(';') }
+        
+      option :timeout,
+        :short => "-t TIMEOUT_VALUE",
+        :long => "--timeout TIMEOUT_VALUE",
+        :description => " Stack creation timeout in minutes",
+        :proc => Proc.new { |t| Chef::Config[:knife][:timeout] = t }  
+        
+      option :template_url,
+        :short => "-u TEMPLATE_URL",
+        :long => "--template-file TEMPLATE_URL",
+        :description => "Path of the URL that contains the template. This must be a reference to a template in an S3 bucket in the same region that the stack will be created in",
+        :proc => Proc.new { |u| Chef::Config[:knife][:template_url] = u }
+        
+      def run
+        $stdout.sync = true
+
+        validate!
+        
+        stack_name = @name_args[0]
+	
+	if stack_name.nil?
+	  show_usage
+	  ui.error("You must specify a stack name")
+          exit 1
+	end
+        
+        begin
+          response = connection.create_stack(stack_name, create_create_def)
+          rescue Excon::Errors::BadRequest => e
+            i= e.response.body.index("<Message>")
+            j = e.response.body.index("</Message>")
+            if !i.nil? and !j.nil?
+              ui.error(e.response.body[i+9,j-i-9])
+            else
+              print "\n#{e.response.body}"
+            end
+            exit 1
+          else
+            message = "Stack #{stack_name} creation started"
+            print "\n#{ui.color(message, :green)}\n"
+          end
+        end  
+      end   
+      
+      def create_create_def
+        create_def = {} 
+        template_file = locate_config_value(:template_file)
+        if template_file != nil and template_file != ""
+          doc = File.open(template_file, 'rb') { |file| file.read }
+	  create_def['TemplateBody'] = doc
+	end
+	create_def['TemplateURL'] = locate_config_value(:template_url)
+	create_def['Capabilities'] = locate_config_value(:capabilities)
+        create_def['DisableRollback'] = locate_config_value(:disable_rollback)
+        create_def['NotificationARNs'] = locate_config_value(:notification_arns)
+        hashed_parameters={}
+        parameters = locate_config_value(:parameters)
+        parameters.map{ |t| key,val=t.split('='); hashed_parameters[key]=val} unless parameters.nil?
+        create_def['Parameters'] = hashed_parameters
+        create_def['TimeoutInMinutes'] = locate_config_value(:timeout)
+        create_def
+      end
+      
+  end
+end

data/lib/chef/knife/cfn_delete.rb

@@ -1,81 +1,81 @@
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'chef/knife'
-require 'chef/knife/cfn_base'
-
-class Chef
-  class Knife
-    class CfnDelete < Chef::Knife::CfnBase
-
-      deps do
-        require 'fog'
-        require 'readline'
-        require 'chef/json_compat'
-        require 'chef/knife/bootstrap'
-        Chef::Knife::Bootstrap.load_deps
-      end
-      
-      banner "knife cfn delete <stack name>"
- 
-      def run
-        $stdout.sync = true
-
-        validate!
-        
-        stack_name = @name_args[0]
-	
-	if stack_name.nil?
-	  show_usage
-	  ui.error("You must specify a stack name")
-	  exit 1
-	end
-		
-        options = {}
-        options['StackName'] = stack_name
-        begin
-          response = connection.describe_stacks(options)
-        rescue Excon::Errors::BadRequest => e        
-	  i= e.response.body.index("<Message>")
-          j = e.response.body.index("</Message>")
-          if !i.nil? and !j.nil?
-            ui.error(e.response.body[i+9,j-i-9])
-          else
-            print "\n#{e.response.body}"
-          end
-          exit 1
-	end
-	
-	puts "\n"
-	confirm("Do you really want to delete stack #{stack_name}")
-        
-        begin
-          response = connection.delete_stack(stack_name)
-        rescue Excon::Errors::BadRequest => e
-	  i= e.response.body.index("<Message>")
-          j = e.response.body.index("</Message>")
-          if !i.nil? and !j.nil?
-            ui.error(e.response.body[i+9,j-i-9])
-          else
-            print "\n#{e.response.body}"
-          end
-          exit 1
-        else
-          message = "Stack #{stack_name} delete started"
-          print "\n#{ui.color(message, :green)}"
-        end  
-      end   
-    end     
-  end
-end
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife'
+require 'chef/knife/cfn_base'
+
+class Chef
+  class Knife
+    class CfnDelete < Chef::Knife::CfnBase
+
+      deps do
+        require 'fog'
+        require 'readline'
+        require 'chef/json_compat'
+        require 'chef/knife/bootstrap'
+        Chef::Knife::Bootstrap.load_deps
+      end
+      
+      banner "knife cfn delete <stack name>"
+ 
+      def run
+        $stdout.sync = true
+
+        validate!
+        
+        stack_name = @name_args[0]
+	
+	if stack_name.nil?
+	  show_usage
+	  ui.error("You must specify a stack name")
+	  exit 1
+	end
+		
+        options = {}
+        options['StackName'] = stack_name
+        begin
+          response = connection.describe_stacks(options)
+        rescue Excon::Errors::BadRequest => e        
+	  i= e.response.body.index("<Message>")
+          j = e.response.body.index("</Message>")
+          if !i.nil? and !j.nil?
+            ui.error(e.response.body[i+9,j-i-9])
+          else
+            print "\n#{e.response.body}"
+          end
+          exit 1
+	end
+	
+	puts "\n"
+	confirm("Do you really want to delete stack #{stack_name}")
+        
+        begin
+          response = connection.delete_stack(stack_name)
+        rescue Excon::Errors::BadRequest => e
+	  i= e.response.body.index("<Message>")
+          j = e.response.body.index("</Message>")
+          if !i.nil? and !j.nil?
+            ui.error(e.response.body[i+9,j-i-9])
+          else
+            print "\n#{e.response.body}"
+          end
+          exit 1
+        else
+          message = "Stack #{stack_name} delete started"
+          print "\n#{ui.color(message, :green)}"
+        end  
+      end   
+    end     
+  end
+end

data/lib/chef/knife/cfn_events.rb

@@ -1,88 +1,88 @@
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'chef/knife'
-require 'chef/knife/cfn_base'
-
-class Chef
-  class Knife
-    class CfnEvents < Chef::Knife::CfnBase
-    
-      deps do
-        require 'fog'
-        require 'readline'
-        require 'chef/json_compat'
-        require 'chef/knife/bootstrap'
-        Chef::Knife::Bootstrap.load_deps
-      end    
-
-      banner "knife cfn events <stack name>"
-
-      def run
-        $stdout.sync = true
-
-        validate!
-        
-        stack_name = @name_args[0]
-			
-	if stack_name.nil?
-	  show_usage
-	  ui.error("You must specify a stack name")
-	  exit 1
-	end
-
-        events_list = [
-          ui.color('Event ID', :bold),
-          ui.color('Stack ID', :bold),
-          ui.color('Logical Resource Id', :bold),
-          ui.color('Physical Resource Id', :bold),
-          ui.color('Resource Type', :bold),
-          ui.color('Timestamp', :bold),
-          ui.color('Resource Status', :bold),
-          ui.color('Resource Status Reason', :bold)
-        ]
-        @name_args.each do |stack_name|
-	  data = Array.new
-	  begin
-            response = connection.describe_stack_events(stack_name)
-            data = response.body['StackEvents']
-          rescue Excon::Errors::BadRequest => e
-	    i= e.response.body.index("<Message>")
-            j = e.response.body.index("</Message>")
-            if !i.nil? and !j.nil?
-              ui.error(e.response.body[i+9,j-i-9])
-            else
-              print "\n#{e.response.body}"
-            end
-            exit 1
-          else
-	    data.each do |event|        
-              events_list << event['EventId']
-              events_list << event['StackId']
-              events_list << event['LogicalResourceId']
-              events_list << event['PhysicalResourceId']
-              events_list << event['ResourceType']
-              events_list << event['Timestamp'].to_s
-              events_list << event['ResourceStatus']
-              events_list << event['ResourceStatusReason'].to_s
-            end
-            puts ui.list(events_list, :uneven_columns_across, 8)
-          end
-        end
-      end
-    end
-  end
-end
-
-
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife'
+require 'chef/knife/cfn_base'
+
+class Chef
+  class Knife
+    class CfnEvents < Chef::Knife::CfnBase
+    
+      deps do
+        require 'fog'
+        require 'readline'
+        require 'chef/json_compat'
+        require 'chef/knife/bootstrap'
+        Chef::Knife::Bootstrap.load_deps
+      end    
+
+      banner "knife cfn events <stack name>"
+
+      def run
+        $stdout.sync = true
+
+        validate!
+        
+        stack_name = @name_args[0]
+			
+	if stack_name.nil?
+	  show_usage
+	  ui.error("You must specify a stack name")
+	  exit 1
+	end
+
+        events_list = [
+          ui.color('Event ID', :bold),
+          ui.color('Stack ID', :bold),
+          ui.color('Logical Resource Id', :bold),
+          ui.color('Physical Resource Id', :bold),
+          ui.color('Resource Type', :bold),
+          ui.color('Timestamp', :bold),
+          ui.color('Resource Status', :bold),
+          ui.color('Resource Status Reason', :bold)
+        ]
+        @name_args.each do |stack_name|
+	  data = Array.new
+	  begin
+            response = connection.describe_stack_events(stack_name)
+            data = response.body['StackEvents']
+          rescue Excon::Errors::BadRequest => e
+	    i= e.response.body.index("<Message>")
+            j = e.response.body.index("</Message>")
+            if !i.nil? and !j.nil?
+              ui.error(e.response.body[i+9,j-i-9])
+            else
+              print "\n#{e.response.body}"
+            end
+            exit 1
+          else
+	    data.each do |event|        
+              events_list << event['EventId']
+              events_list << event['StackId']
+              events_list << event['LogicalResourceId']
+              events_list << event['PhysicalResourceId']
+              events_list << event['ResourceType']
+              events_list << event['Timestamp'].to_s
+              events_list << event['ResourceStatus']
+              events_list << event['ResourceStatusReason'].to_s
+            end
+            puts ui.list(events_list, :uneven_columns_across, 8)
+          end
+        end
+      end
+    end
+  end
+end
+
+

data/lib/chef/knife/cfn_update.rb

@@ -1,125 +1,125 @@
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'chef/knife'
-require 'chef/knife/cfn_base'
-
-class Chef
-  class Knife
-    class CfnUpdate < Chef::Knife::CfnBase
-
-      deps do
-        require 'fog'
-        require 'readline'
-        require 'chef/json_compat'
-        require 'chef/knife/bootstrap'
-        Chef::Knife::Bootstrap.load_deps
-      end
-      
-      banner "knife cfn update <stack name> (options)"
- 
-      option :capabilities,
-        :short => "-c CAPABILITY..",
-        :long => "--capabilities CAPABILITY1,CAPABILITY2,CAPABILITY3..",
-        :description => "The explicitly approved capabilities that may be used during this stack creation",
-        :proc => Proc.new { |capabilities| capabilities.split(',') }  
-        
-      option :disable_rollback,
-        :short => "-d",
-        :long => "--disable-rollback",
-        :description => "Flag to disable rollback of updates when failures are encountered. The default value is 'false'",
-        :proc => Proc.new { |d| Chef::Config[:knife][:disable_rollback] = "true" }
-
-      option :template_file,
-        :short => "-f TEMPLATE_FILE",
-        :long => "--template-file TEMPLATE_FILE",
-        :description => "Path to the file that contains the template",
-        :proc => Proc.new { |f| Chef::Config[:knife][:template_file] = f }
-        
-      option :notification_arns,
-        :short => "-n NOTIFICATION_ARN1,NOTIFICATION_ARN2,NOTIFICATION_ARN3..",
-        :long => "--notification-arns VALUE1,VALUE2,VALUE3..",
-        :description => "SNS ARNs to receive notification about the stack",
-        :proc => Proc.new { |notification_arns| notification_arns.split(',') }
-           
-      option :parameters,
-        :short => "-p 'key1=value1;key2=value2...'",
-        :long => "--parameters 'key1=value1;key2=value2...'",
-        :description => "Parameter values used to update the stack",
-        :proc => Proc.new { |parameters| parameters.split(';') }
-        
-      option :timeout,
-        :short => "-t TIMEOUT_VALUE",
-        :long => "--timeout TIMEOUT_VALUE",
-        :description => " Stack update timeout in minutes",
-        :proc => Proc.new { |t| Chef::Config[:knife][:timeout] = t }  
-        
-      option :template_url,
-        :short => "-u TEMPLATE_URL",
-        :long => "--template-file TEMPLATE_URL",
-        :description => "Path of the URL that contains the template. This must be a reference to a template in an S3 bucket in the same region that the stack was created in",
-        :proc => Proc.new { |u| Chef::Config[:knife][:template_url] = u }
-        
-      def run
-        $stdout.sync = true
-
-        validate!
-        
-        stack_name = @name_args[0]
-	
-	if stack_name.nil?
-	  show_usage
-	  ui.error("You must specify a stack name")
-          exit 1
-	end
-        
-        begin
-          response = connection.update_stack(stack_name, create_update_def)
-          rescue Excon::Errors::BadRequest => e
-            i= e.response.body.index("<Message>")
-            j = e.response.body.index("</Message>")
-            if !i.nil? and !j.nil?
-              ui.error(e.response.body[i+9,j-i-9])
-            else
-              print "\n#{e.response.body}"
-            end
-            exit 1
-          else
-            message = "Stack #{stack_name} update started"
-            print "\n#{ui.color(message, :green)}\n"
-          end
-        end  
-      end   
-      
-      def create_update_def
-        create_def = {} 
-        template_file = locate_config_value(:template_file)
-        if template_file != nil and template_file != ""
-          doc = File.open(template_file, 'rb') { |file| file.read }
-	  create_def['TemplateBody'] = doc
-	end
-	create_def['TemplateURL'] = locate_config_value(:template_url)
-	create_def['Capabilities'] = locate_config_value(:capabilities)
-        create_def['DisableRollback'] = locate_config_value(:disable_rollback)
-        create_def['NotificationARNs'] = locate_config_value(:notification_arns)
-        hashed_parameters={}
-        parameters = locate_config_value(:parameters)
-        parameters.map{ |t| key,val=t.split('='); hashed_parameters[key]=val} unless parameters.nil?
-        create_def['Parameters'] = hashed_parameters
-        create_def['TimeoutInMinutes'] = locate_config_value(:timeout)
-        create_def
-      end
-      
-  end
-end
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife'
+require 'chef/knife/cfn_base'
+
+class Chef
+  class Knife
+    class CfnUpdate < Chef::Knife::CfnBase
+
+      deps do
+        require 'fog'
+        require 'readline'
+        require 'chef/json_compat'
+        require 'chef/knife/bootstrap'
+        Chef::Knife::Bootstrap.load_deps
+      end
+      
+      banner "knife cfn update <stack name> (options)"
+ 
+      option :capabilities,
+        :short => "-c CAPABILITY..",
+        :long => "--capabilities CAPABILITY1,CAPABILITY2,CAPABILITY3..",
+        :description => "The explicitly approved capabilities that may be used during this stack creation",
+        :proc => Proc.new { |capabilities| capabilities.split(',') }  
+        
+      option :disable_rollback,
+        :short => "-d",
+        :long => "--disable-rollback",
+        :description => "Flag to disable rollback of updates when failures are encountered. The default value is 'false'",
+        :proc => Proc.new { |d| Chef::Config[:knife][:disable_rollback] = "true" }
+
+      option :template_file,
+        :short => "-f TEMPLATE_FILE",
+        :long => "--template-file TEMPLATE_FILE",
+        :description => "Path to the file that contains the template",
+        :proc => Proc.new { |f| Chef::Config[:knife][:template_file] = f }
+        
+      option :notification_arns,
+        :short => "-n NOTIFICATION_ARN1,NOTIFICATION_ARN2,NOTIFICATION_ARN3..",
+        :long => "--notification-arns VALUE1,VALUE2,VALUE3..",
+        :description => "SNS ARNs to receive notification about the stack",
+        :proc => Proc.new { |notification_arns| notification_arns.split(',') }
+           
+      option :parameters,
+        :short => "-p 'key1=value1;key2=value2...'",
+        :long => "--parameters 'key1=value1;key2=value2...'",
+        :description => "Parameter values used to update the stack",
+        :proc => Proc.new { |parameters| parameters.split(';') }
+        
+      option :timeout,
+        :short => "-t TIMEOUT_VALUE",
+        :long => "--timeout TIMEOUT_VALUE",
+        :description => " Stack update timeout in minutes",
+        :proc => Proc.new { |t| Chef::Config[:knife][:timeout] = t }  
+        
+      option :template_url,
+        :short => "-u TEMPLATE_URL",
+        :long => "--template-file TEMPLATE_URL",
+        :description => "Path of the URL that contains the template. This must be a reference to a template in an S3 bucket in the same region that the stack was created in",
+        :proc => Proc.new { |u| Chef::Config[:knife][:template_url] = u }
+        
+      def run
+        $stdout.sync = true
+
+        validate!
+        
+        stack_name = @name_args[0]
+	
+	if stack_name.nil?
+	  show_usage
+	  ui.error("You must specify a stack name")
+          exit 1
+	end
+        
+        begin
+          response = connection.update_stack(stack_name, create_update_def)
+          rescue Excon::Errors::BadRequest => e
+            i= e.response.body.index("<Message>")
+            j = e.response.body.index("</Message>")
+            if !i.nil? and !j.nil?
+              ui.error(e.response.body[i+9,j-i-9])
+            else
+              print "\n#{e.response.body}"
+            end
+            exit 1
+          else
+            message = "Stack #{stack_name} update started"
+            print "\n#{ui.color(message, :green)}\n"
+          end
+        end  
+      end   
+      
+      def create_update_def
+        create_def = {} 
+        template_file = locate_config_value(:template_file)
+        if template_file != nil and template_file != ""
+          doc = File.open(template_file, 'rb') { |file| file.read }
+	  create_def['TemplateBody'] = doc
+	end
+	create_def['TemplateURL'] = locate_config_value(:template_url)
+	create_def['Capabilities'] = locate_config_value(:capabilities)
+        create_def['DisableRollback'] = locate_config_value(:disable_rollback)
+        create_def['NotificationARNs'] = locate_config_value(:notification_arns)
+        hashed_parameters={}
+        parameters = locate_config_value(:parameters)
+        parameters.map{ |t| key,val=t.split('='); hashed_parameters[key]=val} unless parameters.nil?
+        create_def['Parameters'] = hashed_parameters
+        create_def['TimeoutInMinutes'] = locate_config_value(:timeout)
+        create_def
+      end
+      
+  end
+end

data/lib/chef/knife/cfn_validate.rb

@@ -1,80 +1,80 @@
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'chef/knife'
-require 'chef/knife/cfn_base'
-
-class Chef
-  class Knife
-    class CfnValidate < Chef::Knife::CfnBase
-    
-      deps do
-        require 'fog'
-        require 'readline'
-        require 'chef/json_compat'
-        require 'chef/knife/bootstrap'
-        Chef::Knife::Bootstrap.load_deps
-      end
-      
-      banner "knife cfn validate (options)"
-
-      option :template_file,
-        :short => "-f TEMPLATE_FILE",
-        :long => "--template-file TEMPLATE_FILE",
-        :description => "Path to the file that contains the template",
-        :proc => Proc.new { |f| Chef::Config[:knife][:template_file] = f }
-        
-      option :template_url,
-        :short => "-u TEMPLATE_URL",
-        :long => "--template-file TEMPLATE_URL",
-        :description => "Path to the URL that contains the template",
-        :proc => Proc.new { |u| Chef::Config[:knife][:template_url] = u }
-        
-
-      def run
-        $stdout.sync = true
-
-        validate!
-        
-	begin
-           response = connection.validate_template(create_validate_def)
-        rescue Excon::Errors::BadRequest => e
-	   i= e.response.body.index("<Message>")
-           j = e.response.body.index("</Message>")
-           if !i.nil? and !j.nil?
-              ui.error(e.response.body[i+9,j-i-9])
-           else
-              print "\n#{e.response.body}"
-           end
-           exit 1
-        else
-           print "\n#{ui.color("Template validated successfully", :green)}"
-        end
-      end   
-        
-      def create_validate_def
-        validate_def = {} 
-        template_file = locate_config_value(:template_file)
-        if template_file != nil and template_file != ""
-            doc = File.open(template_file, 'rb') { |file| file.read }
-	    validate_def['TemplateBody'] = doc
-	else    
-	    validate_def['TemplateURL'] = locate_config_value(:template_url)
-	end
-	validate_def
-      end
-      
-    end
-  end
-end
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife'
+require 'chef/knife/cfn_base'
+
+class Chef
+  class Knife
+    class CfnValidate < Chef::Knife::CfnBase
+    
+      deps do
+        require 'fog'
+        require 'readline'
+        require 'chef/json_compat'
+        require 'chef/knife/bootstrap'
+        Chef::Knife::Bootstrap.load_deps
+      end
+      
+      banner "knife cfn validate (options)"
+
+      option :template_file,
+        :short => "-f TEMPLATE_FILE",
+        :long => "--template-file TEMPLATE_FILE",
+        :description => "Path to the file that contains the template",
+        :proc => Proc.new { |f| Chef::Config[:knife][:template_file] = f }
+        
+      option :template_url,
+        :short => "-u TEMPLATE_URL",
+        :long => "--template-file TEMPLATE_URL",
+        :description => "Path to the URL that contains the template",
+        :proc => Proc.new { |u| Chef::Config[:knife][:template_url] = u }
+        
+
+      def run
+        $stdout.sync = true
+
+        validate!
+        
+	begin
+           response = connection.validate_template(create_validate_def)
+        rescue Excon::Errors::BadRequest => e
+	   i= e.response.body.index("<Message>")
+           j = e.response.body.index("</Message>")
+           if !i.nil? and !j.nil?
+              ui.error(e.response.body[i+9,j-i-9])
+           else
+              print "\n#{e.response.body}"
+           end
+           exit 1
+        else
+           print "\n#{ui.color("Template validated successfully", :green)}"
+        end
+      end   
+        
+      def create_validate_def
+        validate_def = {} 
+        template_file = locate_config_value(:template_file)
+        if template_file != nil and template_file != ""
+            doc = File.open(template_file, 'rb') { |file| file.read }
+	    validate_def['TemplateBody'] = doc
+	else    
+	    validate_def['TemplateURL'] = locate_config_value(:template_url)
+	end
+	validate_def
+      end
+      
+    end
+  end
+end

data/lib/knife-cnf/version.rb

@@ -1,3 +1,3 @@
 module KnifeCfn
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-cfn
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,14 +9,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-14 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
@@ -24,7 +24,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
@@ -32,7 +32,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '11'
   type: :runtime
@@ -40,7 +40,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '11'
 description: CloudFormation Support for Chef's Knife Command