load environment config from knife.rb

Author: sdelano

chef/lib/chef/knife.rb

@@ -267,6 +267,7 @@ def configure_chef
       Chef::Config[:node_name] = config[:node_name] if config[:node_name]
       Chef::Config[:client_key] = config[:client_key] if config[:client_key]
       Chef::Config[:chef_server_url] = config[:chef_server_url] if config[:chef_server_url]
+      Chef::Config[:environment] = config[:environment] if config[:environment]
       Mixlib::Log::Formatter.show_time = false
       Chef::Log.init(Chef::Config[:log_location])
       Chef::Log.level(Chef::Config[:log_level])

chef/lib/chef/knife/cookbook_list.rb

@@ -31,7 +31,7 @@ class CookbookList < Knife
         :description => "Show corresponding URIs"
 
       def run
-        env          = config[:environment]
+        env          = Chef::Config[:environment]
         api_endpoint = env ? "/environments/#{env}/cookbooks" : "/cookbooks/_latest"
         output(format_cookbooks_for_display(rest.get_rest(api_endpoint)))
       end

chef/lib/chef/knife/node_list.rb

@@ -32,7 +32,8 @@ class NodeList < Knife
         :description => "Show corresponding URIs"
 
       def run
-        output(format_list_for_display( config[:environment] ? Chef::Node.list_by_environment(config[:environment]) : Chef::Node.list ))
+        env = Chef::Config[:environment]
+        output(format_list_for_display( env ? Chef::Node.list_by_environment(env) : Chef::Node.list ))
       end
 
     end

chef/spec/unit/application/knife_spec.rb

@@ -50,12 +50,12 @@
     end
 
     describe "with environment configuration" do
-      it "should default to the 'default' environment" do
+      it "should default to no environment" do
         with_argv(*%w{test yourself}) do
           @knife.should_receive(:exit).with(0)
           @knife.run
         end
-        Chef::Config[:environment].should == 'default'
+        Chef::Config[:environment].should == nil
       end
 
       it "should load the environment from the config file" do

chef/spec/unit/knife/node_list_spec.rb

@@ -21,6 +21,7 @@
 describe Chef::Knife::NodeList do
   before(:each) do
     Chef::Config[:node_name]  = "webmonkey.example.com"
+    Chef::Config[:environment] = nil # reset this value each time, as it is not reloaded
     @knife = Chef::Knife::NodeList.new
     @knife.stub!(:output).and_return(true)
     @list = {
@@ -44,7 +45,7 @@
     end
 
     it "should list nodes in the specific environment if -E ENVIRONMENT is specified" do
-      @knife.config = {:environment => "prod"}
+      Chef::Config[:environment] = "prod"
       Chef::Node.should_receive(:list_by_environment).with("prod").and_return(@list)
       @knife.run
     end