knife-cloud 1.1.0 → 1.2.0.rc.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 368ccd2df81639c48973c0c857f6ebdd2df6e206
-  data.tar.gz: d6fb9ffb97b079dcf6494c0af21887480617ad86
+  metadata.gz: a9bd37b28f654e1519bd6257e85df5b334b3552c
+  data.tar.gz: 50388a4270d158c12fda15ed43e8cd69e832283a
 SHA512:
-  metadata.gz: c08479517b5e47bea95f7dd3c3904beb9a7384b50cc5211bf7386259577e461cc32585688b9db4d7c1de6f1c1003b7faad2a548342b72ad646c6b7223e8bc6fe
-  data.tar.gz: d46105f74b81efa11e31b9013b1f726229cd773c5dd2ba11cc194ba5941dbbaf3849887eef315b64704d952bc3631667b9815ea186b0a5fba889ae22f697814d
+  metadata.gz: 53083a0e00ae32d660d4a3ef22994b0348d54e5439001dcc7004b57bf6388cc6465625cc3d048dac6bd2aba2df2fb5900bc0e3d0232907e4e57e207706107205
+  data.tar.gz: 4b456d12c67e2d7485a2e89ab162ea1e17105c87ca6326ae55499722ab30fa30c98a3f5c385fb0fa39279057cfe883246de257c2aab361ddc70a9ac2c82cb2b2

data/lib/chef/knife/cloud/list_resource_command.rb

@@ -53,7 +53,7 @@ class Chef
           end
           false
         end
-        
+
         # Derived class can override this to add more functionality.
         def get_resource_col_val(resource)
           resource_filtered = false
@@ -70,24 +70,29 @@ class Chef
 
         # When @columns_with_info is nil display all
         def list(resources)
-          # display column wise only if @columns_with_info is specified, else as a json for readable display.
-          begin
-            resource_list = @columns_with_info.map { |col_info| ui.color(col_info[:label], :bold) } if @columns_with_info.length > 0
-            resources.sort_by{|x| x.send(@sort_by_field).downcase }.each do |resource|
-              if @columns_with_info.length > 0
-                list = get_resource_col_val(resource)
-                resource_list.concat(list) unless list.nil?
-              else
-                puts resource.to_json
-                puts "\n"
+          if(config[:format] == "summary")
+            # display column wise only if @columns_with_info is specified, else as a json for readable display.
+            begin
+              resource_list = @columns_with_info.map { |col_info| ui.color(col_info[:label], :bold) } if @columns_with_info.length > 0
+              resources.sort_by{|x| x.send(@sort_by_field).downcase }.each do |resource|
+                if @columns_with_info.length > 0
+                  list = get_resource_col_val(resource)
+                  resource_list.concat(list) unless list.nil?
+                else
+                  puts resource.to_json
+                  puts "\n"
+                end
               end
+
+            rescue => e
+              ui.fatal("Unknown resource error : #{e.message}")
+              raise e
             end
 
-          rescue => e
-            ui.fatal("Unknown resource error : #{e.message}")
-            raise e
+            puts ui.list(resource_list, :uneven_columns_across, @columns_with_info.length) if @columns_with_info.length > 0
+          else
+            output(format_for_display(resources))
           end
-          puts ui.list(resource_list, :uneven_columns_across, @columns_with_info.length) if @columns_with_info.length > 0
         end
 
       end # class ResourceListCommand

data/lib/knife-cloud/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Cloud
-    VERSION = "1.1.0"
+    VERSION = "1.2.0.rc.0"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

data/spec/unit/list_resource_command_spec.rb

@@ -24,7 +24,7 @@ require 'excon/errors'
 
 describe Chef::Knife::Cloud::ResourceListCommand do
   it_behaves_like Chef::Knife::Cloud::Command, Chef::Knife::Cloud::ResourceListCommand.new
-  
+
   let (:instance) {Chef::Knife::Cloud::ResourceListCommand.new}
   let (:resources) {[ TestResource.new({:id => "resource-1", :os => "ubuntu"}),
                    TestResource.new({:id => "resource-2", :os => "windows"})]}
@@ -44,6 +44,7 @@ describe Chef::Knife::Cloud::ResourceListCommand do
       let(:test_resource) { "test" }
       before(:each) do
         expect(instance.ui).to receive(:fatal)
+        instance.config[:format] = "summary"
       end
 
       it "handle generic exception" do
@@ -63,6 +64,7 @@ describe Chef::Knife::Cloud::ResourceListCommand do
       allow(instance).to receive(:query_resource).and_return(resources)
       allow(instance).to receive(:create_service_instance).and_return(Chef::Knife::Cloud::Service.new)
       allow(instance).to receive(:puts)
+      instance.config[:format] = "summary"
     end
 
     it "lists resources in json format when columns_with_info parameter is empty" do
@@ -88,6 +90,7 @@ describe Chef::Knife::Cloud::ResourceListCommand do
         allow(@derived_instance).to receive(:query_resource).and_return(resources)
         allow(@derived_instance).to receive(:puts)
         allow(@derived_instance).to receive(:create_service_instance).and_return(Chef::Knife::Cloud::Service.new)
+        @derived_instance.config[:format] = "summary"
       end
 
       it "lists all resources" do
@@ -125,6 +128,7 @@ describe Chef::Knife::Cloud::ResourceListCommand do
         allow(@derived_instance).to receive(:query_resource).and_return(resources)
         allow(@derived_instance).to receive(:puts)
         allow(@derived_instance).to receive(:create_service_instance).and_return(Chef::Knife::Cloud::Service.new)
+        @derived_instance.config[:format] = "summary"
       end
 
       it "lists formatted list of resources" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-cloud
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0.rc.0
 platform: ruby
 authors:
 - Kaustubh Deorukhkar
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knife-windows
@@ -214,9 +214,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2