Adding Redhat init provider, fixing CHEF-56 - also refactoring service providers in general to be a bit more flexible

Author: adamhjk

chef/lib/chef/platform.rb

@@ -47,8 +47,18 @@ class Platform
           :cron => Chef::Provider::Cron,
         }
       },
-      :centos   => {},
-      :redhat   => {},
+      :centos   => {
+        :default => {
+          :service => Chef::Provider::Service::Redhat,
+          :cron => Chef::Provider::Cron
+        }
+      },
+      :redhat   => {
+        :default => {
+          :service => Chef::Provider::Service::Redhat,
+          :cron => Chef::Provider::Cron
+        }
+      },
       :gentoo   => {
         :default => {
           :package => Chef::Provider::Package::Portage,

chef/lib/chef/provider/service.rb

@@ -33,7 +33,7 @@ def initialize(node, new_resource)
       def action_enable
         unless @current_resource.enabled
           Chef::Log.debug("#{@new_resource}: attempting to enable")
-          status = enable_service(@new_resource.service_name)
+          status = enable_service()
           if status
             Chef::Log.info("#{@new_resource}: enabled succesfully")
           end
@@ -45,7 +45,7 @@ def action_enable
       def action_disable
         if @current_resource.enabled
           Chef::Log.debug("#{@new_resource}: attempting to disable")
-          status = disable_service(@new_resource.service_name)
+          status = disable_service()
           if status
             Chef::Log.info("#{@new_resource}: disabled succesfully")
           end
@@ -57,7 +57,7 @@ def action_disable
       def action_start
         unless @current_resource.running
           Chef::Log.debug("#{@new_resource}: attempting to start")
-          status = start_service(@new_resource.service_name)
+          status = start_service()
           if status
             Chef::Log.info("Started service #{@new_resource} succesfully")
           end
@@ -69,7 +69,7 @@ def action_start
       def action_stop
         if @current_resource.running
           Chef::Log.debug("#{@new_resource}: attempting to stop")
-          status = stop_service(@new_resource.service_name)
+          status = stop_service()
           if status
             Chef::Log.info("#{@new_resource}: stopped succesfully")
           end
@@ -81,7 +81,7 @@ def action_stop
       def action_restart
         if @current_resource.running
           Chef::Log.debug("#{@new_resource}: attempting to restart")
-          status = restart_service(@new_resource.service_name)
+          status = restart_service()
           if status
             Chef::Log.info("#{@new_resource}: restarted succesfully")
           end
@@ -94,7 +94,7 @@ def action_reload
         else
           if @current_resource.running
             Chef::Log.debug("#{@new_resource}: attempting to reload")
-            status = reload_service(@new_resource.service_name)
+            status = reload_service()
             if status
               Chef::Log.info("#{@new_resource}: reloaded succesfully")
             end

chef/lib/chef/provider/service/debian.rb

@@ -51,12 +51,12 @@ def load_current_resource
           @current_resource        
         end
 
-        def enable_service(name)
-          run_command(:command => "/usr/sbin/update-rc.d #{name} defaults")
+        def enable_service()
+          run_command(:command => "/usr/sbin/update-rc.d #{@new_resource.service_name} defaults")
         end
 
-        def disable_service(name)
-          run_command(:command => "/usr/sbin/update-rc.d -f #{name} remove")
+        def disable_service()
+          run_command(:command => "/usr/sbin/update-rc.d -f #{@new_resource.service_name} remove")
         end
 
       end

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

@@ -45,12 +45,12 @@ def load_current_resource
           @current_resource
         end
 
-        def enable_service(name)
-          run_command(:command => "/sbin/rc-update add #{name} default")
+        def enable_service()
+          run_command(:command => "/sbin/rc-update add #{@new_resource.service_name} default")
         end
 
-        def disable_service(name)
-          run_command(:command => "/sbin/rc-update del #{name} default")
+        def disable_service()
+          run_command(:command => "/sbin/rc-update del #{@new_resource.service_name} default")
         end
       end
     end

chef/lib/chef/provider/service/init.rb

@@ -23,6 +23,11 @@ class Chef
   class Provider
     class Service
       class Init < Chef::Provider::Service
+        
+        def initialize(node, new_resource)
+          super(node, new_resource)
+          @init_command ||= "/etc/init.d/#{@new_resource.service_name}"
+        end
 
         def load_current_resource
           @current_resource = Chef::Resource::Service.new(@new_resource.name)
@@ -31,7 +36,7 @@ def load_current_resource
             Chef::Log.debug("#{@new_resource} supports status, running")
 
             begin
-              if run_command(:command => "/etc/init.d/#{@current_resource.service_name} status") == 0
+              if run_command(:command => "#{@init_command} status") == 0
                 @current_resource.running true
               end
             rescue Chef::Exception::Exec
@@ -80,37 +85,37 @@ def load_current_resource
           @current_resource
         end
 
-        def start_service(name)
+        def start_service
           if @new_resource.start_command
             run_command(:command => @new_resource.start_command)
           else
-            run_command(:command => "/etc/init.d/#{name} start")
+            run_command(:command => "#{@init_command} start")
           end
         end
 
-        def stop_service(name)
+        def stop_service
           if @new_resource.stop_command
             run_command(:command => @new_resource.stop_command)
           else
-            run_command(:command => "/etc/init.d/#{name} stop")
+            run_command(:command => "#{@init_command} stop")
           end
         end
 
-        def restart_service(name)
+        def restart_service
           if @new_resource.supports[:restart]
-            run_command(:command => "/etc/init.d/#{name} restart")
+            run_command(:command => "#{@init_command} restart")
           elsif @new_resource.restart_command
             run_command(:command => @new_resource.restart_command)
           else
-            stop_service(name)
+            stop_service
             sleep 1
-            start_service(name)
+            start_service
           end
         end
 
-        def reload_service(name)
+        def reload_service
           if @new_resource.supports[:reload]
-            run_command(:command => "/etc/init.d/#{name} reload")
+            run_command(:command => "#{@init_command} reload")
           elsif @new_resource.reload_command
             run_command(:command => @new_resource.reload_command)
           end

chef/lib/chef/provider/service/redhat.rb

@@ -0,0 +1,68 @@
+#
+# Author:: AJ Christensen (<aj@hjksolutions.com>)
+# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/provider/service'
+require 'chef/provider/service/init'
+require 'chef/mixin/command'
+
+class Chef
+  class Provider
+    class Service
+      class Redhat < Chef::Provider::Service::Init
+        
+        def initialize(node, new_resource)
+           super(node, new_resource)
+           @init_command ||= "/sbin/service #{@new_resource.service_name}"
+         end
+        
+        def load_current_resource
+          super
+          
+          unless ::File.exists? "/sbin/chkconfig"
+            raise Chef::Exception::Service, "/sbin/chkconfig does not exist!"
+          end
+
+          status = popen4("/sbin/chkconfig --list #{@current_resource.service_name}") do |pid, stdin, stdout, stderr|
+            stdin.close
+            
+            if stdout.gets =~ /\d:on/
+              @current_resource.enabled true
+            else
+              @current_resource.enabled false
+            end
+          end  
+
+          unless status.exitstatus == 0
+            raise Chef::Exception::Service, "/sbin/chkconfig --list #{@current_resource.service_name} failed - #{status.inspect}"
+          end
+
+          @current_resource        
+        end
+
+        def enable_service()
+          run_command(:command => "/sbin/chkconfig --add #{@new_resource.service_name}")
+        end
+
+        def disable_service()
+          run_command(:command => "/sbin/chkconfig --del #{@new_resource.service_name}")
+        end
+        
+      end
+    end
+  end
+end

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

@@ -119,7 +119,7 @@
 
   it "should call update-rc.d 'service_name' defaults" do
     @provider.should_receive(:run_command).with({:command => "/usr/sbin/update-rc.d #{@new_resource.service_name} defaults"})
-    @provider.enable_service(@new_resource.service_name)
+    @provider.enable_service()
   end
 end
 
@@ -138,6 +138,6 @@
 
   it "should call update-rc.d -f 'service_name' remove" do
     @provider.should_receive(:run_command).with({:command => "/usr/sbin/update-rc.d -f #{@new_resource.service_name} remove"})
-    @provider.disable_service(@new_resource.service_name)
+    @provider.disable_service()
   end
 end

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

@@ -78,14 +78,14 @@
     describe Chef::Provider::Service::Gentoo, "enable_service" do
       it "should call rc-update add *service* default" do
         @provider.should_receive(:run_command).with({:command => "/sbin/rc-update add chef default"})
-        @provider.enable_service('chef')
+        @provider.enable_service()
       end
     end
 
     describe Chef::Provider::Service::Gentoo, "disable_service" do
       it "should call rc-update del *service* default" do
         @provider.should_receive(:run_command).with({:command => "/sbin/rc-update del chef default"})
-        @provider.disable_service('chef')
+        @provider.disable_service()
       end
     end
   end

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

@@ -174,12 +174,12 @@
   it "should call the start command if one is specified" do
     @new_resource.stub!(:start_command).and_return("/etc/init.d/chef startyousillysally")
     @provider.should_receive(:run_command).with({:command => "/etc/init.d/chef startyousillysally"}).and_return(0)
-    @provider.start_service(@new_resource.service_name)
+    @provider.start_service()
   end
 
   it "should call '/etc/init.d/service_name start' if no start command is specified" do
     @provider.should_receive(:run_command).with({:command => "/etc/init.d/#{@new_resource.service_name} start"}).and_return(0)
-    @provider.start_service(@new_resource.service_name)
+    @provider.start_service()
   end 
 end
 
@@ -200,12 +200,12 @@
   it "should call the stop command if one is specified" do
     @new_resource.stub!(:stop_command).and_return("/etc/init.d/chef itoldyoutostop")
     @provider.should_receive(:run_command).with({:command => "/etc/init.d/chef itoldyoutostop"}).and_return(0)
-    @provider.stop_service(@new_resource.service_name)
+    @provider.stop_service()
   end
 
   it "should call '/etc/init.d/service_name stop' if no stop command is specified" do
     @provider.should_receive(:run_command).with({:command => "/etc/init.d/#{@new_resource.service_name} stop"}).and_return(0)
-    @provider.stop_service(@new_resource.service_name)
+    @provider.stop_service()
   end
 end
 
@@ -227,20 +227,20 @@
   it "should call 'restart' on the service_name if the resource supports it" do
     @new_resource.stub!(:supports).and_return({:restart => true})
     @provider.should_receive(:run_command).with({:command => "/etc/init.d/#{@new_resource.service_name} restart"}).and_return(0)
-    @provider.restart_service(@new_resource.service_name)
+    @provider.restart_service()
   end
 
   it "should call the restart_command if one has been specified" do
     @new_resource.stub!(:restart_command).and_return("/etc/init.d/chef restartinafire")
     @provider.should_receive(:run_command).with({:command => "/etc/init.d/#{@new_resource.service_name} restartinafire"}).and_return(0)
-    @provider.restart_service(@new_resource.service_name)
+    @provider.restart_service()
   end
 
   it "should just call stop, then start when the resource doesn't support restart and no restart_command is specified" do
-    @provider.should_receive(:stop_service).with(@new_resource.service_name)
+    @provider.should_receive(:stop_service)
     @provider.should_receive(:sleep).with(1)
-    @provider.should_receive(:start_service).with(@new_resource.service_name)
-    @provider.restart_service(@new_resource.service_name)
+    @provider.should_receive(:start_service)
+    @provider.restart_service()
   end
 end
 
@@ -262,12 +262,12 @@
   it "should call 'reload' on the service if it supports it" do
     @new_resource.stub!(:supports).and_return({:reload => true})
     @provider.should_receive(:run_command).with({:command => "/etc/init.d/#{@new_resource.service_name} reload"}).and_return(0)
-    @provider.reload_service(@new_resource.service_name)
+    @provider.reload_service()
   end
 
   it "should should run the user specified reload command if one is specified and the service doesn't support reload" do
     @new_resource.stub!(:reload_command).and_return("/etc/init.d/chef lollerpants")
     @provider.should_receive(:run_command).with({:command => "/etc/init.d/#{@new_resource.service_name} lollerpants"}).and_return(0)
-    @provider.reload_service(@new_resource.service_name)
+    @provider.reload_service()
   end
 end