ucloudstack 0.0.3 → 0.0.4

data/lib/chef/knife/cs_product_list.rb

@@ -27,6 +27,14 @@ module KnifeCloudstack
 
     banner "knife cs product list (options)"
 
+    option :output_type,
+           :short => "-O Type",
+           :long => "--output-type Type",
+           :description => "Output type json/table",
+           :default => "table",
+           :proc => Proc.new { |type| Chef::Config[:knife][:output_type] = type }
+
+
     def run
 
       connection = CloudstackClient::Connection.new(
@@ -58,8 +66,12 @@ module KnifeCloudstack
           product_list << product['zoneid']
           product_list << product['zonedesc']
       end
-      #puts ui.list(product_list, :columns_across, 9)
-      puts products.to_json
+
+      if config[:output_type].eql? "table"
+        puts ui.list(product_list, :columns_across, 9)
+      else
+        puts products.to_json
+      end
     end
 
     def locate_config_value(key)

data/lib/chef/knife/cs_template_list.rb

@@ -52,6 +52,14 @@ module KnifeCloudstack
            :long => "--cloudstack-secret-key SECRET",
            :description => "Your CloudStack secret key",
            :proc => Proc.new { |key| Chef::Config[:knife][:cloudstack_secret_key] = key }
+    
+    option :output_type,
+           :short => "-O Type",
+           :long => "--output-type Type",
+           :description => "Output type json/table",
+           :default => "table",
+           :proc => Proc.new { |type| Chef::Config[:knife][:output_type] = type }
+
 
     def run
 
@@ -81,7 +89,12 @@ module KnifeCloudstack
         template_list << t['ispublic'].to_s
         template_list << t['created']
       end
-      puts ui.list(template_list, :columns_across, 6)
+      
+      if config[:output_type].eql? "table"
+        puts ui.list(template_list, :columns_across, 6)
+      else 
+        puts templates.to_json
+      end
 
     end
 

metadata

@@ -2,7 +2,7 @@
 name: ucloudstack
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Ryan Holmes
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-21 00:00:00 Z
+date: 2012-09-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chef