Merge branch 'master' into ctennis/chef-213

Author: adamhjk

chef-server-slice/lib/chef-server-slice.rb

@@ -81,9 +81,13 @@ def self.setup_router(scope)
 
       scope.match("/status").to(:controller => "status", :action => "index").name(:status)
 
-      scope.resources :searches, :path => "search", :controller => "search" do
-        scope.resources :entries, :controller => "search_entries"
-      end
+      scope.resources :searches, :path => "search", :controller => "search"
+      scope.match("/search/:search_id/entries", :method => 'get').to(:controller => "search_entries", :action => "index")
+      scope.match("/search/:search_id/entries", :method => 'post').to(:controller => "search_entries", :action => "create")
+      scope.match("/search/:search_id/entries/:id", :method => 'get').to(:controller => "search_entries", :action => "show")
+      scope.match("/search/:search_id/entries/:id", :method => 'put').to(:controller => "search_entries", :action => "create")
+      scope.match("/search/:search_id/entries/:id", :method => 'post').to(:controller => "search_entries", :action => "update")
+      scope.match("/search/:search_id/entries/:id", :method => 'delete').to(:controller => "search_entries", :action => "destroy")
 
       scope.match("/cookbooks/_attribute_files").to(:controller => "cookbooks", :action => "attribute_files")
       scope.match("/cookbooks/_recipe_files").to(:controller => "cookbooks", :action => "recipe_files")

chef/lib/chef/provider/service/gentoo.rb

@@ -24,6 +24,10 @@ class Provider
     class Service
       class Gentoo < Chef::Provider::Service::Init
         def load_current_resource
+
+          @new_resource.supports[:status] = true
+          @new_resource.supports[:restart] = true
+
           super
 
           raise Chef::Exceptions::Service unless ::File.exists?("/sbin/rc-update")

chef/spec/unit/provider/service/gentoo_service_spec.rb

@@ -22,7 +22,7 @@
   before(:each) do
     @node = mock("Chef::Node", :null_object => true)
 
-    resource_opts     = { :null_object => true, :name => 'chef', :service_name => 'chef', :enabled => false, :running => nil }
+    resource_opts     = { :null_object => true, :name => 'chef', :service_name => 'chef', :enabled => false, :running => nil, :supports => {} }
     @new_resource     = mock("Chef::Resource::Service", resource_opts)
     @current_resource = mock("Chef::Resource::Service", resource_opts)
 
@@ -70,6 +70,22 @@
     it "should return the current_resource" do
       @provider.load_current_resource.should == @current_resource
     end  
+
+    it "should support the status command automatically" do
+      @provider.load_current_resource
+      @new_resource.supports[:status].should be_true
+    end
+
+    it "should support the restart command automatically" do
+      @provider.load_current_resource
+      @new_resource.supports[:restart].should be_true
+    end
+
+    it "should not support the reload command automatically" do
+      @provider.load_current_resource
+      @new_resource.supports[:reload].should_not be_true
+    end
+
   end
 
   describe "action_methods" do
@@ -89,4 +105,5 @@
       end
     end
   end
+
 end