From 5edd1f3316b9d2f2f25f1659db36d401782f77ff Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Thu, 23 Oct 2014 16:59:30 -0700 Subject: handles? -> supports? --- lib/chef/provider.rb | 10 ++-------- lib/chef/provider/service/arch.rb | 2 +- lib/chef/provider/service/debian.rb | 2 +- lib/chef/provider/service/insserv.rb | 2 +- lib/chef/provider/service/invokercd.rb | 2 +- lib/chef/provider/service/redhat.rb | 2 +- lib/chef/provider/service/systemd.rb | 2 +- lib/chef/provider/service/upstart.rb | 2 +- lib/chef/provider_resolver.rb | 2 +- 9 files changed, 10 insertions(+), 16 deletions(-) diff --git a/lib/chef/provider.rb b/lib/chef/provider.rb index d933164c8c..680fe9782f 100644 --- a/lib/chef/provider.rb +++ b/lib/chef/provider.rb @@ -33,12 +33,6 @@ class Chef extend Chef::Mixin::DescendantsTracker class << self - attr_accessor :replace_classes - - def replace_classes - @replace_classes ||= [] - end - def node_map @node_map ||= Chef::NodeMap.new end @@ -52,8 +46,8 @@ class Chef node_map.get(node, resource.resource_name) end - # handles the given resource and action (late binding) - def handles?(resource, action) + # supports the given resource and action (late binding) + def supports?(resource, action) true end end diff --git a/lib/chef/provider/service/arch.rb b/lib/chef/provider/service/arch.rb index f52955cff6..888fb3fdf5 100644 --- a/lib/chef/provider/service/arch.rb +++ b/lib/chef/provider/service/arch.rb @@ -22,7 +22,7 @@ class Chef::Provider::Service::Arch < Chef::Provider::Service::Init provides :service, platform_family: "arch" - def self.handles?(resource, action) + def self.supports?(resource, action) ::File.exist?("/etc/rc.d/#{resource.service_name}") end diff --git a/lib/chef/provider/service/debian.rb b/lib/chef/provider/service/debian.rb index bf7c5efa49..25b1960b26 100644 --- a/lib/chef/provider/service/debian.rb +++ b/lib/chef/provider/service/debian.rb @@ -27,7 +27,7 @@ class Chef provides :service, platform_family: "debian" - def self.handles?(resource, action) + def self.supports?(resource, action) Chef::Platform::ServiceHelpers.service_resource_providers.include?(:debian) end diff --git a/lib/chef/provider/service/insserv.rb b/lib/chef/provider/service/insserv.rb index 8f151d242f..df5a162a45 100644 --- a/lib/chef/provider/service/insserv.rb +++ b/lib/chef/provider/service/insserv.rb @@ -26,7 +26,7 @@ class Chef provides :service, os: "linux" - def self.handles?(resource, action) + def self.supports?(resource, action) Chef::Platform::ServiceHelpers.service_resource_providers.include?(:insserv) end diff --git a/lib/chef/provider/service/invokercd.rb b/lib/chef/provider/service/invokercd.rb index bbf0861a68..c7472211bc 100644 --- a/lib/chef/provider/service/invokercd.rb +++ b/lib/chef/provider/service/invokercd.rb @@ -25,7 +25,7 @@ class Chef provides :service, platform_family: "debian" - def self.handles?(resource, action) + def self.supports?(resource, action) Chef::Platform::ServiceHelpers.service_resource_providers.include?(:invokerc) end diff --git a/lib/chef/provider/service/redhat.rb b/lib/chef/provider/service/redhat.rb index 87e8d903cf..90744ae268 100644 --- a/lib/chef/provider/service/redhat.rb +++ b/lib/chef/provider/service/redhat.rb @@ -28,7 +28,7 @@ class Chef provides :service, platform_family: [ "rhel", "fedora", "suse" ] - def self.handles?(resource, action) + def self.supports?(resource, action) Chef::Platform::ServiceHelpers.service_resource_providers.include?(:redhat) end diff --git a/lib/chef/provider/service/systemd.rb b/lib/chef/provider/service/systemd.rb index 35a364d3f7..311751ab9a 100644 --- a/lib/chef/provider/service/systemd.rb +++ b/lib/chef/provider/service/systemd.rb @@ -23,7 +23,7 @@ class Chef::Provider::Service::Systemd < Chef::Provider::Service::Simple provides :service, os: "linux" - def self.handles?(resource, action) + def self.supports?(resource, action) Chef::Platform::ServiceHelpers.service_resource_providers.include?(:systemd) end diff --git a/lib/chef/provider/service/upstart.rb b/lib/chef/provider/service/upstart.rb index 513a1630d3..41bd850d6a 100644 --- a/lib/chef/provider/service/upstart.rb +++ b/lib/chef/provider/service/upstart.rb @@ -29,7 +29,7 @@ class Chef provides :service, os: "linux" - def self.handles?(resource, action) + def self.supports?(resource, action) Chef::Platform::ServiceHelpers.service_resource_providers.include?(:upstart) && Chef::Platform::ServiceHelpers.config_for_service(resource.service_name).include?(:upstart) end diff --git a/lib/chef/provider_resolver.rb b/lib/chef/provider_resolver.rb index c0a537624e..c819b0c87f 100644 --- a/lib/chef/provider_resolver.rb +++ b/lib/chef/provider_resolver.rb @@ -60,7 +60,7 @@ class Chef # ask all the enabled providers if they can actually support the resource supported_handlers = enabled_handlers.select do |klass| - klass.handles?(resource, action) + klass.supports?(resource, action) end # what providers were excluded by machine state (late cut) -- cgit v1.2.1