knife node show foobar -E shows the environment a node is in.

Author: Nuo Yan

chef/lib/chef/knife.rb

@@ -121,7 +121,7 @@ def self.list_commands(preferred_category=nil)
     def self.run(args, options={})
       load_commands
       subcommand_class = subcommand_class_from(args)
-      subcommand_class.options.merge!(options)
+      subcommand_class.options = options.merge!(subcommand_class.options)
       instance = subcommand_class.new(args)
       instance.configure_chef
       instance.run
@@ -324,6 +324,13 @@ def format_for_display(item)
       elsif config[:run_list]
         data = data.run_list.run_list
         { "run_list" => data }
+      elsif config[:environment]
+        if data.class == Chef::Node
+          {"chef_environment" => data.chef_environment}
+        else
+          # this is a place holder for now. Feel free to modify (i.e. add other cases). [nuo]
+          data
+        end
       elsif config[:id_only]
         data.respond_to?(:name) ? data.name : data["id"]
       else

chef/lib/chef/knife/node_show.rb

@@ -35,6 +35,11 @@ class NodeShow < Knife
         :short => "-r",
         :long => "--run-list",
         :description => "Show only the run list"
+        
+      option :environment,
+        :short        => "-E",
+        :long         => "--environment",
+        :description  => "Show only the Chef environment"
 
       def run 
         @node_name = @name_args[0]

chef/spec/unit/knife/node_show_spec.rb

@@ -24,7 +24,8 @@
     @knife = Chef::Knife::NodeShow.new
     @knife.config = {
       :attribute => nil,
-      :run_list => nil
+      :run_list => nil,
+      :environment => nil
     }
     @knife.name_args = [ "adam" ]
     @knife.stub!(:output).and_return(true)