Merge branch 'total-integration' of git@github.com:skeptomai/chef into total-integration

Author: Christopher Brown

chef-solr/lib/chef/solr/application/rebuild.rb

@@ -54,30 +54,6 @@ class Rebuild < Chef::Application
           :show_options => true,
           :exit         => 0
 
-        option :nanite_identity,
-          :long => "--nanite-identity ID",
-          :description => "The nanite identity"
-
-        option :nanite_host,
-          :long => "--nanite-host HOST",
-          :description => "The nanite host"
-
-        option :nanite_port,
-          :long => "--nanite-port PORT",
-          :description => "The nanite port"
-
-        option :nanite_user,
-          :long => "--nanite-user USER",
-          :description => "The nanite user"
-
-        option :nanite_pass,
-          :long => "--nanite-pass PASS",
-          :description => "The nanite password"
-
-        option :nanite_vhost,
-          :long => "--nanite-vhost VHOST",
-          :description => "The nanite vhost"
-
         option :couchdb_database,
           :short => "-d DB",
           :long => "--couchdb-database DB",

chef/lib/chef/rest.rb

@@ -179,6 +179,8 @@ def run_request(method, url, headers={}, data=false, limit=10, raw=false)
           'Accept' => "application/json",
         })
       end
+
+      headers['X-Chef-Version'] = ::Chef::VERSION
 
       if @cookies.has_key?("#{url.host}:#{url.port}")
         headers['Cookie'] = @cookies["#{url.host}:#{url.port}"]

chef/spec/unit/provider/deploy_spec.rb

@@ -412,7 +412,7 @@
 
     before do
       ::File.stub!(:exist?).with("#{@expected_release_dir}/gems.yml").and_return(true)
-      @gem_list = [{:name=>"ezmobius-nanite",:version=>"0.4.1.2"},{:name=>"eventmachine", :version=>"0.12.9"}]
+      @gem_list = [{:name=>"eventmachine", :version=>"0.12.9"}]
     end
 
     it "reads a gems.yml file, creating gem providers for each with action :upgrade" do
@@ -422,7 +422,7 @@
       gems = @provider.send(:gem_packages)
 
       gems.map { |g| g.action }.should == [[:install], [:install]]
-      gems.map { |g| g.name }.should == %w{ezmobius-nanite eventmachine}
+      gems.map { |g| g.name }.should == %w{eventmachine}
       gems.map { |g| g.version }.should == %w{0.4.1.2 0.12.9}
     end
 

chef/spec/unit/rest_spec.rb

@@ -165,6 +165,13 @@ def do_run_request(method=:GET, data=false, limit=10, raw=false)
       Net::HTTP.stub!(:new).and_return(@http_mock)
       @rest.run_request(method, @url_mock, {}, data, limit, raw)
     end
+
+    it "should always include the X-Chef-Version header" do
+      Net::HTTP::Get.should_receive(:new).with("/?foo=bar", 
+        { 'Accept' => 'application/json', 'X-Chef-Version' => Chef::VERSION }
+      ).and_return(@request_mock)
+      do_run_request
+    end
 
     it "should raise an exception if the redirect limit is 0" do
       lambda { @rest.run_request(:GET, "/", {}, false, 0)}.should raise_error(ArgumentError)
@@ -269,36 +276,36 @@ def do_run_request(method=:GET, data=false, limit=10, raw=false)
     it "should set the cookie for this request if one exists for the given host:port" do
       @rest.cookies = { "#{@url_mock.host}:#{@url_mock.port}" => "cookie monster" }
       Net::HTTP::Get.should_receive(:new).with("/?foo=bar", 
-        { 'Accept' => 'application/json', 'Cookie' => 'cookie monster' }
+        { 'Accept' => 'application/json', 'X-Chef-Version' => Chef::VERSION, 'Cookie' => 'cookie monster' }
       ).and_return(@request_mock)
       do_run_request
       @rest.cookies = Hash.new
     end
 
     it "should build a new HTTP GET request" do
       Net::HTTP::Get.should_receive(:new).with("/?foo=bar", 
-        { 'Accept' => 'application/json' }
+        { 'Accept' => 'application/json', 'X-Chef-Version' => Chef::VERSION }
       ).and_return(@request_mock)
       do_run_request
     end
 
     it "should build a new HTTP POST request" do
       Net::HTTP::Post.should_receive(:new).with("/?foo=bar", 
-        { 'Accept' => 'application/json', "Content-Type" => 'application/json' }
+        { 'Accept' => 'application/json', "Content-Type" => 'application/json', 'X-Chef-Version' => Chef::VERSION }
       ).and_return(@request_mock)
       do_run_request(:POST, @data_mock)
     end
 
     it "should build a new HTTP PUT request" do
       Net::HTTP::Put.should_receive(:new).with("/?foo=bar", 
-        { 'Accept' => 'application/json', "Content-Type" => 'application/json' }
+        { 'Accept' => 'application/json', "Content-Type" => 'application/json', 'X-Chef-Version' => Chef::VERSION }
       ).and_return(@request_mock)
       do_run_request(:PUT, @data_mock)
     end
 
     it "should build a new HTTP DELETE request" do
       Net::HTTP::Delete.should_receive(:new).with("/?foo=bar", 
-        { 'Accept' => 'application/json' }
+        { 'Accept' => 'application/json', 'X-Chef-Version' => Chef::VERSION }
       ).and_return(@request_mock)
       do_run_request(:DELETE)
     end
@@ -360,7 +367,7 @@ def do_run_request(method=:GET, data=false, limit=10, raw=false)
     end
 
     it "should build a new HTTP GET request without the application/json accept header for raw reqs" do
-      Net::HTTP::Get.should_receive(:new).with("/?foo=bar", {}).and_return(@request_mock)
+      Net::HTTP::Get.should_receive(:new).with("/?foo=bar", {'X-Chef-Version' => Chef::VERSION}).and_return(@request_mock)
       do_run_request(:GET, false, 10, true)
     end