knife-cfn 0.1.6 → 0.1.7

data/lib/chef/knife/cfn_describe.rb

@@ -18,40 +18,47 @@ require 'chef/knife/cfn_base'
 class Chef
   class Knife
     class CfnDescribe < Chef::Knife::CfnBase
-    
+
       deps do
         require 'fog'
         require 'readline'
         require 'chef/json_compat'
         require 'chef/knife/bootstrap'
         Chef::Knife::Bootstrap.load_deps
-      end    
+      end
 
       banner "knife cfn describe [stack name] - lists all stacks if [stack name] is omitted."
 
+      option :long_names,
+             :short  => "-l",
+             :long   => "--long",
+             :description  => "Use long stack names (ARN) instead of friendly names"
+
       def run
         $stdout.sync = true
 
         validate!
-        
+
         stack_name = @name_args[0]
-        output_mode = "StackId"
-        output_header = "Stack ID"
+        if stack_name.nil?
+          @name_args[0] = "__ALL__"
+        end
 
-		
-	if stack_name.nil?
-    @name_args[0] = "__ALL__"
-    output_mode = "StackName"
-    output_header = "Stack Name"
-	end
+        output_mode = "StackName"
+        output_header = "Stack Name"
+
+        if !config[:long_names].nil?
+          output_mode = "StackId"
+          output_header = "Stack ID"
+        end
 
         stack_list = [
-          ui.color(output_header, :bold),
-          ui.color('Status', :bold),
-          ui.color('Creation Time', :bold),
-          ui.color('Disable Rollback', :bold)
+            ui.color(output_header, :bold),
+            ui.color('Status', :bold),
+            ui.color('Creation Time', :bold),
+            ui.color('Disable Rollback', :bold)
         ]
-        
+
         @name_args.each do |stack_name|
           options = {}
           data = Array.new
@@ -65,26 +72,27 @@ class Chef
             end
 
             data = response.body['Stacks']
-            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
+          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
-	      data.each do |stack|
-                stack_list << stack[output_mode]
-                stack_list << stack['StackStatus']
-                stack_list << stack['CreationTime'].to_s
-                stack_list << stack['DisableRollback'].to_s
-              end
-              puts ui.list(stack_list, :uneven_columns_across, 4)
-            end  
+              print "\n#{e.response.body}"
+            end
+            exit 1
+          else
+            data.each do |stack|
+              stack_list << stack[output_mode]
+              stack_list << stack['StackStatus']
+              stack_list << stack['CreationTime'].to_s
+              stack_list << stack['DisableRollback'].to_s
+            end
+
+            puts ui.list(stack_list, :uneven_columns_across, 4)
           end
         end
       end
     end
+  end
 end

data/lib/chef/knife/cfn_outputs.rb

@@ -0,0 +1,90 @@
+#
+# 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 CfnOutputs < 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 outputs <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("Stack", :bold),
+            ui.color('Output Key', :bold),
+            ui.color('Output Value', :bold),
+            ui.color('Description', :bold)
+        ]
+
+        @name_args.each do |stack_name|
+          options = {}
+          options["StackName"] = stack_name
+          data = Array.new
+          begin
+            response = connection.describe_stacks(options)
+            data = response.body["Stacks"]
+
+          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 |stack|
+              row1 = true
+              events_list << stack["StackName"]
+              stack["Outputs"].each do |output|
+                if !row1
+                  events_list << ""
+                end
+                events_list << output["OutputKey"]
+                events_list << output["OutputValue"]
+                events_list << output["Description"]
+                row1 = false
+              end
+            end
+            puts ui.list(events_list, :uneven_columns_across, 4)
+          end
+        end
+      end
+    end
+  end
+end
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-cfn
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -54,6 +54,7 @@ files:
 - lib/chef/knife/cfn_delete.rb
 - lib/chef/knife/cfn_describe.rb
 - lib/chef/knife/cfn_events.rb
+- lib/chef/knife/cfn_outputs.rb
 - lib/chef/knife/cfn_update.rb
 - lib/chef/knife/cfn_validate.rb
 - lib/knife-cnf/version.rb