puppet 8.5.0-universal-darwin → 8.6.0-universal-darwin

data/lib/puppet/provider/package_targetable.rb

@@ -34,7 +34,7 @@ class Puppet::Provider::Package::Targetable < Puppet::Provider::Package
         catalog_packages.each do |catalog_package|
           if catalog_package[:name] == instance.name && catalog_package.original_parameters[:command] == command
             catalog_package.provider = instance
-            self.debug "Prefetched instance: %{name} via command: %{cmd}" % { name: instance.name, cmd: (command || :default) }
+            debug "Prefetched instance: %{name} via command: %{cmd}" % { name: instance.name, cmd: command || :default }
           end
         end
       end

data/lib/puppet/provider/parsedfile.rb

@@ -116,9 +116,9 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
   # Return the header placed at the top of each generated file, warning
   # users that modifying this file manually is probably a bad idea.
   def self.header
-    %{# HEADER: This file was autogenerated at #{Time.now}
+    %(# HEADER: This file was autogenerated at #{Time.now}
 # HEADER: by puppet.  While it can still be managed manually, it
-# HEADER: is definitely not recommended.\n}
+# HEADER: is definitely not recommended.\n)
   end
 
   # An optional regular expression matched by third party headers.
@@ -282,7 +282,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
     begin
       target_records = retrieve(target)
       unless target_records
-        raise Puppet::DevError, _("Prefetching %{target} for provider %{name} returned nil") % { target: target, name: self.name }
+        raise Puppet::DevError, _("Prefetching %{target} for provider %{name} returned nil") % { target: target, name: name }
       end
     rescue Puppet::Util::FileType::FileReadError => detail
       if @raise_prefetch_errors
@@ -292,7 +292,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
         @failed_prefetch_targets[target] = detail.to_s
       else
         puts detail.backtrace if Puppet[:trace]
-        Puppet.err _("Could not prefetch %{resource} provider '%{name}' target '%{target}': %{detail}. Treating as empty") % { resource: self.resource_type.name, name: self.name, target: target, detail: detail }
+        Puppet.err _("Could not prefetch %{resource} provider '%{name}' target '%{target}': %{detail}. Treating as empty") % { resource: resource_type.name, name: name, target: target, detail: detail }
       end
 
       target_records = []
@@ -306,7 +306,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
 
     target_records = prefetch_hook(target_records) if respond_to?(:prefetch_hook)
 
-    raise Puppet::DevError, _("Prefetching %{target} for provider %{name} returned nil") % { target: target, name: self.name } unless target_records
+    raise Puppet::DevError, _("Prefetching %{target} for provider %{name} returned nil") % { target: target, name: name } unless target_records
 
     target_records
   end
@@ -325,13 +325,13 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
     text = target_object(path).read
     if text.nil? or text == ""
       # there is no file
-      return []
+      []
     else
       # Set the target, for logging.
       old = @target
       begin
         @target = path
-        return self.parse(text)
+        parse(text)
       rescue Puppet::Error => detail
         detail.file = @target if detail.respond_to?(:file=)
         raise detail
@@ -380,9 +380,9 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
   def self.targets(resources = nil)
     targets = []
     # First get the default target
-    raise Puppet::DevError, _("Parsed Providers must define a default target") unless self.default_target
+    raise Puppet::DevError, _("Parsed Providers must define a default target") unless default_target
 
-    targets << self.default_target
+    targets << default_target
 
     # Then get each of the file objects
     targets += @target_objects.keys

data/lib/puppet/provider/service/base.rb

@@ -35,7 +35,7 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
     regex = Regexp.new(@resource[:pattern])
     ps = getps
 
-    self.debug "Executing '#{ps}'"
+    debug "Executing '#{ps}'"
     table = Puppet::Util::Execution.execute(ps)
 
     # The output of the PS command can be a mashup of several different
@@ -51,11 +51,11 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
     table = table.scrub unless table.valid_encoding?
 
     table.each_line { |line|
-      if regex.match(line)
-        self.debug "Process matched: #{line}"
-        ary = line.sub(/^[[:space:]]+/u, '').split(/[[:space:]]+/u)
-        return ary[1]
-      end
+      next unless regex.match(line)
+
+      debug "Process matched: #{line}"
+      ary = line.sub(/^[[:space:]]+/u, '').split(/[[:space:]]+/u)
+      return ary[1]
     }
 
     nil
@@ -74,17 +74,17 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
 
       # Explicitly calling exitstatus to facilitate testing
       if status.exitstatus == 0
-        return :running
+        :running
       else
-        return :stopped
+        :stopped
       end
     else
       pid = getpid
       if pid
-        self.debug "PID is #{pid}"
-        return :running
+        debug "PID is #{pid}"
+        :running
       else
-        return :stopped
+        :stopped
       end
     end
   end
@@ -102,12 +102,7 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
   # The command used to start.  Generated if the 'binary' argument
   # is passed.
   def startcmd
-    if @resource[:binary]
-      return @resource[:binary]
-    else
-      raise Puppet::Error,
-            "Services must specify a start command or a binary"
-    end
+    @resource[:binary] || raise(Puppet::Error, "Services must specify a start command or a binary")
   end
 
   # Stop the service.  If a 'stop' parameter is specified, it
@@ -122,15 +117,15 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
     else
       pid = getpid
       unless pid
-        self.info _("%{name} is not running") % { name: self.name }
+        info _("%{name} is not running") % { name: name }
         return false
       end
       begin
         output = kill pid
-      rescue Puppet::ExecutionFailure
-        @resource.fail Puppet::Error, "Could not kill #{self.name}, PID #{pid}: #{output}", $!
+      rescue Puppet::ExecutionFailure => e
+        @resource.fail Puppet::Error, "Could not kill #{name}, PID #{pid}: #{output}", e
       end
-      return true
+      true
     end
   end
 

data/lib/puppet/provider/service/bsd.rb

@@ -34,9 +34,9 @@ Puppet::Type.type(:service).provide :bsd, :parent => :init do
   # enable service by creating a service file under rc.conf.d with the
   # proper contents
   def enable
-    Dir.mkdir(rcconf_dir) if not Puppet::FileSystem.exist?(rcconf_dir)
+    Dir.mkdir(rcconf_dir) unless Puppet::FileSystem.exist?(rcconf_dir)
     rcfile = File.join(rcconf_dir, @resource[:name])
-    File.open(rcfile, File::WRONLY | File::APPEND | File::CREAT, 0644) { |f|
+    File.open(rcfile, File::WRONLY | File::APPEND | File::CREAT, 0o644) { |f|
       f << "%s_enable=\"YES\"\n" % @resource[:name]
     }
   end
@@ -44,10 +44,10 @@ Puppet::Type.type(:service).provide :bsd, :parent => :init do
   # Override stop/start commands to use one<cmd>'s and the avoid race condition
   # where provider tries to stop/start the service before it is enabled
   def startcmd
-    [self.initscript, :onestart]
+    [initscript, :onestart]
   end
 
   def stopcmd
-    [self.initscript, :onestop]
+    [initscript, :onestop]
   end
 end

data/lib/puppet/provider/service/daemontools.rb

@@ -60,9 +60,9 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
   # returns all providers for all existing services in @defpath
   # ie enabled or not
   def self.instances
-    path = self.defpath
+    path = defpath
     unless path
-      Puppet.info("#{self.name} is unsuitable because service directory is nil")
+      Puppet.info("#{name} is unsuitable because service directory is nil")
       return
     end
     unless FileTest.directory?(path)
@@ -82,7 +82,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
 
   # returns the daemon dir on this node
   def self.daemondir
-    self.defpath
+    defpath
   end
 
   # find the service dir on this node
@@ -102,7 +102,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
   # returns the full path of this service when enabled
   # (ie in the service directory)
   def service
-    File.join(self.servicedir, resource[:name])
+    File.join(servicedir, resource[:name])
   end
 
   # returns the full path to the current daemon directory
@@ -110,14 +110,14 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
   # definition
   def daemon
     path = resource[:path]
-    raise Puppet::Error.new("#{self.class.name} must specify a path for daemon directory") unless path
+    raise Puppet::Error, "#{self.class.name} must specify a path for daemon directory" unless path
 
     File.join(path, resource[:name])
   end
 
   def status
     begin
-      output = svstat self.service
+      output = svstat service
       if output =~ /:\s+up \(/
         return :running
       end
@@ -131,66 +131,66 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
     if resource[:manifest]
       Puppet.notice "Configuring #{resource[:name]}"
       command = [resource[:manifest], resource[:name]]
-      system("#{command}")
+      system(command.to_s)
     end
   rescue Puppet::ExecutionFailure => detail
-    raise Puppet::Error.new("Cannot config #{self.service} to enable it: #{detail}", detail)
+    raise Puppet::Error.new("Cannot config #{service} to enable it: #{detail}", detail)
   end
 
   def enabled?
-    case self.status
+    case status
     when :running
       # obviously if the daemon is running then it is enabled
-      return :true
+      :true
     else
       # the service is enabled if it is linked
-      return Puppet::FileSystem.symlink?(self.service) ? :true : :false
+      Puppet::FileSystem.symlink?(service) ? :true : :false
     end
   end
 
   def enable
-    if !FileTest.directory?(self.daemon)
+    unless FileTest.directory?(daemon)
       Puppet.notice "No daemon dir, calling setupservice for #{resource[:name]}"
-      self.setupservice
+      setupservice
     end
-    if self.daemon
-      if !Puppet::FileSystem.symlink?(self.service)
-        Puppet.notice "Enabling #{self.service}: linking #{self.daemon} -> #{self.service}"
-        Puppet::FileSystem.symlink(self.daemon, self.service)
+    if daemon
+      unless Puppet::FileSystem.symlink?(service)
+        Puppet.notice "Enabling #{service}: linking #{daemon} -> #{service}"
+        Puppet::FileSystem.symlink(daemon, service)
       end
     end
-  rescue Puppet::ExecutionFailure
-    raise Puppet::Error.new("No daemon directory found for #{self.service}", $!)
+  rescue Puppet::ExecutionFailure => e
+    raise Puppet::Error.new("No daemon directory found for #{service}", e)
   end
 
   def disable
     begin
-      if !FileTest.directory?(self.daemon)
+      unless FileTest.directory?(daemon)
         Puppet.notice "No daemon dir, calling setupservice for #{resource[:name]}"
-        self.setupservice
+        setupservice
       end
-      if self.daemon
-        if Puppet::FileSystem.symlink?(self.service)
-          Puppet.notice "Disabling #{self.service}: removing link #{self.daemon} -> #{self.service}"
-          Puppet::FileSystem.unlink(self.service)
+      if daemon
+        if Puppet::FileSystem.symlink?(service)
+          Puppet.notice "Disabling #{service}: removing link #{daemon} -> #{service}"
+          Puppet::FileSystem.unlink(service)
         end
       end
-    rescue Puppet::ExecutionFailure
-      raise Puppet::Error.new("No daemon directory found for #{self.service}", $!)
+    rescue Puppet::ExecutionFailure => e
+      raise Puppet::Error.new("No daemon directory found for #{service}", e)
     end
-    self.stop
+    stop
   end
 
   def restart
-    svc "-t", self.service
+    svc "-t", service
   end
 
   def start
     enable unless enabled? == :true
-    svc "-u", self.service
+    svc "-u", service
   end
 
   def stop
-    svc "-d", self.service
+    svc "-d", service
   end
 end

data/lib/puppet/provider/service/debian.rb

@@ -21,8 +21,8 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
 
   confine :false => Puppet::FileSystem.exist?('/proc/1/comm') && Puppet::FileSystem.read('/proc/1/comm').include?('systemd')
 
-  defaultfor 'os.name' => :cumuluslinux, 'os.release.major' => ['1', '2']
-  defaultfor 'os.name' => :debian, 'os.release.major' => ['5', '6', '7']
+  defaultfor 'os.name' => :cumuluslinux, 'os.release.major' => %w[1 2]
+  defaultfor 'os.name' => :debian, 'os.release.major' => %w[5 6 7]
   defaultfor 'os.name' => :devuan
 
   # Remove the symlinks
@@ -42,7 +42,7 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
     # 106 is the exit status when the policy layer supplies a fallback action
     # See x-man-page://invoke-rc.d
     if [104, 106].include?(status.exitstatus)
-      return :true
+      :true
     elsif [101, 105].include?(status.exitstatus)
       # 101 is action not allowed, which means we have to do the check manually.
       # 105 is unknown, which generally means the initscript does not support query
@@ -50,12 +50,12 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
       # For those that do not, perform the checks manually
       # http://www.debian.org/doc/debian-policy/ch-opersys.html
       if get_start_link_count >= 4
-        return :true
+        :true
       else
-        return :false
+        :false
       end
     else
-      return :false
+      :false
     end
   end
 

data/lib/puppet/provider/service/freebsd.rb

@@ -21,7 +21,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
   # Executing an init script with the 'rcvar' argument returns
   # the service name, rcvar name and whether it's enabled/disabled
   def rcvar
-    rcvar = execute([self.initscript, :rcvar], :failonfail => true, :combine => false, :squelch => false)
+    rcvar = execute([initscript, :rcvar], :failonfail => true, :combine => false, :squelch => false)
     rcvar = rcvar.split("\n")
     rcvar.delete_if { |str| str =~ /^#\s*$/ }
     rcvar[1] = rcvar[1].gsub(/^\$/, '')
@@ -30,11 +30,11 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
 
   # Extract value name from service or rcvar
   def extract_value_name(name, rc_index, regex, regex_index)
-    value_name = self.rcvar[rc_index]
-    self.error("No #{name} name found in rcvar") if value_name.nil?
+    value_name = rcvar[rc_index]
+    error("No #{name} name found in rcvar") if value_name.nil?
     value_name = value_name.gsub!(regex, regex_index)
-    self.error("#{name} name is empty") if value_name.nil?
-    self.debug("#{name} name is #{value_name}")
+    error("#{name} name is empty") if value_name.nil?
+    debug("#{name} name is #{value_name}")
     value_name
   end
 
@@ -50,20 +50,20 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
 
   # Extract rcvar value
   def rcvar_value
-    value = self.rcvar[1]
-    self.error("No rcvar value found in rcvar") if value.nil?
+    value = rcvar[1]
+    error("No rcvar value found in rcvar") if value.nil?
     value = value.gsub!(/(.*)(_enable)?="?(\w+)"?/, '\3')
-    self.error("rcvar value is empty") if value.nil?
-    self.debug("rcvar value is #{value}")
+    error("rcvar value is empty") if value.nil?
+    debug("rcvar value is #{value}")
     value
   end
 
   # Edit rc files and set the service to yes/no
   def rc_edit(yesno)
-    service = self.service_name
-    rcvar = self.rcvar_name
-    self.debug("Editing rc files: setting #{rcvar} to #{yesno} for #{service}")
-    self.rc_add(service, rcvar, yesno) if not self.rc_replace(service, rcvar, yesno)
+    service = service_name
+    rcvar = rcvar_name
+    debug("Editing rc files: setting #{rcvar} to #{yesno} for #{service}")
+    rc_add(service, rcvar, yesno) unless rc_replace(service, rcvar, yesno)
   end
 
   # Try to find an existing setting in the rc files
@@ -72,14 +72,14 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
     success = false
     # Replace in all files, not just in the first found with a match
     [rcconf, rcconf_local, rcconf_dir + "/#{service}"].each do |filename|
-      if Puppet::FileSystem.exist?(filename)
-        s = File.read(filename)
-        if s.gsub!(/^(#{rcvar}(_enable)?)=\"?(YES|NO)\"?/, "\\1=\"#{yesno}\"")
-          Puppet::FileSystem.replace_file(filename) { |f| f << s }
-          self.debug("Replaced in #{filename}")
-          success = true
-        end
-      end
+      next unless Puppet::FileSystem.exist?(filename)
+
+      s = File.read(filename)
+      next unless s.gsub!(/^(#{rcvar}(_enable)?)="?(YES|NO)"?/, "\\1=\"#{yesno}\"")
+
+      Puppet::FileSystem.replace_file(filename) { |f| f << s }
+      debug("Replaced in #{filename}")
+      success = true
     end
     success
   end
@@ -89,53 +89,53 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
     append = "\# Added by Puppet\n#{rcvar}_enable=\"#{yesno}\"\n"
     # First, try the one-file-per-service style
     if Puppet::FileSystem.exist?(rcconf_dir)
-      File.open(rcconf_dir + "/#{service}", File::WRONLY | File::APPEND | File::CREAT, 0644) { |f|
+      File.open(rcconf_dir + "/#{service}", File::WRONLY | File::APPEND | File::CREAT, 0o644) { |f|
         f << append
-        self.debug("Appended to #{f.path}")
+        debug("Appended to #{f.path}")
       }
     elsif Puppet::FileSystem.exist?(rcconf_local)
       # Else, check the local rc file first, but don't create it
       File.open(rcconf_local, File::WRONLY | File::APPEND) { |f|
         f << append
-        self.debug("Appended to #{f.path}")
+        debug("Appended to #{f.path}")
       }
     else
       # At last use the standard rc.conf file
-      File.open(rcconf, File::WRONLY | File::APPEND | File::CREAT, 0644) { |f|
+      File.open(rcconf, File::WRONLY | File::APPEND | File::CREAT, 0o644) { |f|
         f << append
-        self.debug("Appended to #{f.path}")
+        debug("Appended to #{f.path}")
       }
     end
   end
 
   def enabled?
-    if /YES$/ =~ self.rcvar_value
-      self.debug("Is enabled")
+    if /YES$/ =~ rcvar_value
+      debug("Is enabled")
       return :true
     end
-    self.debug("Is disabled")
+    debug("Is disabled")
     :false
   end
 
   def enable
-    self.debug("Enabling")
-    self.rc_edit("YES")
+    debug("Enabling")
+    rc_edit("YES")
   end
 
   def disable
-    self.debug("Disabling")
-    self.rc_edit("NO")
+    debug("Disabling")
+    rc_edit("NO")
   end
 
   def startcmd
-    [self.initscript, :onestart]
+    [initscript, :onestart]
   end
 
   def stopcmd
-    [self.initscript, :onestop]
+    [initscript, :onestop]
   end
 
   def statuscmd
-    [self.initscript, :onestatus]
+    [initscript, :onestatus]
   end
 end

data/lib/puppet/provider/service/gentoo.rb

@@ -16,8 +16,8 @@ Puppet::Type.type(:service).provide :gentoo, :parent => :init do
 
   def disable
     output = update :del, @resource[:name], :default
-  rescue Puppet::ExecutionFailure
-    raise Puppet::Error, "Could not disable #{self.name}: #{output}", $!.backtrace
+  rescue Puppet::ExecutionFailure => e
+    raise Puppet::Error, "Could not disable #{name}: #{output}", e.backtrace
   end
 
   def enabled?
@@ -33,15 +33,15 @@ Puppet::Type.type(:service).provide :gentoo, :parent => :init do
 
     # If it's enabled then it will print output showing service | runlevel
     if output =~ /^\s*#{@resource[:name]}\s*\|\s*(boot|default)/
-      return :true
+      :true
     else
-      return :false
+      :false
     end
   end
 
   def enable
     output = update :add, @resource[:name], :default
-  rescue Puppet::ExecutionFailure
-    raise Puppet::Error, "Could not enable #{self.name}: #{output}", $!.backtrace
+  rescue Puppet::ExecutionFailure => e
+    raise Puppet::Error, "Could not enable #{name}: #{output}", e.backtrace
   end
 end

data/lib/puppet/provider/service/init.rb

@@ -21,7 +21,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
   end
 
   # Debian and Ubuntu should use the Debian provider.
-  confine :false => ['Debian', 'Ubuntu'].include?(Puppet.runtime[:facter].value('os.name'))
+  confine :false => %w[Debian Ubuntu].include?(Puppet.runtime[:facter].value('os.name'))
   # RedHat systems should use the RedHat provider.
   confine :false => Puppet.runtime[:facter].value('os.family') == 'RedHat'
 
@@ -35,9 +35,9 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
   def self.excludes
     excludes = []
     # these exclude list was found with grep -L '\/sbin\/runscript' /etc/init.d/* on gentoo
-    excludes += %w{functions.sh reboot.sh shutdown.sh}
+    excludes += %w[functions.sh reboot.sh shutdown.sh]
     # this exclude list is all from /sbin/service (5.x), but I did not exclude kudzu
-    excludes += %w{functions halt killall single linuxconf reboot boot}
+    excludes += %w[functions halt killall single linuxconf reboot boot]
     # 'wait-for-state' and 'portmap-wait' are excluded from instances here
     # because they take parameters that have unclear meaning. It looks like
     # 'wait-for-state' is a generic waiter mainly used internally for other
@@ -49,37 +49,37 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     # eventually explain how to use the wait-for-state service or perhaps why
     # it should remain excluded. When that bug is addressed this should be
     # reexamined.
-    excludes += %w{wait-for-state portmap-wait}
+    excludes += %w[wait-for-state portmap-wait]
     # these excludes were found with grep -r -L start /etc/init.d
-    excludes += %w{rcS module-init-tools}
+    excludes += %w[rcS module-init-tools]
     # Prevent puppet failing on unsafe scripts from Yocto Linux
     if Puppet.runtime[:facter].value('os.family') == "cisco-wrlinux"
-      excludes += %w{banner.sh bootmisc.sh checkroot.sh devpts.sh dmesg.sh
+      excludes += %w[banner.sh bootmisc.sh checkroot.sh devpts.sh dmesg.sh
                      hostname.sh mountall.sh mountnfs.sh populate-volatile.sh
                      rmnologin.sh save-rtc.sh sendsigs sysfs.sh umountfs
-                     umountnfs.sh}
+                     umountnfs.sh]
     end
     # Prevent puppet failing to get status of the new service introduced
     # by the fix for this (bug https://bugs.launchpad.net/ubuntu/+source/lightdm/+bug/982889)
     # due to puppet's inability to deal with upstart services with instances.
-    excludes += %w{plymouth-ready}
+    excludes += %w[plymouth-ready]
     # Prevent puppet failing to get status of these services, which need parameters
     # passed in (see https://bugs.launchpad.net/ubuntu/+source/puppet/+bug/1276766).
-    excludes += %w{idmapd-mounting startpar-bridge}
+    excludes += %w[idmapd-mounting startpar-bridge]
     # Prevent puppet failing to get status of these services, additional upstart
     # service with instances
-    excludes += %w{cryptdisks-udev}
-    excludes += %w{statd-mounting}
-    excludes += %w{gssd-mounting}
+    excludes += %w[cryptdisks-udev]
+    excludes += %w[statd-mounting]
+    excludes += %w[gssd-mounting]
     excludes
   end
 
   # List all services of this type.
   def self.instances
-    get_services(self.defpath)
+    get_services(defpath)
   end
 
-  def self.get_services(defpath, exclude = self.excludes)
+  def self.get_services(defpath, exclude = excludes)
     defpath = [defpath] unless defpath.is_a? Array
     instances = []
     defpath.each do |path|
@@ -118,7 +118,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
 
   # Where is our init script?
   def initscript
-    @initscript ||= self.search(@resource[:name])
+    @initscript ||= search(@resource[:name])
   end
 
   def paths
@@ -127,9 +127,9 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
         true
       else
         if Puppet::FileSystem.exist?(path)
-          self.debug "Search path #{path} is not a directory"
+          debug "Search path #{path} is not a directory"
         else
-          self.debug "Search path #{path} does not exist"
+          debug "Search path #{path} does not exist"
         end
         false
       end
@@ -142,7 +142,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
       if Puppet::FileSystem.exist? fqname
         return fqname
       else
-        self.debug("Could not find #{name} in #{path}")
+        debug("Could not find #{name} in #{path}")
       end
     end
 
@@ -151,7 +151,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
       if Puppet::FileSystem.exist? fqname_sh
         return fqname_sh
       else
-        self.debug("Could not find #{name}.sh in #{path}")
+        debug("Could not find #{name}.sh in #{path}")
       end
     end
     raise Puppet::Error, "Could not find init script for '#{name}'"