knife node list -E ENV lists the nodes within an environment

Author: Nuo Yan

chef/lib/chef/knife/node_list.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Copyright:: Copyright (c) 2010 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,8 +32,19 @@ class NodeList < Knife
         :description => "Show corresponding URIs"
 
       def run
-        output(format_list_for_display(Chef::Node.list))
+        output(format_list_for_display(retrieve_node_list))
       end
+      
+      def retrieve_node_list
+        if config[:environment]
+          response = Hash.new
+          Chef::Search::Query.new.search(:node, "chef_environment:#{config[:environment]}") {|n| response[n.name] = "#{Chef::Config[:chef_server_url]}/nodes/#{n.name}" unless n.nil?}
+          response
+        else
+          Chef::Node.list
+        end
+      end
+      
     end
   end
 end

chef/spec/unit/knife/node_list_spec.rb

@@ -27,11 +27,14 @@
       "foo" => "http://example.com/foo",
       "bar" => "http://example.com/foo"
     }
+    Chef::REST.stub!(:new).and_return("foo")
+    @chef_search_query = Chef::Search::Query.new
     Chef::Node.stub!(:list).and_return(@list)
+    Chef::Search::Query.stub!(:new).and_return(@chef_search_query)
   end
 
   describe "run" do
-    it "should list the nodes" do
+    it "should list all of the nodes if -E is not specified" do
       Chef::Node.should_receive(:list).and_return(@list)
       @knife.run
     end
@@ -42,6 +45,13 @@
       @knife.run
     end
 
+    it "should list nodes in the specific environment if -E ENVIRONMENT is specified" do
+      @knife.config = {:environment => "prod"}
+      Chef::Search::Query.should_receive(:new).and_return(@chef_search_query)
+      @chef_search_query.should_receive(:search).with(:node, "chef_environment:prod").and_return(["foo","bar"])
+      @knife.run
+    end
+    
     describe "with -w or --with-uri" do
       it "should pretty print the hash" do
         @knife.config[:with_uri] = true