Merge branch 'master' into ctennis/chef-221

Author: adamhjk

chef-server-slice/app/controllers/nodes.rb

@@ -87,7 +87,7 @@ def destroy
       @status = 202
       display @node
     else
-      redirect(absolute_slice_url(:nodes), {:message => { :notice => "Node #{params[:id]} deleted succesfully" }, :permanent => true})
+      redirect(absolute_slice_url(:nodes), {:message => { :notice => "Node #{params[:id]} deleted successfully" }, :permanent => true})
     end
   end
 

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/config.rb

@@ -62,8 +62,8 @@ class Config
       :template_url => "http://localhost:4000",
       :remotefile_url => "http://localhost:4000",
       :search_url => "http://localhost:4000",
-      :couchdb_database => "chef",
       :couchdb_version => nil,
+      :couchdb_database => "chef",
       :openid_store_couchdb => false,
       :openid_cstore_couchdb => false,
       :openid_store_path => "/var/chef/openid/db",

chef/lib/chef/couchdb.rb

@@ -25,11 +25,10 @@
 class Chef
   class CouchDB
     include Chef::Mixin::ParamsValidate
-
+    
     def initialize(url=nil)
       url ||= Chef::Config[:couchdb_url]
       @rest = Chef::REST.new(url)
-      Chef::Config[:couchdb_version] ||= @rest.run_request(:GET, URI.parse(@rest.url + "/"), false, 10, false)["version"].gsub(/-.+/,"").to_f
     end
 
     def create_db
@@ -145,20 +144,21 @@ def has_key?(obj_type, name)
       end
     end
 
-    private
-    
-    def safe_name(name)
-      name.gsub(/\./, "_")
-    end
-      
     def view_uri(design, view)
+      Chef::Config[:couchdb_version] ||= @rest.run_request(:GET, URI.parse(@rest.url + "/"), false, 10, false)["version"].gsub(/-.+/,"").to_f
       case Chef::Config[:couchdb_version]
       when 0.9
         "#{Chef::Config[:couchdb_database]}/_design/#{design}/_view/#{view}"
       when 0.8
         "#{Chef::Config[:couchdb_database]}/_view/#{design}/#{view}"
       end
     end
-
+    
+    private
+    
+    def safe_name(name)
+      name.gsub(/\./, "_")
+    end
+      
   end
 end

chef/lib/chef/provider/mount.rb

@@ -36,7 +36,7 @@ def action_mount
           status = mount_fs()
           if status
             @new_resource.updated = true            
-            Chef::Log.info("#{@new_resource}: mounted succesfully")
+            Chef::Log.info("#{@new_resource}: mounted successfully")
           end
         else
           Chef::Log.debug("#{@new_resource}: not mounting, already mounted")
@@ -49,7 +49,7 @@ def action_umount
           status = umount_fs()
           if status
             @new_resource.updated = true            
-            Chef::Log.info("#{@new_resource}: unmounted succesfully")
+            Chef::Log.info("#{@new_resource}: unmounted successfully")
           end
         else
           Chef::Log.debug("#{@new_resource}: not unmounting, already unmounted")
@@ -65,7 +65,7 @@ def action_remount
             status = remount_fs()
             if status
               @new_resource.updated = true            
-              Chef::Log.info("#{@new_resource}: remounted succesfully")
+              Chef::Log.info("#{@new_resource}: remounted successfully")
             end
           else
             Chef::Log.debug("#{@new_resource}: not mounted, not remounting")

chef/lib/chef/provider/service.rb

@@ -35,7 +35,7 @@ def action_enable
           Chef::Log.debug("#{@new_resource}: attempting to enable")
           status = enable_service()
           if status
-            Chef::Log.info("#{@new_resource}: enabled succesfully")
+            Chef::Log.info("#{@new_resource}: enabled successfully")
           end
         else
           Chef::Log.debug("#{@new_resource}: not enabling, already enabled")
@@ -47,7 +47,7 @@ def action_disable
           Chef::Log.debug("#{@new_resource}: attempting to disable")
           status = disable_service()
           if status
-            Chef::Log.info("#{@new_resource}: disabled succesfully")
+            Chef::Log.info("#{@new_resource}: disabled successfully")
           end
         else
           Chef::Log.debug("#{@new_resource}: not disabling, already disabled")
@@ -59,7 +59,7 @@ def action_start
           Chef::Log.debug("#{@new_resource}: attempting to start")
           status = start_service()
           if status
-            Chef::Log.info("Started service #{@new_resource} succesfully")
+            Chef::Log.info("Started service #{@new_resource} successfully")
           end
         else
           Chef::Log.debug("#{@new_resource}: not starting, already running")
@@ -71,7 +71,7 @@ def action_stop
           Chef::Log.debug("#{@new_resource}: attempting to stop")
           status = stop_service()
           if status
-            Chef::Log.info("#{@new_resource}: stopped succesfully")
+            Chef::Log.info("#{@new_resource}: stopped successfully")
           end
         else
           Chef::Log.debug("#{@new_resource}: not stopping, already stopped")
@@ -83,7 +83,7 @@ def action_restart
           Chef::Log.debug("#{@new_resource}: attempting to restart")
           status = restart_service()
           if status
-            Chef::Log.info("#{@new_resource}: restarted succesfully")
+            Chef::Log.info("#{@new_resource}: restarted successfully")
           end
         end
       end
@@ -96,7 +96,7 @@ def action_reload
             Chef::Log.debug("#{@new_resource}: attempting to reload")
             status = reload_service()
             if status
-              Chef::Log.info("#{@new_resource}: reloaded succesfully")
+              Chef::Log.info("#{@new_resource}: reloaded successfully")
             end
           end
         end

chef/lib/chef/provider/service/freebsd.rb

@@ -84,7 +84,7 @@ def load_current_resource
             unless status.exitstatus == 0
               raise Chef::Exceptions::Service, "Command #{@node[:command][:ps]} failed"
             else
-              Chef::Log.debug("#{@new_resource}: #{@node[:command][:ps]} exited and parsed succesfully, process running: #{@current_resource.running}")
+              Chef::Log.debug("#{@new_resource}: #{@node[:command][:ps]} exited and parsed successfully, process running: #{@current_resource.running}")
             end
           end
 

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/lib/chef/provider/service/init.rb

@@ -77,7 +77,7 @@ def load_current_resource
             unless status.exitstatus == 0
               raise Chef::Exceptions::Service, "Command #{@node[:command][:ps]} failed"
             else
-              Chef::Log.debug("#{@new_resource}: #{@node[:command][:ps]} exited and parsed succesfully, process running: #{@current_resource.running}")
+              Chef::Log.debug("#{@new_resource}: #{@node[:command][:ps]} exited and parsed successfully, process running: #{@current_resource.running}")
             end
           end
 

chef/spec/unit/couchdb_spec.rb

@@ -36,10 +36,6 @@
     Chef::REST.should_receive(:new).with("http://monkeypants")
     Chef::CouchDB.new("http://monkeypants")
   end  
-  
-  it "should parse the CouchDB version number" do
-    
-  end
 end
 
 describe Chef::CouchDB, "create_db" do
@@ -252,23 +248,27 @@ def do_delete(rev=nil)
   end
 end
 
-describe Chef::CouchDB, "safe_name" do
+describe Chef::CouchDB, "view_uri" do
   before do
-    @couchdb = mock("Chef::CouchDB", :null_object => true)
-    Chef::CouchDB.stub!(:new).and_return(@couchdb)
+    @mock_rest = mock("Chef::REST", :null_object => true, :url => "http://monkeypants")
+    Chef::REST.stub!(:new).and_return(@mock_rest)
+    @couchdb = Chef::CouchDB.new("http://localhost")    
   end
 
-  it "should convert the name to a safe name" do
-    @couchdb.should_receive(:safe_name).with("asdf.lol.com").and_return("asdf_lol_com")
-    @couchdb.safe_name("asdf.lol.com")
-  end
-end
-
-describe Chef::CouchDB, "view_uri" do
-  before do
-    @couchdb = mock("Chef::CouchDB", :null_object => true)
-    Chef::CouchDB.stub!(:new).and_return(@couchdb)
-    Chef::Config.stub!(:[]).with(:couchdb_database).and_return("chef")
+  describe "when the couchdb version is unknown" do
+    it "should set the couchdb version appropriately" do
+      ov = Chef::Config[:couchdb_version]
+      Chef::Config[:couchdb_version] = nil      
+      @mock_rest.should_receive(:run_request).with(
+        :GET, 
+        URI.parse("http://monkeypants/"), 
+        false, 
+        10, 
+        false
+      ).and_return({ "version" => "0.9" })
+      @couchdb.view_uri("nodes", "all")
+      Chef::Config[:couchdb_version] = ov
+    end
   end
 
   describe "on couchdb 0.8" do